External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 13:02:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed some tests and text

Browse source
This commit is contained in:
Evan Kranzler 2018-04-15 13:50:48 -04:00
parent bddb958ea3
commit ef33472ee5
6 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/TokenImplActivatedAbilityTest.java
View file

@ -50,9 +50,9 @@ public class TokenImplActivatedAbilityTest extends CardTestPlayerBase {
addCard(Zone.BATTLEFIELD, playerA, "Omnath, Locus of Mana", 1); addCard(Zone.BATTLEFIELD, playerA, "Omnath, Locus of Mana", 1);
addCard(Zone.BATTLEFIELD, playerA, "Freyalise, Llanowar's Fury"); addCard(Zone.BATTLEFIELD, playerA, "Freyalise, Llanowar's Fury");
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+2: Create a 1/1 green Elf Druid creature token with \"{T}: Add {G} to your mana pool.\""); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+2: Create a 1/1 green Elf Druid creature token with \"{T}: Add {G}.\"");
activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "+2: Create a 1/1 green Elf Druid creature token with \"{T}: Add {G} to your mana pool.\""); activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "+2: Create a 1/1 green Elf Druid creature token with \"{T}: Add {G}.\"");
activateManaAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {G} to your mana pool."); activateManaAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {G}.");
setStopAt(3, PhaseStep.PRECOMBAT_MAIN); setStopAt(3, PhaseStep.PRECOMBAT_MAIN);
execute(); execute();

8
Mage.Tests/src/test/java/org/mage/test/cards/mana/CryptGhastTest.java
View file

@ -49,8 +49,8 @@ public class CryptGhastTest extends CardTestPlayerBase {
// Swamp Mountain // Swamp Mountain
addCard(Zone.BATTLEFIELD, playerA, "Badlands", 1); addCard(Zone.BATTLEFIELD, playerA, "Badlands", 1);
activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R} to your mana pool"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}");
activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {B} to your mana pool"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {B}");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Erebos's Titan"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Erebos's Titan");
setStopAt(1, PhaseStep.BEGIN_COMBAT); setStopAt(1, PhaseStep.BEGIN_COMBAT);
@ -88,8 +88,8 @@ public class CryptGhastTest extends CardTestPlayerBase {
setChoice(playerB, "X=2"); setChoice(playerB, "X=2");
// Crypt Ghast may no longer give additional mana // Crypt Ghast may no longer give additional mana
activateManaAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R} to your mana pool"); activateManaAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}");
activateManaAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {B} to your mana pool"); activateManaAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {B}");
castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Erebos's Titan"); castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Erebos's Titan");
setStopAt(3, PhaseStep.PRECOMBAT_MAIN); setStopAt(3, PhaseStep.PRECOMBAT_MAIN);

26
Mage.Tests/src/test/java/org/mage/test/cards/mana/ManaFlareTest.java
View file

@ -36,7 +36,6 @@ import org.mage.test.serverside.base.CardTestPlayerBase;
* *
* @author LevelX2 * @author LevelX2
*/ */
public class ManaFlareTest extends CardTestPlayerBase { public class ManaFlareTest extends CardTestPlayerBase {
@Test @Test
@ -50,20 +49,20 @@ public class ManaFlareTest extends CardTestPlayerBase {
addCard(Zone.HAND, playerA, "Vedalken Mastermind", 1); addCard(Zone.HAND, playerA, "Vedalken Mastermind", 1);
// because available mana calculation does not work correctly with Mana Flare we have to tap the land manually // because available mana calculation does not work correctly with Mana Flare we have to tap the land manually
activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {U} to your mana pool"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {U}");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Vedalken Mastermind"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Vedalken Mastermind");
setStopAt(1, PhaseStep.BEGIN_COMBAT); setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute(); execute();
assertPermanentCount(playerA, "Vedalken Mastermind", 1); assertPermanentCount(playerA, "Vedalken Mastermind", 1);
} }
/** /**
* Mana Flare is only adding colorless mana, at least off of dual lands (Watery Grave in this instance). * Mana Flare is only adding colorless mana, at least off of dual lands
* Island only adds colorless. Plains adds white though. * (Watery Grave in this instance). Island only adds colorless. Plains adds
* white though.
*/ */
@Test @Test
public void testWateryGrave() { public void testWateryGrave() {
@ -76,15 +75,14 @@ public class ManaFlareTest extends CardTestPlayerBase {
addCard(Zone.HAND, playerB, "Nantuko Shade", 1); addCard(Zone.HAND, playerB, "Nantuko Shade", 1);
// because available mana calculation does not work correctly with Mana Flare we have to tap the land manually // because available mana calculation does not work correctly with Mana Flare we have to tap the land manually
activateManaAbility(2, PhaseStep.PRECOMBAT_MAIN, playerB, "{T}: Add {B} to your mana pool"); activateManaAbility(2, PhaseStep.PRECOMBAT_MAIN, playerB, "{T}: Add {B}");
castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Nantuko Shade"); castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Nantuko Shade");
setStopAt(2, PhaseStep.BEGIN_COMBAT); setStopAt(2, PhaseStep.BEGIN_COMBAT);
execute(); execute();
assertPermanentCount(playerB, "Nantuko Shade", 1); assertPermanentCount(playerB, "Nantuko Shade", 1);
} }
} }

2
Mage.Tests/src/test/java/org/mage/test/cards/rules/MeliraSylvokOutcastTest.java
View file

@ -59,7 +59,7 @@ public class MeliraSylvokOutcastTest extends CardTestPlayerBase {
// Put a -1/-1 counter on Devoted Druid: Untap Devoted Druid. // Put a -1/-1 counter on Devoted Druid: Untap Devoted Druid.
addCard(Zone.BATTLEFIELD, playerA, "Devoted Druid", 1); // 0/2 addCard(Zone.BATTLEFIELD, playerA, "Devoted Druid", 1); // 0/2
activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {G} to your mana pool"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {G}");
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Put a -1/-1 counter on "); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Put a -1/-1 counter on ");
setStopAt(1, PhaseStep.BEGIN_COMBAT); setStopAt(1, PhaseStep.BEGIN_COMBAT);

2
Mage.Tests/src/test/java/org/mage/test/game/ends/GameIsADrawTest.java
View file

@ -167,7 +167,7 @@ public class GameIsADrawTest extends CardTestPlayerBase {
Assert.assertFalse("Game should not have ended.", currentGame.hasEnded()); Assert.assertFalse("Game should not have ended.", currentGame.hasEnded());
assertLife(playerA, 100); assertLife(playerA, 100);
Assert.assertFalse("No inifinite loop detected, game has be no draw.", currentGame.isADraw()); Assert.assertFalse("No infinite loop detected, game has be no draw.", currentGame.isADraw());
} }

4
Mage/src/main/java/mage/game/permanent/token/FreyaliseLlanowarsFuryToken.java
View file

@ -25,8 +25,8 @@
* authors and should not be interpreted as representing official policies, either expressed * authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com. * or implied, of BetaSteward_at_googlemail.com.
*/ */
package mage.game.permanent.token; package mage.game.permanent.token;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@ -57,7 +57,7 @@ public class FreyaliseLlanowarsFuryToken extends TokenImpl {
} }
public FreyaliseLlanowarsFuryToken(String setCode, int tokenType) { public FreyaliseLlanowarsFuryToken(String setCode, int tokenType) {
super("Elf Druid", "1/1 green Elf Druid creature token with \"{T}: Add {G} to your mana pool.\""); super("Elf Druid", "1/1 green Elf Druid creature token with \"{T}: Add {G}.\"");
availableImageSetCodes = tokenImageSets; availableImageSetCodes = tokenImageSets;
setOriginalExpansionSetCode(setCode); setOriginalExpansionSetCode(setCode);
this.cardType.add(CardType.CREATURE); this.cardType.add(CardType.CREATURE);