github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 11:09:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some changes to test handling to set correct zon for cards in library.

Browse source
This commit is contained in:
LevelX2 2013-09-01 15:48:44 +02:00
parent 1090258114
commit 8e9dba6368
3 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Mage.Tests/src/test/java/org/mage/test/cards/triggers/BloodbraidElfTest.java
View file

@ -9,6 +9,24 @@ import org.mage.test.serverside.base.CardTestPlayerBase;
* @author noxx, Loki * @author noxx, Loki
*/ */
public class BloodbraidElfTest extends CardTestPlayerBase { public class BloodbraidElfTest extends CardTestPlayerBase {
/*
* Terminus
* Sorcery, 4WW (6)
* Put all creatures on the bottom of their owners' libraries.
* Miracle {W} (You may cast this card for its miracle cost when you draw it if it's the first card you drew this turn.)
*
* Bloodbraid Elf
* Creature — Elf Berserker 3/2, 2RG (4)
* Haste
* Cascade (When you cast this spell, exile cards from the top of your library until you exile a nonland card that costs
* less. You may cast it without paying its mana cost. Put the exiled cards on the bottom in a random order.)
*
* Goblin Wardriver
* Creature — Goblin Warrior 2/2, RR (2)
* Battle cry (Whenever this creature attacks, each other attacking creature gets +1/+0 until end of turn.)
*
*/
@Test @Test
public void testCascade() { public void testCascade() {
addCard(Zone.HAND, playerA, "Bloodbraid Elf"); addCard(Zone.HAND, playerA, "Bloodbraid Elf");

4
Mage.Tests/src/test/java/org/mage/test/serverside/base/CardTestPlayerBase.java
View file

@ -64,8 +64,8 @@ public abstract class CardTestPlayerBase extends CardTestPlayerAPIImpl {
if (deck.getCards().size() < 40) { if (deck.getCards().size() < 40) {
throw new IllegalArgumentException("Couldn't load deck, deck size=" + deck.getCards().size()); throw new IllegalArgumentException("Couldn't load deck, deck size=" + deck.getCards().size());
} }
game.addPlayer(playerA, deck);
game.loadCards(deck.getCards(), playerA.getId()); game.loadCards(deck.getCards(), playerA.getId());
game.addPlayer(playerA, deck);
playerB = createNewPlayer("PlayerB"); playerB = createNewPlayer("PlayerB");
playerB.setTestMode(true); playerB.setTestMode(true);
@ -73,8 +73,8 @@ public abstract class CardTestPlayerBase extends CardTestPlayerAPIImpl {
if (deck2.getCards().size() < 40) { if (deck2.getCards().size() < 40) {
throw new IllegalArgumentException("Couldn't load deck, deck size=" + deck2.getCards().size()); throw new IllegalArgumentException("Couldn't load deck, deck size=" + deck2.getCards().size());
} }
game.addPlayer(playerB, deck2);
game.loadCards(deck2.getCards(), playerB.getId()); game.loadCards(deck2.getCards(), playerB.getId());
game.addPlayer(playerB, deck2);
activePlayer = playerA; activePlayer = playerA;
currentGame = game; currentGame = game;

3
Mage/src/mage/abilities/keyword/CascadeAbility.java
View file

@ -110,11 +110,10 @@ class CascadeEffect extends OneShotEffect<CascadeEffect> {
ExileZone exile = game.getExile().createZone(source.getSourceId(), player.getName() + " Cascade"); ExileZone exile = game.getExile().createZone(source.getSourceId(), player.getName() + " Cascade");
int sourceCost = game.getCard(source.getSourceId()).getManaCost().convertedManaCost(); int sourceCost = game.getCard(source.getSourceId()).getManaCost().convertedManaCost();
do { do {
card = player.getLibrary().removeFromTop(game); card = player.getLibrary().getFromTop(game);
if (card == null) { if (card == null) {
break; break;
} }
card.moveToExile(exile.getId(), exile.getName(), source.getId(), game); card.moveToExile(exile.getId(), exile.getName(), source.getId(), game);
} while (card.getCardType().contains(CardType.LAND) || card.getManaCost().convertedManaCost() >= sourceCost); } while (card.getCardType().contains(CardType.LAND) || card.getManaCost().convertedManaCost() >= sourceCost);