External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-10 21:02:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2112 from fwannmacher/master

Browse source 
Converted cardNumber from int to String. Now card number with "a" or "b" can be used.
This commit is contained in:
Derek M 2016-07-25 16:24:01 -04:00 • committed by GitHub
commit 86e7ace06e
11427 changed files with 13206 additions and 11464 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage.Tests/src/test/java/org/mage/test/cards/continuous/ImprisonedInTheMoonTest.java
View file

@ -35,20 +35,20 @@ public class ImprisonedInTheMoonTest extends CardTestPlayerBase {
addCard(Zone.BATTLEFIELD, playerB, "Urza's Tower", 1);
addCard(Zone.BATTLEFIELD, playerB, "Urza's Power Plant", 1);
addCard(Zone.HAND, playerB, "Wurmcoil Engine", 1); // {6} Wurm - 6/6 Deathtouch and Lifelink
addCard(Zone.HAND, playerB, "Bottle Gnomes", 1); // {3} Gnome - 1/3
addCard(Zone.HAND, playerB, "Bonesplitter", 1); // {1} Equipament
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Imprisoned in the Moon");
addTarget(playerA, "Urza's Mine");
// 6 total mana available - 3 from Tower, 2 from Powerplant, 1 from enchanted Mine
castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Wurmcoil Engine");
castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Bottle Gnomes");
castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Bonesplitter");
setStopAt(2, PhaseStep.BEGIN_COMBAT);
execute();
assertPermanentCount(playerA, "Imprisoned in the Moon", 1);
assertPermanentCount(playerB, "Wurmcoil Engine", 1);
assertHandCount(playerB,"Wurmcoil Engine", 0);
assertHandCount(playerB, "Bottle Gnomes", 1); // should never be cast - wurmcoil uses up all mana
assertPermanentCount(playerB, "Bottle Gnomes", 0);
assertHandCount(playerB, "Bonesplitter", 1); // should never be cast - wurmcoil uses up all mana
assertPermanentCount(playerB, "Bonesplitter", 0);
}
}

6
Mage.Tests/src/test/java/org/mage/test/cards/triggers/SoulWardenTest.java
View file

@ -21,19 +21,21 @@ public class SoulWardenTest extends CardTestPlayerBase {
public void testDisabledEffectOnChangeZone() {
addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1);
addCard(Zone.HAND, playerA, "Lightning Bolt");
addCard(Zone.BATTLEFIELD, playerA, "Plains", 2);
addCard(Zone.BATTLEFIELD, playerA, "Plains", 4);
addCard(Zone.HAND, playerA, "Elite Vanguard", 2);
addCard(Zone.HAND, playerA, "Raise the Alarm", 1);
addCard(Zone.BATTLEFIELD, playerA, "Soul Warden", 1);
// Creature 2/1
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Vanguard");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Raise the Alarm");
castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "Soul Warden");
castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Elite Vanguard");
setStopAt(1, PhaseStep.END_TURN);
execute();
assertLife(playerA, 21);
assertLife(playerA, 23);
assertLife(playerB, 20);
}

6
Mage.Tests/src/test/java/org/mage/test/serverside/deck/DeckValidatorTest.java
View file

@ -49,14 +49,14 @@ public class DeckValidatorTest extends CardTestPlayerBase {
String name;
String setCode;
int cardNumber;
String cardNumber;
int number;
public CardNameAmount(String setCode, int cardNumber, int number) {
this.name = "";
this.setCode = setCode;
this.cardNumber = cardNumber;
this.cardNumber = String.valueOf(cardNumber);
this.number = number;
}
@ -77,7 +77,7 @@ public class DeckValidatorTest extends CardTestPlayerBase {
return setCode;
}
public int getCardNumber() {
public String getCardNumber() {
return cardNumber;
}