From 35628c205add336655aba40131ba80f45f179aac Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 10 Jan 2020 20:43:19 +0100 Subject: [PATCH] * Venarian Gold - Fixed rule text according #6170. --- Mage.Sets/src/mage/cards/v/VenarianGold.java | 13 ++++++------- .../common/counter/AddCountersAttachedEffect.java | 4 +++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Mage.Sets/src/mage/cards/v/VenarianGold.java b/Mage.Sets/src/mage/cards/v/VenarianGold.java index 3de871a0556..06942304655 100644 --- a/Mage.Sets/src/mage/cards/v/VenarianGold.java +++ b/Mage.Sets/src/mage/cards/v/VenarianGold.java @@ -1,4 +1,3 @@ - package mage.cards.v; import java.util.UUID; @@ -32,7 +31,7 @@ import mage.target.common.TargetCreaturePermanent; public final class VenarianGold extends CardImpl { public VenarianGold(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{X}{U}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{X}{U}{U}"); this.subtype.add(SubType.AURA); // Enchant creature @@ -41,19 +40,19 @@ public final class VenarianGold extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); - // When Venarian Gold enters the battlefield, tap enchanted creature and put a number of sleep counters on it equal to the value of X as you cast Venarian Gold. + // When Venarian Gold enters the battlefield, tap enchanted creature and put X sleep counters on it. Ability ability = new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect()); - ability.addEffect(new AddCountersAttachedEffect(CounterType.SLEEP.createInstance(), new VenarianGoldValue(), "it equal to the value of X as you cast {this}")); + ability.addEffect(new AddCountersAttachedEffect(CounterType.SLEEP.createInstance(), new VenarianGoldValue(), "it").setText("and put X sleep counters on it")); this.addAbility(ability); // Enchanted creature doesn’t untap during its controller’s untap step if it has a sleep counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousRuleModifyingEffect(new DontUntapInControllersUntapStepEnchantedEffect(), + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousRuleModifyingEffect(new DontUntapInControllersUntapStepEnchantedEffect(), new AttachedToCounterCondition(CounterType.SLEEP, 1)).setText("Enchanted creature doesn't untap during its controller's untap step if it has a sleep counter on it"))); // At the beginning of the upkeep of enchanted creature’s controller, remove a sleep counter from that creature. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new RemoveCountersAttachedEffect(CounterType.SLEEP.createInstance(), "that creature"), + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new RemoveCountersAttachedEffect(CounterType.SLEEP.createInstance(), "that creature"), TargetController.CONTROLLER_ATTACHED_TO, false)); - + } public VenarianGold(final VenarianGold card) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersAttachedEffect.java index 5a9f9bbbb11..8854bc43283 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersAttachedEffect.java @@ -1,4 +1,3 @@ - package mage.abilities.effects.common.counter; import java.util.Locale; @@ -69,6 +68,9 @@ public class AddCountersAttachedEffect extends OneShotEffect { } private void setText() { + if (!staticText.isEmpty()) { + return; + } StringBuilder sb = new StringBuilder(); // put a +1/+1 counter on it sb.append("put ");