diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AffinityForArtifactsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AffinityForArtifactsTest.java index 3dbd3c90029..c6ea9dcd780 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AffinityForArtifactsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AffinityForArtifactsTest.java @@ -14,16 +14,17 @@ public class AffinityForArtifactsTest extends CardTestPlayerBase { @Test public void testCastForCheaperCost() { addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4); + // Myr Enforcer Artifact Creature — Myr {7} + // Affinity for artifacts (This spell costs {1} less to cast for each artifact you control.) addCard(Zone.HAND, playerA, "Myr Enforcer"); addCard(Zone.BATTLEFIELD, playerA, "Myr Enforcer", 3); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Myr Enforcer"); - setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertPermanentCount(playerA, "Myr Enforcer", 4); + assertPermanentCount(playerA, "Myr Enforcer", 4); } /** diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DoublingSeasonTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DoublingSeasonTest.java index 43d05810f92..e1cb48a3b5a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DoublingSeasonTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DoublingSeasonTest.java @@ -76,7 +76,7 @@ public class DoublingSeasonTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Pallid Mycoderm"); - activateAbility(5, PhaseStep.PRECOMBAT_MAIN, playerA, "Remove three Spore counters from {this}: Put a 1/1 green Saproling creature token onto the battlefield."); + activateAbility(5, PhaseStep.PRECOMBAT_MAIN, playerA, "Remove three spore counters from {this}: Put a 1/1 green Saproling creature token onto the battlefield."); setStopAt(5, PhaseStep.END_TURN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/cards/abilities/ProtectionFromTypeTest.java b/Mage.Tests/src/test/java/org/mage/test/serverside/cards/abilities/ProtectionFromTypeTest.java index 8f6f42e4419..09a993228f2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/cards/abilities/ProtectionFromTypeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/cards/abilities/ProtectionFromTypeTest.java @@ -17,7 +17,7 @@ public class ProtectionFromTypeTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Tel-Jilad Fallen"); - activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{2},Remove a Charge counter from {this}, {T}: put a -1/-1 counter on target creature.", "Tel-Jilad Fallen"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{2},Remove a charge counter from {this}, {T}: put a -1/-1 counter on target creature.", "Tel-Jilad Fallen"); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -32,7 +32,7 @@ public class ProtectionFromTypeTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Coral Merfolk"); - activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{2},Remove a Charge counter from {this}, {T}: Put a -1/-1 counter on target creature.", "Coral Merfolk"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{2},Remove a charge counter from {this}, {T}: Put a -1/-1 counter on target creature.", "Coral Merfolk"); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage/src/mage/counters/CounterType.java b/Mage/src/mage/counters/CounterType.java index e253c129358..99056392adc 100644 --- a/Mage/src/mage/counters/CounterType.java +++ b/Mage/src/mage/counters/CounterType.java @@ -34,54 +34,54 @@ package mage.counters; * @author nantuko */ public enum CounterType { - AGE("Age"), - AIM("Aim"), - ARROWHEAD("Arrowhead"), - AWAKENING("Awakening"), - BLAZE("Blaze"), - BRIBERY("Bribery"), - CHARGE("Charge"), - DELAY("Delay"), - DEPLETION("Depletion"), - DESPAIR("Despair"), - DEVOTION("Devotion"), - DIVINITY("Divinity"), - DOOM("Doom"), - ELIXIR("Elixir"), - EON("Eon"), - EYEBALL("Eyeball"), - FADE("Fade"), - FATE("Fate"), - FEATHER("Feather"), - FUSE("Fuse"), - HATCHLING("Hatchling"), - HOOFPRINT("Hoofprint"), - ICE("Ice"), - KI("Ki"), - LEVEL("Level"), - LORE("Lore"), - LUCK("Luck"), - LOYALTY("Loyalty"), + AGE("age"), + AIM("aim"), + ARROWHEAD("arrowhead"), + AWAKENING("awakening"), + BLAZE("blaze"), + BRIBERY("bribery"), + CHARGE("charge"), + DELAY("delay"), + DEPLETION("depletion"), + DESPAIR("despair"), + DEVOTION("devotion"), + DIVINITY("divinity"), + DOOM("doom"), + ELIXIR("elixir"), + EON("eon"), + EYEBALL("eyeball"), + FADE("fade"), + FATE("fate"), + FEATHER("feather"), + FUSE("fuse"), + HATCHLING("hatchling"), + HOOFPRINT("hoofprint"), + ICE("ice"), + KI("ki"), + LEVEL("level"), + LORE("lore"), + LUCK("luck"), + LOYALTY("loyalty"), M1M1(new BoostCounter(-1, -1).name), - MINING("Mining"), + MINING("mining"), P1P1(new BoostCounter(1, 1).name), - PAGE("Page"), - PAIN("Pain"), - PETRIFICATION("Petrification"), - PLAGUE("Plague"), - POISON("Poison"), - PRESSURE("Pressure"), - QUEST("Quest"), - SLIME("Slime"), - SPORE("Spore"), - STORAGE("Storage"), - STUDY("Study"), - THEFT("Theft"), - TIME("Time"), - TOWER("Tower"), - VELOCITY("Velocity"), - VILE("Vile"), - WISH("Wish"); + PAGE("page"), + PAIN("pain"), + PETRIFICATION("petrification"), + PLAGUE("plague"), + POISON("poison"), + PRESSURE("pressure"), + QUEST("quest"), + SLIME("slime"), + SPORE("spore"), + STORAGE("storage"), + STUDY("study"), + THEFT("theft"), + TIME("time"), + TOWER("tower"), + VELOCITY("velocity"), + VILE("vile"), + WISH("wish"); private final String name;