diff --git a/Mage.Sets/src/mage/cards/s/StubbornDenial.java b/Mage.Sets/src/mage/cards/s/StubbornDenial.java index 20a741afb1b..cbf434affa0 100644 --- a/Mage.Sets/src/mage/cards/s/StubbornDenial.java +++ b/Mage.Sets/src/mage/cards/s/StubbornDenial.java @@ -40,7 +40,7 @@ public final class StubbornDenial extends CardImpl { this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new CounterTargetEffect(), FerociousCondition.instance, - "
Ferocious &mdash If you control a creature with power 4 or greater, counter that spell instead")); + "
Ferocious — If you control a creature with power 4 or greater, counter that spell instead")); this.getSpellAbility().addTarget(new TargetSpell(filter)); this.getSpellAbility().addHint(FerociousHint.instance); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/xln/TreasureCoveTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/xln/TreasureCoveTest.java new file mode 100644 index 00000000000..dcb9dc645e3 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/xln/TreasureCoveTest.java @@ -0,0 +1,39 @@ +package org.mage.test.cards.single.xln; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * @author JayDi85 + */ +public class TreasureCoveTest extends CardTestPlayerBase { + + @Test + public void test_CanDrawAfterSacrifice() { + removeAllCardsFromHand(playerA); + + // {T}, Sacrifice a Treasure: Draw a card. + addCard(Zone.BATTLEFIELD, playerA, "Treasure Cove", 1); + // + // saga: I, II — Create a Treasure token. + addCard(Zone.BATTLEFIELD, playerA, "Forging the Tyrite Sword", 1); + + waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); + checkHandCount("before", 1, PhaseStep.PRECOMBAT_MAIN, playerA, 0); + checkPermanentCount("before", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Treasure", 2); // from saga + + // sacrifice and draw + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}, Sacrifice"); + setChoice(playerA, "Treasure"); + waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); + checkHandCount("after", 1, PhaseStep.PRECOMBAT_MAIN, playerA, 1); + checkPermanentCount("after", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Treasure", 2 - 1); + + setStrictChooseMode(true); + setStopAt(1, PhaseStep.END_TURN); + execute(); + assertAllCommandsUsed(); + } +} diff --git a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java index 69ccf67af8e..eca0cba80c3 100644 --- a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java +++ b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java @@ -1322,6 +1322,9 @@ public class VerifyCardDataTest { if (rule.contains("’")) { fail(card, "rules", "card's rules contains restricted symbol ’"); } + if (rule.contains("&mdash ")) { + fail(card, "rules", "card's rules contains restricted test [&mdash ] instead [—]"); + } } } diff --git a/Mage/src/main/java/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java index d67e4fe1327..1200d87d10b 100644 --- a/Mage/src/main/java/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java @@ -1,6 +1,5 @@ package mage.abilities.common; -import java.util.Locale; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.condition.Condition; import mage.abilities.effects.Effect; @@ -8,14 +7,15 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.Locale; + public class BeginningOfEndStepTriggeredAbility extends TriggeredAbilityImpl { - private TargetController targetController; - private Condition interveningIfClauseCondition; + private final TargetController targetController; + private final Condition interveningIfClauseCondition; public BeginningOfEndStepTriggeredAbility(Effect effect, TargetController targetController, boolean isOptional) { this(Zone.BATTLEFIELD, effect, targetController, null, isOptional); @@ -113,7 +113,7 @@ public class BeginningOfEndStepTriggeredAbility extends TriggeredAbilityImpl { } String abilityWordRule = ""; if (abilityWord != null) { - abilityWordRule = "" + abilityWord.toString() + " &mdash "; + abilityWordRule = "" + abilityWord.toString() + " — "; } switch (targetController) { @@ -139,7 +139,7 @@ public class BeginningOfEndStepTriggeredAbility extends TriggeredAbilityImpl { //Fixes punctuation on multiple sentence if-then construction // see -- Colfenor's Urn - if (interveningIfClauseCondition.toString().endsWith(".")){ + if (interveningIfClauseCondition.toString().endsWith(".")) { return interveningIfClauseCondition.toString() + " "; }