Moved skipping initial shuffling to game options.

This commit is contained in:
magenoxx 2012-04-07 11:52:31 +04:00
parent 53b2893a81
commit f0be9c35d7
5 changed files with 25 additions and 10 deletions

View file

@ -19,7 +19,9 @@ public class MulDayaChannelersTest extends CardTestPlayerBase {
public void testBoostFromTopCreatureCard() {
addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 3);
addCard(Constants.Zone.HAND, playerA, "Mul Daya Channelers");
addCard(Constants.Zone.LIBRARY, playerA, "Memnite");
skipInitShuffling();
castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Mul Daya Channelers");
@ -53,8 +55,10 @@ public class MulDayaChannelersTest extends CardTestPlayerBase {
public void testBoostLossThroughPhases() {
addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 3);
addCard(Constants.Zone.HAND, playerA, "Mul Daya Channelers");
addCard(Constants.Zone.LIBRARY, playerA, "Shock");
addCard(Constants.Zone.LIBRARY, playerA, "Memnite");
skipInitShuffling();
castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Mul Daya Channelers");

View file

@ -33,7 +33,9 @@ public abstract class CardTestPlayerBase extends CardTestPlayerAPIImpl {
BATTLEFIELD,
GRAVEYARD,
UNKNOWN
}
}
protected GameOptions gameOptions;
public CardTestPlayerBase() {
}
@ -86,6 +88,8 @@ public abstract class CardTestPlayerBase extends CardTestPlayerAPIImpl {
libraryCardsB.clear();
commandsA.clear();
commandsB.clear();
gameOptions = new GameOptions();
}
public void load(String path) throws FileNotFoundException, GameException {
@ -149,7 +153,7 @@ public abstract class CardTestPlayerBase extends CardTestPlayerAPIImpl {
boolean testMode = true;
long t1 = System.nanoTime();
GameOptions gameOptions = new GameOptions();
gameOptions.testMode = true;
gameOptions.stopOnTurn = stopOnTurn;
gameOptions.stopAtStep = stopAtStep;
@ -311,4 +315,7 @@ public abstract class CardTestPlayerBase extends CardTestPlayerAPIImpl {
}
}
protected void skipInitShuffling() {
gameOptions.skipInitShuffling = true;
}
}