From 960146d5544ede5b46c1f58940c7966ca5258d71 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Tue, 27 Jul 2021 08:58:27 -0400 Subject: [PATCH] added boolean set choice --- .../mage/test/AI/basic/ChooseTargetTest.java | 4 +- .../org/mage/test/AI/basic/CopyAITest.java | 2 +- .../AI/basic/TargetControllerChangeTest.java | 4 +- .../abilities/activated/ChaosWandTest.java | 2 +- .../activated/LightningStormTest.java | 4 +- .../curses/CurseOfShallowGravesTest.java | 8 +- .../cards/abilities/curses/CursesTest.java | 4 +- .../abilities/enters/AetherFigmentTest.java | 2 +- .../enters/ValakutTheMoltenPinnacleTest.java | 6 +- .../cards/abilities/keywords/AmplifyTest.java | 14 ++-- .../abilities/keywords/AnnihilatorTest.java | 2 +- .../cards/abilities/keywords/BestowTest.java | 2 +- .../cards/abilities/keywords/BuybackTest.java | 4 +- .../cards/abilities/keywords/CascadeTest.java | 6 +- .../cards/abilities/keywords/CipherTest.java | 6 +- .../abilities/keywords/ConspireTest.java | 24 +++--- .../keywords/CumulativeUpkeepTest.java | 12 +-- .../cards/abilities/keywords/CyclingTest.java | 2 +- .../cards/abilities/keywords/DashTest.java | 8 +- .../cards/abilities/keywords/DredgeTest.java | 2 +- .../cards/abilities/keywords/EchoTest.java | 2 +- .../cards/abilities/keywords/EntwineTest.java | 14 ++-- .../cards/abilities/keywords/EvokeTest.java | 2 +- .../cards/abilities/keywords/ExertTest.java | 36 ++++----- .../cards/abilities/keywords/ExploitTest.java | 6 +- .../abilities/keywords/FlashbackTest.java | 2 +- .../cards/abilities/keywords/GraftTest.java | 4 +- .../abilities/keywords/HideawayTest.java | 12 +-- .../cards/abilities/keywords/KickerTest.java | 72 +++++++++--------- .../KickerWithAnyNumberModesAbilityTest.java | 12 +-- .../keywords/KickerWithFlashbackTest.java | 4 +- .../cards/abilities/keywords/MadnessTest.java | 16 ++-- .../abilities/keywords/MegamorphTest.java | 2 +- .../cards/abilities/keywords/ModularTest.java | 4 +- .../cards/abilities/keywords/MorphTest.java | 76 +++++++++---------- .../abilities/keywords/OfferingTest.java | 10 +-- .../cards/abilities/keywords/ProwlTest.java | 4 +- .../cards/abilities/keywords/RecoverTest.java | 4 +- .../abilities/keywords/ReplicateTest.java | 32 ++++---- .../cards/abilities/keywords/RiotTest.java | 16 ++-- .../cards/abilities/keywords/RippleTest.java | 6 +- .../keywords/SoulbondKeywordTest.java | 6 +- .../keywords/SpliceOnArcaneTest.java | 8 +- .../cards/abilities/keywords/TributeTest.java | 2 +- .../oneshot/ConditionalOneShotEffectTest.java | 2 +- .../counterspell/CounterbalanceTest.java | 2 +- .../counterspell/CounterspellTest.java | 6 +- .../counterspell/DisruptingShoalTest.java | 8 +- .../exile/RoonOfTheHiddenRealmTest.java | 2 +- .../optional/IdentityThiefTests.java | 4 +- .../other/ChorusOfTheConclaveTest.java | 8 +- .../abilities/other/ThrummingStoneTest.java | 4 +- .../asthough/LeylineOfAnticipationTest.java | 4 +- .../twofaced/TwoFacedCardEffectsTest.java | 2 +- .../continuous/AngelOfJubilationTest.java | 2 +- ...manderAsIndomitableCreativityCastTest.java | 2 +- .../cards/continuous/CommandersCastTest.java | 34 ++++----- .../continuous/ConditionalPreventionTest.java | 4 +- .../continuous/DependentEffectsTest.java | 2 +- .../continuous/GoblinBushwhackerTest.java | 2 +- .../cards/continuous/SerraAscendantTest.java | 2 +- .../TappedForManaFromMultipleEffects.java | 4 +- .../continuous/UnboundFlourishingTest.java | 4 +- .../ExileAndReturnUnderYourControl.java | 2 +- .../control/GainControlTargetEffectTest.java | 8 +- .../TakeControlWhileSearchingLibraryTest.java | 10 +-- .../mage/test/cards/copy/AlteredEgoTest.java | 4 +- .../cards/copy/CleverImpersonatorTest.java | 2 +- .../org/mage/test/cards/copy/CloneTest.java | 4 +- .../test/cards/copy/CopyEnchantmentTest.java | 2 +- .../cards/copy/CopyPermanentSpellTest.java | 24 +++--- .../mage/test/cards/copy/CopySpellTest.java | 42 +++++----- .../mage/test/cards/copy/CryptoplasmTest.java | 4 +- .../test/cards/copy/EldraziMimicTest.java | 2 +- .../cards/copy/FlameshadowConjuringTest.java | 4 +- .../mage/test/cards/copy/HiveMindTest.java | 4 +- .../test/cards/copy/IdentityThiefTest.java | 2 +- .../test/cards/copy/IsochronScepterTest.java | 16 ++-- .../mage/test/cards/copy/MimicVatTest.java | 18 ++--- .../mage/test/cards/copy/MirrorworksTest.java | 4 +- .../cards/copy/ReversalOfFortuneTest.java | 4 +- .../cards/copy/SharuumTheHegemonTest.java | 10 +-- .../mage/test/cards/copy/SparkDoubleTest.java | 18 ++--- .../mage/test/cards/copy/SpelltwineTest.java | 4 +- ...CastFromHandWithoutPayingManaCostTest.java | 26 +++---- .../UseAlternateSourceCostsTest.java | 8 +- .../cost/kicker/GatekeeperOfMalakirTest.java | 2 +- .../ModalDoubleFacesCardsTest.java | 16 ++-- .../modification/CostModificationTest.java | 8 +- .../cost/modification/HeartstoneTest.java | 2 +- .../modification/MizzixOfTheIzmagnusTest.java | 2 +- .../sacrifice/OptionalSacrificeTests.java | 14 ++-- .../CastSplitCardsFromOtherZonesTest.java | 8 +- .../cost/splitcards/SplitCardCmcTest.java | 2 +- .../mage/test/cards/dungeons/DungeonTest.java | 52 ++++++------- .../cards/enchantments/AuraMovingTest.java | 4 +- .../enchantments/CircleOfAfflictionTest.java | 18 ++--- .../EnchantingGraveyardCardsTest.java | 4 +- .../cards/enchantments/MindsDilationTest.java | 4 +- .../cards/enchantments/OathOfLiegesTest.java | 22 +++--- .../test/cards/facedown/GrimHaruspexTest.java | 2 +- .../cards/facedown/PrimordialMistTest.java | 6 +- .../test/cards/mana/ExtraplanarLensTest.java | 4 +- .../mage/test/cards/mana/ManaPoolTest.java | 4 +- .../cards/mana/RosheenMeandererManaXTest.java | 12 +-- .../mana/conditional/ConditionalManaTest.java | 2 +- .../mana/phyrexian/PhyrexianManaTest.java | 22 +++--- .../cards/planes/UndercityReachesTest.java | 4 +- .../test/cards/planeswalker/LilianaTest.java | 2 +- .../planeswalker/NissaVastwoodSeerTest.java | 2 +- .../prevention/PreventAllDamageTest.java | 2 +- .../cards/replacement/DamageEffectsTest.java | 2 +- .../cards/replacement/DoublingSeasonTest.java | 2 +- .../replacement/LeylineOfTheVoidTest.java | 6 +- .../cards/replacement/PanharmoniconTest.java | 4 +- .../cards/replacement/PropagandaTest.java | 6 +- .../cards/replacement/PulmonicSliverTest.java | 8 +- .../cards/replacement/ScorchingLavaTest.java | 2 +- .../cards/replacement/WinLoseEffectsTest.java | 8 +- .../prevent/RefractionTrapTest.java | 2 +- .../cards/restriction/CantAttackTest.java | 16 ++-- .../cards/restriction/MeddlingMageTest.java | 8 +- .../test/cards/rules/CantBeTargetTest.java | 2 +- .../mage/test/cards/rules/CantCastTest.java | 2 +- .../mage/test/cards/rules/CantDrawTest.java | 2 +- .../rules/WorldEnchantmentsRuleTest.java | 4 +- .../cards/single/afr/TheTarrasqueTest.java | 6 +- .../akh/HapatraVizierOfPoisonsTest.java | 2 +- .../cards/single/akh/NewPerspectivesTest.java | 8 +- .../cards/single/bfz/ConduitOfRuinTest.java | 2 +- .../cards/single/bfz/EmeriaShepherdTest.java | 2 +- .../cards/single/c17/TheUrDragonTest.java | 2 +- .../cards/single/c18/AminatousAuguryTest.java | 2 +- .../test/cards/single/c18/GeodeGolemTest.java | 34 ++++----- .../single/c19/ChainerNightmareAdeptTest.java | 2 +- .../cards/single/c20/TwinningStaffTest.java | 2 +- .../cards/single/cmd/FlusterstormTest.java | 4 +- .../single/cmr/ArmixFiligreeThrasherTest.java | 2 +- .../cards/single/cmr/HellkiteCourserTest.java | 2 +- .../single/cmr/KrarkTheThumblessTest.java | 8 +- .../single/cmr/PromiseOfTomorrowTest.java | 8 +- .../test/cards/single/dst/DemonsHornTest.java | 2 +- .../cards/single/eld/OnceUponATimeTest.java | 12 +-- .../cards/single/emn/NephaliaAcademyTest.java | 6 +- .../cards/single/emn/SpellQuellerTest.java | 4 +- .../single/fut/MuragandaPetroglyphsTest.java | 6 +- .../single/grn/ThousandYearStormTest.java | 34 ++++----- .../single/hou/TormentOfHailfireTest.java | 16 ++-- .../cards/single/ice/ZursWeirdingTest.java | 4 +- .../test/cards/single/iko/TheOzolithTest.java | 6 +- .../single/iko/UnpredictableCycloneTest.java | 4 +- .../cards/single/inv/SpreadingPlagueTest.java | 2 +- .../single/khm/MoritteOfTheFrostTest.java | 6 +- .../single/lgn/InfernalCaretakerTest.java | 2 +- .../single/lrw/BurrentonForgeTenderTest.java | 2 +- .../cards/single/lrw/MulldrifterTest.java | 6 +- .../cards/single/m14/JacesMindseekerTest.java | 2 +- .../test/cards/single/m20/AetherGustTest.java | 4 +- .../single/m20/RepeatedReverberationTest.java | 8 +- .../single/m21/AlpineHoundmasterTest.java | 6 +- .../cards/single/m21/BasrisAegisTest.java | 2 +- .../single/m21/DireFleetWarmongerTest.java | 2 +- .../cards/single/m21/DoubleVisionTest.java | 2 +- .../cards/single/m21/EnthrallingHoldTest.java | 2 +- .../single/m21/ExperimentalOverloadTest.java | 2 +- .../cards/single/mh2/GarthOneEyeTest.java | 8 +- .../single/mh2/ZabazTheGlimmerwaspTest.java | 2 +- .../cards/single/mrd/SoulFoundryTest.java | 2 +- .../test/cards/single/nph/NornsAnnexTest.java | 4 +- .../single/ogw/EldraziObligatorTest.java | 2 +- .../cards/single/ogw/RealitySmasherTest.java | 10 +-- .../single/rtr/NivmagusElementalTest.java | 2 +- .../single/soi/TheGitrogMonsterTest.java | 2 +- .../single/soi/WolfOfDevilsBreachTest.java | 4 +- .../cards/single/som/NimDeathmantleTest.java | 2 +- .../cards/single/stx/BalefulMasteryTest.java | 16 ++-- .../single/stx/ShowOfConfidenceTest.java | 6 +- .../ths/PurphorosGodOfTheForgeTest.java | 2 +- .../single/war/GodEternalKefnetTest.java | 10 +-- .../cards/single/zen/ArchiveTrapTest.java | 2 +- .../cards/single/zen/BlazingTorchTest.java | 2 +- .../split/CastSplitCardsWithSpliceTest.java | 2 +- .../cards/triggers/AbilityOwnershipTest.java | 4 +- .../test/cards/triggers/BiovisionaryTest.java | 6 +- .../test/cards/triggers/BroodSliverTest.java | 2 +- .../cards/triggers/DrawTriggeredTest.java | 10 +-- .../EnterLeaveBattlefieldExileTargetTest.java | 4 +- .../EntersTheBattlefieldTriggerTest.java | 2 +- .../test/cards/triggers/GripOfChaosTest.java | 4 +- .../cards/triggers/KarmicJusticeTest.java | 8 +- .../cards/triggers/MasterOfCrueltiesTest.java | 2 +- .../cards/triggers/PossibilityStormTest.java | 6 +- .../ReturnToBattlefieldEffectsTest.java | 2 +- .../triggers/ReturnToHandEffectsTest.java | 2 +- .../triggers/SelvalaHeartOfTheWildsTest.java | 2 +- .../cards/triggers/SpellCastTriggerTest.java | 2 +- .../test/cards/triggers/SpellskiteTest.java | 14 ++-- .../cards/triggers/WorldgorgerDragonTest.java | 2 +- .../triggers/damage/SyrCarahTheBoldTest.java | 2 +- .../test/cards/triggers/dies/AthreosTest.java | 4 +- .../triggers/dies/ElendaTheDuskRoseTest.java | 8 +- .../dies/ReturnOnlyFromGraveyardTest.java | 4 +- .../triggers/dies/SidisiBroodTyrantTest.java | 2 +- .../triggers/dies/SilumgarScavengerTest.java | 2 +- .../cards/triggers/dies/ThragtuskTest.java | 4 +- .../triggers/dies/ZulaportCutthroatTest.java | 2 +- .../triggers/events/UnequipEventTest.java | 6 +- .../duel/CastBGPartnerCommanderTest.java | 2 +- .../commander/duel/CastBRGCommanderTest.java | 6 +- .../commander/duel/CastCommanderTest.java | 4 +- .../commander/duel/CommanderAffinityTest.java | 10 +-- .../duel/CommanderColorChangeTest.java | 6 +- .../duel/CommanderReplaceEffectTest.java | 10 +-- .../duel/MairsilThePretenderTest.java | 22 +++--- .../test/commander/duel/MythUnboundTest.java | 2 +- .../test/commander/duel/NorinTheWaryTest.java | 6 +- .../YorvoLordOfGarenbrigOnCommandersTest.java | 4 +- .../org/mage/test/multiplayer/VotingTest.java | 12 +-- .../test/rollback/CopyAnthemEffectTest.java | 2 +- .../test/rollback/DemonicCollusionTest.java | 4 +- .../mage/test/rollback/DemonicPactTest.java | 4 +- .../base/impl/CardTestPlayerAPIImpl.java | 6 +- .../org/mage/test/turnmod/ExtraTurnsTest.java | 12 +-- 223 files changed, 806 insertions(+), 802 deletions(-) diff --git a/Mage.Tests/src/test/java/org/mage/test/AI/basic/ChooseTargetTest.java b/Mage.Tests/src/test/java/org/mage/test/AI/basic/ChooseTargetTest.java index c9071775bc..7f8608886c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/AI/basic/ChooseTargetTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/AI/basic/ChooseTargetTest.java @@ -21,7 +21,7 @@ public class ChooseTargetTest extends CardTestPlayerBase { setChoice(playerA, "Silvercoat Lion"); setChoice(playerB, "Silvercoat Lion"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStrictChooseMode(true); setStopAt(2, PhaseStep.BEGIN_COMBAT); @@ -44,7 +44,7 @@ public class ChooseTargetTest extends CardTestPlayerBase { // AI must choose itself (strict mode must be disabled) //setChoice(playerA, "Silvercoat Lion"); //setChoice(playerB, "Silvercoat Lion"); - //setChoice(playerA, "Yes"); + //setChoice(playerA, true); //setStrictChooseMode(true); setStopAt(2, PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/AI/basic/CopyAITest.java b/Mage.Tests/src/test/java/org/mage/test/AI/basic/CopyAITest.java index 3e10c293b6..ce1dbb67ca 100644 --- a/Mage.Tests/src/test/java/org/mage/test/AI/basic/CopyAITest.java +++ b/Mage.Tests/src/test/java/org/mage/test/AI/basic/CopyAITest.java @@ -26,7 +26,7 @@ public class CopyAITest extends CardTestPlayerBaseWithAIHelps { // clone castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Clone"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "Spectral Bears"); setStopAt(1, PhaseStep.END_TURN); diff --git a/Mage.Tests/src/test/java/org/mage/test/AI/basic/TargetControllerChangeTest.java b/Mage.Tests/src/test/java/org/mage/test/AI/basic/TargetControllerChangeTest.java index fcf75f9d40..ddf989f028 100644 --- a/Mage.Tests/src/test/java/org/mage/test/AI/basic/TargetControllerChangeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/AI/basic/TargetControllerChangeTest.java @@ -21,7 +21,7 @@ public class TargetControllerChangeTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Evangelize"); // do not call direct target setup addTarget(playerA, playerB); // choose target opponent - setChoice(playerA, "No"); // no buyback + setChoice(playerA, false); // no buyback // addTarget(playerB, "Balduvian Bears"); // give small bear to A @@ -45,7 +45,7 @@ public class TargetControllerChangeTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Evangelize"); // do not call direct target setup //addTarget(playerA, playerB); // choose target opponent - AI must choose itself - //setChoice(playerA, "No"); // no buyback - AI must choose itself + //setChoice(playerA, false); // no buyback - AI must choose itself // //addTarget(playerB, "Balduvian Bears"); // give small bear to A - AI must choose itself diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/ChaosWandTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/ChaosWandTest.java index 4b98e27289..0eaa4d4e00 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/ChaosWandTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/ChaosWandTest.java @@ -24,7 +24,7 @@ public class ChaosWandTest extends CardTestPlayerBase { activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{4}, {T}: "); addTarget(playerA, playerB); - setChoice(playerA, "Yes"); // cast for free + setChoice(playerA, true); // cast for free setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/LightningStormTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/LightningStormTest.java index e59a302c23..58cf5fe0d0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/LightningStormTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/LightningStormTest.java @@ -33,14 +33,14 @@ public class LightningStormTest extends CardTestPlayerBase { // B discard and re-target activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Discard"); - setChoice(playerB, "Yes"); // change target + setChoice(playerB, true); // change target addTarget(playerB, playerA); // new target setChoice(playerB, "Mountain"); // discard cost // A discard and re-target activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Discard"); setChoice(playerA, "Mountain"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, playerB); setStrictChooseMode(true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CurseOfShallowGravesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CurseOfShallowGravesTest.java index 8edd083aa4..5e9fe33e01 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CurseOfShallowGravesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CurseOfShallowGravesTest.java @@ -31,12 +31,12 @@ public class CurseOfShallowGravesTest extends CardTestPlayerBase { // turn 1 - attack without token attack(1, playerA, "Balduvian Bears", playerB); - setChoice(playerA, "No"); // don't create token + setChoice(playerA, false); // don't create token checkPermanentCount("zombie 0", 1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Zombie", 0); // turn 3 - attack with token attack(3, playerA, "Balduvian Bears", playerB); - setChoice(playerA, "Yes"); // create token + setChoice(playerA, true); // create token checkPermanentCount("zombie 1", 3, PhaseStep.POSTCOMBAT_MAIN, playerA, "Zombie", 1); setStopAt(3, PhaseStep.END_TURN); @@ -60,12 +60,12 @@ public class CurseOfShallowGravesTest extends CardTestPlayerBase { // turn 1 - attack player without token attack(1, playerA, "Balduvian Bears", playerB); - setChoice(playerA, "No"); // don't create token + setChoice(playerA, false); // don't create token checkPermanentCount("zombie 0", 1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Zombie", 0); // turn 3 - attack planeswalker (no choices at all) attack(3, playerA, "Balduvian Bears", "Chandra Ablaze"); - //setChoice(playerA, "Yes"); + //setChoice(playerA, true); checkPermanentCount("zombie 0", 3, PhaseStep.POSTCOMBAT_MAIN, playerA, "Zombie", 0); setStopAt(3, PhaseStep.END_TURN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CursesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CursesTest.java index 3f74e4b399..1a93aeea51 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CursesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CursesTest.java @@ -116,7 +116,7 @@ public class CursesTest extends CardTestPlayerBase { castSpell(4, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", playerB); castSpell(4, PhaseStep.PRECOMBAT_MAIN, playerB, "Copy Enchantment"); - setChoice(playerB, "Yes"); + setChoice(playerB, true); setChoice(playerB, "Curse of Exhaustion"); setChoice(playerB, "targetPlayer=PlayerA"); castSpell(4, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", playerB); @@ -384,7 +384,7 @@ public class CursesTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, memnite); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, cReality, playerB); - setChoice(playerB, "No"); + setChoice(playerB, false); setStopAt(2, PhaseStep.PRECOMBAT_MAIN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/AetherFigmentTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/AetherFigmentTest.java index f08694e8d0..b0d937d40b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/AetherFigmentTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/AetherFigmentTest.java @@ -24,7 +24,7 @@ public class AetherFigmentTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Aether Figment"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Aether Figment"); - setChoice(playerA, "Yes"); // use kicker + setChoice(playerA, true); // use kicker setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/ValakutTheMoltenPinnacleTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/ValakutTheMoltenPinnacleTest.java index fa1a9a80fc..fb5bb47797 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/ValakutTheMoltenPinnacleTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/ValakutTheMoltenPinnacleTest.java @@ -114,9 +114,9 @@ public class ValakutTheMoltenPinnacleTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Scapeshift"); addTarget(playerA, "Forest^Forest^Forest^Forest^Forest^Forest^Forest"); - setChoice(playerA, "No"); // Stomping Ground can be tapped - setChoice(playerA, "No"); // Stomping Ground can be tapped - setChoice(playerA, "No"); // Stomping Ground can be tapped + setChoice(playerA, false); // Stomping Ground can be tapped + setChoice(playerA, false); // Stomping Ground can be tapped + setChoice(playerA, false); // Stomping Ground can be tapped setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AmplifyTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AmplifyTest.java index 0e3d9916d3..328ffa00d1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AmplifyTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AmplifyTest.java @@ -25,7 +25,7 @@ public class AmplifyTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Mountain", 7); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Kilnmouth Dragon"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, "Kilnmouth Dragon"); setStrictChooseMode(true); @@ -49,7 +49,7 @@ public class AmplifyTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Mountain", 7); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Kilnmouth Dragon"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, "Kilnmouth Dragon^Phantasmal Dragon"); setStrictChooseMode(true); @@ -76,13 +76,13 @@ public class AmplifyTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Island", 4); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Kilnmouth Dragon"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, "Kilnmouth Dragon"); castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Clone"); - setChoice(playerB, "Yes"); // use clone + setChoice(playerB, true); // use clone setChoice(playerB, "Kilnmouth Dragon"); // what clone - setChoice(playerB, "Yes"); // use amplify + setChoice(playerB, true); // use amplify addTarget(playerB, "Phantasmal Dragon"); // reveal setStrictChooseMode(true); @@ -115,9 +115,9 @@ public class AmplifyTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Through the Breach"); - setChoice(playerA, "Yes"); // Put a creature into play with Through the Breach? + setChoice(playerA, true); // Put a creature into play with Through the Breach? setChoice(playerA, "Kilnmouth Dragon"); - //setChoice(playerA, "Yes"); // no reveal request cause no cards to show + //setChoice(playerA, true); // no reveal request cause no cards to show //addTarget(playerA, "Kilnmouth Dragon"); setStrictChooseMode(true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AnnihilatorTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AnnihilatorTest.java index 7c84ee87c5..4cb9dcc752 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AnnihilatorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AnnihilatorTest.java @@ -70,7 +70,7 @@ public class AnnihilatorTest extends CardTestPlayerBase { setChoice(playerA, "Academy Rector"); // Annihilator setChoice(playerA, "Plains"); // Annihilator castSpell(2, PhaseStep.DECLARE_ATTACKERS, playerA, "Cauldron Haze", "Academy Rector", "Annihilator"); - setChoice(playerA, "No"); // Academy Rector No Exile + setChoice(playerA, false); // Academy Rector No Exile setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BestowTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BestowTest.java index b7ff451771..5aa2a8df33 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BestowTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BestowTest.java @@ -357,7 +357,7 @@ public class BestowTest extends CardTestPlayerBase { // attacks by Alesha and return card on trigger attack(2, playerB, "Alesha, Who Smiles at Death"); - setChoice(playerB, "Yes"); // use trigger + setChoice(playerB, true); // use trigger addTarget(playerB, "Pillarfield Ox"); // target card to return castSpell(2, PhaseStep.POSTCOMBAT_MAIN, playerA, "Chandra's Outrage", "Alesha, Who Smiles at Death"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BuybackTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BuybackTest.java index b42c28ce96..fa4209a867 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BuybackTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BuybackTest.java @@ -23,7 +23,7 @@ public class BuybackTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Elvish Fury", 1); // Instant {G} castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Elvish Fury", "Silvercoat Lion"); - setChoice(playerA, "Yes"); // use buyback + setChoice(playerA, true); // use buyback setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -44,7 +44,7 @@ public class BuybackTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Elvish Fury", 1); // Instant {G} castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Elvish Fury", "Silvercoat Lion"); - //setChoice(playerA, "Yes"); // use buyback - AI must choose + //setChoice(playerA, true); // use buyback - AI must choose //setStrictChooseMode(true); - AI must choose setStopAt(1, PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CascadeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CascadeTest.java index cc058468a2..9371c2d614 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CascadeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CascadeTest.java @@ -187,8 +187,8 @@ public class CascadeTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Enlisted Wurm"); // Creature {4}{G}{W} 5/5 castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Enlisted Wurm"); - setChoice(playerA, "Yes"); // Use cascade on Promise of Power - setChoice(playerA, "No"); // Pay no Entwine + setChoice(playerA, true); // Use cascade on Promise of Power + setChoice(playerA, false); // Pay no Entwine setModeChoice(playerA, "1"); setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -224,7 +224,7 @@ public class CascadeTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Ardent Plea"); // Enchantment {1}{W}{U} castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Ardent Plea"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, playerB); setStopAt(1, PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CipherTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CipherTest.java index 2f109ed839..121840e34e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CipherTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CipherTest.java @@ -39,7 +39,7 @@ public class CipherTest extends CardTestPlayerBase { // cast spell, create copy token, exile spell card and encode it to that token of Roil Elemental castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Stolen Identity", "Roil Elemental"); - setChoice(playerA, "Yes"); // Cipher activate + setChoice(playerA, true); // Cipher activate addTarget(playerA, "Roil Elemental"); // Cipher target for encode checkPermanentCount("playerA must have Roil Elemental", 2, PhaseStep.PRECOMBAT_MAIN, playerA, "Roil Elemental", 1); checkPermanentCount("playerB must have Roil Elemental", 2, PhaseStep.PRECOMBAT_MAIN, playerB, "Roil Elemental", 1); @@ -47,14 +47,14 @@ public class CipherTest extends CardTestPlayerBase { // Roil Elemental must activated on new land playLand(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Mountain"); - setChoice(playerA, "Yes"); // activate landfall to control opponent creature + setChoice(playerA, true); // activate landfall to control opponent creature addTarget(playerA, "Silvercoat Lion"); // Triggered ability of copied Roil Elemental to gain control checkPermanentCount("must gain control of Lion", 3, PhaseStep.POSTCOMBAT_MAIN, playerA, "Silvercoat Lion", 1); checkPermanentCount("must lose control of Lion", 3, PhaseStep.POSTCOMBAT_MAIN, playerB, "Silvercoat Lion", 0); // on attack must activated ability to free cast attack(5, playerA, "Roil Elemental"); - setChoice(playerA, "Yes"); // activate free cast of encoded card + setChoice(playerA, true); // activate free cast of encoded card checkPermanentCount("playerA must have 2 Roil Elemental", 5, PhaseStep.POSTCOMBAT_MAIN, playerA, "Roil Elemental", 2); checkPermanentCount("playerB must have Roil Elemental", 5, PhaseStep.POSTCOMBAT_MAIN, playerB, "Roil Elemental", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ConspireTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ConspireTest.java index a1634acd61..e9d95cdb6c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ConspireTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ConspireTest.java @@ -43,7 +43,7 @@ public class ConspireTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Burn Trail"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Burn Trail", playerB); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -63,7 +63,7 @@ public class ConspireTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Burn Trail"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Burn Trail", playerB); - setChoice(playerA, "No"); + setChoice(playerA, false); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -89,10 +89,10 @@ public class ConspireTest extends CardTestPlayerBase { // cast with conspire castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", playerB); - setChoice(playerA, "Yes"); // use conspire + setChoice(playerA, true); // use conspire setChoice(playerA, "Goblin Warrior"); setChoice(playerA, "Goblin Warrior"); - setChoice(playerA, "No"); // keep targets + setChoice(playerA, false); // keep targets setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); @@ -118,8 +118,8 @@ public class ConspireTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Wort, the Raidmother"); // {4}{R/G}{R/G} castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Burn Trail", playerB); - setChoice(playerA, "Yes"); // use Conspire from Burn Trail itself - setChoice(playerA, "Yes"); // use Conspire gained from Wort, the Raidmother + setChoice(playerA, true); // use Conspire from Burn Trail itself + setChoice(playerA, true); // use Conspire gained from Wort, the Raidmother setStopAt(1, PhaseStep.END_TURN); execute(); @@ -141,9 +141,9 @@ public class ConspireTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Burn Trail"); addTarget(playerA, playerB); - setChoice(playerA, "Yes"); // use conspire + setChoice(playerA, true); // use conspire setChoice(playerA, "Goblin Assailant^Goblin Assailant"); - setChoice(playerA, "No"); // don't change target 1 + setChoice(playerA, false); // don't change target 1 setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -166,9 +166,9 @@ public class ConspireTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Burn Trail"); addTarget(playerA, playerB); - //setChoice(playerA, "Yes"); // use conspire - AI must choose + //setChoice(playerA, true); // use conspire - AI must choose //setChoice(playerA, "Goblin Assailant^Goblin Assailant"); - AI must choose - //setChoice(playerA, "No"); // don't change target 1 - AI must choose + //setChoice(playerA, false); // don't change target 1 - AI must choose //setStrictChooseMode(true); - AI must choose setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -191,9 +191,9 @@ public class ConspireTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Burn Trail"); addTarget(playerA, playerB); - //setChoice(playerA, "Yes"); // use conspire - AI must choose + //setChoice(playerA, true); // use conspire - AI must choose //setChoice(playerA, "Goblin Assailant^Goblin Assailant"); - AI must choose - //setChoice(playerA, "No"); // don't change target 1 - AI must choose + //setChoice(playerA, false); // don't change target 1 - AI must choose //setStrictChooseMode(true); - AI must choose setStopAt(1, PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CumulativeUpkeepTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CumulativeUpkeepTest.java index fc0398cde8..8c00b671fd 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CumulativeUpkeepTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CumulativeUpkeepTest.java @@ -26,15 +26,15 @@ public class CumulativeUpkeepTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Phobian Phantasm"); // Phobian Phantasm - CumulativeUpkeepAbility: Cumulative upkeep {B} - setChoice(playerA, "Yes"); // Pay {B}? + setChoice(playerA, true); // Pay {B}? attack(3, playerA, "Phobian Phantasm"); checkPermanentCounters("Age counters", 3, PhaseStep.PRECOMBAT_MAIN, playerA, "Phobian Phantasm", CounterType.AGE, 1); - setChoice(playerA, "Yes"); // Pay {B}{B}? + setChoice(playerA, true); // Pay {B}{B}? attack(5, playerA, "Phobian Phantasm"); checkPermanentCounters("Age counters", 5, PhaseStep.PRECOMBAT_MAIN, playerA, "Phobian Phantasm", CounterType.AGE, 2); - setChoice(playerA, "No"); // Pay {B}{B}{B}? + setChoice(playerA, false); // Pay {B}{B}{B}? setStopAt(7, PhaseStep.BEGIN_COMBAT); execute(); @@ -79,7 +79,7 @@ public class CumulativeUpkeepTest extends CardTestPlayerBase { castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Kor Celebrant"); // Illusions of Grandeur - CumulativeUpkeepAbility: Cumulative upkeep {2} - setChoice(playerA, "Yes"); // Pay {2}? + setChoice(playerA, true); // Pay {2}? castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Puca's Mischief"); @@ -87,8 +87,8 @@ public class CumulativeUpkeepTest extends CardTestPlayerBase { addTarget(playerA, "Illusions of Grandeur"); // Own target permanent of Puca's Mischief addTarget(playerA, "Kor Celebrant"); // Opponent's target permanent of Puca's Mischief - setChoice(playerA, "Yes"); // At the beginning of your upkeep, you may exchange control of target nonland permanent you control and target nonland permanent an opponent controls with an equal or lesser converted mana cost. - setChoice(playerA, "No"); // Pay {2}{2}? + setChoice(playerA, true); // At the beginning of your upkeep, you may exchange control of target nonland permanent you control and target nonland permanent an opponent controls with an equal or lesser converted mana cost. + setChoice(playerA, false); // Pay {2}{2}? checkPermanentCounters("Age counters", 5, PhaseStep.PRECOMBAT_MAIN, playerB, "Illusions of Grandeur", CounterType.AGE, 2); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CyclingTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CyclingTest.java index 74583de462..eeee404dc2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CyclingTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CyclingTest.java @@ -130,7 +130,7 @@ public class CyclingTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "New Perspectives"); activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Cycling"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.END_TURN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DashTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DashTest.java index 90cf0d8bd9..290b579e91 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DashTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DashTest.java @@ -39,7 +39,7 @@ public class DashTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Screamreach Brawler"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Screamreach Brawler"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); attack(1, playerA, "Screamreach Brawler"); setStopAt(2, PhaseStep.UNTAP); @@ -57,7 +57,7 @@ public class DashTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Screamreach Brawler"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Screamreach Brawler"); - setChoice(playerA, "No"); + setChoice(playerA, false); attack(1, playerA, "Screamreach Brawler"); setStopAt(2, PhaseStep.UNTAP); @@ -81,7 +81,7 @@ public class DashTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Geist of the Moors", 1); // 3/1 castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Screamreach Brawler"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); attack(1, playerA, "Screamreach Brawler"); block(1, playerB, "Geist of the Moors", "Screamreach Brawler"); @@ -105,7 +105,7 @@ public class DashTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Screamreach Brawler"); // 2/3 castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Screamreach Brawler"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); attack(1, playerA, "Screamreach Brawler"); castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Screamreach Brawler"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DredgeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DredgeTest.java index 4e6bea162d..dd5de81794 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DredgeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DredgeTest.java @@ -67,7 +67,7 @@ public class DredgeTest extends CardTestPlayerBase { addCard(Zone.LIBRARY, playerB, "Silvercoat Lion", 5); skipInitShuffling(); - setChoice(playerB, "Yes"); // Use Dredge + setChoice(playerB, true); // Use Dredge setStopAt(2, PhaseStep.PRECOMBAT_MAIN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EchoTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EchoTest.java index 2d610e86c6..b4e427738a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EchoTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EchoTest.java @@ -47,7 +47,7 @@ public class EchoTest extends CardTestPlayerBase { activateManaAbility(3, PhaseStep.UPKEEP, playerA, "{T}: Add {W}"); castSpell(3, PhaseStep.UPKEEP, playerA, "Restoration Angel"); addTarget(playerA, "Avalanche Riders"); - setChoice(playerA, "Yes"); // raider do restore + setChoice(playerA, true); // raider do restore // Avalanche Riders triggered again addTarget(playerA, "Forest"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EntwineTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EntwineTest.java index 437dd6a6ff..787d9d59f0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EntwineTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EntwineTest.java @@ -23,7 +23,7 @@ public class EntwineTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Balduvian Bears", 1); // 2/2 castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Barbed Lightning"); - setChoice(playerA, "No"); // not use Entwine + setChoice(playerA, false); // not use Entwine setModeChoice(playerA, "1"); // target creature addTarget(playerA, "Balduvian Bears"); @@ -49,7 +49,7 @@ public class EntwineTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Balduvian Bears", 1); // 2/2 castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Barbed Lightning"); - setChoice(playerA, "Yes"); // use Entwine + setChoice(playerA, true); // use Entwine addTarget(playerA, "Balduvian Bears"); addTarget(playerA, playerA); @@ -77,7 +77,7 @@ public class EntwineTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Balduvian Bears", 1); // 2/2 castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Barbed Lightning"); - setChoice(playerA, "Yes"); // use Entwine + setChoice(playerA, true); // use Entwine addTarget(playerA, "Balduvian Bears"); addTarget(playerA, playerA); @@ -105,7 +105,7 @@ public class EntwineTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Balduvian Bears", 1); // 2/2 castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Barbed Lightning"); - setChoice(playerA, "Yes"); // use Entwine + setChoice(playerA, true); // use Entwine addTarget(playerA, "Balduvian Bears"); addTarget(playerA, playerA); @@ -134,8 +134,8 @@ public class EntwineTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Balduvian Bears", 1); // 2/2 castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Barbed Lightning"); - setChoice(playerA, "Yes"); // cast for free - setChoice(playerA, "Yes"); // use Entwine + setChoice(playerA, true); // cast for free + setChoice(playerA, true); // use Entwine addTarget(playerA, "Balduvian Bears"); addTarget(playerA, playerA); @@ -164,7 +164,7 @@ public class EntwineTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Tooth and Nail"); // Sorcery {5}{G}{G} castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Tooth and Nail"); - setChoice(playerA, "Yes"); // Message: Pay Entwine {2} ? + setChoice(playerA, true); // Message: Pay Entwine {2} ? addTarget(playerA, "Silvercoat Lion^Pillarfield Ox"); setChoice(playerA, "Silvercoat Lion^Pillarfield Ox"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EvokeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EvokeTest.java index f1c6bcb2b6..863967600f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EvokeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EvokeTest.java @@ -40,7 +40,7 @@ public class EvokeTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Shriekmaw"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, "Silvercoat Lion"); castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Exhume"); setStopAt(1, PhaseStep.END_TURN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ExertTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ExertTest.java index 67053e496d..2a225f67d7 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ExertTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ExertTest.java @@ -23,7 +23,7 @@ public class ExertTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, gWalker); attack(1, playerA, gWalker); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); @@ -40,7 +40,7 @@ public class ExertTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, brawler); attack(1, playerA, brawler); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); @@ -56,7 +56,7 @@ public class ExertTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, warrior); attack(1, playerA, warrior); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); @@ -72,7 +72,7 @@ public class ExertTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, spearmaster); attack(1, playerA, spearmaster); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); @@ -87,7 +87,7 @@ public class ExertTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Grizzly Bears"); addCard(Zone.BATTLEFIELD, playerB, "Grizzly Bears"); attack(1, playerA, elite); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); assertPowerToughness(playerA, "Grizzly Bears", 3, 3); @@ -101,7 +101,7 @@ public class ExertTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, minotaur); attack(1, playerA, minotaur); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); @@ -115,7 +115,7 @@ public class ExertTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, entangler); attack(1, playerA, entangler); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); @@ -129,7 +129,7 @@ public class ExertTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Hyena Pack"); addCard(Zone.BATTLEFIELD, playerB, "Dune Beetle"); attack(1, playerA, twins); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); @@ -148,7 +148,7 @@ public class ExertTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, gWalker); addCard(Zone.BATTLEFIELD, playerA, twins); attack(1, playerA, gWalker); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); @@ -170,7 +170,7 @@ public class ExertTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, gbInitiate); attack(1, playerA, gbInitiate); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(3, PhaseStep.PRECOMBAT_MAIN); execute(); @@ -192,7 +192,7 @@ public class ExertTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, gbInitiate); attack(1, playerA, gbInitiate); - setChoice(playerA, "No"); + setChoice(playerA, false); setStopAt(3, PhaseStep.PRECOMBAT_MAIN); execute(); @@ -225,7 +225,7 @@ public class ExertTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, gbInitiate); castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, aTreason, gbInitiate); attack(2, playerB, gbInitiate); - setChoice(playerB, "Yes"); + setChoice(playerB, true); setStopAt(3, PhaseStep.PRECOMBAT_MAIN); execute(); @@ -251,10 +251,10 @@ public class ExertTest extends CardTestPlayerBase { attack(1, playerA, cCelebrant); attack(1, playerA, memnite); - setChoice(playerA, "Yes"); // exert for extra turn + setChoice(playerA, true); // exert for extra turn attack(1, playerA, cCelebrant); attack(1, playerA, memnite); - setChoice(playerA, "Yes"); // try to exert again + setChoice(playerA, true); // try to exert again attack(1, playerA, cCelebrant); // should not be able to enter this 3rd combat phase attack(1, playerA, memnite); @@ -292,10 +292,10 @@ public class ExertTest extends CardTestPlayerBase { attack(1, playerA, cCelebrant); attack(1, playerA, memnite); - setChoice(playerA, "Yes"); // exert for extra turn + setChoice(playerA, true); // exert for extra turn attack(1, playerA, cCelebrant); attack(1, playerA, memnite); - setChoice(playerA, "Yes"); // try to exert again + setChoice(playerA, true); // try to exert again attack(1, playerA, cCelebrant); // should not be able to enter this 3rd combat phase attack(1, playerA, memnite); @@ -333,9 +333,9 @@ public class ExertTest extends CardTestPlayerBase { activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+1:"); // grant +2/+2 vig and haste to celebrant addTarget(playerA, cCelebrant); attack(1, playerA, cCelebrant); - setChoice(playerA, "Yes"); // exert for extra turn + setChoice(playerA, true); // exert for extra turn attack(1, playerA, cCelebrant); - setChoice(playerA, "Yes"); // try to exert again + setChoice(playerA, true); // try to exert again attack(1, playerA, cCelebrant); // should not be able to enter this 3rd combat phase setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ExploitTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ExploitTest.java index 152bc50c77..4e5dcf5254 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ExploitTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ExploitTest.java @@ -37,7 +37,7 @@ public class ExploitTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Thundering Giant"); // 4/3 castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Silumgar Butcher"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, "Silvercoat Lion"); // sacrifice to Exploit addTarget(playerA, "Thundering Giant"); // Target for the -3/-3 @@ -69,7 +69,7 @@ public class ExploitTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Silumgar Butcher"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", "Silumgar Butcher"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, "Silvercoat Lion"); // sacrifice to Exploit addTarget(playerA, "Thundering Giant"); // Target for the -3/-3 @@ -97,7 +97,7 @@ public class ExploitTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Qarsi Sadist"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Qarsi Sadist"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, "Qarsi Sadist"); // sacrifice to Exploit addTarget(playerA, playerB); // Target for lose life diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/FlashbackTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/FlashbackTest.java index 900d2cc548..d6c8ac6eb6 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/FlashbackTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/FlashbackTest.java @@ -375,7 +375,7 @@ public class FlashbackTest extends CardTestPlayerBase { setChoice(playerA, "Whispers of the Muse"); activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Flashback"); // Flashback Whispers of the Muse - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.END_TURN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/GraftTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/GraftTest.java index ace6b35dde..ee779a84fd 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/GraftTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/GraftTest.java @@ -70,7 +70,7 @@ public class GraftTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cytoplast Root-Kin"); castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Sporeback Troll"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.END_TURN); execute(); @@ -91,7 +91,7 @@ public class GraftTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cytoplast Root-Kin"); castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Sporeback Troll"); - setChoice(playerA, "No"); + setChoice(playerA, false); setStopAt(1, PhaseStep.END_TURN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/HideawayTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/HideawayTest.java index feb3feb906..6d6e3d5d42 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/HideawayTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/HideawayTest.java @@ -79,7 +79,7 @@ public class HideawayTest extends CardTestPlayerBase { setChoice(playerA, "Ulamog, the Ceaseless Hunger"); activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{G},"); - setChoice(playerA, "Yes"); // play Ghost Quarter + setChoice(playerA, true); // play Ghost Quarter addTarget(playerA, "Dross Crocodile^Dross Crocodile"); @@ -126,7 +126,7 @@ public class HideawayTest extends CardTestPlayerBase { attack(3, playerA, "Auriok Champion"); activateAbility(3, PhaseStep.DECLARE_BLOCKERS, playerA, "{W},"); - setChoice(playerA, "Yes"); // play Ghost Quarter + setChoice(playerA, true); // play Ghost Quarter setStopAt(3, PhaseStep.END_COMBAT); @@ -180,7 +180,7 @@ public class HideawayTest extends CardTestPlayerBase { attack(3, playerA, "Auriok Champion"); activateAbility(3, PhaseStep.DECLARE_BLOCKERS, playerA, "{W},"); - setChoice(playerA, "Yes"); // play Ghost Quarter + setChoice(playerA, true); // play Ghost Quarter setStopAt(3, PhaseStep.END_COMBAT); @@ -214,7 +214,7 @@ public class HideawayTest extends CardTestPlayerBase { attack(3, playerA, "Auriok Champion"); activateAbility(3, PhaseStep.DECLARE_BLOCKERS, playerA, "{W},"); - setChoice(playerA, "Yes"); // play Ghost Quarter + setChoice(playerA, true); // play Ghost Quarter setStopAt(3, PhaseStep.END_COMBAT); @@ -254,7 +254,7 @@ public class HideawayTest extends CardTestPlayerBase { playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, sIsle); setChoice(playerA, ulamog); activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{U}"); - setChoice(playerA, "Yes"); // play Ulamog's Crusher + setChoice(playerA, true); // play Ulamog's Crusher setStopAt(3, PhaseStep.BEGIN_COMBAT); @@ -299,7 +299,7 @@ public class HideawayTest extends CardTestPlayerBase { playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, sIsle); setChoice(playerA, ulamog); activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{U}"); - setChoice(playerA, "Yes"); // play Ulamog's Crusher + setChoice(playerA, true); // play Ulamog's Crusher setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerTest.java index e91ace7894..5a9ad9029c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerTest.java @@ -55,7 +55,7 @@ public class KickerTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Aether Figment"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Aether Figment"); - setChoice(playerA, "Yes"); // with Kicker + setChoice(playerA, true); // with Kicker setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -75,7 +75,7 @@ public class KickerTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Aether Figment"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Aether Figment"); - //setChoice(playerA, "Yes"); // with Kicker - AI must choose + //setChoice(playerA, true); // with Kicker - AI must choose //setStrictChooseMode(true); - AI must choose setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -93,7 +93,7 @@ public class KickerTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Aether Figment"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Aether Figment"); - setChoice(playerA, "No"); + setChoice(playerA, false); setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -113,7 +113,7 @@ public class KickerTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Aether Figment"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Aether Figment"); - //setChoice(playerA, "No"); - AI must choose + //setChoice(playerA, false); - AI must choose //setStrictChooseMode(true); - AI must choose setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -137,8 +137,8 @@ public class KickerTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Apex Hawks"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Apex Hawks"); - setChoice(playerA, "Yes"); - setChoice(playerA, "No"); + setChoice(playerA, true); + setChoice(playerA, false); setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -157,9 +157,9 @@ public class KickerTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Apex Hawks"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Apex Hawks"); - setChoice(playerA, "Yes"); - setChoice(playerA, "Yes"); - setChoice(playerA, "No"); + setChoice(playerA, true); + setChoice(playerA, true); + setChoice(playerA, false); setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -177,7 +177,7 @@ public class KickerTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Apex Hawks"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Apex Hawks"); - setChoice(playerA, "No"); + setChoice(playerA, false); setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -200,8 +200,8 @@ public class KickerTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Sunscape Battlemage", 1); // 2/2 {2}{W} castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Sunscape Battlemage"); - setChoice(playerA, "No"); // not use kicker {1}{G} - setChoice(playerA, "Yes"); // use kicker {2}{U} + setChoice(playerA, false); // not use kicker {1}{G} + setChoice(playerA, true); // use kicker {2}{U} setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -226,8 +226,8 @@ public class KickerTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Birds of Paradise", 2); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Sunscape Battlemage"); - setChoice(playerA, "Yes"); // use kicker {1}{G} - setChoice(playerA, "Yes"); // use kicker {2}{U} + setChoice(playerA, true); // use kicker {1}{G} + setChoice(playerA, true); // use kicker {2}{U} setChoice(playerA, "When "); // two triggers from two kicker options addTarget(playerA, "Birds of Paradise"); @@ -259,8 +259,8 @@ public class KickerTest extends CardTestPlayerBase { // cast with kicker castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Sunscape Battlemage"); - setChoice(playerA, "Yes"); // use kicker {1}{G} - destroy target creature with flying - setChoice(playerA, "Yes"); // use kicker {2}{U} - draw two cards + setChoice(playerA, true); // use kicker {1}{G} - destroy target creature with flying + setChoice(playerA, true); // use kicker {2}{U} - draw two cards // spell must be countered, so no chooses //setChoice(playerA, "When "); // two triggers rised: When {this} enters the battlefield, if it was kicked... //addTarget(playerA, "Birds of Paradise"); // target for {1}{G} trigger @@ -297,10 +297,10 @@ public class KickerTest extends CardTestPlayerBase { // cast kicked spell castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Thornscape Battlemage"); - setChoice(playerA, "Yes"); // use kicker {R} - 2 damage to any target - setChoice(playerA, "No"); // not use kicker {W} - destroy target + setChoice(playerA, true); // use kicker {R} - 2 damage to any target + setChoice(playerA, false); // not use kicker {W} - destroy target addTarget(playerA, playerB); // target for 2 damage - setChoice(playerA, "Yes"); // put counter on hallar + setChoice(playerA, true); // put counter on hallar setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -332,7 +332,7 @@ public class KickerTest extends CardTestPlayerBase { // first cast with kicker castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Gatekeeper of Malakir"); - setChoice(playerA, "Yes"); // use kicker + setChoice(playerA, true); // use kicker addTarget(playerA, playerB); // trigger's target addTarget(playerB, "Birds of Paradise"); // sacrifice @@ -341,7 +341,7 @@ public class KickerTest extends CardTestPlayerBase { // second cast without kicker castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Gatekeeper of Malakir"); - setChoice(playerA, "No"); // no kicker + setChoice(playerA, false); // no kicker setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); @@ -377,14 +377,14 @@ public class KickerTest extends CardTestPlayerBase { // cast spell with kicker and copy it (kicker status must be saved) activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {B}", 4); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Agonizing Demise", "@bear1"); - setChoice(playerA, "Yes"); // use kicker + setChoice(playerA, true); // use kicker checkStackSize("after cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, 2); // spell + trigger checkStackObject("after cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Ago", 1); checkStackObject("after cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Whenever you cast", 1); // waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN, true); - setChoice(playerA, "Yes"); // copy spell - setChoice(playerA, "Yes"); // new target + setChoice(playerA, true); // copy spell + setChoice(playerA, true); // new target addTarget(playerA, "@bear2"); checkStackSize("after copy trigger", 1, PhaseStep.PRECOMBAT_MAIN, playerA, 2); // spell + copy checkStackObject("after copy trigger", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Ago", 2); @@ -422,14 +422,14 @@ public class KickerTest extends CardTestPlayerBase { // cast spell with kicker and copy it (kicker status must be saved) activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {B}", 4); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Agonizing Demise", "@bear1"); - setChoice(playerA, "Yes"); // use kicker + setChoice(playerA, true); // use kicker checkStackSize("after cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, 2); // spell + trigger checkStackObject("after cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Ago", 1); checkStackObject("after cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Whenever you cast", 1); // waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN, true); - setChoice(playerA, "Yes"); // copy spell - setChoice(playerA, "Yes"); // new target + setChoice(playerA, true); // copy spell + setChoice(playerA, true); // new target addTarget(playerA, "@bear2"); checkStackSize("after copy trigger", 1, PhaseStep.PRECOMBAT_MAIN, playerA, 2); // spell + copy checkStackObject("after copy trigger", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Ago", 2); @@ -443,7 +443,7 @@ public class KickerTest extends CardTestPlayerBase { checkStackObject("before counter", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Absorb", 1); // waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN, true); // trigger - setChoice(playerA, "No"); // do not copy counter spell + setChoice(playerA, false); // do not copy counter spell waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN, true); // counter checkStackSize("after counter", 1, PhaseStep.PRECOMBAT_MAIN, playerA, 1); // copy checkStackObject("after counter", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Ago", 1); @@ -481,7 +481,7 @@ public class KickerTest extends CardTestPlayerBase { // cast spell with kicker activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {U}", 3); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Academy Drake"); - setChoice(playerA, "Yes"); // use kicker + setChoice(playerA, true); // use kicker // copy spell activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {U}", 4); @@ -536,10 +536,10 @@ public class KickerTest extends CardTestPlayerBase { // cast 2x kicked spell for 4x damage castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Deathforge Shaman"); - setChoice(playerA, "Yes"); // 1x kick - setChoice(playerA, "Yes"); // 2x kick - setChoice(playerA, "No"); // stop multikicker - setChoice(playerA, "Yes"); // remove counters and activate verazol's copy + setChoice(playerA, true); // 1x kick + setChoice(playerA, true); // 2x kick + setChoice(playerA, false); // stop multikicker + setChoice(playerA, true); // remove counters and activate verazol's copy addTarget(playerA, playerA); // on resolve: target for copied spell addTarget(playerA, playerB); // on resolve: target for original spell waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); @@ -571,7 +571,7 @@ public class KickerTest extends CardTestPlayerBase { addCard(Zone.HAND, playerB, "Lightning Bolt"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Orim's Chant", playerB); - setChoice(playerA, "Yes"); + setChoice(playerA, true); attack(1, playerA, "Raging Goblin"); @@ -607,7 +607,7 @@ public class KickerTest extends CardTestPlayerBase { // When Bloodhusk Ritualist enters the battlefield, target opponent discards a card for each time it was kicked. castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Bloodhusk Ritualist"); setChoice(playerA, "Yes", 2); // 2 x Multikicker - setChoice(playerA, "No"); // stop the kicking + setChoice(playerA, false); // stop the kicking castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", "Bloodhusk Ritualist"); addTarget(playerA, playerB); // target for kicker's trigger (discard cards) @@ -640,7 +640,7 @@ public class KickerTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Centaur Courser", 1); // 3/3 castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Marsh Casualties", playerB); - setChoice(playerA, "Yes"); // Pay Kicker + setChoice(playerA, true); // Pay Kicker setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerWithAnyNumberModesAbilityTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerWithAnyNumberModesAbilityTest.java index 05b8c998fc..9117005b4c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerWithAnyNumberModesAbilityTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerWithAnyNumberModesAbilityTest.java @@ -22,7 +22,7 @@ public class KickerWithAnyNumberModesAbilityTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Balduvian Bears", 1); // 2/2 castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Inscription of Abundance"); - setChoice(playerA, "No"); // no kicker + setChoice(playerA, false); // no kicker setModeChoice(playerA, "1"); addTarget(playerA, "Balduvian Bears"); @@ -48,7 +48,7 @@ public class KickerWithAnyNumberModesAbilityTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Balduvian Bears", 1); // 2/2 castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Inscription of Abundance"); - setChoice(playerA, "Yes"); // use kicker + setChoice(playerA, true); // use kicker setModeChoice(playerA, "2"); setModeChoice(playerA, "1"); addTarget(playerA, playerA); // gain x life @@ -78,7 +78,7 @@ public class KickerWithAnyNumberModesAbilityTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Balduvian Bears", 1); // 2/2 castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Inscription of Abundance"); - setChoice(playerA, "Yes"); // use kicker + setChoice(playerA, true); // use kicker setModeChoice(playerA, "2"); setModeChoice(playerA, "1"); addTarget(playerA, playerA); // gain x life @@ -108,7 +108,7 @@ public class KickerWithAnyNumberModesAbilityTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Balduvian Bears", 1); // 2/2 castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Inscription of Abundance"); - setChoice(playerA, "Yes"); // use kicker + setChoice(playerA, true); // use kicker setModeChoice(playerA, "2"); setModeChoice(playerA, "1"); addTarget(playerA, playerA); // gain x life @@ -139,8 +139,8 @@ public class KickerWithAnyNumberModesAbilityTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Balduvian Bears", 1); // 2/2 castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Inscription of Abundance"); - setChoice(playerA, "Yes"); // use free cast - setChoice(playerA, "Yes"); // use kicker + setChoice(playerA, true); // use free cast + setChoice(playerA, true); // use kicker setModeChoice(playerA, "2"); setModeChoice(playerA, "1"); addTarget(playerA, playerA); // gain x life diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerWithFlashbackTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerWithFlashbackTest.java index 6133020672..1c6fe418ad 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerWithFlashbackTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerWithFlashbackTest.java @@ -24,7 +24,7 @@ public class KickerWithFlashbackTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Burst Lightning"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Burst Lightning", playerB); - setChoice(playerA, "Yes"); // use kicker + setChoice(playerA, true); // use kicker checkLife("after", 1, PhaseStep.END_TURN, playerB, 20 - 4); @@ -77,7 +77,7 @@ public class KickerWithFlashbackTest extends CardTestPlayerBase { // cast burst by flashback // showAvailableAbilities("after", 1, PhaseStep.BEGIN_COMBAT, playerA); activateAbility(1, PhaseStep.BEGIN_COMBAT, playerA, "Flashback"); - setChoice(playerA, "Yes"); // use kicker + setChoice(playerA, true); // use kicker addTarget(playerA, playerB); checkLife("after", 1, PhaseStep.END_TURN, playerB, 20 - 4); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MadnessTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MadnessTest.java index 8f366cf8a3..0b3d0ba108 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MadnessTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MadnessTest.java @@ -44,7 +44,7 @@ public class MadnessTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Swamp", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Raven's Crime", playerA); - setChoice(playerA, "Yes"); // use madness triggered ability + setChoice(playerA, true); // use madness triggered ability setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -65,7 +65,7 @@ public class MadnessTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Raven's Crime"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Raven's Crime", playerA); - setChoice(playerA, "No"); + setChoice(playerA, false); setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -94,8 +94,8 @@ public class MadnessTest extends CardTestPlayerBase { addCard(Zone.HAND, playerB, "Haunting Hymn"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Haunting Hymn", playerA); - setChoice(playerA, "Yes"); // use madness triggered ability - setChoice(playerA, "Yes"); // use madness cast + setChoice(playerA, true); // use madness triggered ability + setChoice(playerA, true); // use madness cast setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -123,7 +123,7 @@ public class MadnessTest extends CardTestPlayerBase { addCard(Zone.HAND, playerB, "Haunting Hymn"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Haunting Hymn", playerA); - setChoice(playerA, "Yes"); // use madness triggered ability + setChoice(playerA, true); // use madness triggered ability setChoice(playerA, "X=4"); addTargetAmount(playerA, "Pillarfield Ox", 4); @@ -176,11 +176,11 @@ public class MadnessTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Falkenrath Gorger"); - setChoice(playerA, "Yes"); // Discard a card and put a +1/+1 counter on that creature, it gains haste until end of turn, and it becomes a Vampire in addition to its other types? + setChoice(playerA, true); // Discard a card and put a +1/+1 counter on that creature, it gains haste until end of turn, and it becomes a Vampire in addition to its other types? setChoice(playerA, "Asylum Visitor"); // Card to discard from Falkenrath entering by Olivia effect setChoice(playerA, "Asylum Visito"); // Madness {1}{B} - setChoice(playerA, "Yes"); // use madness triggered ability - setChoice(playerA, "Yes"); // Discard a card and put a +1/+1 counter on that creature, it gains haste until end of turn, and it becomes a Vampire in addition to its other types? + setChoice(playerA, true); // use madness triggered ability + setChoice(playerA, true); // Discard a card and put a +1/+1 counter on that creature, it gains haste until end of turn, and it becomes a Vampire in addition to its other types? setChoice(playerA, "Forest"); setStrictChooseMode(true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MegamorphTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MegamorphTest.java index 3ce45a1d25..6c824e85d6 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MegamorphTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MegamorphTest.java @@ -22,7 +22,7 @@ public class MegamorphTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Forest", 6); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Aerie Bowmasters"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{5}{G}: Turn"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ModularTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ModularTest.java index 91502ecdeb..d794ec38d3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ModularTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ModularTest.java @@ -65,7 +65,7 @@ public class ModularTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Arcbound Hybrid"); castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Arcbound Bruiser"); setStopAt(3, PhaseStep.BEGIN_COMBAT); - setChoice(playerA, "Yes"); + setChoice(playerA, true); execute(); assertPermanentCount(playerA, "Arcbound Bruiser", 0); @@ -115,7 +115,7 @@ public class ModularTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Puncture Blast"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Puncture Blast", "Arcbound Bruiser"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.END_TURN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MorphTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MorphTest.java index 9b4a52df42..4f47240202 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MorphTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MorphTest.java @@ -31,7 +31,7 @@ public class MorphTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Forest", 5); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Pine Walker"); - setChoice(playerA, "No"); // cast it normal as 5/5 + setChoice(playerA, false); // cast it normal as 5/5 setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -50,7 +50,7 @@ public class MorphTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Forest", 3); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Pine Walker"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -69,7 +69,7 @@ public class MorphTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Forest", 5); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Pine Walker"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature attack(3, playerA, EmptyNames.FACE_DOWN_CREATURE.toString()); @@ -100,14 +100,14 @@ public class MorphTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Island", 3); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Pine Walker"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Icefeather Aven", TestPlayer.NO_TARGET, "Pine Walker", StackClause.WHILE_NOT_ON_STACK); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature attack(3, playerA, EmptyNames.FACE_DOWN_CREATURE.toString()); attack(3, playerA, EmptyNames.FACE_DOWN_CREATURE.toString()); activateAbility(3, PhaseStep.DECLARE_BLOCKERS, playerA, "{1}{G}{U}: Turn this face-down permanent face up."); - setChoice(playerA, "No"); // Don't use return permanent to hand effect + setChoice(playerA, false); // Don't use return permanent to hand effect setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); execute(); @@ -142,7 +142,7 @@ public class MorphTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Soldier of the Pantheon", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Ponyback Brigade"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -170,10 +170,10 @@ public class MorphTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Island", 4); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Pine Walker"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Clever Impersonator"); - setChoice(playerB, "Yes"); // use to copy a nonland permanent + setChoice(playerB, true); // use to copy a nonland permanent addTarget(playerB, EmptyNames.FACE_DOWN_CREATURE.toString()); // Morphed creature setStopAt(2, PhaseStep.BEGIN_COMBAT); @@ -206,7 +206,7 @@ public class MorphTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Swamp", 5); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Pine Walker"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Doomwake Giant"); @@ -248,7 +248,7 @@ public class MorphTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Swamp", 5); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Ponyback Brigade"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Doomwake Giant"); @@ -285,7 +285,7 @@ public class MorphTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Forest", 3); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Sagu Mauler"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{3}{G}{U}: Turn this face-down permanent face up."); castSpell(5, PhaseStep.PRECOMBAT_MAIN, playerA, "Clone"); setChoice(playerA, "Sagu Mauler"); @@ -322,7 +322,7 @@ public class MorphTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Island", 2); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Sagu Mauler"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Disdainful Stroke", "Sagu Mauler"); @@ -359,9 +359,9 @@ public class MorphTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Swamp", 2); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Sagu Mauler"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Sagu Mauler", TestPlayer.NO_TARGET, "Sagu Mauler", StackClause.WHILE_NOT_ON_STACK); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature // showBattlefield("A battle", 1, PhaseStep.POSTCOMBAT_MAIN, playerA); castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Echoing Decay", EmptyNames.FACE_DOWN_CREATURE.toString()); @@ -397,7 +397,7 @@ public class MorphTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Island", 2); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Akroma, Angel of Fury"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Counterspell", "Akroma, Angel of Fury"); setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -423,7 +423,7 @@ public class MorphTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Plains", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Birchlore Rangers"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Swords to Plowshares", ""); @@ -462,7 +462,7 @@ public class MorphTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Mountain", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Ashcloud Phoenix"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", EmptyNames.FACE_DOWN_CREATURE.toString()); @@ -502,7 +502,7 @@ public class MorphTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Mirri, Cat Warrior"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Ashcloud Phoenix"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature attack(2, playerB, "Mirri, Cat Warrior"); block(2, playerA, EmptyNames.FACE_DOWN_CREATURE.toString(), "Mirri, Cat Warrior"); @@ -540,7 +540,7 @@ public class MorphTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Island", 6); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Akroma, Angel of Fury"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature // showBattlefield("A battle", 1, PhaseStep.POSTCOMBAT_MAIN, playerA); // showBattlefield("B battle", 1, PhaseStep.POSTCOMBAT_MAIN, playerB); @@ -580,7 +580,7 @@ public class MorphTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Dragonlord Kolaghan", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Akroma, Angel of Fury"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -610,7 +610,7 @@ public class MorphTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Linvala, Keeper of Silence", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Pine Walker"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature attack(3, playerA, EmptyNames.FACE_DOWN_CREATURE.toString()); @@ -657,7 +657,7 @@ public class MorphTest extends CardTestPlayerBase { // try cast as normal -- must not work castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Rattleclaw Mystic"); - setChoice(playerB, "No"); // try cast as normal + setChoice(playerB, false); // try cast as normal //setStrictChooseMode(true); // no strict mode - cause can't cast as normal setStopAt(2, PhaseStep.BEGIN_COMBAT); @@ -692,7 +692,7 @@ public class MorphTest extends CardTestPlayerBase { // try cast as morph - must work castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Rattleclaw Mystic"); - setChoice(playerB, "Yes"); // try cast as morph + setChoice(playerB, true); // try cast as morph setStrictChooseMode(true); setStopAt(2, PhaseStep.BEGIN_COMBAT); @@ -734,12 +734,12 @@ public class MorphTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Island", 2); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Rattleclaw Mystic"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Reflector Mage"); castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Rattleclaw Mystic"); - setChoice(playerA, "No"); // cast it face down as 2/2 creature + setChoice(playerA, false); // cast it face down as 2/2 creature setStopAt(3, PhaseStep.BEGIN_COMBAT); @@ -779,7 +779,7 @@ public class MorphTest extends CardTestPlayerBase { // 1. Cast Vesuvan as face-down castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Vesuvan Shapeshifter"); - setChoice(playerB, "Yes"); // cast as face-down + setChoice(playerB, true); // cast as face-down // 2. Moth Vesuvan and copy brine activateAbility(2, PhaseStep.POSTCOMBAT_MAIN, playerB, "{1}{U}: Turn this face-down permanent"); @@ -822,7 +822,7 @@ public class MorphTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Swamp", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Pine Walker"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Fatal Push"); @@ -860,7 +860,7 @@ public class MorphTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "The Ur-Dragon", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Quicksilver Dragon"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -898,7 +898,7 @@ public class MorphTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Mountain", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Quicksilver Dragon"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", EmptyNames.FACE_DOWN_CREATURE.toString()); @@ -939,7 +939,7 @@ public class MorphTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Mountain", 6); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Akroma, Angel of Fury"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{3}{R}{R}{R}: Turn this face-down permanent face up."); @@ -959,7 +959,7 @@ public class MorphTest extends CardTestPlayerBase { checkPlayableAbility("before", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Play Zoetic Cavern", true); playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Zoetic Cavern"); - setChoice(playerA, "No"); // no morph (canPay for generic/colored mana returns true all the time, so xmage ask about face down cast) + setChoice(playerA, false); // no morph (canPay for generic/colored mana returns true all the time, so xmage ask about face down cast) setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); @@ -979,7 +979,7 @@ public class MorphTest extends CardTestPlayerBase { checkPlayableAbility("before", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Play Zoetic Cavern", true); checkPlayableAbility("morph must be replaced by play ability", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Morph", false); playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Zoetic Cavern"); - setChoice(playerA, "Yes"); // morph + setChoice(playerA, true); // morph setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); @@ -1007,7 +1007,7 @@ public class MorphTest extends CardTestPlayerBase { checkPlayableAbility("before", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Play Zoetic Cavern", true); checkPlayableAbility("morph must be replaced by play ability", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Morph", false); playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Zoetic Cavern"); - setChoice(playerA, "Yes"); // morph + setChoice(playerA, true); // morph setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); @@ -1033,7 +1033,7 @@ public class MorphTest extends CardTestPlayerBase { checkPlayableAbility("before", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Play Zoetic Cavern", true); checkPlayableAbility("morph must be replaced by play ability", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Morph", false); playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Zoetic Cavern"); - setChoice(playerA, "Yes"); // morph + setChoice(playerA, true); // morph setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); @@ -1078,7 +1078,7 @@ public class MorphTest extends CardTestPlayerBase { checkPlayableAbility("can", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Willbender", true); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Willbender"); - setChoice(playerA, "Yes"); // morph + setChoice(playerA, true); // morph setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); @@ -1101,7 +1101,7 @@ public class MorphTest extends CardTestPlayerBase { checkPlayableAbility("can", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Willbender", true); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Willbender"); - setChoice(playerA, "Yes"); // morph + setChoice(playerA, true); // morph setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); @@ -1125,7 +1125,7 @@ public class MorphTest extends CardTestPlayerBase { // creature one - get cost reduce checkPlayableAbility("can", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Willbender", true); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Willbender"); - setChoice(playerA, "Yes"); // morph + setChoice(playerA, true); // morph waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); // creature two - do not get cost reduce diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/OfferingTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/OfferingTest.java index 3d4259f243..3ff8e9b897 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/OfferingTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/OfferingTest.java @@ -20,7 +20,7 @@ public class OfferingTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, kurosTaken); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, nezumiPatron); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, kurosTaken); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); @@ -40,7 +40,7 @@ public class OfferingTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, kurosTaken); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, nezumiPatron); - setChoice(playerA, "No"); + setChoice(playerA, false); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); @@ -63,7 +63,7 @@ public class OfferingTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Akki Drillmaster"); // Creature Goblin {2}{R} (2/2) castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, patron); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, "Akki Drillmaster"); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); @@ -93,7 +93,7 @@ public class OfferingTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Boros Recruit"); // Creature Goblin {R/W} (1/1) castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, patron); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, "Boros Recruit"); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); @@ -126,7 +126,7 @@ public class OfferingTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, patron); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, "Boggart Ram-Gang"); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ProwlTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ProwlTest.java index 38db073ae3..23c78dfae6 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ProwlTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ProwlTest.java @@ -29,7 +29,7 @@ public class ProwlTest extends CardTestPlayerBase { checkPlayableAbility("must play", 1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Cast Auntie's Snitch", true); castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Auntie's Snitch"); - setChoice(playerA, "Yes"); // choosing to pay prowl cost + setChoice(playerA, true); // choosing to pay prowl cost setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); @@ -65,7 +65,7 @@ public class ProwlTest extends CardTestPlayerBase { checkPlayableAbility("must play", 1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Cast Auntie's Snitch", true); castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Auntie's Snitch"); // should only cost {B} with Warchief discount - setChoice(playerA, "Yes"); // choosing to pay prowl cost + setChoice(playerA, true); // choosing to pay prowl cost setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/RecoverTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/RecoverTest.java index 4fec8bfe4d..9cd0ae1aa3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/RecoverTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/RecoverTest.java @@ -33,7 +33,7 @@ public class RecoverTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Sun's Bounty"); castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Lightning Bolt", "Silvercoat Lion"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.END_TURN); execute(); @@ -62,7 +62,7 @@ public class RecoverTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Sun's Bounty"); castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Lightning Bolt", "Silvercoat Lion"); - setChoice(playerA, "No"); + setChoice(playerA, false); setStopAt(1, PhaseStep.END_TURN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ReplicateTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ReplicateTest.java index 335d4d850f..0312e318fa 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ReplicateTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ReplicateTest.java @@ -38,8 +38,8 @@ public class ReplicateTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Train of Thought"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Train of Thought"); - setChoice(playerA, "Yes"); - setChoice(playerA, "No"); + setChoice(playerA, true); + setChoice(playerA, false); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -54,9 +54,9 @@ public class ReplicateTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Train of Thought"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Train of Thought"); - setChoice(playerA, "Yes"); - setChoice(playerA, "Yes"); - setChoice(playerA, "No"); + setChoice(playerA, true); + setChoice(playerA, true); + setChoice(playerA, false); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -71,7 +71,7 @@ public class ReplicateTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Train of Thought"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Train of Thought"); - setChoice(playerA, "No"); + setChoice(playerA, false); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -89,12 +89,12 @@ public class ReplicateTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Pyromatics"); addTarget(playerA, playerB); - setChoice(playerA, "Yes"); // replicate 1 - setChoice(playerA, "Yes"); // replicate 2 - setChoice(playerA, "No"); // stop + setChoice(playerA, true); // replicate 1 + setChoice(playerA, true); // replicate 2 + setChoice(playerA, false); // stop // - setChoice(playerA, "No"); // don't change target 1 - setChoice(playerA, "No"); // don't change target 2 + setChoice(playerA, false); // don't change target 1 + setChoice(playerA, false); // don't change target 2 setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -114,12 +114,12 @@ public class ReplicateTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Pyromatics"); addTarget(playerA, playerB); - //setChoice(playerA, "Yes"); // replicate 1 - AI must choice max possible - //setChoice(playerA, "Yes"); // replicate 2 - AI must choice max possible - //setChoice(playerA, "No"); // stop - AI must choice max possible + //setChoice(playerA, true); // replicate 1 - AI must choice max possible + //setChoice(playerA, true); // replicate 2 - AI must choice max possible + //setChoice(playerA, false); // stop - AI must choice max possible // - //setChoice(playerA, "No"); // don't change target 1 - //setChoice(playerA, "No"); // don't change target 2 + //setChoice(playerA, false); // don't change target 1 + //setChoice(playerA, false); // don't change target 2 //setStrictChooseMode(true); - AI must choice setStopAt(1, PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/RiotTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/RiotTest.java index 7315ce32c6..15b5b1f0e1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/RiotTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/RiotTest.java @@ -30,7 +30,7 @@ public class RiotTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Rampaging Rendhorn", 1); // Creature {4}{G} castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Rampaging Rendhorn"); - setChoice(playerA, "Yes"); // yes - counter + setChoice(playerA, true); // yes - counter setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -51,7 +51,7 @@ public class RiotTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Rampaging Rendhorn", 1); // Creature {4}{G} castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Rampaging Rendhorn"); - setChoice(playerA, "No"); // no - haste + setChoice(playerA, false); // no - haste setStopAt(2, PhaseStep.BEGIN_COMBAT); @@ -75,7 +75,7 @@ public class RiotTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Silvercoat Lion", 1); // Creature {1}{W} 2/2 castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Silvercoat Lion"); - setChoice(playerA, "Yes"); // yes - counter + setChoice(playerA, true); // yes - counter setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -102,8 +102,8 @@ public class RiotTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Silvercoat Lion"); setChoice(playerA, "Rhythm of the Wild"); // choose replacement effect - setChoice(playerA, "Yes"); // yes - counter - setChoice(playerA, "Yes"); // yes - counter + setChoice(playerA, true); // yes - counter + setChoice(playerA, true); // yes - counter setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -129,7 +129,7 @@ public class RiotTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Silvercoat Lion", 1); // Creature {1}{W} 2/2 castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Silvercoat Lion"); - setChoice(playerA, "No"); // no - haste + setChoice(playerA, false); // no - haste setStopAt(2, PhaseStep.BEGIN_COMBAT); @@ -156,7 +156,7 @@ public class RiotTest extends CardTestPlayerBase { addCard(Zone.GRAVEYARD, playerA, "Silvercoat Lion", 1); // Creature {1}{W} 2/2 castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Exhume"); - setChoice(playerA, "Yes"); // yes - counter + setChoice(playerA, true); // yes - counter setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -182,7 +182,7 @@ public class RiotTest extends CardTestPlayerBase { addCard(Zone.GRAVEYARD, playerA, "Silvercoat Lion", 1); // Creature {1}{W} 2/2 castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Exhume"); - setChoice(playerA, "No"); // no - haste + setChoice(playerA, false); // no - haste setStopAt(1, PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/RippleTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/RippleTest.java index 4217495e54..9c1e28c0e8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/RippleTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/RippleTest.java @@ -33,7 +33,7 @@ public class RippleTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Surging Dementia", playerB); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(2, PhaseStep.END_TURN); @@ -62,7 +62,7 @@ public class RippleTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Surging Dementia", playerB); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, playerB); setStopAt(2, PhaseStep.END_TURN); @@ -97,7 +97,7 @@ public class RippleTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Surging Dementia", playerB); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, playerB); setStopAt(2, PhaseStep.END_TURN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SoulbondKeywordTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SoulbondKeywordTest.java index f1f1d9c071..68a291326f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SoulbondKeywordTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SoulbondKeywordTest.java @@ -379,9 +379,9 @@ public class SoulbondKeywordTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Plains", 2); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Vanguard"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Cloudshift", "Trusted Forcemage"); - setChoice(playerA, "No"); + setChoice(playerA, false); setStopAt(1, PhaseStep.END_TURN); execute(); @@ -415,7 +415,7 @@ public class SoulbondKeywordTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Swamp", 2); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Deadeye Navigator"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "Palinchron"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Doom Blade", "Deadeye Navigator"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SpliceOnArcaneTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SpliceOnArcaneTest.java index 1da2b00728..a1264ecc86 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SpliceOnArcaneTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SpliceOnArcaneTest.java @@ -31,7 +31,7 @@ public class SpliceOnArcaneTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lava Spike", playerB); // activate splice: yes -> card with splice ability -> new target for spliced ability - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, "Through the Breach"); addTarget(playerA, "Silvercoat Lion"); // target for spliced ability: put from hand to battlefield @@ -64,7 +64,7 @@ public class SpliceOnArcaneTest extends CardTestPlayerBase { // cast arcane Lava Spike castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lava Spike", playerB); // activate splice: yes -> card with splice ability -> new target for spliced ability - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, "Torrent of Stone"); addTarget(playerA, "Silvercoat Lion"); // target for spliced ability: 4 damage @@ -103,7 +103,7 @@ public class SpliceOnArcaneTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Nourishing Shoal"); // activate splice: yes -> card with splice ability -> new target for spliced ability - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, "Through the Breach"); addTarget(playerA, "Silvercoat Lion"); // target for spliced ability: put from hand to battlefield @@ -168,7 +168,7 @@ public class SpliceOnArcaneTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Nourishing Shoal"); setChoice(playerA, "X=3"); - setChoice(playerA, "Yes"); // splice + setChoice(playerA, true); // splice addTarget(playerA, "Griselbrand"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Goryo's Vengeance", "Griselbrand", "Nourishing Shoal"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/TributeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/TributeTest.java index fa6817c02f..62156c92e3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/TributeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/TributeTest.java @@ -32,7 +32,7 @@ public class TributeTest extends CardTestPlayerBase { addCard(Zone.GRAVEYARD, playerB, "Pharagax Giant"); // Creature 3/3 attack(1, playerA, "Ink-Eyes, Servant of Oni"); - setChoice(playerB, "Yes"); // pay tribute + setChoice(playerB, true); // pay tribute setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/ConditionalOneShotEffectTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/ConditionalOneShotEffectTest.java index 5cc7202871..553a0e9c19 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/ConditionalOneShotEffectTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/ConditionalOneShotEffectTest.java @@ -55,7 +55,7 @@ public class ConditionalOneShotEffectTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Unlicensed Disintegration", "Silvercoat Lion"); - setChoice(playerA, "Yes"); // Get life from Dragon's Claw + setChoice(playerA, true); // Get life from Dragon's Claw setStopAt(1, PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CounterbalanceTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CounterbalanceTest.java index dd00c934ba..5718fffb9f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CounterbalanceTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CounterbalanceTest.java @@ -69,7 +69,7 @@ public class CounterbalanceTest extends CardTestPlayerBase { skipInitShuffling(); // so the set to top card stays at top castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Nessian Courser"); - setChoice(playerB, "Yes"); + setChoice(playerB, true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CounterspellTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CounterspellTest.java index 8812ef5bc4..a8ac15f21b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CounterspellTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CounterspellTest.java @@ -80,7 +80,7 @@ public class CounterspellTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Memory Lapse", "Lightning Bolt"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Twincast", "Memory Lapse"); - setChoice(playerA, "Yes"); // change the target + setChoice(playerA, true); // change the target addTarget(playerA, "Memory Lapse"); setStrictChooseMode(true); @@ -116,7 +116,7 @@ public class CounterspellTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Counterspell", "Lightning Bolt"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Twincast", "Counterspell"); - setChoice(playerA, "Yes"); // change the target + setChoice(playerA, true); // change the target addTarget(playerA, "Counterspell"); setStrictChooseMode(true); @@ -152,7 +152,7 @@ public class CounterspellTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Dissipate", "Lightning Bolt"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Twincast", "Dissipate"); - setChoice(playerA, "Yes"); // change the target + setChoice(playerA, true); // change the target addTarget(playerA, "Dissipate"); setStrictChooseMode(true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/DisruptingShoalTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/DisruptingShoalTest.java index 59b499611c..6fed544563 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/DisruptingShoalTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/DisruptingShoalTest.java @@ -89,7 +89,7 @@ public class DisruptingShoalTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Pillarfield Ox"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Disrupting Shoal", "Pillarfield Ox", "Pillarfield Ox"); - setChoice(playerB, "Yes"); // use alternate costs + setChoice(playerB, true); // use alternate costs setChoice(playerB, "Mistfire Adept"); // pay to cast Mistfire Adept (CMC = 4) // rules: 202.3e When calculating the converted mana cost of an object with an {X} in its mana cost, @@ -139,7 +139,7 @@ public class DisruptingShoalTest extends CardTestPlayerBase { // try to pay by split card, but can't counter -- X <> bear's cmc castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Disrupting Shoal", "Grizzly Bears", "Grizzly Bears"); - setChoice(playerB, "Yes"); // use alternative cost + setChoice(playerB, true); // use alternative cost setChoice(playerB, "Far // Away"); // pay by card (cmc = 5, so X = 5 too) setStrictChooseMode(true); @@ -171,7 +171,7 @@ public class DisruptingShoalTest extends CardTestPlayerBase { // try to pay by split card, but can't counter -- X <> centaur's cmc castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Disrupting Shoal", "Centaur Courser", "Centaur Courser"); - setChoice(playerB, "Yes"); // use alternative cost + setChoice(playerB, true); // use alternative cost setChoice(playerB, "Far // Away"); // pay by card (cmc = 5, so X = 5 too) setStrictChooseMode(true); @@ -203,7 +203,7 @@ public class DisruptingShoalTest extends CardTestPlayerBase { // try to pay by split card and it works castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Disrupting Shoal", "Air Elemental", "Air Elemental"); - setChoice(playerB, "Yes"); // use alternative cost + setChoice(playerB, true); // use alternative cost setChoice(playerB, "Far // Away"); // pay by card (cmc = 5, so X = 5 too) setStrictChooseMode(true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/exile/RoonOfTheHiddenRealmTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/exile/RoonOfTheHiddenRealmTest.java index b2c8740948..c7b1eeef96 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/exile/RoonOfTheHiddenRealmTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/exile/RoonOfTheHiddenRealmTest.java @@ -32,7 +32,7 @@ public class RoonOfTheHiddenRealmTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Plains", 2); castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Silvercoat Lion"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); activateAbility(2, PhaseStep.POSTCOMBAT_MAIN, playerA, "{2}", "Perplexing Chimera"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/optional/IdentityThiefTests.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/optional/IdentityThiefTests.java index 0f10103563..3350c4de1d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/optional/IdentityThiefTests.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/optional/IdentityThiefTests.java @@ -13,7 +13,7 @@ public class IdentityThiefTests extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion"); attack(1, playerA, "Identity Thief"); - setChoice(playerA, "No"); + setChoice(playerA, false); setStopAt(1, PhaseStep.DECLARE_BLOCKERS); execute(); @@ -28,7 +28,7 @@ public class IdentityThiefTests extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion"); attack(1, playerA, "Identity Thief"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.DECLARE_BLOCKERS); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/ChorusOfTheConclaveTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/ChorusOfTheConclaveTest.java index ca19cf1ca1..3a28de0e86 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/ChorusOfTheConclaveTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/ChorusOfTheConclaveTest.java @@ -33,7 +33,7 @@ public class ChorusOfTheConclaveTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Goblin Roughrider"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Goblin Roughrider"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "X=1"); setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -70,16 +70,16 @@ public class ChorusOfTheConclaveTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Hamza, Guardian of Arashin"); // {4}{G}{W} castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Goblin Roughrider"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "X=1"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Hamza, Guardian of Arashin"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "X=1"); playLand(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Mountain"); castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Akki Drillmaster"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "X=1"); setStopAt(1, PhaseStep.END_TURN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/ThrummingStoneTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/ThrummingStoneTest.java index 1b84ec26f6..4c3a28c2be 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/ThrummingStoneTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/ThrummingStoneTest.java @@ -23,7 +23,7 @@ public class ThrummingStoneTest extends CardTestPlayerBase { addCard(Zone.LIBRARY, playerA, "Swamp", 3); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Shadowborn Apostle"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); execute(); @@ -48,7 +48,7 @@ public class ThrummingStoneTest extends CardTestPlayerBase { skipInitShuffling(); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Shadowborn Apostle"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/LeylineOfAnticipationTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/LeylineOfAnticipationTest.java index d7bed1b60c..71311d896f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/LeylineOfAnticipationTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/LeylineOfAnticipationTest.java @@ -18,7 +18,7 @@ public class LeylineOfAnticipationTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Leyline of Anticipation"); addCard(Zone.HAND, playerA, "Silvercoat Lion"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); castSpell(2, PhaseStep.DRAW, playerA, "Silvercoat Lion"); setStopAt(2, PhaseStep.END_COMBAT); @@ -41,7 +41,7 @@ public class LeylineOfAnticipationTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Yawgmoth's Agenda",1); addCard(Zone.HAND, playerA, "Leyline of Anticipation"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addCard(Zone.GRAVEYARD, playerA, "Silvercoat Lion"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/twofaced/TwoFacedCardEffectsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/twofaced/TwoFacedCardEffectsTest.java index 4b5c5511d9..38894410d4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/twofaced/TwoFacedCardEffectsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/twofaced/TwoFacedCardEffectsTest.java @@ -83,7 +83,7 @@ public class TwoFacedCardEffectsTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mayor of Avabruck"); castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Clone"); - setChoice(playerB, "Yes"); // use copy + setChoice(playerB, true); // use copy setChoice(playerB, "Mayor of Avabruck"); // clone target setStrictChooseMode(true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/AngelOfJubilationTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/AngelOfJubilationTest.java index 00847cd52f..3f1bf13327 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/AngelOfJubilationTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/AngelOfJubilationTest.java @@ -201,7 +201,7 @@ public class AngelOfJubilationTest extends CardTestPlayerBase { addCard(Zone.HAND, playerB, "Lightning Bolt"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", "Silvercoat Lion"); - setChoice(playerB, "Yes"); // Pay 3 life to prevent that returns to PlayerA's hand? + setChoice(playerB, true); // Pay 3 life to prevent that returns to PlayerA's hand? addTarget(playerA, playerB); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommanderAsIndomitableCreativityCastTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommanderAsIndomitableCreativityCastTest.java index 5b946292e4..2fbc9fb55c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommanderAsIndomitableCreativityCastTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommanderAsIndomitableCreativityCastTest.java @@ -53,7 +53,7 @@ public class CommanderAsIndomitableCreativityCastTest extends CardTestCommander4 castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Indomitable Creativity"); setChoice(playerA, "X=1"); addTarget(playerA, "Balduvian Bears"); - setChoice(playerA, "Yes"); // return spell as commander + setChoice(playerA, true); // return spell as commander checkPermanentCount("after", 1, PhaseStep.BEGIN_COMBAT, playerA, "Balduvian Bears", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommandersCastTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommandersCastTest.java index 1eef649caf..9d871dfe06 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommandersCastTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommandersCastTest.java @@ -52,7 +52,7 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { // destroy commander castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", "Balduvian Bears"); - setChoice(playerA, "Yes"); // put to command zone again + setChoice(playerA, true); // put to command zone again waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); checkPermanentCount("after destroy", 1, PhaseStep.PRECOMBAT_MAIN, playerB, playerA, "Balduvian Bears", 0); @@ -105,7 +105,7 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { // destroy commander land castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Pillage", "Academy Ruins"); - setChoice(playerA, "Yes"); // put to command zone again + setChoice(playerA, true); // put to command zone again waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); checkPermanentCount("after destroy", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Academy Ruins", 0); @@ -177,7 +177,7 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { setModeChoice(playerA, "1"); setModeChoice(playerA, "1"); setModeChoice(playerA, "4"); - setChoice(playerA, "Yes"); // return commander + setChoice(playerA, true); // return commander checkPermanentCount("after", 1, PhaseStep.BEGIN_COMBAT, playerA, "Citizen", 3); checkLife("after", 1, PhaseStep.BEGIN_COMBAT, playerA, 20 + 4); @@ -203,7 +203,7 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { // cast 1 and counter (increase commander tax) castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Balduvian Bears"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Remand", "Balduvian Bears", "Balduvian Bears"); - setChoice(playerA, "No"); // move to hand + setChoice(playerA, false); // move to hand checkCommandCardCount("cast 1", 1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Balduvian Bears", 0); checkHandCardCount("cast 1", 1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Balduvian Bears", 1); checkPermanentCount("cast 1", 1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Balduvian Bears", 0); @@ -212,7 +212,7 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { // cast 2 from hand without tax castSpell(5, PhaseStep.PRECOMBAT_MAIN, playerA, "Balduvian Bears"); castSpell(5, PhaseStep.PRECOMBAT_MAIN, playerB, "Remand", "Balduvian Bears", "Balduvian Bears"); - setChoice(playerA, "Yes"); // move to command zone + setChoice(playerA, true); // move to command zone checkCommandCardCount("cast 2", 5, PhaseStep.POSTCOMBAT_MAIN, playerA, "Balduvian Bears", 1); checkHandCardCount("cast 2", 5, PhaseStep.POSTCOMBAT_MAIN, playerA, "Balduvian Bears", 0); checkPermanentCount("cast 2", 5, PhaseStep.POSTCOMBAT_MAIN, playerA, "Balduvian Bears", 0); @@ -265,7 +265,7 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { // cast overload castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Weapon Surge with overload"); - setChoice(playerA, "Yes"); // move to command zone + setChoice(playerA, true); // move to command zone checkAbility("after", 1, PhaseStep.BEGIN_COMBAT, playerA, "Balduvian Bears", FirstStrikeAbility.class, true); setStopAt(1, PhaseStep.END_TURN); @@ -306,7 +306,7 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Balduvian Bears"); setChoice(playerA, "Red"); // pay - setChoice(playerA, "No"); // leave in graveyard + setChoice(playerA, false); // leave in graveyard // use commander as delve pay activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {U}", 5); @@ -314,7 +314,7 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { setChoice(playerA, "Blue", 5); // pay normal setChoice(playerA, "Exile a card"); // pay delve setChoice(playerA, "Balduvian Bears"); - setChoice(playerA, "Yes"); // move to command zone + setChoice(playerA, true); // move to command zone setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); @@ -350,7 +350,7 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { // turn 1 - cast left castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Fire"); addTargetAmount(playerA, playerB, 2); - setChoice(playerA, "Yes"); // return commander + setChoice(playerA, true); // return commander waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); // can't cast due commander cost added checkCommandCardCount("after first cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Fire // Ice", 1); @@ -363,7 +363,7 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { // cast right and use all mana (4 = card + commander cost) castSpell(5, PhaseStep.PRECOMBAT_MAIN, playerA, "Ice"); addTarget(playerA, "Mountain"); // tap target - setChoice(playerA, "Yes"); // move to commander + setChoice(playerA, true); // move to commander waitStackResolved(5, PhaseStep.PRECOMBAT_MAIN); checkCommandCardCount("after second cast", 5, PhaseStep.PRECOMBAT_MAIN, playerA, "Fire // Ice", 1); checkPlayableAbility("after second cast", 5, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Fire", false); @@ -406,7 +406,7 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { // cast adventure spell castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Treats to Share"); - setChoice(playerA, "Yes"); // return commander + setChoice(playerA, true); // return commander waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); checkCommandCardCount("after first cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Curious Pair", 1); checkPermanentCount("after first cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Food", 1); @@ -423,7 +423,7 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { // play adventure spell, but keep it castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Treats to Share"); - setChoice(playerA, "No"); // do not return commander + setChoice(playerA, false); // do not return commander waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); checkPermanentCount("after second cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Food", 2); checkPlayableAbility("after second cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Curious Pair", false); @@ -439,7 +439,7 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { // return commander to command zone activateAbility(5, PhaseStep.PRECOMBAT_MAIN, playerA, "target damage 10", "Curious Pair"); - setChoice(playerA, "Yes"); // return to command zone + setChoice(playerA, true); // return to command zone // can't cast - only {2} mana, but need {G} + {2} + {2} checkPlayableAbility("after return 2", 5, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Curious Pair", false); checkPlayableAbility("after return 2", 5, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Treats to Share", false); @@ -518,7 +518,7 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { // exile and return castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Angelic Edict", "Tergrid, God of Fright"); - setChoice(playerA, "Yes"); // return to command + setChoice(playerA, true); // return to command // turn 5 - check commander cost checkPlayableAbility("before second cast 1", 5, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Tergrid, God of Fright", true); @@ -572,7 +572,7 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { checkStackSize("must have 2 bolts on stack", 1, PhaseStep.PRECOMBAT_MAIN, playerA, 2); checkPlayableAbility("must see commander on battle for free cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Fierce Guardianship", true); // - setChoice(playerA, "Yes"); // return to command zone after kill + setChoice(playerA, true); // return to command zone after kill setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); @@ -599,8 +599,8 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Uro, Titan of Nature's Wrath"); setChoice(playerA, "Whenever {this} enters the battlefield or attacks"); // gain life trigger first, sacrifice next - setChoice(playerA, "No"); // keep in graveyard - setChoice(playerA, "Yes"); // put land to battlefield + setChoice(playerA, false); // keep in graveyard + setChoice(playerA, true); // put land to battlefield setChoice(playerA, "Swamp"); // put a Swamp setStrictChooseMode(true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/ConditionalPreventionTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/ConditionalPreventionTest.java index 5f61921279..ba5f93d7d8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/ConditionalPreventionTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/ConditionalPreventionTest.java @@ -207,7 +207,7 @@ public class ConditionalPreventionTest extends CardTestPlayerBase { // add shield for 3 damage castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Pollen Remedy"); - setChoice(playerA, "No"); // no kicker + setChoice(playerA, false); // no kicker addTargetAmount(playerA, "Balduvian Bears", 3); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); checkGraveyardCount("shield", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Pollen Remedy", 1); @@ -242,7 +242,7 @@ public class ConditionalPreventionTest extends CardTestPlayerBase { // add shield for 6 damage castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Pollen Remedy"); - setChoice(playerA, "Yes"); // use kicker + setChoice(playerA, true); // use kicker setChoice(playerA, "Swamp"); // kicker cost addTargetAmount(playerA, "Balduvian Bears", 6); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/DependentEffectsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/DependentEffectsTest.java index d37d80f9f7..331ccbb3c6 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/DependentEffectsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/DependentEffectsTest.java @@ -78,7 +78,7 @@ public class DependentEffectsTest extends CardTestPlayerBase { addCard(Zone.HAND, playerB, "Raise the Alarm"); // Instant {1}{W} castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Rite of Replication", "Cobblebrute"); - setChoice(playerA, "No"); // no kicker + setChoice(playerA, false); // no kicker castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Raise the Alarm"); castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Enchanted Evening"); setStopAt(1, PhaseStep.END_TURN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GoblinBushwhackerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GoblinBushwhackerTest.java index 023abcfe19..6dedb8edf2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GoblinBushwhackerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GoblinBushwhackerTest.java @@ -21,7 +21,7 @@ public class GoblinBushwhackerTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Goblin Bushwhacker"); - setChoice(playerA, "Yes"); // use kicker + setChoice(playerA, true); // use kicker setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/SerraAscendantTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/SerraAscendantTest.java index c97099ab65..8f1601bbf1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/SerraAscendantTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/SerraAscendantTest.java @@ -38,7 +38,7 @@ public class SerraAscendantTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Serra Ascendant"); playLand(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Stomping Ground"); - setChoice(playerB, "Yes"); + setChoice(playerB, true); castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Wild Nacatl"); playLand(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Plains"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/TappedForManaFromMultipleEffects.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/TappedForManaFromMultipleEffects.java index c89d869854..d1a814515b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/TappedForManaFromMultipleEffects.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/TappedForManaFromMultipleEffects.java @@ -97,7 +97,7 @@ public class TappedForManaFromMultipleEffects extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Balduvian Bears", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Chrome Mox"); - setChoice(playerA, "Yes"); // use imprint + setChoice(playerA, true); // use imprint setChoice(playerA, "Balduvian Bears"); // discard activateManaAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "{T}: Add one"); @@ -138,7 +138,7 @@ public class TappedForManaFromMultipleEffects extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Mana Reflection", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Chrome Mox"); - setChoice(playerA, "Yes"); // use imprint + setChoice(playerA, true); // use imprint setChoice(playerA, "Balduvian Bears"); // discard activateManaAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "{T}: Add one"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/UnboundFlourishingTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/UnboundFlourishingTest.java index 517f665bdb..71811dea30 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/UnboundFlourishingTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/UnboundFlourishingTest.java @@ -71,7 +71,7 @@ public class UnboundFlourishingTest extends CardTestPlayerBase { checkLife("before", 1, PhaseStep.PRECOMBAT_MAIN, playerA, 20); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Banefire", playerA); setChoice(playerA, "X=3"); - setChoice(playerA, "Yes"); // change target + setChoice(playerA, true); // change target addTarget(playerA, playerB); // change to B checkLife("after", 1, PhaseStep.BEGIN_COMBAT, playerA, 20 - 3); // original damage checkLife("after", 1, PhaseStep.BEGIN_COMBAT, playerB, 20 - 3); // copy damage @@ -158,7 +158,7 @@ public class UnboundFlourishingTest extends CardTestPlayerBase { checkLife("before", 1, PhaseStep.PRECOMBAT_MAIN, playerA, 20); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{X}{R}", playerA); setChoice(playerA, "X=3"); - setChoice(playerA, "Yes"); // change target + setChoice(playerA, true); // change target addTarget(playerA, playerB); // change to B checkLife("after", 1, PhaseStep.BEGIN_COMBAT, playerA, 20 - 3); // original damage checkLife("after", 1, PhaseStep.BEGIN_COMBAT, playerB, 20 - 3); // copy damage diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/control/ExileAndReturnUnderYourControl.java b/Mage.Tests/src/test/java/org/mage/test/cards/control/ExileAndReturnUnderYourControl.java index ccb3437295..4c39946699 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/control/ExileAndReturnUnderYourControl.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/control/ExileAndReturnUnderYourControl.java @@ -90,7 +90,7 @@ public class ExileAndReturnUnderYourControl extends CardTestPlayerBase { skipInitShuffling(); // to keep this card on top of library castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Master of Pearls"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Villainous Wealth", playerB); setChoice(playerA, "X=3"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/control/GainControlTargetEffectTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/control/GainControlTargetEffectTest.java index 0206162487..aea51a53f1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/control/GainControlTargetEffectTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/control/GainControlTargetEffectTest.java @@ -96,7 +96,7 @@ public class GainControlTargetEffectTest extends CardTestPlayerBase { activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerB, "{1}:"); activateAbility(2, PhaseStep.POSTCOMBAT_MAIN, playerA, "{2}, {T}: Gain control", "Mutavault"); - setChoice(playerA, "No"); // Don't untap the Shackles + setChoice(playerA, false); // Don't untap the Shackles setStopAt(3, PhaseStep.PRECOMBAT_MAIN); execute(); @@ -171,9 +171,9 @@ public class GainControlTargetEffectTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, leovold); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, oGorger); - setChoice(playerA, "Yes"); // opt to use Kirin's ability + setChoice(playerA, true); // opt to use Kirin's ability addTarget(playerA, leovold); // attempt to target Leovold with Kirin's take control ability - setChoice(playerB, "Yes"); // opt to use Leovold's ability to draw a card when targetted (should not occur) + setChoice(playerB, true); // opt to use Leovold's ability to draw a card when targetted (should not occur) setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -218,7 +218,7 @@ public class GainControlTargetEffectTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, aLight); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, oGorger); - setChoice(playerA, "Yes"); // opt to use Kirin's ability + setChoice(playerA, true); // opt to use Kirin's ability addTarget(playerA, aLight); // target Angel of Light with Kirin's take control ability setStopAt(1, PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/control/TakeControlWhileSearchingLibraryTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/control/TakeControlWhileSearchingLibraryTest.java index 80ea599f65..130a86f56a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/control/TakeControlWhileSearchingLibraryTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/control/TakeControlWhileSearchingLibraryTest.java @@ -72,7 +72,7 @@ public class TakeControlWhileSearchingLibraryTest extends CardTestPlayerBase { // search under control of B activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {B}", 3); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Buried Alive"); - setChoice(playerB, "Yes"); // continue + setChoice(playerB, true); // continue addTarget(playerB, "Balduvian Bears"); // player B must take control for searching waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); @@ -115,7 +115,7 @@ public class TakeControlWhileSearchingLibraryTest extends CardTestPlayerBase { // search as normal and cast activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {B}", 3); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Buried Alive"); - setChoice(playerA, "Yes"); // yes, try to cast a creature card from lib + setChoice(playerA, true); // yes, try to cast a creature card from lib setChoice(playerA, "Panglacial Wurm"); // try to cast addTarget(playerA, "Balduvian Bears"); // choice for searching waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); @@ -169,8 +169,8 @@ public class TakeControlWhileSearchingLibraryTest extends CardTestPlayerBase { // search under control of B and cast under B too activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {B}", 3); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Buried Alive"); - setChoice(playerB, "Yes"); // continue - setChoice(playerB, "Yes"); // yes, try to cast a creature card from lib + setChoice(playerB, true); // continue + setChoice(playerB, true); // yes, try to cast a creature card from lib setChoice(playerB, "Panglacial Wurm"); // try to cast addTarget(playerB, "Balduvian Bears"); // choice for searching waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); @@ -233,7 +233,7 @@ public class TakeControlWhileSearchingLibraryTest extends CardTestPlayerBase { // start searching under B (bears must go to exile instead graveyard) castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Buried Alive"); - setChoice(playerB, "Yes"); // continue after new control + setChoice(playerB, true); // continue after new control addTarget(playerB, "Balduvian Bears"); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); checkGraveyardCount("after grave a", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Balduvian Bears", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/AlteredEgoTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/AlteredEgoTest.java index 9d8f74121f..c7e875f52f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/AlteredEgoTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/AlteredEgoTest.java @@ -22,7 +22,7 @@ public class AlteredEgoTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Altered Ego"); setChoice(playerA, "X=3"); - setChoice(playerA, "Yes"); // use copy + setChoice(playerA, true); // use copy setChoice(playerA, "Silvercoat Lion"); // copy target setStrictChooseMode(true); @@ -44,7 +44,7 @@ public class AlteredEgoTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Altered Ego"); setChoice(playerA, "X=3"); - setChoice(playerA, "Yes"); // use copy (but no targets for copy) + setChoice(playerA, true); // use copy (but no targets for copy) setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CleverImpersonatorTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CleverImpersonatorTest.java index e6b6eb16ef..446c645d30 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CleverImpersonatorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CleverImpersonatorTest.java @@ -65,7 +65,7 @@ public class CleverImpersonatorTest extends CardTestPlayerBase { addCard(Zone.HAND, playerB, "Balduvian Bears", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Clever Impersonator"); - setChoice(playerA, "Yes"); // make copy + setChoice(playerA, true); // make copy setChoice(playerA, "Liliana, Defiant Necromancer"); // copy target activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+2: Each player discards a card"); addTarget(playerA, "Balduvian Bears"); // discard diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CloneTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CloneTest.java index d38e19f92a..415b4ce272 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CloneTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CloneTest.java @@ -214,7 +214,7 @@ public class CloneTest extends CardTestPlayerBase { setChoice(playerA, "Elf"); castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Clone"); - setChoice(playerB, "Yes"); + setChoice(playerB, true); setChoice(playerB, "Adaptive Automaton"); setChoice(playerB, "Goblin"); @@ -271,7 +271,7 @@ public class CloneTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Ixidron"); castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Clone"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, EmptyNames.FACE_DOWN_CREATURE.toString()); setStrictChooseMode(true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopyEnchantmentTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopyEnchantmentTest.java index 9e4e0fbad4..77b81a665c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopyEnchantmentTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopyEnchantmentTest.java @@ -50,7 +50,7 @@ public class CopyEnchantmentTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Inferno Fist", "Geist of the Moors"); castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Copy Enchantment"); - setChoice(playerB, "Yes"); // copy + setChoice(playerB, true); // copy setChoice(playerB, "Inferno Fist"); // copied setChoice(playerB, "Silvercoat Lion"); // target for copy diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopyPermanentSpellTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopyPermanentSpellTest.java index b00a321bbd..75ada0ac39 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopyPermanentSpellTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopyPermanentSpellTest.java @@ -48,7 +48,7 @@ public class CopyPermanentSpellTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Grizzly Bears"); addCard(Zone.HAND, playerA, "Holy Strength"); - setChoice(playerA, "No"); + setChoice(playerA, false); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Holy Strength", "Grizzly Bears"); setStopAt(1, PhaseStep.END_TURN); @@ -67,7 +67,7 @@ public class CopyPermanentSpellTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Hill Giant"); addCard(Zone.HAND, playerA, "Dead Weight"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Dead Weight", "Centaur Courser"); setStopAt(1, PhaseStep.END_TURN); @@ -89,7 +89,7 @@ public class CopyPermanentSpellTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Grizzly Bears"); addCard(Zone.HAND, playerA, "Goblin Bushwhacker"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Goblin Bushwhacker"); setStopAt(1, PhaseStep.END_TURN); @@ -107,7 +107,7 @@ public class CopyPermanentSpellTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Island", 5); addCard(Zone.HAND, playerA, "Aether Figment"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Aether Figment"); setStopAt(1, PhaseStep.END_TURN); @@ -144,7 +144,7 @@ public class CopyPermanentSpellTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Grizzly Bears"); addCard(Zone.HAND, playerA, "Nimbus Naiad"); - setChoice(playerA, "No"); + setChoice(playerA, false); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Nimbus Naiad using bestow", "Grizzly Bears"); setStopAt(1, PhaseStep.END_TURN); @@ -164,7 +164,7 @@ public class CopyPermanentSpellTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion"); addCard(Zone.HAND, playerA, "Nimbus Naiad"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Nimbus Naiad using bestow", "Grizzly Bears"); setStopAt(1, PhaseStep.END_TURN); @@ -191,10 +191,10 @@ public class CopyPermanentSpellTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Murder", 1); addCard(Zone.HAND, playerA, "Nimbus Naiad"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Nimbus Naiad using bestow", "Grizzly Bears"); - setChoice(playerA, "No"); + setChoice(playerA, false); castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Murder", "Grizzly Bears"); setStopAt(1, PhaseStep.END_TURN); @@ -217,10 +217,10 @@ public class CopyPermanentSpellTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Murder", 1); addCard(Zone.HAND, playerA, "Nimbus Naiad"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Nimbus Naiad using bestow", "Grizzly Bears"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Murder", "Silvercoat Lion"); setStopAt(1, PhaseStep.END_TURN); @@ -244,11 +244,11 @@ public class CopyPermanentSpellTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Murder", 1); addCard(Zone.HAND, playerA, "Nimbus Naiad"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Nimbus Naiad using bestow", "Grizzly Bears"); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN, true); - setChoice(playerA, "No"); + setChoice(playerA, false); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Murder", "Grizzly Bears"); setStopAt(1, PhaseStep.END_TURN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java index 835bcfdd92..9a54c82224 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java @@ -39,13 +39,13 @@ public class CopySpellTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Chain of Vapor", "Pillarfield Ox"); // chain 1 - B can return addTarget(playerB, "Island"); // select a land to sacrifice - setChoice(playerB, "Yes"); // want to copy spell - setChoice(playerB, "Yes"); // want to change target + setChoice(playerB, true); // want to copy spell + setChoice(playerB, true); // want to change target addTarget(playerB, "Silvercoat Lion"); // new target after copy // chain 2 - A can return addTarget(playerA, "Island"); // select a land to sacrifice - setChoice(playerA, "Yes"); // want to copy spell - setChoice(playerA, "Yes"); // want to change target + setChoice(playerA, true); // want to copy spell + setChoice(playerA, true); // want to change target addTarget(playerA, "Pillarfield Ox"); // new target after copy // stop the chain by B addTarget(playerB, TestPlayer.TARGET_SKIP); @@ -109,12 +109,12 @@ public class CopySpellTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Savannah Lions"); castSpell(1, PhaseStep.UPKEEP, playerA, "Barkshell Blessing"); - setChoice(playerA, "Yes"); // use Conspire + setChoice(playerA, true); // use Conspire addTarget(playerA, "Bonecrusher Giant"); // target bone setChoice(playerA, "Grizzly Bears"); // pay for conspire setChoice(playerA, "Savannah Lions"); // pay for conspire setChoice(playerA, "When you pay"); // Put Conspire on the stack first. - setChoice(playerA, "No"); // both spells target bone + setChoice(playerA, false); // both spells target bone setStrictChooseMode(true); setStopAt(1, PhaseStep.PRECOMBAT_MAIN); @@ -140,12 +140,12 @@ public class CopySpellTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Savannah Lions"); castSpell(1, PhaseStep.UPKEEP, playerA, "Barkshell Blessing"); - setChoice(playerA, "Yes"); // use Conspire + setChoice(playerA, true); // use Conspire addTarget(playerA, "Bonecrusher Giant"); // target bone setChoice(playerA, "Grizzly Bears"); // pay for conspire setChoice(playerA, "Savannah Lions"); // pay for conspire setChoice(playerA, "When you pay"); // Put Conspire on the stack first. - setChoice(playerA, "Yes"); // new target for copy: bear + setChoice(playerA, true); // new target for copy: bear addTarget(playerA, "Grizzly Bears"); setStrictChooseMode(true); @@ -172,11 +172,11 @@ public class CopySpellTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Savannah Lions"); castSpell(1, PhaseStep.UPKEEP, playerA, "Barkshell Blessing"); - setChoice(playerA, "Yes"); // use Conspire + setChoice(playerA, true); // use Conspire addTarget(playerA, "Grizzly Bears"); // target bear setChoice(playerA, "Grizzly Bears"); // pay for conspire setChoice(playerA, "Savannah Lions"); // pay for conspire - setChoice(playerA, "Yes"); // new target for copy: bone + setChoice(playerA, true); // new target for copy: bone addTarget(playerA, "Bonecrusher Giant"); // setChoice(playerA, "When {this} becomes the target of a spell"); // must be one trigger from bone, not two @@ -300,7 +300,7 @@ public class CopySpellTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Pillarfield Ox", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Into the Fray", "Zada, Hedron Grinder"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -331,7 +331,7 @@ public class CopySpellTest extends CardTestPlayerBase { addTarget(playerA, playerB); castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt"); addTarget(playerB, playerA); // original target - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, playerB); setStopAt(2, PhaseStep.BEGIN_COMBAT); @@ -379,7 +379,7 @@ public class CopySpellTest extends CardTestPlayerBase { castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Flame Slash", "Atraxa, Praetors' Voice"); castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Dualcaster Mage"); addTarget(playerB, "Flame Slash"); // original target - setChoice(playerB, "Yes"); + setChoice(playerB, true); addTarget(playerB, "Walking Ballista"); activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerA, "Remove a", "Silvercoat Lion", "Flame Slash", StackClause.WHILE_COPY_ON_STACK); @@ -411,8 +411,8 @@ public class CopySpellTest extends CardTestPlayerBase { activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Flashback"); addTarget(playerA, "Mountain"); - setChoice(playerA, "Yes"); // Copy - setChoice(playerA, "Yes"); // Choose new target + setChoice(playerA, true); // Copy + setChoice(playerA, true); // Choose new target addTarget(playerA, "Island"); setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -459,7 +459,7 @@ public class CopySpellTest extends CardTestPlayerBase { // cast spark and make imoti's copy castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Spark Double"); - setChoice(playerA, "Yes"); // use copy + setChoice(playerA, true); // use copy setChoice(playerA, "Imoti, Celebrant of Bounty"); // copy of imoti waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); checkPermanentCount("after copy", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Imoti, Celebrant of Bounty", 2); @@ -469,9 +469,9 @@ public class CopySpellTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Alpha Tyrranax"); checkStackSize("afer big spell", 1, PhaseStep.PRECOMBAT_MAIN, playerA, 3); setChoice(playerA, "cascade"); // choice between 2x gained cascades - setChoice(playerA, "Yes"); // cast first bolt by first cascade + setChoice(playerA, true); // cast first bolt by first cascade addTarget(playerA, playerB); // target for first bolt - setChoice(playerA, "Yes"); // cast second bold by second cascade + setChoice(playerA, true); // cast second bold by second cascade addTarget(playerA, playerB); // target for second bolt setStopAt(1, PhaseStep.END_TURN); @@ -556,8 +556,8 @@ public class CopySpellTest extends CardTestPlayerBase { activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}", 3); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Banefire", playerB); setChoice(playerA, "X=2"); - setChoice(playerA, "Yes"); // make copy - setChoice(playerA, "No"); // keep target same + setChoice(playerA, true); // make copy + setChoice(playerA, false); // keep target same waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); checkLife("after spell copy", 1, PhaseStep.PRECOMBAT_MAIN, playerB, 20 - 2 * 2); @@ -566,7 +566,7 @@ public class CopySpellTest extends CardTestPlayerBase { // token must have x=0 (dies) castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Capricopian"); setChoice(playerA, "X=1"); - setChoice(playerA, "Yes"); // make copy + setChoice(playerA, true); // make copy waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); checkPermanentCount("after creature copy", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Capricopian", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CryptoplasmTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CryptoplasmTest.java index ccd96aab7e..018f9173ee 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CryptoplasmTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CryptoplasmTest.java @@ -54,14 +54,14 @@ public class CryptoplasmTest extends CardTestPlayerBase { // turn 2 - prepare (crypto to paladin, footsteps to crypto) // crypto: copy as paladin on upkeep - setChoice(playerB, "Yes"); + setChoice(playerB, true); addTarget(playerB, "Sigiled Paladin"); // footsteps: enchant copy of paladin (crypto) castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Followed Footsteps"); addTarget(playerB, "Sigiled Paladin[only copy]"); // turn 4 - ignore crypto ask for new copy - setChoice(playerB, "No"); + setChoice(playerB, false); setStopAt(4, PhaseStep.END_TURN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/EldraziMimicTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/EldraziMimicTest.java index 0c703ec21f..9948965586 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/EldraziMimicTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/EldraziMimicTest.java @@ -59,7 +59,7 @@ public class EldraziMimicTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Eldrazi Mimic", 1); // 2/1 castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Composite Golem"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/FlameshadowConjuringTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/FlameshadowConjuringTest.java index dcf3a6ad47..a000092bea 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/FlameshadowConjuringTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/FlameshadowConjuringTest.java @@ -33,7 +33,7 @@ public class FlameshadowConjuringTest extends CardTestPlayerBase { // When Priest of the Blood Rite enters the battlefield, put a 5/5 black Demon creature token with flying onto the battlefield. // At the beginning of your upkeep, you lose 2 life. addCard(Zone.HAND, playerA, "Priest of the Blood Rite", 1); // {3}{B}{B} - setChoice(playerB, "Yes"); + setChoice(playerB, true); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Priest of the Blood Rite"); setStopAt(3, PhaseStep.UPKEEP); @@ -65,7 +65,7 @@ public class FlameshadowConjuringTest extends CardTestPlayerBase { addCard(Zone.HAND, playerB, "Kill Shot", 1); // {2}{U} castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Wurmcoil Engine"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); attack(1, playerA, "Wurmcoil Engine"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/HiveMindTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/HiveMindTest.java index 3295ba79d1..c95eef5e7a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/HiveMindTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/HiveMindTest.java @@ -23,7 +23,7 @@ public class HiveMindTest extends CardTestPlayerBase { // Each of those players may choose new targets for their copy. addCard(Zone.BATTLEFIELD, playerA, "Hive Mind", 1); addCard(Zone.HAND, playerA, "Lightning Bolt", 1); - setChoice(playerB, "Yes"); + setChoice(playerB, true); addTarget(playerB, playerA); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); @@ -55,7 +55,7 @@ public class HiveMindTest extends CardTestPlayerBase { // Whenever a player casts a spell with converted mana cost equal to the number of charge counters on Chalice of the Void, counter that spell. addCard(Zone.BATTLEFIELD, playerB, "Chalice of the Void", 1); - setChoice(playerB, "Yes"); + setChoice(playerB, true); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Pact of the Titan"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/IdentityThiefTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/IdentityThiefTest.java index a549c9e747..213a0637da 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/IdentityThiefTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/IdentityThiefTest.java @@ -32,7 +32,7 @@ public class IdentityThiefTest extends CardTestPlayerBase { setFlipCoinResult(playerA, true); attack(2, playerB, "Identity Thief"); - setChoice(playerB, "Yes"); + setChoice(playerB, true); addTarget(playerB, "Molten Sentry"); setStrictChooseMode(true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/IsochronScepterTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/IsochronScepterTest.java index 810e5ea628..98f2906b6c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/IsochronScepterTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/IsochronScepterTest.java @@ -44,12 +44,12 @@ public class IsochronScepterTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Lightning Bolt"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Isochron Scepter"); - setChoice(playerA, "Yes"); // use imprint + setChoice(playerA, true); // use imprint setChoice(playerA, "Lightning Bolt"); // target for imprint (excile from hand) // copy and cast imprinted card activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "{2}, {T}:"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.END_TURN); execute(); @@ -70,8 +70,8 @@ public class IsochronScepterTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Isochron Scepter"); addTarget(playerA, "Lightning Bolt"); activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "{2}, {T}:"); - setChoice(playerA, "Yes"); - setChoice(playerA, "No"); + setChoice(playerA, true); + setChoice(playerA, false); setStopAt(1, PhaseStep.END_TURN); execute(); @@ -113,8 +113,8 @@ public class IsochronScepterTest extends CardTestPlayerBase { attack(2, playerB, "Dross Crocodile"); activateAbility(2, PhaseStep.DECLARE_BLOCKERS, playerA, "{2}, {T}:"); - setChoice(playerA, "Yes"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); + setChoice(playerA, true); // Damage life loss is reduced to 0 because of Angel's Grace effect active castSpell(2, PhaseStep.POSTCOMBAT_MAIN, playerB, "Lightning Bolt", playerA); @@ -157,8 +157,8 @@ public class IsochronScepterTest extends CardTestPlayerBase { addTarget(playerA, "Silence"); activateAbility(2, PhaseStep.UPKEEP, playerA, "{2}, {T}:"); - setChoice(playerA, "Yes"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); + setChoice(playerA, true); castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Silvercoat Lion"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/MimicVatTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/MimicVatTest.java index 1391b9472a..153879a2a5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/MimicVatTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/MimicVatTest.java @@ -34,19 +34,19 @@ public class MimicVatTest extends CardTestPlayerBase { // clone the opponent's creature castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Clone"); - setChoice(playerA, "Yes"); // use clone on etb + setChoice(playerA, true); // use clone on etb setChoice(playerA, "Silvercoat Lion"); // kill clone and exile it (imprint into vat) activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{2}, {T}, Sacrifice a creature"); setChoice(playerA, "Silvercoat Lion"); - setChoice(playerA, "Yes"); // exile killed card by vat + setChoice(playerA, true); // exile killed card by vat // turn 3 // create a token from exile (imprinted card: clone) activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{3}, {T}: Create a token"); - setChoice(playerA, "Yes"); // use clone on etb + setChoice(playerA, true); // use clone on etb setChoice(playerA, "Silvercoat Lion"); setStrictChooseMode(true); @@ -74,13 +74,13 @@ public class MimicVatTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Phyrexian Metamorph"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "Silvercoat Lion"); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{2}, {T}, Sacrifice a creature"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{3}, {T}: Create a token that's a copy of a card exiled with "); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "Silvercoat Lion"); setStopAt(3, PhaseStep.BEGIN_COMBAT); @@ -115,14 +115,14 @@ public class MimicVatTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Silvercoat Lion"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "Silvercoat Lion"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Shred Memory", "Silvercoat Lion", "Whenever a nontoken creature dies"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{3}, {T}: Create a token that's a copy of a card exiled with "); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "Silvercoat Lion"); setStopAt(3, PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/MirrorworksTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/MirrorworksTest.java index d8ba557399..e54c358d34 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/MirrorworksTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/MirrorworksTest.java @@ -31,7 +31,7 @@ public class MirrorworksTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Mirrorworks", 1); // Artifact {5} castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mox Diamond"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -56,7 +56,7 @@ public class MirrorworksTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Mirrorworks", 1); // Artifact {5} castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mox Diamond"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/ReversalOfFortuneTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/ReversalOfFortuneTest.java index a47e832365..4919f2b3de 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/ReversalOfFortuneTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/ReversalOfFortuneTest.java @@ -29,7 +29,7 @@ public class ReversalOfFortuneTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Reversal of Fortune", playerB); setChoice(playerA, "Lightning Bolt"); // select to copy - setChoice(playerA, "Yes"); // cast copy + setChoice(playerA, true); // cast copy setStopAt(1, PhaseStep.END_TURN); execute(); @@ -49,7 +49,7 @@ public class ReversalOfFortuneTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Reversal of Fortune", playerB); addTarget(playerA, "Lightning Bolt"); - setChoice(playerA, "No"); + setChoice(playerA, false); setStopAt(1, PhaseStep.END_TURN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/SharuumTheHegemonTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/SharuumTheHegemonTest.java index 0ac2a0db44..ee035f14f2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/SharuumTheHegemonTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/SharuumTheHegemonTest.java @@ -52,29 +52,29 @@ public class SharuumTheHegemonTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Blood Artist", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Clone"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "Sharuum the Hegemon"); // what creature to clone addTarget(playerA, "Sharuum the Hegemon[only copy]"); // which legend to keep setChoice(playerA, "Whenever {this} or another creature dies"); // blood first addTarget(playerA, playerB); // damage by blood - setChoice(playerA, "Yes"); // return + setChoice(playerA, true); // return addTarget(playerA, "Sharuum the Hegemon"); // return real sharuum addTarget(playerA, "Sharuum the Hegemon[only copy]"); // which legend to keep setChoice(playerA, "Whenever {this} or another creature dies"); // blood first addTarget(playerA, playerB); // damage by blood - setChoice(playerA, "Yes"); // return + setChoice(playerA, true); // return addTarget(playerA, "Sharuum the Hegemon"); // return real sharuum addTarget(playerA, "Sharuum the Hegemon[only copy]"); // which legend to keep setChoice(playerA, "Whenever {this} or another creature dies"); // blood first addTarget(playerA, playerB); // damage by blood - setChoice(playerA, "Yes"); // return + setChoice(playerA, true); // return addTarget(playerA, "Sharuum the Hegemon"); // return real sharuum addTarget(playerA, "Sharuum the Hegemon[only copy]"); // which legend to keep - setChoice(playerA, "No"); // Don't use it anymore + setChoice(playerA, false); // Don't use it anymore setStopAt(1, PhaseStep.END_TURN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/SparkDoubleTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/SparkDoubleTest.java index 7164314b83..dbdebe836f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/SparkDoubleTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/SparkDoubleTest.java @@ -40,7 +40,7 @@ public class SparkDoubleTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Island", 4); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Spark Double"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "Abbey Griffin"); setStrictChooseMode(true); @@ -66,7 +66,7 @@ public class SparkDoubleTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Island", 4); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Spark Double"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "Ajani, the Greathearted"); setChoice(playerA, "Ajani, the Greathearted"); // two etb effects (own + copy) @@ -90,7 +90,7 @@ public class SparkDoubleTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Island", 4); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Spark Double"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "Abbey Griffin"); setStrictChooseMode(true); @@ -118,7 +118,7 @@ public class SparkDoubleTest extends CardTestPlayerBase { // copy castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Spark Double"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "Gideon, Ally of Zendikar"); setChoice(playerA, "Gideon, Ally of Zendikar"); // two etb effects (own + copy) @@ -147,7 +147,7 @@ public class SparkDoubleTest extends CardTestPlayerBase { // copy castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Spark Double"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "Gideon Blackblade"); setStrictChooseMode(true); @@ -188,7 +188,7 @@ public class SparkDoubleTest extends CardTestPlayerBase { // make copy of legendary creature (it's not legendary now) castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Spark Double"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "Akroma, Angel of Wrath"); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN, playerA); checkPermanentCount("must have copy", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Akroma, Angel of Wrath", 2); @@ -224,7 +224,7 @@ public class SparkDoubleTest extends CardTestPlayerBase { // make copy of legendary creature (it's not legendary now) castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Spark Double"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "Akroma, Angel of Wrath"); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN, playerA); checkPermanentCount("must have copy", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Akroma, Angel of Wrath", 2); @@ -266,7 +266,7 @@ public class SparkDoubleTest extends CardTestPlayerBase { // cast first spark castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Spark Double"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "Grizzly Bears"); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); checkPermanentCount("after 1", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Grizzly Bears", 2); @@ -274,7 +274,7 @@ public class SparkDoubleTest extends CardTestPlayerBase { // cast second spark // rules 706.9e affected, so must get only 1 counter castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Spark Double"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "Grizzly Bears[only copy]"); //setChoice(playerA, "Grizzly Bears"); // possible bug: two etb effects waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/SpelltwineTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/SpelltwineTest.java index db532ec771..811465658f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/SpelltwineTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/SpelltwineTest.java @@ -70,8 +70,8 @@ public class SpelltwineTest extends CardTestPlayerBase { addTarget(playerA, "Impulse"); // target 1 to exile addTarget(playerA, "Blasphemous Act"); // target 2 to exile - setChoice(playerA, "Yes"); // pay {3} and copy spell - setChoice(playerA, "Yes"); // Change targets + setChoice(playerA, true); // pay {3} and copy spell + setChoice(playerA, true); // Change targets addTarget(playerA, "Night's Whisper"); addTarget(playerA, "Divination"); setStopAt(1, PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/alternate/CastFromHandWithoutPayingManaCostTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/alternate/CastFromHandWithoutPayingManaCostTest.java index 34acb039a4..22956ce9fc 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/alternate/CastFromHandWithoutPayingManaCostTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/alternate/CastFromHandWithoutPayingManaCostTest.java @@ -96,7 +96,7 @@ public class CastFromHandWithoutPayingManaCostTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Silvercoat Lion"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Silvercoat Lion"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -119,7 +119,7 @@ public class CastFromHandWithoutPayingManaCostTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Fire // Ice"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Fire", playerB); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -147,7 +147,7 @@ public class CastFromHandWithoutPayingManaCostTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Shrapnel Blast", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Shrapnel Blast"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -177,7 +177,7 @@ public class CastFromHandWithoutPayingManaCostTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Trinisphere", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Silvercoat Lion"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -214,7 +214,7 @@ public class CastFromHandWithoutPayingManaCostTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Far // Away"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "fused Far // Away"); - setChoice(playerA, "Yes"); // Cast without paying its mana cost? + setChoice(playerA, true); // Cast without paying its mana cost? addTarget(playerA, "Silvercoat Lion"); addTarget(playerA, playerB); playerB.addTarget("Pillarfield Ox"); @@ -253,7 +253,7 @@ public class CastFromHandWithoutPayingManaCostTest extends CardTestPlayerBase { skipInitShuffling(); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Silvercoat Lion"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -287,8 +287,8 @@ public class CastFromHandWithoutPayingManaCostTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Bog Wraith", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Barbed Lightning"); - setChoice(playerA, "Yes"); // cast without cost - setChoice(playerA, "Yes"); // pay Entwine + setChoice(playerA, true); // cast without cost + setChoice(playerA, true); // pay Entwine addTarget(playerA, "Bog Wraith"); // target form mode 1 addTarget(playerA, playerB); // target for mode 2 @@ -364,12 +364,12 @@ public class CastFromHandWithoutPayingManaCostTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Bog Wraith", 1); // Creature {3}{B} (3/3) castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Omniscience"); - setChoice(playerA, "Yes"); // Pay alternative costs? ({W}{U}{B}{R}{G}) + setChoice(playerA, true); // Pay alternative costs? ({W}{U}{B}{R}{G}) castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Bog Wraith"); // The order of the two alternate casting abilities is not fixed, so it's not clear which ability is asked for first - setChoice(playerA, "No"); // Pay alternative costs? ({W}{U}{B}{R}{G}) - setChoice(playerA, "Yes"); // Cast without paying its mana cost? + setChoice(playerA, false); // Pay alternative costs? ({W}{U}{B}{R}{G}) + setChoice(playerA, true); // Cast without paying its mana cost? setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -414,9 +414,9 @@ public class CastFromHandWithoutPayingManaCostTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, jeleva); attack(3, playerA, jeleva); - setChoice(playerA, "Yes"); // opt to use Jeleva ability + setChoice(playerA, true); // opt to use Jeleva ability setChoice(playerA, savageBeating); // choose to cast Savage Beating for free - setChoice(playerA, "No"); // opt not to pay entwine cost + setChoice(playerA, false); // opt not to pay entwine cost setModeChoice(playerA, "1"); // use first mode of Savage Beating granting double strike setStopAt(3, PhaseStep.END_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/alternate/UseAlternateSourceCostsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/alternate/UseAlternateSourceCostsTest.java index 88ff765efc..91cde8b317 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/alternate/UseAlternateSourceCostsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/alternate/UseAlternateSourceCostsTest.java @@ -22,7 +22,7 @@ public class UseAlternateSourceCostsTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Lightning Bolt", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Gray Ogre"); // Cast Orgre by discarding the Lightning Bolt - setChoice(playerA, "Yes"); // Pay alternative costs? (Discard a card that shares a color with that spell) + setChoice(playerA, true); // Pay alternative costs? (Discard a card that shares a color with that spell) setChoice(playerA, "Lightning Bolt"); setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -93,7 +93,7 @@ public class UseAlternateSourceCostsTest extends CardTestPlayerBase { checkPlayableAbility("can", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Abolish", true); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Abolish", "Alpha Myr"); - setChoice(playerA, "Yes"); // use alternative cost + setChoice(playerA, true); // use alternative cost setChoice(playerA, "Plains"); setStrictChooseMode(true); @@ -118,7 +118,7 @@ public class UseAlternateSourceCostsTest extends CardTestPlayerBase { checkPlayableAbility("can", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Abolish", true); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Abolish", "Alpha Myr"); - setChoice(playerA, "Yes"); // use alternative cost + setChoice(playerA, true); // use alternative cost setChoice(playerA, "Plains"); setStrictChooseMode(true); @@ -158,7 +158,7 @@ public class UseAlternateSourceCostsTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Invigorate", "Silvercoat Lion"); - setChoice(playerA, "Yes"); // use alternative cost + setChoice(playerA, true); // use alternative cost addTarget(playerA, playerB); // Opponent to gain live setStrictChooseMode(true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/kicker/GatekeeperOfMalakirTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/kicker/GatekeeperOfMalakirTest.java index 100702051a..8d1c9f0c97 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/kicker/GatekeeperOfMalakirTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/kicker/GatekeeperOfMalakirTest.java @@ -19,7 +19,7 @@ public class GatekeeperOfMalakirTest extends CardTestPlayerBase { // Kicker {B} (You may pay an additional {B} as you cast this spell.) // When Gatekeeper of Malakir enters the battlefield, if it was kicked, target player sacrifices a creature. castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Gatekeeper of Malakir"); - setChoice(playerA, "Yes"); // use kicker + setChoice(playerA, true); // use kicker setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaces/ModalDoubleFacesCardsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaces/ModalDoubleFacesCardsTest.java index f21c9ca82e..e917db36e1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaces/ModalDoubleFacesCardsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaces/ModalDoubleFacesCardsTest.java @@ -670,7 +670,7 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { // cast and make copy of bear castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Glasspool Mimic"); - setChoice(playerA, "Yes"); // as copy + setChoice(playerA, true); // as copy setChoice(playerA, "Balduvian Bears"); // copy of setStrictChooseMode(true); @@ -695,16 +695,16 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Aether Vial", 1); // prepare charge counters - setChoice(playerA, "Yes"); // +1 charge on turn 1 - setChoice(playerA, "Yes"); // +1 charge on turn 3 - setChoice(playerA, "Yes"); // +1 charge on turn 5 + setChoice(playerA, true); // +1 charge on turn 1 + setChoice(playerA, true); // +1 charge on turn 3 + setChoice(playerA, true); // +1 charge on turn 5 // put card from hand to battlefield activateAbility(5, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: You may put a creature card"); - setChoice(playerA, "Yes"); // put card + setChoice(playerA, true); // put card setChoice(playerA, "Glasspool Mimic"); // select card with cmc 3 from hand // - setChoice(playerA, "Yes"); // put to battlefield as copy + setChoice(playerA, true); // put to battlefield as copy setChoice(playerA, "Balduvian Bears"); // copy of setStrictChooseMode(true); @@ -820,7 +820,7 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { // play elf with cascade castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Bloodbraid Elf"); - setChoice(playerA, "Yes"); // use free cast + setChoice(playerA, true); // use free cast //setChoice(playerA, "Cast Valki, God of Lies"); possible bug: you can see two spell abilities to choose, but only one allows here setChoice(playerA, TestPlayer.CHOICE_SKIP); // no choices for valki's etb exile @@ -853,7 +853,7 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { // play elf with cascade castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Bloodbraid Elf"); - setChoice(playerA, "Yes"); // use free cast + setChoice(playerA, true); // use free cast setChoice(playerA, "Cast The Omenkeel"); // can cast any side here setStrictChooseMode(true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/CostModificationTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/CostModificationTest.java index be75c330b0..df37996314 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/CostModificationTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/CostModificationTest.java @@ -204,7 +204,7 @@ public class CostModificationTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Silvercoat Lion"); playLand(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Zoetic Cavern"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.END_TURN); execute(); @@ -410,7 +410,7 @@ public class CostModificationTest extends CardTestPlayerBase { // Vivien: make cost +2 instead +1 (total 7 counters) activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+1: Look at the top four"); - setChoice(playerA, "No"); + setChoice(playerA, false); checkPermanentCounters("Vivien Reid counter check", 1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Vivien Reid", CounterType.LOYALTY, 7); // loyalty cost modification doesn't affect card rule's text, so it still shown an old cost value for a user @@ -467,10 +467,10 @@ public class CostModificationTest extends CardTestPlayerBase { // prepare duplicates castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Spark Double"); - setChoice(playerA, "Yes"); // copy + setChoice(playerA, true); // copy setChoice(playerA, "Carth the Lion"); // copy target castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Spark Double"); - setChoice(playerA, "Yes"); // copy + setChoice(playerA, true); // copy setChoice(playerA, "Carth the Lion"); // copy target // x3 lions gives +3 in cost reduction (-8 -> -5) diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/HeartstoneTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/HeartstoneTest.java index c8fd769841..611bbd0ee8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/HeartstoneTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/HeartstoneTest.java @@ -29,7 +29,7 @@ public class HeartstoneTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", playerA); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{1}{U}, Tap two untapped Wizards you control: Copy target instant or sorcery spell. You may choose new targets for the copy.", "Lightning Bolt"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, playerB); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/MizzixOfTheIzmagnusTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/MizzixOfTheIzmagnusTest.java index e068495745..69320670be 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/MizzixOfTheIzmagnusTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/MizzixOfTheIzmagnusTest.java @@ -80,7 +80,7 @@ public class MizzixOfTheIzmagnusTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Seething Anger", "Mizzix of the Izmagnus"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/sacrifice/OptionalSacrificeTests.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/sacrifice/OptionalSacrificeTests.java index b7e9d6fa07..412181a3bf 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/sacrifice/OptionalSacrificeTests.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/sacrifice/OptionalSacrificeTests.java @@ -26,7 +26,7 @@ public class OptionalSacrificeTests extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Relic of Progenitus"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Glint Hawk"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, "Relic of Progenitus"); setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -53,7 +53,7 @@ public class OptionalSacrificeTests extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Relic of Progenitus"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Glint Hawk"); - setChoice(playerA, "No"); + setChoice(playerA, false); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -78,7 +78,7 @@ public class OptionalSacrificeTests extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Glint Hawk"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Glint Hawk"); - setChoice(playerA, "No"); + setChoice(playerA, false); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -102,7 +102,7 @@ public class OptionalSacrificeTests extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Moat"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Drake Familiar"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, "Moat"); setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -130,7 +130,7 @@ public class OptionalSacrificeTests extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Propaganda"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Drake Familiar"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, "Propaganda"); setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -156,7 +156,7 @@ public class OptionalSacrificeTests extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Drake Familiar"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Drake Familiar"); - setChoice(playerA, "No"); + setChoice(playerA, false); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -180,7 +180,7 @@ public class OptionalSacrificeTests extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Propaganda"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Drake Familiar"); - setChoice(playerA, "No"); + setChoice(playerA, false); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/splitcards/CastSplitCardsFromOtherZonesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/splitcards/CastSplitCardsFromOtherZonesTest.java index 07c260e8ad..8afb4166c5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/splitcards/CastSplitCardsFromOtherZonesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/splitcards/CastSplitCardsFromOtherZonesTest.java @@ -35,7 +35,7 @@ public class CastSplitCardsFromOtherZonesTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mindclaw Shaman"); addTarget(playerA, playerB); setChoice(playerA, "Wear // Tear"); // select card - setChoice(playerA, "Yes"); // confirm to cast + setChoice(playerA, true); // confirm to cast setChoice(playerA, "Cast Tear"); // select tear side addTarget(playerA, "Sanguine Bond"); // target for tear @@ -68,7 +68,7 @@ public class CastSplitCardsFromOtherZonesTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mindclaw Shaman"); addTarget(playerA, playerB); setChoice(playerA, "Wear // Tear"); // select card - setChoice(playerA, "Yes"); // confirm to cast + setChoice(playerA, true); // confirm to cast setChoice(playerA, "Cast Wear"); // select wear side addTarget(playerA, "Icy Manipulator"); // target for wear @@ -101,7 +101,7 @@ public class CastSplitCardsFromOtherZonesTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mindclaw Shaman"); addTarget(playerA, playerB); setChoice(playerA, "Wear // Tear"); // select card - setChoice(playerA, "Yes"); // confirm to cast + setChoice(playerA, true); // confirm to cast setChoice(playerA, "Cast fused Wear // Tear"); // select fused addTarget(playerA, "Icy Manipulator"); // target for wear addTarget(playerA, "Sanguine Bond"); // target for tear @@ -136,7 +136,7 @@ public class CastSplitCardsFromOtherZonesTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Etali, Primal Storm"); // Creature {4}{R} 6/6 attack(2, playerB, "Etali, Primal Storm"); - setChoice(playerB, "Yes"); // free cast + setChoice(playerB, true); // free cast setChoice(playerB, "Fire // Ice"); // card to cast setChoice(playerB, "Cast Fire"); // ability to cast addTargetAmount(playerB, "Silvercoat Lion", 2); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/splitcards/SplitCardCmcTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/splitcards/SplitCardCmcTest.java index 8e09ec0f02..547c877004 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/splitcards/SplitCardCmcTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/splitcards/SplitCardCmcTest.java @@ -59,7 +59,7 @@ public class SplitCardCmcTest extends CardTestPlayerBase { skipInitShuffling(); // so the set to top card stays at top castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Typhoid Rats"); - setChoice(playerB, "Yes"); // Reveal to Counterbalance to attempt to counter Typhoid Rats + setChoice(playerB, true); // Reveal to Counterbalance to attempt to counter Typhoid Rats setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/dungeons/DungeonTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/dungeons/DungeonTest.java index 75a4f225bc..76fe266b30 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/dungeons/DungeonTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/dungeons/DungeonTest.java @@ -105,7 +105,7 @@ public class DungeonTest extends CardTestPlayerBase { setChoice(playerA, LOST_MINE_OF_PHANDELVER); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{0}:"); - setChoice(playerA, "Yes"); // Goblin Lair + setChoice(playerA, true); // Goblin Lair setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); @@ -128,10 +128,10 @@ public class DungeonTest extends CardTestPlayerBase { setChoice(playerA, LOST_MINE_OF_PHANDELVER); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{0}:"); - setChoice(playerA, "Yes"); // Goblin Lair + setChoice(playerA, true); // Goblin Lair waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{0}:"); - setChoice(playerA, "No"); // Dark Pool + setChoice(playerA, false); // Dark Pool setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); @@ -154,10 +154,10 @@ public class DungeonTest extends CardTestPlayerBase { setChoice(playerA, LOST_MINE_OF_PHANDELVER); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{0}:"); - setChoice(playerA, "Yes"); // Goblin Lair + setChoice(playerA, true); // Goblin Lair waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{0}:"); - setChoice(playerA, "No"); // Dark Pool + setChoice(playerA, false); // Dark Pool waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{0}:"); @@ -180,9 +180,9 @@ public class DungeonTest extends CardTestPlayerBase { activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{0}:"); setChoice(playerA, LOST_MINE_OF_PHANDELVER); activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "{0}:"); - setChoice(playerA, "Yes"); // Goblin Lair + setChoice(playerA, true); // Goblin Lair activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerA, "{0}:"); - setChoice(playerA, "No"); // Dark Pool + setChoice(playerA, false); // Dark Pool activateAbility(2, PhaseStep.POSTCOMBAT_MAIN, playerA, "{0}:"); setStopAt(2, PhaseStep.END_TURN); @@ -203,9 +203,9 @@ public class DungeonTest extends CardTestPlayerBase { activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{0}:"); setChoice(playerA, LOST_MINE_OF_PHANDELVER); activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "{0}:"); - setChoice(playerA, "Yes"); // Goblin Lair + setChoice(playerA, true); // Goblin Lair activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerA, "{0}:"); - setChoice(playerA, "No"); // Dark Pool + setChoice(playerA, false); // Dark Pool activateAbility(2, PhaseStep.POSTCOMBAT_MAIN, playerA, "{0}:"); rollbackTurns(2, PhaseStep.END_TURN, playerA, 0); @@ -228,16 +228,16 @@ public class DungeonTest extends CardTestPlayerBase { activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{0}:"); setChoice(playerA, LOST_MINE_OF_PHANDELVER); activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "{0}:"); - setChoice(playerA, "Yes"); // Goblin Lair + setChoice(playerA, true); // Goblin Lair activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerA, "{0}:"); - setChoice(playerA, "No"); // Dark Pool + setChoice(playerA, false); // Dark Pool activateAbility(2, PhaseStep.POSTCOMBAT_MAIN, playerA, "{0}:"); rollbackTurns(2, PhaseStep.END_TURN, playerA, 0); rollbackAfterActionsStart(); activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerA, "{0}:"); - setChoice(playerA, "Yes"); // Storeroom + setChoice(playerA, true); // Storeroom addTarget(playerA, SILVERCOAT_LION); rollbackAfterActionsEnd(); @@ -265,10 +265,10 @@ public class DungeonTest extends CardTestPlayerBase { setChoice(playerA, LOST_MINE_OF_PHANDELVER); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{0}:"); - setChoice(playerA, "Yes"); // Goblin Lair + setChoice(playerA, true); // Goblin Lair waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{0}:"); - setChoice(playerA, "No"); // Dark Pool + setChoice(playerA, false); // Dark Pool activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "{0}:"); setChoice(playerB, DUNGEON_OF_THE_MAD_MAGE); @@ -276,7 +276,7 @@ public class DungeonTest extends CardTestPlayerBase { activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "{0}:"); waitStackResolved(1, PhaseStep.POSTCOMBAT_MAIN); activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "{0}:"); - setChoice(playerB, "Yes"); // Goblin Bazaar + setChoice(playerB, true); // Goblin Bazaar waitStackResolved(1, PhaseStep.POSTCOMBAT_MAIN); activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "{0}:"); @@ -305,10 +305,10 @@ public class DungeonTest extends CardTestPlayerBase { setChoice(playerA, LOST_MINE_OF_PHANDELVER); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{0}:"); - setChoice(playerA, "Yes"); // Goblin Lair + setChoice(playerA, true); // Goblin Lair waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{0}:"); - setChoice(playerA, "No"); // Dark Pool + setChoice(playerA, false); // Dark Pool waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{0}:"); @@ -346,10 +346,10 @@ public class DungeonTest extends CardTestPlayerBase { setChoice(playerA, LOST_MINE_OF_PHANDELVER); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{0}:"); - setChoice(playerA, "Yes"); // Goblin Lair + setChoice(playerA, true); // Goblin Lair waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{0}:"); - setChoice(playerA, "No"); // Dark Pool + setChoice(playerA, false); // Dark Pool waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{0}:"); @@ -370,13 +370,13 @@ public class DungeonTest extends CardTestPlayerBase { setChoice(playerA, LOST_MINE_OF_PHANDELVER); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{0}:"); - setChoice(playerA, "Yes"); // Goblin Lair + setChoice(playerA, true); // Goblin Lair waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{0}:"); - setChoice(playerA, "No"); // Dark Pool + setChoice(playerA, false); // Dark Pool waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{0}:"); - setChoice(playerA, "Yes"); // return Dungeon Crawler + setChoice(playerA, true); // return Dungeon Crawler setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); @@ -396,10 +396,10 @@ public class DungeonTest extends CardTestPlayerBase { setChoice(playerA, LOST_MINE_OF_PHANDELVER); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{0}:"); - setChoice(playerA, "Yes"); // Goblin Lair + setChoice(playerA, true); // Goblin Lair waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{0}:"); - setChoice(playerA, "No"); // Dark Pool + setChoice(playerA, false); // Dark Pool setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); @@ -423,10 +423,10 @@ public class DungeonTest extends CardTestPlayerBase { setChoice(playerA, LOST_MINE_OF_PHANDELVER); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{0}:"); - setChoice(playerA, "Yes"); // Goblin Lair + setChoice(playerA, true); // Goblin Lair waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{0}:"); - setChoice(playerA, "No"); // Dark Pool + setChoice(playerA, false); // Dark Pool setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/AuraMovingTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/AuraMovingTest.java index 4aaf1bb682..5be462c5de 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/AuraMovingTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/AuraMovingTest.java @@ -50,9 +50,9 @@ public class AuraMovingTest extends CardTestPlayerBase { castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Alexi's Cloak", "Bruna, Light of Alabaster"); attack(2, playerB, "Bruna, Light of Alabaster"); - setChoice(playerB, "Yes"); + setChoice(playerB, true); addTarget(playerB, "Hostile Realm"); - setChoice(playerB, "Yes"); + setChoice(playerB, true); addTarget(playerB, "Unholy Strength"); setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/CircleOfAfflictionTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/CircleOfAfflictionTest.java index 9a0de90bbc..f12690304e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/CircleOfAfflictionTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/CircleOfAfflictionTest.java @@ -32,7 +32,7 @@ public class CircleOfAfflictionTest extends CardTestPlayerBase { attack(2, playerB, "Hill Giant"); addTarget(playerA, playerB); // Circle of Affliction drain ability - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); execute(); @@ -60,9 +60,9 @@ public class CircleOfAfflictionTest extends CardTestPlayerBase { attack(2, playerB, "Silvercoat Lion"); attack(2, playerB, "Silvercoat Lion"); addTarget(playerA, playerB); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, playerB); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); execute(); @@ -93,18 +93,18 @@ public class CircleOfAfflictionTest extends CardTestPlayerBase { castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Lava Spike", playerA); addTarget(playerA, playerB); - setChoice(playerA, "Yes"); + setChoice(playerA, true); attack(2, playerB, "Hill Giant"); attack(2, playerB, "Hill Giant"); addTarget(playerA, playerB); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, playerB); - setChoice(playerA, "Yes"); + setChoice(playerA, true); castSpell(2, PhaseStep.POSTCOMBAT_MAIN, playerB, "Lava Spike", playerA); addTarget(playerA, playerB); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(2, PhaseStep.END_TURN); execute(); @@ -135,9 +135,9 @@ public class CircleOfAfflictionTest extends CardTestPlayerBase { attack(2, playerB, "Silvercoat Lion"); attack(2, playerB, "Hill Giant"); addTarget(playerA, playerB); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, playerB); // should not be able to drain Hill Giant with white selected - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/EnchantingGraveyardCardsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/EnchantingGraveyardCardsTest.java index b40f1969d9..8871e721c0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/EnchantingGraveyardCardsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/EnchantingGraveyardCardsTest.java @@ -74,7 +74,7 @@ public class EnchantingGraveyardCardsTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, SPELLWEAVER_VOLUTE, LIGHTNING_BOLT); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cloak of Feathers", "Silvercoat Lion"); - setChoice(playerA, "Yes"); // play the L. Bold + setChoice(playerA, true); // play the L. Bold addTarget(playerA, playerB); // Add Target for the L. Bold setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -120,7 +120,7 @@ public class EnchantingGraveyardCardsTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, SPELLWEAVER_VOLUTE, LIGHTNING_BOLT); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cloak of Feathers", "Silvercoat Lion"); - setChoice(playerA, "Yes"); // play the L. Bold + setChoice(playerA, true); // play the L. Bold addTarget(playerA, playerB); // Add Target for the L. Bold setStopAt(1, PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/MindsDilationTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/MindsDilationTest.java index 269329ff66..5bfa0ffa8e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/MindsDilationTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/MindsDilationTest.java @@ -28,7 +28,7 @@ public class MindsDilationTest extends CardTestPlayerBase { skipInitShuffling(); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); - setChoice(playerB, "Yes"); + setChoice(playerB, true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -55,7 +55,7 @@ public class MindsDilationTest extends CardTestPlayerBase { addCard(Zone.LIBRARY, playerA, "Divination", 1); // draw 2 cards castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); - setChoice(playerB, "No"); // no, I don't want my free 2 cards + setChoice(playerB, false); // no, I don't want my free 2 cards setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/OathOfLiegesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/OathOfLiegesTest.java index 952c6122d8..4789747d90 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/OathOfLiegesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/OathOfLiegesTest.java @@ -25,7 +25,7 @@ public class OathOfLiegesTest extends CardTestPlayerBase { // turn 1 - A // oath A triggers for A and activates addTarget(playerA, playerB); // who control more lands - setChoice(playerA, "Yes"); // search library + setChoice(playerA, true); // search library addTarget(playerA, "Plains"); // card from library setStopAt(1, PhaseStep.END_TURN); @@ -57,7 +57,7 @@ public class OathOfLiegesTest extends CardTestPlayerBase { // turn 2 - B // oath A triggers for B and activates addTarget(playerB, playerA); // who control more lands - setChoice(playerB, "Yes"); // search library + setChoice(playerB, true); // search library addTarget(playerB, "Plains"); // card from library setStopAt(2, PhaseStep.END_TURN); @@ -81,7 +81,7 @@ public class OathOfLiegesTest extends CardTestPlayerBase { // turn 1 - A // oath B triggers for A and activates addTarget(playerA, playerB); // who control more lands - setChoice(playerA, "Yes"); // search library + setChoice(playerA, true); // search library addTarget(playerA, "Plains"); // card from library setStopAt(1, PhaseStep.END_TURN); @@ -106,11 +106,11 @@ public class OathOfLiegesTest extends CardTestPlayerBase { // oath B triggers for A and activates // 1 addTarget(playerA, playerB); // who control more lands - setChoice(playerA, "Yes"); // search library + setChoice(playerA, true); // search library addTarget(playerA, "Plains"); // card from library // 2 addTarget(playerA, playerB); // who control more lands - setChoice(playerA, "Yes"); // search library + setChoice(playerA, true); // search library addTarget(playerA, "Plains"); // card from library setStopAt(1, PhaseStep.END_TURN); @@ -142,7 +142,7 @@ public class OathOfLiegesTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Replenish"); // cast oath copy castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Copy Enchantment"); - setChoice(playerA, "Yes"); // use copy effect + setChoice(playerA, true); // use copy effect setChoice(playerA, "Oath of Lieges"); // target for copy checkPermanentCount("A have 2 oath", 1, PhaseStep.END_TURN, playerA, "Oath of Lieges", 2); checkPermanentCount("A have 10 plains", 1, PhaseStep.END_TURN, playerA, "Plains", 10); @@ -161,11 +161,11 @@ public class OathOfLiegesTest extends CardTestPlayerBase { setChoice(playerA, "At the beginning of each player's upkeep"); // two triggers on upkeep // 1 addTarget(playerA, playerB); // who control more lands - setChoice(playerA, "Yes"); // search library + setChoice(playerA, true); // search library addTarget(playerA, "Plains"); // card from library // 2 addTarget(playerA, playerB); // who control more lands - setChoice(playerA, "Yes"); // search library + setChoice(playerA, true); // search library addTarget(playerA, "Plains"); // card from library setStrictChooseMode(true); @@ -201,7 +201,7 @@ public class OathOfLiegesTest extends CardTestPlayerBase { castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerA, "Replenish"); // cast oath copy by opponent castSpell(2, PhaseStep.POSTCOMBAT_MAIN, playerB, "Copy Enchantment"); - setChoice(playerB, "Yes"); // use copy effect + setChoice(playerB, true); // use copy effect setChoice(playerB, "Oath of Lieges"); // target for copy checkPermanentCount("A have 1 oath", 2, PhaseStep.END_TURN, playerA, "Oath of Lieges", 1); checkPermanentCount("B have 1 oath", 2, PhaseStep.END_TURN, playerA, "Oath of Lieges", 1); @@ -213,11 +213,11 @@ public class OathOfLiegesTest extends CardTestPlayerBase { // copy oath B triggers for A and activates // 1 addTarget(playerA, playerB); // who control more lands - setChoice(playerA, "Yes"); // search library + setChoice(playerA, true); // search library addTarget(playerA, "Plains"); // card from library // 2 addTarget(playerA, playerB); // who control more lands - setChoice(playerA, "Yes"); // search library + setChoice(playerA, true); // search library addTarget(playerA, "Plains"); // card from library setStopAt(3, PhaseStep.END_TURN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/facedown/GrimHaruspexTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/facedown/GrimHaruspexTest.java index deea5f4a59..b3c43ade43 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/facedown/GrimHaruspexTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/facedown/GrimHaruspexTest.java @@ -17,7 +17,7 @@ public class GrimHaruspexTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Plains", 7); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Grim Haruspex"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Wrath of God"); setStopAt(1, PhaseStep.END_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/facedown/PrimordialMistTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/facedown/PrimordialMistTest.java index 4de081e34f..bf7a287c1d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/facedown/PrimordialMistTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/facedown/PrimordialMistTest.java @@ -31,7 +31,7 @@ public class PrimordialMistTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Island", 9); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Brine Elemental"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN, playerA); @@ -39,9 +39,9 @@ public class PrimordialMistTest extends CardTestPlayerBase { setChoice(playerA, EmptyNames.FACE_DOWN_CREATURE.toString()); castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Brine Elemental"); - setChoice(playerA, "No"); // cast it face down as 2/2 creature + setChoice(playerA, false); // cast it face down as 2/2 creature - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.END_TURN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/ExtraplanarLensTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/ExtraplanarLensTest.java index 0d9e4e8bfc..dad94b266f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/ExtraplanarLensTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/ExtraplanarLensTest.java @@ -24,7 +24,7 @@ public class ExtraplanarLensTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, snow_covered_forest, 10); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, lens); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, snow_covered_forest); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); @@ -49,7 +49,7 @@ public class ExtraplanarLensTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, forest, 10); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, lens); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, forest); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/ManaPoolTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/ManaPoolTest.java index ea63b4b2b9..1fecee7419 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/ManaPoolTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/ManaPoolTest.java @@ -316,7 +316,7 @@ public class ManaPoolTest extends CardTestPlayerBase { setChoice(playerB, "X=3"); addTarget(playerB, "Lightning Bolt"); // pay to prevent - setChoice(playerA, "Yes"); // pay 3 to prevent counter + setChoice(playerA, true); // pay 3 to prevent counter waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); checkManaPool("mana after", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "R", 4 - 3); @@ -362,7 +362,7 @@ public class ManaPoolTest extends CardTestPlayerBase { setChoice(playerB, "X=3"); addTarget(playerB, "Lightning Bolt"); // pay to prevent - setChoice(playerA, "Yes"); // pay 3 to prevent counter + setChoice(playerA, true); // pay 3 to prevent counter waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); checkManaPool("mana after", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "R", 10 + 1 - 1 - 3); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/RosheenMeandererManaXTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/RosheenMeandererManaXTest.java index 95125e8974..40f3e79ef1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/RosheenMeandererManaXTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/RosheenMeandererManaXTest.java @@ -26,7 +26,7 @@ public class RosheenMeandererManaXTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Verdeloth the Ancient"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Verdeloth the Ancient"); - setChoice(playerA, "Yes"); // use kicker + setChoice(playerA, true); // use kicker setChoice(playerA, "X=2"); checkPermanentCount("after", 1, PhaseStep.END_TURN, playerA, "Verdeloth the Ancient", 1); @@ -51,7 +51,7 @@ public class RosheenMeandererManaXTest extends CardTestPlayerBase { // cast kicker X and use extra 4 mana castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Verdeloth the Ancient"); - setChoice(playerA, "Yes"); // use kicker + setChoice(playerA, true); // use kicker setChoice(playerA, "X=2"); checkPermanentCount("after", 1, PhaseStep.END_TURN, playerA, "Verdeloth the Ancient", 1); @@ -81,7 +81,7 @@ public class RosheenMeandererManaXTest extends CardTestPlayerBase { // cast kicker X and use extra 4 mana castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Verdeloth the Ancient"); - setChoice(playerA, "Yes"); // use kicker + setChoice(playerA, true); // use kicker setChoice(playerA, "X=0"); checkPermanentCount("after", 1, PhaseStep.END_TURN, playerA, "Verdeloth the Ancient", 1); @@ -109,7 +109,7 @@ public class RosheenMeandererManaXTest extends CardTestPlayerBase { attack(1, playerA, "Flameblast Dragon", playerB); // with extra damage (-3) - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "X=3"); addTarget(playerA, playerB); @@ -135,7 +135,7 @@ public class RosheenMeandererManaXTest extends CardTestPlayerBase { attack(1, playerA, "Flameblast Dragon", playerB); // with extra damage (-3) - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "X=3"); // need to pay {3}{R} addTarget(playerA, playerB); @@ -170,7 +170,7 @@ public class RosheenMeandererManaXTest extends CardTestPlayerBase { activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {C}"); checkManaPool("mana", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "C", 4); // pay to prevent - setChoice(playerA, "Yes"); // pay 2 to prevent counter + setChoice(playerA, true); // pay 2 to prevent counter checkLife("after", 1, PhaseStep.POSTCOMBAT_MAIN, playerB, 20 - 3); checkHandCardCount("after", 1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/conditional/ConditionalManaTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/conditional/ConditionalManaTest.java index 7c9a9b5c81..4b95301083 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/conditional/ConditionalManaTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/conditional/ConditionalManaTest.java @@ -377,7 +377,7 @@ public class ConditionalManaTest extends CardTestPlayerBase { addCard(Zone.GRAVEYARD, playerA, "Grizzly Bears", 2); - setChoice(playerA, "No"); // Put [Top Card of Library] into your graveyard? + setChoice(playerA, false); // Put [Top Card of Library] into your graveyard? setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/phyrexian/PhyrexianManaTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/phyrexian/PhyrexianManaTest.java index 8ce24a2953..70ed935c56 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/phyrexian/PhyrexianManaTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/phyrexian/PhyrexianManaTest.java @@ -45,7 +45,7 @@ public class PhyrexianManaTest extends CardTestPlayerBase { checkPlayableAbility("pay 2 life for Banehound", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Banehound", true); - setChoice(playerA, "Yes"); + setChoice(playerA, true); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Banehound"); checkPlayableAbility("no Mana for Banehound", 2, PhaseStep.PRECOMBAT_MAIN, playerB, "Cast Banehound", false); @@ -71,11 +71,11 @@ public class PhyrexianManaTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Swamp", 1); - setChoice(playerA, "Yes"); //yes to pay 2 life to cast Crypt Ghast + setChoice(playerA, true); //yes to pay 2 life to cast Crypt Ghast castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Crypt Ghast"); //3 mana used, 2 life paid (18 life total) - setChoice(playerA, "Yes"); //yes to pay 2 life to cast Banehound - setChoice(playerA, "Yes"); //yes to Extort - setChoice(playerA, "Yes"); //yes to pay 2 life to Extort + setChoice(playerA, true); //yes to pay 2 life to cast Banehound + setChoice(playerA, true); //yes to Extort + setChoice(playerA, true); //yes to pay 2 life to Extort castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Banehound"); //0 mana used, 4 life paid, 1 life gained (15 life total) setStopAt(1, PhaseStep.END_TURN); execute(); @@ -94,7 +94,7 @@ public class PhyrexianManaTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Swamp", 1); - setChoice(playerA, "Yes"); //yes to pay 2 life to activate Frozen Shade's +1/+1 ability + setChoice(playerA, true); //yes to pay 2 life to activate Frozen Shade's +1/+1 ability activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{B}: {this} gets +1/+1 until end of turn."); setStopAt(1, PhaseStep.END_TURN); execute(); @@ -114,10 +114,10 @@ public class PhyrexianManaTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Swamp", 1); addCard(Zone.BATTLEFIELD, playerB, "Banehound"); - setChoice(playerA, "No"); //don't pay 2 life for Dismember's Phyrexian cost - setChoice(playerA, "No"); //don't pay 2 life for Dismember's Phyrexian cost - setChoice(playerA, "Yes"); //yes to pay 2 life for Dismember's {B} cost via K'rrik - setChoice(playerA, "Yes"); //yes to pay 2 life for Dismember's {B} cost via K'rrik + setChoice(playerA, false); //don't pay 2 life for Dismember's Phyrexian cost + setChoice(playerA, false); //don't pay 2 life for Dismember's Phyrexian cost + setChoice(playerA, true); //yes to pay 2 life for Dismember's {B} cost via K'rrik + setChoice(playerA, true); //yes to pay 2 life for Dismember's {B} cost via K'rrik //Dismember costs {1} now + life paid. Normally this would be {3} + life paid with true Phyrexian mana and Trinisphere active. castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Dismember", "Banehound"); @@ -144,7 +144,7 @@ public class PhyrexianManaTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Banehound"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Banehound"); - setChoice(playerA, "Yes"); // Pay 2 life for {B} + setChoice(playerA, true); // Pay 2 life for {B} setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/planes/UndercityReachesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/planes/UndercityReachesTest.java index e1dad1ed05..b6dc83de9f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/planes/UndercityReachesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/planes/UndercityReachesTest.java @@ -20,7 +20,7 @@ public class UndercityReachesTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Balduvian Bears", 1); attack(1, playerA, "Balduvian Bears"); - setChoice(playerA, "Yes"); // draw + setChoice(playerA, true); // draw setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); @@ -40,7 +40,7 @@ public class UndercityReachesTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Balduvian Bears", 1); attack(2, playerB, "Balduvian Bears"); - setChoice(playerB, "Yes"); // draw + setChoice(playerB, true); // draw setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/LilianaTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/LilianaTest.java index 281f0644b2..0e77d2deb0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/LilianaTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/LilianaTest.java @@ -51,7 +51,7 @@ public class LilianaTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, liliannaDM); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "-3:"); // Liliana -3 addTarget(playerA, wShepherd); // returns to battlefield and become zombie on top of other types - setChoice(playerA, "Yes"); // use Binding Mummy ability + setChoice(playerA, true); // use Binding Mummy ability addTarget(playerA, yOx); // tap the ox setStopAt(1, PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/NissaVastwoodSeerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/NissaVastwoodSeerTest.java index 48bd050aeb..67394200ff 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/NissaVastwoodSeerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/NissaVastwoodSeerTest.java @@ -48,7 +48,7 @@ Later I used her -2 to kill her, which (after putting another spell on the stack addCard(Zone.HAND, playerA, "Nissa, Vastwood Seer"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Nissa, Vastwood Seer"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, "Forest"); playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Forest"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/prevention/PreventAllDamageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/prevention/PreventAllDamageTest.java index 51f81e4a29..28e27aa624 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/prevention/PreventAllDamageTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/prevention/PreventAllDamageTest.java @@ -124,7 +124,7 @@ public class PreventAllDamageTest extends CardTestPlayerBase { attack(2, playerB, "Silvercoat Lion"); - setChoice(playerA, "No"); // Pay {1}? Energy Storm - CumulativeUpkeepAbility: Cumulative upkeep {1} + setChoice(playerA, false); // Pay {1}? Energy Storm - CumulativeUpkeepAbility: Cumulative upkeep {1} setStopAt(3, PhaseStep.PRECOMBAT_MAIN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DamageEffectsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DamageEffectsTest.java index 263cf64f91..fa7606a2f7 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DamageEffectsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DamageEffectsTest.java @@ -30,7 +30,7 @@ public class DamageEffectsTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Gratuitous Violence"); playLand(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Mountain"); - setChoice(playerB, "Yes"); + setChoice(playerB, true); addTarget(playerB, playerA); attack(2, playerB, "Ob Nixilis, the Fallen"); 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 820ab1a7a4..381fb09ad2 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 @@ -123,7 +123,7 @@ public class DoublingSeasonTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Venerable Monk", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Rite of Replication", "Venerable Monk"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/LeylineOfTheVoidTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/LeylineOfTheVoidTest.java index 627877016a..c954d2b6a3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/LeylineOfTheVoidTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/LeylineOfTheVoidTest.java @@ -89,7 +89,7 @@ public class LeylineOfTheVoidTest extends CardTestPlayerBase { castSpell(2, PhaseStep.POSTCOMBAT_MAIN, playerA, "Murder"); setChoice(playerA, "Memnite"); - setChoice(playerB, "Yes"); + setChoice(playerB, true); setStopAt(2, PhaseStep.END_TURN); execute(); @@ -116,9 +116,9 @@ public class LeylineOfTheVoidTest extends CardTestPlayerBase { // Morbid — At the beginning of each end step, if a creature died this turn, you may draw a card. addCard(Zone.BATTLEFIELD, playerB, "Deathreap Ritual"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Sacrifice"); - setChoice(playerB, "Yes"); + setChoice(playerB, true); setStopAt(1, PhaseStep.END_TURN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/PanharmoniconTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/PanharmoniconTest.java index 8d36c92cf4..b87c6f8fe6 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/PanharmoniconTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/PanharmoniconTest.java @@ -92,8 +92,8 @@ public class PanharmoniconTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Plains", 6); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Scion of Ugin"); - setChoice(playerA, "No"); // Return Bladewing's Thrall from your graveyard to the battlefield? - setChoice(playerA, "Yes"); // Should not get run since there is only one trigger. + setChoice(playerA, false); // Return Bladewing's Thrall from your graveyard to the battlefield? + setChoice(playerA, true); // Should not get run since there is only one trigger. setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/PropagandaTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/PropagandaTest.java index 867941e441..a321d27d39 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/PropagandaTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/PropagandaTest.java @@ -22,7 +22,7 @@ public class PropagandaTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Plains", 2); attack(2, playerB, "Silvercoat Lion"); - setChoice(playerB, "Yes");// Pay {2} to attack? + setChoice(playerB, true);// Pay {2} to attack? setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); execute(); @@ -45,8 +45,8 @@ public class PropagandaTest extends CardTestPlayerBase { attack(2, playerB, "Silvercoat Lion"); setChoice(playerB, "Propaganda"); // Creatures can't attack you unless their controller pays {2} for each creature they control that's attacking you."); - setChoice(playerB, "Yes");// Pay {2} to attack? - setChoice(playerB, "Yes");// Pay {2} to attack? + setChoice(playerB, true);// Pay {2} to attack? + setChoice(playerB, true);// Pay {2} to attack? setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/PulmonicSliverTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/PulmonicSliverTest.java index b674465be3..5830e7a8f2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/PulmonicSliverTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/PulmonicSliverTest.java @@ -26,7 +26,7 @@ public class PulmonicSliverTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Doom Blade"); addTarget(playerB, "Venom Sliver"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -50,8 +50,8 @@ public class PulmonicSliverTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Swamp", 4); castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Damnation"); - setChoice(playerA, "Yes"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); + setChoice(playerA, true); setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); @@ -79,7 +79,7 @@ public class PulmonicSliverTest extends CardTestPlayerBase { castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Path to Exile"); addTarget(playerB, "Venom Sliver"); - setChoice(playerA, "Yes"); // should not even have this as a choice + setChoice(playerA, true); // should not even have this as a choice setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/ScorchingLavaTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/ScorchingLavaTest.java index 3a5e909e70..3f733a4cf6 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/ScorchingLavaTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/ScorchingLavaTest.java @@ -25,7 +25,7 @@ public class ScorchingLavaTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Scorching Lava", "Silvercoat Lion"); - setChoice(playerA, "Yes"); // with Kicker + setChoice(playerA, true); // with Kicker setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/WinLoseEffectsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/WinLoseEffectsTest.java index 0e2f5ab768..e2c56bfe9e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/WinLoseEffectsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/WinLoseEffectsTest.java @@ -130,10 +130,10 @@ public class WinLoseEffectsTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Angel's Grace"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Ad Nauseam"); - setChoice(playerA, "Yes"); - setChoice(playerA, "Yes"); - setChoice(playerA, "Yes"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); + setChoice(playerA, true); + setChoice(playerA, true); + setChoice(playerA, true); castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Serum Visions"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/prevent/RefractionTrapTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/prevent/RefractionTrapTest.java index 99c0aaea51..d59db4edaf 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/prevent/RefractionTrapTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/prevent/RefractionTrapTest.java @@ -33,7 +33,7 @@ public class RefractionTrapTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Refraction Trap", "Silvercoat Lion", "Lightning Bolt"); - setChoice(playerB, "Yes"); + setChoice(playerB, true); setChoice(playerB, "Lightning Bolt"); setStopAt(1, PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/restriction/CantAttackTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/restriction/CantAttackTest.java index af517d7c5b..dbbd463b90 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/restriction/CantAttackTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/restriction/CantAttackTest.java @@ -125,8 +125,8 @@ public class CantAttackTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Orzhov Advokist"); - setChoice(playerA, "Yes"); - setChoice(playerB, "Yes"); + setChoice(playerA, true); + setChoice(playerB, true); attack(2, playerB, "Silvercoat Lion"); attack(4, playerB, "Silvercoat Lion"); setStopAt(4, PhaseStep.POSTCOMBAT_MAIN); @@ -239,7 +239,7 @@ public class CantAttackTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Forest"); attack(1, playerA, memnite); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); @@ -264,7 +264,7 @@ public class CantAttackTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Forest"); attack(1, playerA, memnite); - setChoice(playerA, "No"); + setChoice(playerA, false); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); @@ -290,7 +290,7 @@ public class CantAttackTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Forest"); attack(1, playerA, memnite); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); @@ -316,7 +316,7 @@ public class CantAttackTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Forest"); attack(1, playerA, memnite); - setChoice(playerA, "No"); + setChoice(playerA, false); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); @@ -341,7 +341,7 @@ public class CantAttackTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Forest", 2); attack(1, playerA, memnite); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); @@ -366,7 +366,7 @@ public class CantAttackTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Forest", 2); attack(1, playerA, memnite); - setChoice(playerA, "No"); + setChoice(playerA, false); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/restriction/MeddlingMageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/restriction/MeddlingMageTest.java index 3830a9c40e..b9b523b714 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/restriction/MeddlingMageTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/restriction/MeddlingMageTest.java @@ -49,14 +49,14 @@ public class MeddlingMageTest extends CardTestPlayerBase { setChoice(playerA, "Lightning Bolt"); // name a spell that can't be cast castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Isochron Scepter"); - setChoice(playerA, "Yes"); // use imprint + setChoice(playerA, true); // use imprint setChoice(playerA, "Lightning Bolt"); // target for imprint // copy and cast imprinted card waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "{2}, {T}:"); - setChoice(playerA, "Yes"); // create copy - setChoice(playerA, "Yes"); // cast copy + setChoice(playerA, true); // create copy + setChoice(playerA, true); // cast copy setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); @@ -83,7 +83,7 @@ public class MeddlingMageTest extends CardTestPlayerBase { setChoice(playerA, "Ainok Tracker"); // name a spell that can't be cast castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Ainok Tracker"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/rules/CantBeTargetTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/rules/CantBeTargetTest.java index 7a672d2b10..5edd34f52c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/rules/CantBeTargetTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/rules/CantBeTargetTest.java @@ -27,7 +27,7 @@ public class CantBeTargetTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Divine Favor", "Silvercoat Lion"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Vines of Vastwood", "Silvercoat Lion", "Divine Favor"); - setChoice(playerB, "No"); // don't use kicker + setChoice(playerB, false); // don't use kicker setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/rules/CantCastTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/rules/CantCastTest.java index 802c570bd9..eafdfe7fbc 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/rules/CantCastTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/rules/CantCastTest.java @@ -107,7 +107,7 @@ public class CantCastTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Forest", 3); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Pine Walker"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/rules/CantDrawTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/rules/CantDrawTest.java index a5e73c2361..f1b8973775 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/rules/CantDrawTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/rules/CantDrawTest.java @@ -46,7 +46,7 @@ public class CantDrawTest extends CardTestPlayerBase { // If you do, choose two cards in your hand drawn this turn. For each of those cards, pay 4 life or put the card on top of your library. addCard(Zone.BATTLEFIELD, playerA, "Sylvan Library", 1); - setChoice(playerA, "No"); + setChoice(playerA, false); setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/rules/WorldEnchantmentsRuleTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/rules/WorldEnchantmentsRuleTest.java index e2866affcc..69ac7de10b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/rules/WorldEnchantmentsRuleTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/rules/WorldEnchantmentsRuleTest.java @@ -123,10 +123,10 @@ public class WorldEnchantmentsRuleTest extends CardTestMultiPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Charmed Griffin"); - setChoice(playerD, "Yes"); // Put an artifact or enchantment card from your hand onto the battlefield? + setChoice(playerD, true); // Put an artifact or enchantment card from your hand onto the battlefield? setChoice(playerD, "Concordant Crossroads"); - setChoice(playerB, "Yes"); // Put an artifact or enchantment card from your hand onto the battlefield? + setChoice(playerB, true); // Put an artifact or enchantment card from your hand onto the battlefield? setChoice(playerB, "Concordant Crossroads"); concede(1, PhaseStep.PRECOMBAT_MAIN, playerC); // World Enchantments come into range diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/TheTarrasqueTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/TheTarrasqueTest.java index d681d8c690..7f158e6ac3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/TheTarrasqueTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/TheTarrasqueTest.java @@ -50,7 +50,7 @@ public class TheTarrasqueTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, tarrasque); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{G},"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.END_TURN); execute(); @@ -83,11 +83,11 @@ public class TheTarrasqueTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, sakashima); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{G},"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, tarrasque); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, sakashima); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.END_TURN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/HapatraVizierOfPoisonsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/HapatraVizierOfPoisonsTest.java index 4dfbfe57b5..1c525b158a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/HapatraVizierOfPoisonsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/HapatraVizierOfPoisonsTest.java @@ -29,7 +29,7 @@ public class HapatraVizierOfPoisonsTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, gBears); attack(3, playerA, hapatra); - setChoice(playerA, "Yes"); // opt to place -1/-1 counter on creature + setChoice(playerA, true); // opt to place -1/-1 counter on creature addTarget(playerA, gBears); setStopAt(3, PhaseStep.END_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/NewPerspectivesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/NewPerspectivesTest.java index fb9a238376..c088c3593e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/NewPerspectivesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/NewPerspectivesTest.java @@ -35,7 +35,7 @@ public class NewPerspectivesTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, newPerspectives); activateAbility(1, PhaseStep.BEGIN_COMBAT, playerA, "Cycling"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.END_COMBAT); execute(); @@ -59,7 +59,7 @@ public class NewPerspectivesTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, newPerspectives); activateAbility(1, PhaseStep.BEGIN_COMBAT, playerA, "Cycling"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.END_COMBAT); execute(); @@ -87,7 +87,7 @@ public class NewPerspectivesTest extends CardTestPlayerBase { castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, newPerspectives); activateAbility(3, PhaseStep.BEGIN_COMBAT, playerA, "Cycling"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(3, PhaseStep.END_COMBAT); execute(); @@ -116,7 +116,7 @@ public class NewPerspectivesTest extends CardTestPlayerBase { castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, newPerspectives); activateAbility(3, PhaseStep.BEGIN_COMBAT, playerA, "Cycling"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(3, PhaseStep.END_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/bfz/ConduitOfRuinTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/bfz/ConduitOfRuinTest.java index 44aca020c9..727dda1f04 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/bfz/ConduitOfRuinTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/bfz/ConduitOfRuinTest.java @@ -28,7 +28,7 @@ public class ConduitOfRuinTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Plains", 13); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Conduit of Ruin"); - setChoice(playerA, "Yes"); // When you cast this spell, you may search... + setChoice(playerA, true); // When you cast this spell, you may search... addTarget(playerA, "Emrakul, the Aeons Torn"); setStopAt(3, PhaseStep.DRAW); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/bfz/EmeriaShepherdTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/bfz/EmeriaShepherdTest.java index 88ca8bfce9..954bf014e1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/bfz/EmeriaShepherdTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/bfz/EmeriaShepherdTest.java @@ -40,7 +40,7 @@ public class EmeriaShepherdTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Plains", 7); playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Plains"); - setChoice(playerA, "Yes"); // opt to use Emeria's triggered ability + setChoice(playerA, true); // opt to use Emeria's triggered ability addTarget(playerA, bruna); // target Bruna in grave setStopAt(1, PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/c17/TheUrDragonTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/c17/TheUrDragonTest.java index 0ebc89b1ba..a1e26783b4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/c17/TheUrDragonTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/c17/TheUrDragonTest.java @@ -33,7 +33,7 @@ public class TheUrDragonTest extends CardTestPlayerBase { attack(3, playerA, "The Ur-Dragon"); attack(3, playerA, "Dragon Hatchling"); attack(3, playerA, "Dragon Hatchling"); - setChoice(playerA, "Yes"); // Put a permanent card from your hand onto the battlefield? + setChoice(playerA, true); // Put a permanent card from your hand onto the battlefield? setChoice(playerA, "Silvercoat Lion"); setStopAt(3, PhaseStep.END_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/c18/AminatousAuguryTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/c18/AminatousAuguryTest.java index 8dff191188..a8d36115ce 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/c18/AminatousAuguryTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/c18/AminatousAuguryTest.java @@ -39,7 +39,7 @@ public class AminatousAuguryTest extends CardTestPlayerBase { playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mountain"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Aminatou's Augury"); - setChoice(playerA, "Yes"); // Put a land from among the exiled cards into play? + setChoice(playerA, true); // Put a land from among the exiled cards into play? setChoice(playerA, "Badlands"); // Select a land card castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Adarkar Sentinel"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/c18/GeodeGolemTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/c18/GeodeGolemTest.java index 3c4cce83e0..3306cb0acf 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/c18/GeodeGolemTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/c18/GeodeGolemTest.java @@ -27,7 +27,7 @@ public class GeodeGolemTest extends CardTestCommanderDuelBase { // attack and cast first time (free) attack(1, playerA, "Geode Golem"); - setChoice(playerA, "Yes"); // cast commander + setChoice(playerA, true); // cast commander setChoice(playerA, "Grizzly Bears"); // commander choice waitStackResolved(1, PhaseStep.COMBAT_DAMAGE); checkPermanentCount("after 1", 1, PhaseStep.COMBAT_DAMAGE, playerA, "Grizzly Bears", 1); @@ -35,12 +35,12 @@ public class GeodeGolemTest extends CardTestCommanderDuelBase { // // remove to command zone (0x tax) activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "target damage 2", "Grizzly Bears"); - setChoice(playerA, "Yes"); // move to command zone + setChoice(playerA, true); // move to command zone // turn 3 - second cast (1x tax) attack(3, playerA, "Geode Golem"); - setChoice(playerA, "Yes"); // cast commander + setChoice(playerA, true); // cast commander setChoice(playerA, "Grizzly Bears"); // commander choice waitStackResolved(3, PhaseStep.COMBAT_DAMAGE); checkPermanentCount("after 2", 3, PhaseStep.COMBAT_DAMAGE, playerA, "Grizzly Bears", 1); @@ -48,12 +48,12 @@ public class GeodeGolemTest extends CardTestCommanderDuelBase { // // remove to command zone activateAbility(3, PhaseStep.POSTCOMBAT_MAIN, playerA, "target damage 2", "Grizzly Bears"); - setChoice(playerA, "Yes"); // move to command zone + setChoice(playerA, true); // move to command zone // turn 5 - third cast (2x tax) attack(5, playerA, "Geode Golem"); - setChoice(playerA, "Yes"); // cast commander + setChoice(playerA, true); // cast commander setChoice(playerA, "Grizzly Bears"); // commander choice waitStackResolved(5, PhaseStep.COMBAT_DAMAGE); checkPermanentCount("after 3", 5, PhaseStep.COMBAT_DAMAGE, playerA, "Grizzly Bears", 1); @@ -86,7 +86,7 @@ public class GeodeGolemTest extends CardTestCommanderDuelBase { // attack and cast first time (free) attack(1, playerA, "Geode Golem"); - setChoice(playerA, "Yes"); // cast commander + setChoice(playerA, true); // cast commander setChoice(playerA, "Akoum Warrior"); // commander choice waitStackResolved(1, PhaseStep.COMBAT_DAMAGE); checkPermanentCount("after 1", 1, PhaseStep.COMBAT_DAMAGE, playerA, "Akoum Warrior", 1); @@ -94,12 +94,12 @@ public class GeodeGolemTest extends CardTestCommanderDuelBase { // // remove to command zone (0x tax) activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "target damage 5", "Akoum Warrior"); - setChoice(playerA, "Yes"); // move to command zone + setChoice(playerA, true); // move to command zone // turn 3 - second cast (1x tax) attack(3, playerA, "Geode Golem"); - setChoice(playerA, "Yes"); // cast commander + setChoice(playerA, true); // cast commander setChoice(playerA, "Akoum Warrior"); // commander choice waitStackResolved(3, PhaseStep.COMBAT_DAMAGE); checkPermanentCount("after 2", 3, PhaseStep.COMBAT_DAMAGE, playerA, "Akoum Warrior", 1); @@ -107,12 +107,12 @@ public class GeodeGolemTest extends CardTestCommanderDuelBase { // // remove to command zone activateAbility(3, PhaseStep.POSTCOMBAT_MAIN, playerA, "target damage 5", "Akoum Warrior"); - setChoice(playerA, "Yes"); // move to command zone + setChoice(playerA, true); // move to command zone // turn 5 - third cast (2x tax) attack(5, playerA, "Geode Golem"); - setChoice(playerA, "Yes"); // cast commander + setChoice(playerA, true); // cast commander setChoice(playerA, "Akoum Warrior"); // commander choice waitStackResolved(5, PhaseStep.COMBAT_DAMAGE); checkPermanentCount("after 3", 5, PhaseStep.COMBAT_DAMAGE, playerA, "Akoum Warrior", 1); @@ -146,7 +146,7 @@ public class GeodeGolemTest extends CardTestCommanderDuelBase { // attack and cast first time (free) attack(1, playerA, "Geode Golem"); - setChoice(playerA, "Yes"); // cast commander + setChoice(playerA, true); // cast commander setChoice(playerA, "Birgi, God of Storytelling"); // commander choice setChoice(playerA, "Cast Birgi, God of Storytelling"); // spell choice waitStackResolved(1, PhaseStep.COMBAT_DAMAGE); @@ -155,12 +155,12 @@ public class GeodeGolemTest extends CardTestCommanderDuelBase { // // remove to command zone (0x tax) activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "target damage 3", "Birgi, God of Storytelling"); - setChoice(playerA, "Yes"); // move to command zone + setChoice(playerA, true); // move to command zone // turn 3 - second cast, LEFT side (1x tax) attack(3, playerA, "Geode Golem"); - setChoice(playerA, "Yes"); // cast commander + setChoice(playerA, true); // cast commander setChoice(playerA, "Birgi, God of Storytelling"); // commander choice setChoice(playerA, "Cast Birgi, God of Storytelling"); // spell choice waitStackResolved(3, PhaseStep.COMBAT_DAMAGE); @@ -169,12 +169,12 @@ public class GeodeGolemTest extends CardTestCommanderDuelBase { // // remove to command zone activateAbility(3, PhaseStep.POSTCOMBAT_MAIN, playerA, "target damage 3", "Birgi, God of Storytelling"); - setChoice(playerA, "Yes"); // move to command zone + setChoice(playerA, true); // move to command zone // turn 5 - third cast, RIGHT side (2x tax) attack(5, playerA, "Geode Golem"); - setChoice(playerA, "Yes"); // cast commander + setChoice(playerA, true); // cast commander setChoice(playerA, "Birgi, God of Storytelling"); // commander choice setChoice(playerA, "Cast Harnfel, Horn of Bounty"); // spell choice waitStackResolved(5, PhaseStep.COMBAT_DAMAGE); @@ -183,12 +183,12 @@ public class GeodeGolemTest extends CardTestCommanderDuelBase { // // remove to command zone activateAbility(5, PhaseStep.POSTCOMBAT_MAIN, playerA, "target destroy", "Harnfel, Horn of Bounty"); - setChoice(playerA, "Yes"); // move to command zone + setChoice(playerA, true); // move to command zone // turn 7 - fourth cast, RIGHT side (3x tax) attack(7, playerA, "Geode Golem"); - setChoice(playerA, "Yes"); // cast commander + setChoice(playerA, true); // cast commander setChoice(playerA, "Birgi, God of Storytelling"); // commander choice setChoice(playerA, "Cast Harnfel, Horn of Bounty"); // spell choice waitStackResolved(7, PhaseStep.COMBAT_DAMAGE); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/c19/ChainerNightmareAdeptTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/c19/ChainerNightmareAdeptTest.java index 95f0b712f2..24ba3f45a2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/c19/ChainerNightmareAdeptTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/c19/ChainerNightmareAdeptTest.java @@ -48,7 +48,7 @@ public class ChainerNightmareAdeptTest extends CardTestPlayerBase { addCard(Zone.GRAVEYARD, playerA, khenra); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Discard"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, maaka); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, khenra); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/c20/TwinningStaffTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/c20/TwinningStaffTest.java index 61a697488b..0f54d615e3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/c20/TwinningStaffTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/c20/TwinningStaffTest.java @@ -29,7 +29,7 @@ public class TwinningStaffTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, growth); setChoice(playerA, TestPlayer.CHOICE_SKIP); // skip stack order - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, bear); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, growth, zada); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmd/FlusterstormTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmd/FlusterstormTest.java index d306f63b02..1b424c0d87 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmd/FlusterstormTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmd/FlusterstormTest.java @@ -18,8 +18,8 @@ public class FlusterstormTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Spark Spray", playerB); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Flusterstorm", "Spark Spray", "Spark Spray"); - setChoice(playerA, "No"); - setChoice(playerB, "No"); + setChoice(playerA, false); + setChoice(playerB, false); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/ArmixFiligreeThrasherTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/ArmixFiligreeThrasherTest.java index 5c671b2c65..e3c05947a4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/ArmixFiligreeThrasherTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/ArmixFiligreeThrasherTest.java @@ -25,7 +25,7 @@ public class ArmixFiligreeThrasherTest extends CardTestPlayerBase { // attack and discard to kill bear attack(1, playerA, "Armix, Filigree Thrasher", playerB); - setChoice(playerA, "Yes"); // pay discard cost + setChoice(playerA, true); // pay discard cost setChoice(playerA, "Alpha Myr"); addTarget(playerA, "Grizzly Bears"); // target for trigger (must kill) diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/HellkiteCourserTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/HellkiteCourserTest.java index 6467b82b1f..0b3d61a1b1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/HellkiteCourserTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/HellkiteCourserTest.java @@ -27,7 +27,7 @@ public class HellkiteCourserTest extends CardTestCommanderDuelBase { // cast card and move commander to battle castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Hellkite Courser"); - setChoice(playerA, "Yes"); // put commander to battlefield + setChoice(playerA, true); // put commander to battlefield setChoice(playerA, "Balduvian Bears"); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); checkPermanentCount("after etb", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Balduvian Bears", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/KrarkTheThumblessTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/KrarkTheThumblessTest.java index 9b0d461c7c..da785a8b2f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/KrarkTheThumblessTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/KrarkTheThumblessTest.java @@ -32,7 +32,7 @@ public class KrarkTheThumblessTest extends CardTestPlayerBase { // prepare two legendary creatures (for two flipcoin events) activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {U}", 4); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Sakashima the Impostor"); - setChoice(playerA, "Yes"); // enter as copy + setChoice(playerA, true); // enter as copy setChoice(playerA, "Krark, the Thumbless"); // copy target waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); @@ -56,7 +56,7 @@ public class KrarkTheThumblessTest extends CardTestPlayerBase { // resolve second trigger and win (copy the spell) setFlipCoinResult(playerA, true); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN, true); - setChoice(playerA, "No"); // do not change a target of the copy + setChoice(playerA, false); // do not change a target of the copy checkStackSize("after win trigger", 1, PhaseStep.PRECOMBAT_MAIN, playerA, 1); // copied bolt checkStackObject("after lose trigger", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast L", 1); checkStackObject("after win trigger", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Whenever you cast", 0); @@ -67,9 +67,9 @@ public class KrarkTheThumblessTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); setChoice(playerA, "Whenever"); // 2x triggers raise setFlipCoinResult(playerA, true); // win and copy second bolt - setChoice(playerA, "No"); // keep target + setChoice(playerA, false); // keep target setFlipCoinResult(playerA, true); // win and copy second bolt - setChoice(playerA, "No"); // keep target + setChoice(playerA, false); // keep target // TOTAL to resolve: // * 1 copied bolt from first bolt cast diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/PromiseOfTomorrowTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/PromiseOfTomorrowTest.java index 209162d2ba..863eef7532 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/PromiseOfTomorrowTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/PromiseOfTomorrowTest.java @@ -66,8 +66,8 @@ public class PromiseOfTomorrowTest extends CardTestCommander4Players { waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); checkExileCount("after die", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Balduvian Bears", 1); - setChoice(playerA, "No"); // move commander from graveyard to command zone - setChoice(playerA, "No"); // move commander from exile to command zone + setChoice(playerA, false); // move commander from graveyard to command zone + setChoice(playerA, false); // move commander from exile to command zone // must return checkPermanentCount("after return", 2, PhaseStep.PRECOMBAT_MAIN, playerA, "Balduvian Bears", 1); @@ -106,8 +106,8 @@ public class PromiseOfTomorrowTest extends CardTestCommander4Players { checkExileCount("after die", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Balduvian Bears", 1); // possible bug: Promise of Tomorrow tries to move commander card to exile from command zone with error - setChoice(playerA, "Yes"); // move commander from graveyard to command zone - setChoice(playerA, "No"); // move commander from exile to command zone + setChoice(playerA, true); // move commander from graveyard to command zone + setChoice(playerA, false); // move commander from exile to command zone // must return checkPermanentCount("after return", 2, PhaseStep.PRECOMBAT_MAIN, playerA, "Balduvian Bears", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/dst/DemonsHornTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/dst/DemonsHornTest.java index 7a055b7974..6f91f4cbde 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/dst/DemonsHornTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/dst/DemonsHornTest.java @@ -24,7 +24,7 @@ public class DemonsHornTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Demon's Horn", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Abyssal Gatekeeper"); - setChoice(playerB, "Yes"); + setChoice(playerB, true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/eld/OnceUponATimeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/eld/OnceUponATimeTest.java index ec06a1b217..ec736c19a5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/eld/OnceUponATimeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/eld/OnceUponATimeTest.java @@ -32,9 +32,9 @@ public class OnceUponATimeTest extends CardTestPlayerBase { castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Once Upon a Time"); - setChoice(playerA, "No"); // Cast without paying its mana cost? + setChoice(playerA, false); // Cast without paying its mana cost? - setChoice(playerA, "Yes"); // Do you wish to reveal a creature or land card and put into your hand? + setChoice(playerA, true); // Do you wish to reveal a creature or land card and put into your hand? setChoice(playerA, "Silvercoat Lion"); setStopAt(2, PhaseStep.END_TURN); @@ -66,13 +66,13 @@ public class OnceUponATimeTest extends CardTestPlayerBase { addCard(Zone.HAND, playerB, "Once Upon a Time"); // Instant {1}{G} castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Once Upon a Time"); - setChoice(playerA, "Yes"); // Cast without paying its mana cost? - setChoice(playerA, "Yes"); // Do you wish to reveal a creature or land card and put into your hand? + setChoice(playerA, true); // Cast without paying its mana cost? + setChoice(playerA, true); // Do you wish to reveal a creature or land card and put into your hand? setChoice(playerA, "Silvercoat Lion"); castSpell(2, PhaseStep.POSTCOMBAT_MAIN, playerB, "Once Upon a Time"); - setChoice(playerB, "Yes"); // Cast without paying its mana cost? - setChoice(playerB, "Yes"); // Do you wish to reveal a creature or land card and put into your hand? + setChoice(playerB, true); // Cast without paying its mana cost? + setChoice(playerB, true); // Do you wish to reveal a creature or land card and put into your hand? setChoice(playerB, "Silvercoat Lion"); setStopAt(2, PhaseStep.END_TURN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/NephaliaAcademyTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/NephaliaAcademyTest.java index 3f321cd93f..801a97a224 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/NephaliaAcademyTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/NephaliaAcademyTest.java @@ -27,7 +27,7 @@ public class NephaliaAcademyTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Duress"); addTarget(playerA, playerB); setChoice(playerA, "Giant Growth"); // choose to discard Giant Growth - setChoice(playerB, "Yes"); // replacement effect, choose to reveal the card and place on top of library + setChoice(playerB, true); // replacement effect, choose to reveal the card and place on top of library execute(); assertGraveyardCount(playerA, "Duress", 1); @@ -52,7 +52,7 @@ public class NephaliaAcademyTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Duress"); addTarget(playerA, playerB); setChoice(playerA, "Giant Growth"); // choose to discard Giant Growth - setChoice(playerB, "No"); // decline the replacement effect, allow the discard to happen + setChoice(playerB, false); // decline the replacement effect, allow the discard to happen execute(); assertGraveyardCount(playerA, "Duress", 1); @@ -75,7 +75,7 @@ public class NephaliaAcademyTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Sift", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Sift"); - setChoice(playerA, "Yes"); // should not be given the option to use Nephalia Academy replacement effect + setChoice(playerA, true); // should not be given the option to use Nephalia Academy replacement effect setChoice(playerA, "Memnite"); setStopAt(1, PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/SpellQuellerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/SpellQuellerTest.java index 61e18f2d29..7e847a3e61 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/SpellQuellerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/SpellQuellerTest.java @@ -81,7 +81,7 @@ public class SpellQuellerTest extends CardTestPlayerBase { castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Murder"); addTarget(playerA, "Spell Queller"); - setChoice(playerB, "Yes"); // elect to cast exiled card (divination) for free + setChoice(playerB, true); // elect to cast exiled card (divination) for free setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); @@ -124,7 +124,7 @@ public class SpellQuellerTest extends CardTestPlayerBase { addTarget(playerB, "Centaur Courser"); // exiles courser castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Wasteland Strangler"); - setChoice(playerB, "Yes"); + setChoice(playerB, true); setChoice(playerB, "Centaur Courser"); // put courser from exile into grave from ETB ability addTarget(playerB, "Sylvan Advocate"); // gives -3/-3 to Advocate diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/fut/MuragandaPetroglyphsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/fut/MuragandaPetroglyphsTest.java index 1cbd3ad1a0..c5deb734b3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/fut/MuragandaPetroglyphsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/fut/MuragandaPetroglyphsTest.java @@ -52,7 +52,7 @@ public class MuragandaPetroglyphsTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Muraganda Petroglyphs", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Pine Walker"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -75,7 +75,7 @@ public class MuragandaPetroglyphsTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Muraganda Petroglyphs", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Pine Walker"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -202,7 +202,7 @@ public class MuragandaPetroglyphsTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Shadow Slice"); // {4}{B} castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Shadow Slice", playerB); - setChoice(playerA, "Yes"); // do cipher + setChoice(playerA, true); // do cipher addTarget(playerA, "Grizzly Bears"); setStrictChooseMode(true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/grn/ThousandYearStormTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/grn/ThousandYearStormTest.java index ccd1a69982..7d85b0303c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/grn/ThousandYearStormTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/grn/ThousandYearStormTest.java @@ -36,7 +36,7 @@ public class ThousandYearStormTest extends CardTestPlayerBase { // bolt after (1 + 1x copy) castSpell(1, PhaseStep.BEGIN_COMBAT, playerA, "Lightning Bolt", playerB); - setChoice(playerA, "No"); // change target for copy 1 + setChoice(playerA, false); // change target for copy 1 checkLife("copy", 1, PhaseStep.END_COMBAT, playerB, 20 - 3 - 3 * 2); setStrictChooseMode(true); @@ -64,7 +64,7 @@ public class ThousandYearStormTest extends CardTestPlayerBase { // bolt after (1 + 1x copy) castSpell(1, PhaseStep.BEGIN_COMBAT, playerA, "Lightning Bolt", playerB); - setChoice(playerA, "No"); // change target for copy 1 + setChoice(playerA, false); // change target for copy 1 checkLife("copy", 1, PhaseStep.END_COMBAT, playerB, 20 - 3 - 3 * 2); setStrictChooseMode(true); @@ -92,7 +92,7 @@ public class ThousandYearStormTest extends CardTestPlayerBase { // bolt after (1 + 1x copy) castSpell(1, PhaseStep.BEGIN_COMBAT, playerA, "Lightning Bolt", playerB); - setChoice(playerA, "No"); // change target for copy 1 + setChoice(playerA, false); // change target for copy 1 checkLife("copy", 1, PhaseStep.END_COMBAT, playerB, 20 - 3 - 3 * 2); setStrictChooseMode(true); @@ -120,7 +120,7 @@ public class ThousandYearStormTest extends CardTestPlayerBase { castSpell(1, PhaseStep.BEGIN_COMBAT, playerA, "Lightning Bolt", playerB); // bolt after (1 + 1x copy) castSpell(1, PhaseStep.BEGIN_COMBAT, playerA, "Lightning Bolt", playerB); - setChoice(playerA, "No"); // change target for copy 1 + setChoice(playerA, false); // change target for copy 1 checkLife("copy", 1, PhaseStep.END_COMBAT, playerB, 20 - 3 - 3 * 2); setStrictChooseMode(true); @@ -148,7 +148,7 @@ public class ThousandYearStormTest extends CardTestPlayerBase { castSpell(1, PhaseStep.BEGIN_COMBAT, playerA, "Lightning Bolt", playerB); // bolt after (1 + 1x copy) castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", playerB); - setChoice(playerA, "No"); // change target for copy 1 + setChoice(playerA, false); // change target for copy 1 checkLife("copy", 1, PhaseStep.END_TURN, playerB, 20 - 3 - 3 * 2); setStrictChooseMode(true); @@ -184,17 +184,17 @@ public class ThousandYearStormTest extends CardTestPlayerBase { // 1 castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); checkLife("1x copy", 1, PhaseStep.BEGIN_COMBAT, playerB, startLife - 3 - 3 * 2); - setChoice(playerA, "No"); // change target for copy 1 + setChoice(playerA, false); // change target for copy 1 // 2 castSpell(1, PhaseStep.DECLARE_ATTACKERS, playerA, "Lightning Bolt", playerB); - setChoice(playerA, "No"); // change target for copy 1 - setChoice(playerA, "No"); // change target for copy 2 + setChoice(playerA, false); // change target for copy 1 + setChoice(playerA, false); // change target for copy 2 checkLife("2x copy", 1, PhaseStep.END_COMBAT, playerB, startLife - 3 - 3 * 2 - 3 * 3); // 3 castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", playerB); - setChoice(playerA, "No"); // change target for copy 1 - setChoice(playerA, "No"); // change target for copy 2 - setChoice(playerA, "No"); // change target for copy 3 + setChoice(playerA, false); // change target for copy 1 + setChoice(playerA, false); // change target for copy 2 + setChoice(playerA, false); // change target for copy 3 checkLife("3x copy", 1, PhaseStep.END_TURN, playerB, startLife - 3 - 3 * 2 - 3 * 3 - 3 * 4); // turn 3 @@ -205,12 +205,12 @@ public class ThousandYearStormTest extends CardTestPlayerBase { checkLife("3. no copy", 3, PhaseStep.BEGIN_COMBAT, playerB, startLife - 3); // after storm 1x castSpell(3, PhaseStep.DECLARE_ATTACKERS, playerA, "Lightning Bolt", playerB); - setChoice(playerA, "No"); // change target for copy 1 + setChoice(playerA, false); // change target for copy 1 checkLife("3. 1x copy", 3, PhaseStep.END_COMBAT, playerB, startLife - 3 - 3 * 2); // after storm 2x castSpell(3, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", playerB); - setChoice(playerA, "No"); // change target for copy 1 - setChoice(playerA, "No"); // change target for copy 2 + setChoice(playerA, false); // change target for copy 1 + setChoice(playerA, false); // change target for copy 2 checkLife("3. 2x copy", 3, PhaseStep.END_TURN, playerB, startLife - 3 - 3 * 2 - 3 * 3); setStrictChooseMode(true); @@ -241,7 +241,7 @@ public class ThousandYearStormTest extends CardTestPlayerBase { // 2a castSpell(1, PhaseStep.DECLARE_ATTACKERS, playerA, "Lightning Bolt", playerB); - setChoice(playerA, "No"); // change target for copy 1 + setChoice(playerA, false); // change target for copy 1 checkLife("1x copy", 1, PhaseStep.END_COMBAT, playerB, 20 - 3 - 3 * 2); // 2b castSpell(1, PhaseStep.DECLARE_ATTACKERS, playerB, "Lightning Bolt", playerA); @@ -299,7 +299,7 @@ public class ThousandYearStormTest extends CardTestPlayerBase { checkLife("a 0x copy", 2, PhaseStep.BEGIN_COMBAT, playerB, 20 - 3); // 2 castSpell(2, PhaseStep.DECLARE_ATTACKERS, playerA, "Lightning Bolt", playerB); - setChoice(playerA, "No"); // change target for copy 1 + setChoice(playerA, false); // change target for copy 1 checkLife("a 1x copy", 2, PhaseStep.END_COMBAT, playerB, 20 - 3 - 3 * 2); // change controller to B @@ -316,7 +316,7 @@ public class ThousandYearStormTest extends CardTestPlayerBase { checkLife("b 0x copy", 4, PhaseStep.BEGIN_COMBAT, playerA, 20 - 3 - 3); // 2 castSpell(4, PhaseStep.DECLARE_ATTACKERS, playerB, "Lightning Bolt", playerA); - setChoice(playerB, "No"); // change target for copy 1 + setChoice(playerB, false); // change target for copy 1 checkLife("b 1x copy", 4, PhaseStep.END_COMBAT, playerA, 20 - 3 - 3 - 3 * 2); setStrictChooseMode(true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/hou/TormentOfHailfireTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/hou/TormentOfHailfireTest.java index 3085db981a..4d2d4d2aff 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/hou/TormentOfHailfireTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/hou/TormentOfHailfireTest.java @@ -51,24 +51,24 @@ public class TormentOfHailfireTest extends CardTestMultiPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Torment of Hailfire"); setChoice(playerA, "X=10"); - setChoice(playerD, "Yes");// Sacrifices a nonland permanent? + setChoice(playerD, true);// Sacrifices a nonland permanent? setChoice(playerD, "Silvercoat Lion"); - setChoice(playerB, "Yes");// Sacrifices a nonland permanent? + setChoice(playerB, true);// Sacrifices a nonland permanent? setChoice(playerB, "Silvercoat Lion"); - setChoice(playerD, "Yes");// Sacrifices a nonland permanent? + setChoice(playerD, true);// Sacrifices a nonland permanent? setChoice(playerD, "Silvercoat Lion"); - setChoice(playerB, "Yes");// Sacrifices a nonland permanent? + setChoice(playerB, true);// Sacrifices a nonland permanent? setChoice(playerB, "Silvercoat Lion"); - setChoice(playerD, "No");// Sacrifices a nonland permanent? - setChoice(playerD, "Yes");// Discard a card? + setChoice(playerD, false);// Sacrifices a nonland permanent? + setChoice(playerD, true);// Discard a card? - setChoice(playerB, "Yes");// Discard a card? + setChoice(playerB, true);// Discard a card? - setChoice(playerD, "Yes");// Sacrifices a nonland permanent? + setChoice(playerD, true);// Sacrifices a nonland permanent? setChoice(playerD, "Silvercoat Lion"); setStopAt(1, PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/ice/ZursWeirdingTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/ice/ZursWeirdingTest.java index 99746173d5..b5dbbba21a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/ice/ZursWeirdingTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/ice/ZursWeirdingTest.java @@ -16,7 +16,7 @@ public class ZursWeirdingTest extends CardTestPlayerBase { public void testYes() { addCard(Zone.BATTLEFIELD, playerA, weirding); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); @@ -32,7 +32,7 @@ public class ZursWeirdingTest extends CardTestPlayerBase { public void testNo() { addCard(Zone.BATTLEFIELD, playerA, weirding); - setChoice(playerA, "No"); + setChoice(playerA, false); setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/TheOzolithTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/TheOzolithTest.java index fb0f77c6bc..f2a268ba5f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/TheOzolithTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/TheOzolithTest.java @@ -57,7 +57,7 @@ public class TheOzolithTest extends CardTestPlayerBase { waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN, playerA); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, MURDER, FERTILID); - setChoice(playerA, "Yes"); // Move counters at beginning of combat + setChoice(playerA, true); // Move counters at beginning of combat setStopAt(1, PhaseStep.END_TURN); execute(); @@ -80,7 +80,7 @@ public class TheOzolithTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, MURDER, FERTILID); - setChoice(playerA, "Yes"); // Move counters at beginning of combat + setChoice(playerA, true); // Move counters at beginning of combat setStopAt(1, PhaseStep.END_TURN); execute(); @@ -105,7 +105,7 @@ public class TheOzolithTest extends CardTestPlayerBase { waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN, playerA); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, MURDER, FERTILID); - setChoice(playerA, "Yes"); // Move counters at beginning of combat + setChoice(playerA, true); // Move counters at beginning of combat setStopAt(1, PhaseStep.END_TURN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/UnpredictableCycloneTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/UnpredictableCycloneTest.java index df5c5f50d7..de672f2023 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/UnpredictableCycloneTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/UnpredictableCycloneTest.java @@ -22,7 +22,7 @@ public class UnpredictableCycloneTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Desert Cerodon"); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cycling"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); @@ -120,7 +120,7 @@ public class UnpredictableCycloneTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Plagiarize", playerB); activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Cycling"); - setChoice(playerA, "Yes"); // cast found library card + setChoice(playerA, true); // cast found library card setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/inv/SpreadingPlagueTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/inv/SpreadingPlagueTest.java index 00aa6493ee..b54d5d6072 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/inv/SpreadingPlagueTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/inv/SpreadingPlagueTest.java @@ -34,7 +34,7 @@ public class SpreadingPlagueTest extends CardTestPlayerBase { // play colorless creature and do not destroy anything castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Golos, Tireless Pilgrim"); setChoice(playerA, "When {this} enters the battlefield"); // two replacement effects - setChoice(playerA, "No"); // no search + setChoice(playerA, false); // no search waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); checkPermanentCount("after colorless play", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Golos, Tireless Pilgrim", 1); checkPermanentCount("after colorless play", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Goblin Archaeologist", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/MoritteOfTheFrostTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/MoritteOfTheFrostTest.java index cf2426167a..98e5ec0d6e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/MoritteOfTheFrostTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/MoritteOfTheFrostTest.java @@ -30,7 +30,7 @@ public class MoritteOfTheFrostTest extends CardTestPlayerBase { // cast myr and remove to to graveyard due 0/0 checkPlayableAbility("before", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Moritte of the Frost", true); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Moritte of the Frost"); - setChoice(playerA, "No"); // no copy + setChoice(playerA, false); // no copy setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); @@ -59,7 +59,7 @@ public class MoritteOfTheFrostTest extends CardTestPlayerBase { // cast myr and keep on battlefield due boost checkPlayableAbility("before", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Moritte of the Frost", true); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Moritte of the Frost"); - setChoice(playerA, "No"); // no copy + setChoice(playerA, false); // no copy setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); @@ -93,7 +93,7 @@ public class MoritteOfTheFrostTest extends CardTestPlayerBase { // cast myr and copy checkPlayableAbility("before", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Moritte of the Frost", true); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Moritte of the Frost"); - setChoice(playerA, "Yes"); // use copy + setChoice(playerA, true); // use copy setChoice(playerA, "Grizzly Bears"); // copy target setStrictChooseMode(true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/lgn/InfernalCaretakerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/lgn/InfernalCaretakerTest.java index 0df4097782..27f4489fcf 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/lgn/InfernalCaretakerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/lgn/InfernalCaretakerTest.java @@ -31,7 +31,7 @@ public class InfernalCaretakerTest extends CardTestPlayerBase { addCard(Zone.GRAVEYARD, playerB, "Elvish Visionary", 4); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Infernal Caretaker"); - setChoice(playerA, "Yes"); // Cast as a morph + setChoice(playerA, true); // Cast as a morph activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{3}{B}: Turn this face-down permanent face up."); setStopAt(1, PhaseStep.END_TURN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/lrw/BurrentonForgeTenderTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/lrw/BurrentonForgeTenderTest.java index 8faa8cf049..019796e77e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/lrw/BurrentonForgeTenderTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/lrw/BurrentonForgeTenderTest.java @@ -109,7 +109,7 @@ public class BurrentonForgeTenderTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Island", 4); castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Rite of Replication", "Mogg Fanatic"); - setChoice(playerB, "No"); // no kicker + setChoice(playerB, false); // no kicker castSpell(2, PhaseStep.BEGIN_COMBAT, playerA, "Orzhov Charm", "Mogg Fanatic"); setModeChoice(playerA, "1"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/lrw/MulldrifterTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/lrw/MulldrifterTest.java index c8b63068bf..8e65bab5bb 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/lrw/MulldrifterTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/lrw/MulldrifterTest.java @@ -28,7 +28,7 @@ public class MulldrifterTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Island", 3); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mulldrifter"); - setChoice(playerA, "No"); // cast regularly, not evoked + setChoice(playerA, false); // cast regularly, not evoked setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -47,7 +47,7 @@ public class MulldrifterTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Island", 3); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mulldrifter"); - setChoice(playerA, "Yes"); // only paid evoke cost + setChoice(playerA, true); // only paid evoke cost setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -73,7 +73,7 @@ public class MulldrifterTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Ghostly Flicker"); addTarget(playerA, "Mulldrifter^Merfolk Looter"); - setChoice(playerA, "No"); // do not pay evoke cost + setChoice(playerA, false); // do not pay evoke cost setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m14/JacesMindseekerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m14/JacesMindseekerTest.java index 686b4d70f0..14839d1373 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m14/JacesMindseekerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m14/JacesMindseekerTest.java @@ -35,7 +35,7 @@ public class JacesMindseekerTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Jace's Mindseeker"); addTarget(playerA, playerB); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "Lightning Bolt"); addTarget(playerA, playerB); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m20/AetherGustTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m20/AetherGustTest.java index 194b6fdbd9..92fbbf2ecf 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m20/AetherGustTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m20/AetherGustTest.java @@ -35,7 +35,7 @@ public class AetherGustTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, barkhide); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, aetherGust, barkhide); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); @@ -59,7 +59,7 @@ public class AetherGustTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, barkhide); castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, aetherGust, barkhide); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m20/RepeatedReverberationTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m20/RepeatedReverberationTest.java index a668b53457..26bab09b4d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m20/RepeatedReverberationTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m20/RepeatedReverberationTest.java @@ -68,9 +68,9 @@ public class RepeatedReverberationTest extends CardTestPlayerBase { waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN, playerA); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, soothingBalm); addTarget(playerA, playerA); - setChoice(playerA, "Yes"); //Choose new targets? + setChoice(playerA, true); //Choose new targets? addTarget(playerA, playerB); - setChoice(playerA, "Yes"); //Choose new targets? + setChoice(playerA, true); //Choose new targets? addTarget(playerA, playerA); setStrictChooseMode(true); @@ -101,8 +101,8 @@ public class RepeatedReverberationTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, repeatedReverb); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, soulFeast); addTarget(playerA, playerB); - setChoice(playerA, "No"); //Choose new targets? - setChoice(playerA, "No"); //Choose new targets? + setChoice(playerA, false); //Choose new targets? + setChoice(playerA, false); //Choose new targets? setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AlpineHoundmasterTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AlpineHoundmasterTest.java index 35f40e4b0b..4343c93ba5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AlpineHoundmasterTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AlpineHoundmasterTest.java @@ -20,7 +20,7 @@ public class AlpineHoundmasterTest extends CardTestPlayerBase { addCard(Zone.LIBRARY, playerA, "Igneous Cur"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Alpine Houndmaster"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, "Alpine Watchdog"); setStrictChooseMode(true); @@ -43,7 +43,7 @@ public class AlpineHoundmasterTest extends CardTestPlayerBase { addCard(Zone.LIBRARY, playerA, "Igneous Cur"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Alpine Houndmaster"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, "Igneous Cur"); setStrictChooseMode(true); @@ -66,7 +66,7 @@ public class AlpineHoundmasterTest extends CardTestPlayerBase { addCard(Zone.LIBRARY, playerA, "Igneous Cur"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Alpine Houndmaster"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, "Igneous Cur^Alpine Watchdog"); //addTarget(playerA, ""); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasrisAegisTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasrisAegisTest.java index 49dd7a94ef..76cc010237 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasrisAegisTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasrisAegisTest.java @@ -20,7 +20,7 @@ public class BasrisAegisTest extends CardTestPlayerBase { // You may search your library and/or graveyard for a card named Basri, Devoted Paladin, reveal it, and put it into your hand. If you search your library this way, shuffle it. castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Basri's Aegis"); addTarget(playerA, "Grizzly Bears^Savannah Lions"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, "Basri, Devoted Paladin"); setStrictChooseMode(true); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DireFleetWarmongerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DireFleetWarmongerTest.java index f9f6b1a82a..070b98ef56 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DireFleetWarmongerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DireFleetWarmongerTest.java @@ -15,7 +15,7 @@ public class DireFleetWarmongerTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Dire Fleet Warmonger"); addCard(Zone.BATTLEFIELD, playerA, "Grizzly Bears"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "Grizzly Bears"); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DoubleVisionTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DoubleVisionTest.java index 1632afb855..f4fb58cb75 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DoubleVisionTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DoubleVisionTest.java @@ -16,7 +16,7 @@ public class DoubleVisionTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Shock"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Shock", playerB); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, playerB); setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/EnthrallingHoldTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/EnthrallingHoldTest.java index a322395590..bb5c5f4f13 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/EnthrallingHoldTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/EnthrallingHoldTest.java @@ -29,7 +29,7 @@ public class EnthrallingHoldTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Enthralling Hold", "Traxos, Scourge of Kroog"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Twiddle", "Traxos, Scourge of Kroog"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStrictChooseMode(true); setStopAt(1, PhaseStep.END_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ExperimentalOverloadTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ExperimentalOverloadTest.java index 5c03f64848..df135f8923 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ExperimentalOverloadTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ExperimentalOverloadTest.java @@ -18,7 +18,7 @@ public class ExperimentalOverloadTest extends CardTestPlayerBase { addCard(Zone.GRAVEYARD, playerA, "Shock"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Experimental Overload"); - // setChoice(playerA, "Yes"); + // setChoice(playerA, true); setChoice(playerA, "Shock"); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/GarthOneEyeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/GarthOneEyeTest.java index e78adbea82..1a5b37fc0a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/GarthOneEyeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/GarthOneEyeTest.java @@ -29,7 +29,7 @@ public class GarthOneEyeTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, courser); setChoice(playerA, disenchant); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, courser); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Choose"); @@ -51,7 +51,7 @@ public class GarthOneEyeTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, garth); setChoice(playerA, braingeyser); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "X=3"); addTarget(playerA, playerA); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Choose"); @@ -74,7 +74,7 @@ public class GarthOneEyeTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, courser); setChoice(playerA, terror); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, courser); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Choose"); @@ -116,7 +116,7 @@ public class GarthOneEyeTest extends CardTestPlayerBase { addCard(Zone.GRAVEYARD, playerA, courser); setChoice(playerA, regrowth); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, courser); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Choose"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/ZabazTheGlimmerwaspTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/ZabazTheGlimmerwaspTest.java index e9804cf25f..89870d787e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/ZabazTheGlimmerwaspTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/ZabazTheGlimmerwaspTest.java @@ -42,7 +42,7 @@ public class ZabazTheGlimmerwaspTest extends CardTestPlayerBase { setChoice(playerA, worker); addTarget(playerA, zabaz); - setChoice(playerA, "Yes"); + setChoice(playerA, true); activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Sacrifice"); setStrictChooseMode(true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/mrd/SoulFoundryTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/mrd/SoulFoundryTest.java index cf25aa2ef3..7de63f3e88 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/mrd/SoulFoundryTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/mrd/SoulFoundryTest.java @@ -26,7 +26,7 @@ public class SoulFoundryTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Bloodline Keeper"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Soul Foundry"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "{X}, {T}: Create a token"); setStopAt(1, PhaseStep.END_TURN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/nph/NornsAnnexTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/nph/NornsAnnexTest.java index 6a69f1c845..141e83d7ab 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/nph/NornsAnnexTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/nph/NornsAnnexTest.java @@ -20,8 +20,8 @@ public class NornsAnnexTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Brindle Boar"); // Creature 2/2 attack(2, playerB, "Brindle Boar", playerA); - setChoice(playerB, "Yes"); // Pay {W/P} to attack? - setChoice(playerB, "Yes"); // Pay 2 life instead of {W}? + setChoice(playerB, true); // Pay {W/P} to attack? + setChoice(playerB, true); // Pay 2 life instead of {W}? setStopAt(2, PhaseStep.END_TURN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/ogw/EldraziObligatorTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/ogw/EldraziObligatorTest.java index 7969172901..b1c901bc90 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/ogw/EldraziObligatorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/ogw/EldraziObligatorTest.java @@ -28,7 +28,7 @@ public class EldraziObligatorTest extends CardTestPlayerBase { attack(1, playerA, "Bronze Sable"); // tap dat sable castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Eldrazi Obligator"); - setChoice(playerB, "No"); + setChoice(playerB, false); setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/ogw/RealitySmasherTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/ogw/RealitySmasherTest.java index 246c932a9a..45f6d740bb 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/ogw/RealitySmasherTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/ogw/RealitySmasherTest.java @@ -27,7 +27,7 @@ public class RealitySmasherTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Doom Blade"); addTarget(playerB, "Reality Smasher"); - setChoice(playerB, "Yes"); // discard to prevent counter + setChoice(playerB, true); // discard to prevent counter setChoice(playerB, "Sigiled Starfish"); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -51,7 +51,7 @@ public class RealitySmasherTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Doom Blade"); addTarget(playerB, "Reality Smasher"); - setChoice(playerB, "No"); // no discard + setChoice(playerB, false); // no discard setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -76,10 +76,10 @@ public class RealitySmasherTest extends CardTestPlayerBase { activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}:"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt"); addTarget(playerA, "Reality Smasher"); - setChoice(playerA, "Yes"); // discard a card to prevent counter (bolt targetting) + setChoice(playerA, true); // discard a card to prevent counter (bolt targetting) setChoice(playerA, "Swamp"); - setChoice(playerA, "No"); // do not choose new targets for copy (goggles) - setChoice(playerA, "Yes"); // discard a card to prevent counter (copy of bolt targetting) + setChoice(playerA, false); // do not choose new targets for copy (goggles) + setChoice(playerA, true); // discard a card to prevent counter (copy of bolt targetting) setChoice(playerA, "Swamp"); setStopAt(1, PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/rtr/NivmagusElementalTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/rtr/NivmagusElementalTest.java index 00f14b7ca3..e51478c935 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/rtr/NivmagusElementalTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/rtr/NivmagusElementalTest.java @@ -43,7 +43,7 @@ public class NivmagusElementalTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, bolt, playerB); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Exile"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, grapeshot, playerB); - setChoice(playerA, "No"); + setChoice(playerA, false); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Exile"); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Exile"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/TheGitrogMonsterTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/TheGitrogMonsterTest.java index 5ba4677427..53e27f365f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/TheGitrogMonsterTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/TheGitrogMonsterTest.java @@ -61,7 +61,7 @@ public class TheGitrogMonsterTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "The Gitrog Monster"); // on 3rd turn during upkeep opt to sacrifice a land - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, "Swamp"); setStopAt(3, PhaseStep.DRAW); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/WolfOfDevilsBreachTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/WolfOfDevilsBreachTest.java index 1e3dbf00da..158b21cec3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/WolfOfDevilsBreachTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/WolfOfDevilsBreachTest.java @@ -25,7 +25,7 @@ public class WolfOfDevilsBreachTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Grizzly Bears", 1); // 2/2 attack(1, playerA, "Wolf of Devil's Breach"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "Bronze Sable"); addTarget(playerA, "Grizzly Bears"); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); @@ -48,7 +48,7 @@ public class WolfOfDevilsBreachTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Grizzly Bears", 1); // 2/2 attack(1, playerA, "Wolf of Devil's Breach"); - setChoice(playerA, "No"); + setChoice(playerA, false); setChoice(playerA, "Bronze Sable"); addTarget(playerA, "Grizzly Bears"); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/som/NimDeathmantleTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/som/NimDeathmantleTest.java index 4452683c25..24990a6699 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/som/NimDeathmantleTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/som/NimDeathmantleTest.java @@ -32,7 +32,7 @@ public class NimDeathmantleTest extends CardTestPlayerBase { waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", "Silvercoat Lion"); - setChoice(playerA, "Yes"); // Message: Nim Deathmantle - Pay {4}? + setChoice(playerA, true); // Message: Nim Deathmantle - Pay {4}? setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/BalefulMasteryTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/BalefulMasteryTest.java index 155b7fd98f..dd3e67df39 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/BalefulMasteryTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/BalefulMasteryTest.java @@ -22,7 +22,7 @@ public class BalefulMasteryTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Witchbane Orb"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Baleful Mastery", "Goblin Piker"); - setChoice(playerA, "No"); // use normal cost + setChoice(playerA, false); // use normal cost setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); @@ -46,7 +46,7 @@ public class BalefulMasteryTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Witchbane Orb"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Baleful Mastery", "Goblin Piker"); - setChoice(playerA, "Yes"); // use alternative cost + setChoice(playerA, true); // use alternative cost addTarget(playerA, playerB); // select opponent setStrictChooseMode(true); @@ -72,12 +72,12 @@ public class BalefulMasteryTest extends CardTestPlayerBase { // cast 1 - alternative castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Baleful Mastery", "Goblin Piker"); - setChoice(playerA, "Yes"); // use alternative cost + setChoice(playerA, true); // use alternative cost addTarget(playerA, playerB); // select opponent // cast 2 - normal castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Baleful Mastery", "Grizzly Bears"); - setChoice(playerA, "No"); // normal cast + setChoice(playerA, false); // normal cast setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); @@ -105,7 +105,7 @@ public class BalefulMasteryTest extends CardTestPlayerBase { // cast 1 - with alternative castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Baleful Mastery", "Goblin Piker"); - setChoice(playerA, "Yes"); // use alternative cost + setChoice(playerA, true); // use alternative cost addTarget(playerA, playerB); // select opponent waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); checkGraveyardCount("after cast 1", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Baleful Mastery", 1); @@ -123,7 +123,7 @@ public class BalefulMasteryTest extends CardTestPlayerBase { // cast 2 - without alternative // possible bug: cost status can be found from previous object (e.g. it ask about opponent select, but must not) castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Baleful Mastery", "Grizzly Bears"); - setChoice(playerA, "No"); // do not use alternative cost + setChoice(playerA, false); // do not use alternative cost waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); checkGraveyardCount("after cast 2", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Baleful Mastery", 1); checkHandCount("after cast 2", 1, PhaseStep.PRECOMBAT_MAIN, playerA, 0); @@ -155,10 +155,10 @@ public class BalefulMasteryTest extends CardTestPlayerBase { // cast with alternative activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {B}", 2); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Baleful Mastery", "Goblin Piker"); - setChoice(playerA, "Yes"); // use alternative cost + setChoice(playerA, true); // use alternative cost // copy spell castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Twincast", "Cast Baleful Mastery", "Cast Baleful Mastery"); - setChoice(playerA, "Yes"); // change target + setChoice(playerA, true); // change target addTarget(playerA, "Grizzly Bears"); // new target checkStackSize("before copy", 1, PhaseStep.PRECOMBAT_MAIN, playerA, 2); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN, playerA, true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/ShowOfConfidenceTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/ShowOfConfidenceTest.java index 2f4b77d495..69ef3e359f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/ShowOfConfidenceTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/ShowOfConfidenceTest.java @@ -49,9 +49,9 @@ public class ShowOfConfidenceTest extends CardTestPlayerBase { // cast and copy 3x castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Show of Confidence", "Balduvian Bears"); - setChoice(playerA, "No"); // no change target (copy 1) - setChoice(playerA, "No"); // no change target (copy 2) - setChoice(playerA, "No"); // no change target (copy 3) + setChoice(playerA, false); // no change target (copy 1) + setChoice(playerA, false); // no change target (copy 2) + setChoice(playerA, false); // no change target (copy 3) // test watcher's copy waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/ths/PurphorosGodOfTheForgeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/ths/PurphorosGodOfTheForgeTest.java index 109f0f58ce..ed0d9baf06 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/ths/PurphorosGodOfTheForgeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/ths/PurphorosGodOfTheForgeTest.java @@ -74,7 +74,7 @@ public class PurphorosGodOfTheForgeTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Ashcloud Phoenix"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/war/GodEternalKefnetTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/war/GodEternalKefnetTest.java index cc5e80f70f..396cbb8be8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/war/GodEternalKefnetTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/war/GodEternalKefnetTest.java @@ -26,11 +26,11 @@ public class GodEternalKefnetTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Mountain"); // draw on tune 3 - bear - ignore - setChoice(playerA, "Yes"); + setChoice(playerA, true); // draw on tune 5 - bolt - reveal and cast - setChoice(playerA, "Yes"); // reveal - setChoice(playerA, "Yes"); // cast + setChoice(playerA, true); // reveal + setChoice(playerA, true); // cast addTarget(playerA, playerB); setStrictChooseMode(true); @@ -62,8 +62,8 @@ public class GodEternalKefnetTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Mountain"); showAvailableMana("before", 1, PhaseStep.PRECOMBAT_MAIN, playerA); - setChoice(playerA, "Yes"); // reveal - setChoice(playerA, "Yes"); // cast + setChoice(playerA, true); // reveal + setChoice(playerA, true); // cast setChoice(playerA, "Cast Fire"); addTargetAmount(playerA, playerB, 2); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/zen/ArchiveTrapTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/zen/ArchiveTrapTest.java index 6b758bc21c..01e0b0b4bb 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/zen/ArchiveTrapTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/zen/ArchiveTrapTest.java @@ -37,7 +37,7 @@ public class ArchiveTrapTest extends CardTestPlayerBase { // must able to cast trap for {0} checkPlayableAbility("must able to cast", 1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Cast Archive Trap", true); castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Archive Trap"); - setChoice(playerB, "Yes"); // use alternative cost + setChoice(playerB, true); // use alternative cost addTarget(playerB, playerA); setStrictChooseMode(true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/zen/BlazingTorchTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/zen/BlazingTorchTest.java index 5ca45d9fa8..cefe8edf40 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/zen/BlazingTorchTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/zen/BlazingTorchTest.java @@ -46,7 +46,7 @@ public class BlazingTorchTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, torch); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, masterwork); - setChoice(playerA, "Yes"); // use copy + setChoice(playerA, true); // use copy setChoice(playerA, torch); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Equip", lion); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/split/CastSplitCardsWithSpliceTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/split/CastSplitCardsWithSpliceTest.java index 85b9b88947..cfd0bdc08a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/split/CastSplitCardsWithSpliceTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/split/CastSplitCardsWithSpliceTest.java @@ -73,7 +73,7 @@ public class CastSplitCardsWithSpliceTest extends CardTestPlayerBase { // cast fused with splice castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "fused Wear // Tear"); - setChoice(playerA, "Yes"); // use splice + setChoice(playerA, true); // use splice addTarget(playerA, "Everdream"); // card to splice addTarget(playerA, "Bident of Thassa"); // target left addTarget(playerA, "Bow of Nylea"); // target right diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/AbilityOwnershipTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/AbilityOwnershipTest.java index eea23ee1b1..df11bfb0f8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/AbilityOwnershipTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/AbilityOwnershipTest.java @@ -34,7 +34,7 @@ public class AbilityOwnershipTest extends CardTestPlayerBase { setChoice(playerA, "When "); // two triggers // * Ability: Soul Snuffers - EntersBattlefieldTriggeredAbility: When {this} enters the battlefield, put a -1/-1 counter on each creature. // * Ability: Minister of Pain - ExploitAbility: Exploit (When this creature enters the battlefield, you may sacrifice a creature.) - setChoice(playerA, "No"); // no exploit + setChoice(playerA, false); // no exploit // 3x life triggers setChoice(playerA, "Whenever you put one or more"); setChoice(playerA, "Whenever you put one or more"); @@ -68,7 +68,7 @@ public class AbilityOwnershipTest extends CardTestPlayerBase { // - SO Obelisk Spider must triggers 2x times, BUT it's controlled by opponent, so no triggers at all castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Rise of the Dark Realms"); setChoice(playerA, "When "); // two triggers - setChoice(playerA, "No"); // no exploit + setChoice(playerA, false); // no exploit setStrictChooseMode(true); setStopAt(1, PhaseStep.END_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BiovisionaryTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BiovisionaryTest.java index 6291ae1fcc..7978f97c80 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BiovisionaryTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BiovisionaryTest.java @@ -45,13 +45,13 @@ public class BiovisionaryTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Clone", 3); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Clone"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "Biovisionary"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Clone"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "Biovisionary"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Clone"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "Biovisionary"); setStopAt(2, PhaseStep.UNTAP); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BroodSliverTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BroodSliverTest.java index 350798e27c..49f81af496 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BroodSliverTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BroodSliverTest.java @@ -23,7 +23,7 @@ public class BroodSliverTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Venom Sliver"); // 1/1 deathtouch granting sliver attack(1, playerA, "Venom Sliver"); - setChoice(playerA, "Yes"); // controller of Venom Sliver dealing damage should get the choice to create token + setChoice(playerA, true); // controller of Venom Sliver dealing damage should get the choice to create token setStopAt(1, PhaseStep.END_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/DrawTriggeredTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/DrawTriggeredTest.java index 7b865dfc95..88d1e7e3e5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/DrawTriggeredTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/DrawTriggeredTest.java @@ -80,12 +80,12 @@ public class DrawTriggeredTest extends CardTestPlayerBase { // Whenever an opponent draws a card, you may draw two cards. addCard(Zone.BATTLEFIELD, playerB, "Consecrated Sphinx", 1); - setChoice(playerA, "Yes"); - setChoice(playerA, "No"); - setChoice(playerA, "No"); + setChoice(playerA, true); + setChoice(playerA, false); + setChoice(playerA, false); - setChoice(playerB, "Yes"); - setChoice(playerB, "No"); + setChoice(playerB, true); + setChoice(playerB, false); setStopAt(2, PhaseStep.PRECOMBAT_MAIN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EnterLeaveBattlefieldExileTargetTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EnterLeaveBattlefieldExileTargetTest.java index 5f544c9abd..427c0e2778 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EnterLeaveBattlefieldExileTargetTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EnterLeaveBattlefieldExileTargetTest.java @@ -23,7 +23,7 @@ public class EnterLeaveBattlefieldExileTargetTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Angel of Serenity"); addTarget(playerA, "Silvercoat Lion^Pillarfield Ox"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); @@ -95,7 +95,7 @@ public class EnterLeaveBattlefieldExileTargetTest extends CardTestPlayerBase { // angel castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Angel of Serenity"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); //addTarget(playerA, "Silvercoat Lion^Balduvian Bears"); // AI must target //setStrictChooseMode(true); // AI must target diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EntersTheBattlefieldTriggerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EntersTheBattlefieldTriggerTest.java index 609bf18fcf..07187e7f3b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EntersTheBattlefieldTriggerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EntersTheBattlefieldTriggerTest.java @@ -393,7 +393,7 @@ public class EntersTheBattlefieldTriggerTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Uro, Titan of Nature's Wrath"); setChoice(playerA, "Balduvian Bears^Balduvian Bears^Balduvian Bears^Balduvian Bears^Balduvian Bears"); setChoice(playerA, "When {this} enters the battlefield, sacrifice it"); // sacrifice trigger must go first - setChoice(playerA, "No"); // do not put land to battlefield + setChoice(playerA, false); // do not put land to battlefield // sacrifice trigger must found escape ability by getSpellOrLKIStack and keep uro on battlefield diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/GripOfChaosTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/GripOfChaosTest.java index e060120920..77641e8a1e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/GripOfChaosTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/GripOfChaosTest.java @@ -45,8 +45,8 @@ public class GripOfChaosTest extends CardTestPlayerBase { setChoice(playerB, "Whenever "); // Select order of Grip of Chaos trigger - setChoice(playerA, "Yes"); // use for the original trigger of Felidar Guardian - setChoice(playerA, "Yes"); // use for the copied trigger of Felidar Guardian + setChoice(playerA, true); // use for the original trigger of Felidar Guardian + setChoice(playerA, true); // use for the copied trigger of Felidar Guardian addTarget(playerA, "Forest"); addTarget(playerA, "Mountain"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/KarmicJusticeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/KarmicJusticeTest.java index 5c160165d7..6b8fd81a94 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/KarmicJusticeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/KarmicJusticeTest.java @@ -28,7 +28,7 @@ public class KarmicJusticeTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Forest", 2); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Naturalize", "Karmic Justice"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, "Forest"); setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -58,11 +58,11 @@ public class KarmicJusticeTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Swamp", 1); castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Planar Cleansing"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, "Plains"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, "Swamp"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, "Mountain"); setStopAt(2, PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/MasterOfCrueltiesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/MasterOfCrueltiesTest.java index 0f9f89ba29..6e41cf0150 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/MasterOfCrueltiesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/MasterOfCrueltiesTest.java @@ -32,7 +32,7 @@ public class MasterOfCrueltiesTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion", 1); attack(2, playerB, "Alesha, Who Smiles at Death"); - setChoice(playerB, "Yes"); + setChoice(playerB, true); addTarget(playerB, "Master of Cruelties"); block(2, playerA, "Silvercoat Lion", "Master of Cruelties"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/PossibilityStormTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/PossibilityStormTest.java index 7919371e69..16d06e3d88 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/PossibilityStormTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/PossibilityStormTest.java @@ -43,7 +43,7 @@ public class PossibilityStormTest extends CardTestPlayerBase { skipInitShuffling(); playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Zoetic Cavern"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -102,9 +102,9 @@ public class PossibilityStormTest extends CardTestPlayerBase { setModeChoice(playerA, "3"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Remand", "Izzet Charm", "Whenever a player casts"); - setChoice(playerA, "No"); // Don't play Pact of Negotiation + setChoice(playerA, false); // Don't play Pact of Negotiation - setChoice(playerA, "Yes"); // Play Cryptic Command + setChoice(playerA, true); // Play Cryptic Command setModeChoice(playerA, "3"); setModeChoice(playerA, "4"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToBattlefieldEffectsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToBattlefieldEffectsTest.java index e1086fcac9..5291e0fa66 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToBattlefieldEffectsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToBattlefieldEffectsTest.java @@ -111,7 +111,7 @@ public class ReturnToBattlefieldEffectsTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Pharika, God of Affliction", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Pine Walker"); - setChoice(playerA, "Yes"); // cast it face down as 2/2 creature + setChoice(playerA, true); // cast it face down as 2/2 creature activateAbility(3, PhaseStep.POSTCOMBAT_MAIN, playerA, "{4}{G}: Turn this face-down permanent face up."); activateAbility(3, PhaseStep.POSTCOMBAT_MAIN, playerB, "{B}{G}: Exile target creature card from a graveyard", diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToHandEffectsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToHandEffectsTest.java index 3cebc17a95..765f5b8028 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToHandEffectsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToHandEffectsTest.java @@ -63,7 +63,7 @@ public class ReturnToHandEffectsTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Stormfront Riders"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lab Rats"); - setChoice(playerA, "No"); + setChoice(playerA, false); castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Boomerang", "Rat"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SelvalaHeartOfTheWildsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SelvalaHeartOfTheWildsTest.java index 3fef7ab6af..2183177bff 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SelvalaHeartOfTheWildsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SelvalaHeartOfTheWildsTest.java @@ -66,7 +66,7 @@ public class SelvalaHeartOfTheWildsTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Giant Growth", "Memnite"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Giant Growth", "Memnite"); // a whopping 7/7 - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SpellCastTriggerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SpellCastTriggerTest.java index 5dad6f58ac..2da89a251f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SpellCastTriggerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SpellCastTriggerTest.java @@ -79,7 +79,7 @@ public class SpellCastTriggerTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Mountain", 8); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Dance with Devils"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.END_TURN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SpellskiteTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SpellskiteTest.java index 42633cee9b..b96914c82d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SpellskiteTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SpellskiteTest.java @@ -257,7 +257,7 @@ public class SpellskiteTest extends CardTestPlayerBase { // B activate Spellskite, but can't change any targets cause it's already targeted activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerB, "{U/P}: Change a target", "Fiery Justice", "Fiery Justice"); - setChoice(playerB, "Yes"); // pay 2 life + setChoice(playerB, true); // pay 2 life setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -293,8 +293,8 @@ public class SpellskiteTest extends CardTestPlayerBase { addTargetAmount(playerA, "Scute Mob", 5); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerB, "{U/P}: Change a target", "Fiery Justice", "Fiery Justice"); - setChoice(playerB, "Yes"); // pay 2 life - setChoice(playerB, "Yes"); // retarget + setChoice(playerB, true); // pay 2 life + setChoice(playerB, true); // retarget setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -326,10 +326,10 @@ public class SpellskiteTest extends CardTestPlayerBase { addTargetAmount(playerA, "Pearled Unicorn", 2); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerB, "{U/P}: Change a target", "Fiery Justice", "Fiery Justice"); - setChoice(playerB, "Yes"); // pay 2 life - setChoice(playerB, "No"); // skip royal - setChoice(playerB, "No"); // skip blink - setChoice(playerB, "Yes"); // change pearl + setChoice(playerB, true); // pay 2 life + setChoice(playerB, false); // skip royal + setChoice(playerB, false); // skip blink + setChoice(playerB, true); // change pearl setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/WorldgorgerDragonTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/WorldgorgerDragonTest.java index fe7b4515d3..462cd7ee4a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/WorldgorgerDragonTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/WorldgorgerDragonTest.java @@ -104,7 +104,7 @@ public class WorldgorgerDragonTest extends CardTestPlayerBase { setChoice(playerA, "Worldgorger Dragon"); setChoice(playerA, "When {this} enters the battlefield, if it's"); - setChoice(playerA, "No"); + setChoice(playerA, false); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/damage/SyrCarahTheBoldTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/damage/SyrCarahTheBoldTest.java index ca5982d5ca..9ee31b1654 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/damage/SyrCarahTheBoldTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/damage/SyrCarahTheBoldTest.java @@ -73,7 +73,7 @@ public class SyrCarahTheBoldTest extends CardTestPlayerBase { // activate damage - 2x damage with copy activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: {this} deals", playerB); - setChoice(playerA, "No"); // no new target for copy + setChoice(playerA, false); // no new target for copy waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); checkLife("damage 2", 1, PhaseStep.PRECOMBAT_MAIN, playerB, 20 - 1 - 1); checkExileCount("after", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Balduvian Bears", 2); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/AthreosTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/AthreosTest.java index 943a889156..bbad5c87dd 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/AthreosTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/AthreosTest.java @@ -43,7 +43,7 @@ public class AthreosTest extends CardTestPlayerBase { setChoice(playerA, gBears); // sac bears to Cartel activated ability setChoice(playerA, "Red"); // color chosen for Cartel - setChoice(playerB, "No"); // opponent does not pay 3 life + setChoice(playerB, false); // opponent does not pay 3 life setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -86,7 +86,7 @@ public class AthreosTest extends CardTestPlayerBase { setChoice(playerA, gBears); // sac bears to Cartel activated ability setChoice(playerA, "Red"); // color chosen for Cartel - setChoice(playerB, "Yes"); // opponent does pay 3 life + setChoice(playerB, true); // opponent does pay 3 life setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ElendaTheDuskRoseTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ElendaTheDuskRoseTest.java index db65bc5092..c88fa78c1b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ElendaTheDuskRoseTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ElendaTheDuskRoseTest.java @@ -100,8 +100,8 @@ public class ElendaTheDuskRoseTest extends CardTestPlayerBase { castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", "Silvercoat Lion"); castSpell(3, PhaseStep.POSTCOMBAT_MAIN, playerB, "Lightning Bolt", "Elenda, the Dusk Rose"); - setChoice(playerA, "No"); // use Angelic Renewal on Silvercoat Lion - setChoice(playerA, "Yes"); // use Angelic Renewal on Elenda, the Dusk Rose + setChoice(playerA, false); // use Angelic Renewal on Silvercoat Lion + setChoice(playerA, true); // use Angelic Renewal on Elenda, the Dusk Rose setStopAt(3, PhaseStep.END_TURN); execute(); @@ -142,8 +142,8 @@ public class ElendaTheDuskRoseTest extends CardTestPlayerBase { castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Sweltering Suns"); - setChoice(playerA, "Yes"); // use Angelic Renewal on Elenda, the Dusk Rose - setChoice(playerA, "No"); // use Angelic Renewal on Silvercoat Lion + setChoice(playerA, true); // use Angelic Renewal on Elenda, the Dusk Rose + setChoice(playerA, false); // use Angelic Renewal on Silvercoat Lion setStopAt(2, PhaseStep.END_TURN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ReturnOnlyFromGraveyardTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ReturnOnlyFromGraveyardTest.java index 6777989fb1..91cb0a9e55 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ReturnOnlyFromGraveyardTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ReturnOnlyFromGraveyardTest.java @@ -36,7 +36,7 @@ public class ReturnOnlyFromGraveyardTest extends CardTestPlayerBase { castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Lightning Bolt", "Academy Rector"); setChoice(playerA, "When enchanted creature dies"); // Select triggered ability to execute last - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, "Primal Rage"); setStopAt(1, PhaseStep.END_TURN); @@ -70,7 +70,7 @@ public class ReturnOnlyFromGraveyardTest extends CardTestPlayerBase { castSpell(1, PhaseStep.BEGIN_COMBAT, playerB, "Lightning Bolt", "Academy Rector"); setChoice(playerA, "When enchanted creature dies"); // Select triggered ability to execute last - setChoice(playerA, "Yes"); // May exile it + setChoice(playerA, true); // May exile it addTarget(playerA, "Primal Rage"); setStopAt(1, PhaseStep.END_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/SidisiBroodTyrantTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/SidisiBroodTyrantTest.java index f584cfbf9d..021b6279bf 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/SidisiBroodTyrantTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/SidisiBroodTyrantTest.java @@ -74,7 +74,7 @@ public class SidisiBroodTyrantTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Sidisi, Brood Tyrant"); castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Satyr Wayfinder"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(1, PhaseStep.END_TURN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/SilumgarScavengerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/SilumgarScavengerTest.java index 0a105f5a14..be864d83e0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/SilumgarScavengerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/SilumgarScavengerTest.java @@ -23,7 +23,7 @@ public class SilumgarScavengerTest extends CardTestPlayerBase { // cast and exploit castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Silumgar Scavenger"); - setChoice(playerA, "Yes"); // yes, exploit + setChoice(playerA, true); // yes, exploit addTarget(playerA, "Balduvian Bears"); checkPermanentCounters("boost", 1, PhaseStep.BEGIN_COMBAT, playerA, "Silumgar Scavenger", CounterType.P1P1, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ThragtuskTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ThragtuskTest.java index a99bfdb137..5dbf4a10bc 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ThragtuskTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ThragtuskTest.java @@ -30,7 +30,7 @@ public class ThragtuskTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Thragtusk", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Phyrexian Metamorph"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "Thragtusk"); castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Public Execution", "Thragtusk"); @@ -70,7 +70,7 @@ public class ThragtuskTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Thragtusk", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Phyrexian Metamorph"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "Thragtusk"); castSpell(1, PhaseStep.BEGIN_COMBAT, playerB, "Tortoise Formation"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ZulaportCutthroatTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ZulaportCutthroatTest.java index dc91f4ae4f..95b8d78f20 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ZulaportCutthroatTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ZulaportCutthroatTest.java @@ -47,7 +47,7 @@ public class ZulaportCutthroatTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Gluttonous Slime"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Gluttonous Slime"); - setChoice(playerA, "Yes"); // Devour + setChoice(playerA, true); // Devour addTarget(playerA, "Zulaport Cutthroat^Grizzly Bears"); setChoice(playerA, "Whenever {this}"); // Two triggers diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/events/UnequipEventTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/events/UnequipEventTest.java index afa0e4315d..daffafbc60 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/events/UnequipEventTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/events/UnequipEventTest.java @@ -77,12 +77,12 @@ public class UnequipEventTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Nazahn, Revered Bladesmith"); addTarget(playerA, "Hammer of Nazahn"); - setChoice(playerA, "Yes"); // Put the hammer on the battlefield - setChoice(playerA, "Yes"); // Attach the hammer to a creature + setChoice(playerA, true); // Put the hammer on the battlefield + setChoice(playerA, true); // Attach the hammer to a creature addTarget(playerA, "Nazahn, Revered Bladesmith"); castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Grafted Exoskeleton"); - setChoice(playerA, "Yes"); // Attach the Grafted Exoskeleton to a creature + setChoice(playerA, true); // Attach the Grafted Exoskeleton to a creature addTarget(playerA, "Nazahn, Revered Bladesmith"); castSpell(3, PhaseStep.BEGIN_COMBAT, playerA, "Beast Within", "Grafted Exoskeleton"); diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastBGPartnerCommanderTest.java b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastBGPartnerCommanderTest.java index 37054c54f0..62031d124e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastBGPartnerCommanderTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastBGPartnerCommanderTest.java @@ -40,7 +40,7 @@ public class CastBGPartnerCommanderTest extends CardTestCommanderDuelBase { castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Titan's Presence", "Reyhan, Last of the Abzan"); setChoice(playerB, "Ancient Stone Idol"); - setChoice(playerA, "Yes"); // Commander goes to command zone + setChoice(playerA, true); // Commander goes to command zone setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastBRGCommanderTest.java b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastBRGCommanderTest.java index b3bf8e2bc1..471441723d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastBRGCommanderTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastBRGCommanderTest.java @@ -113,7 +113,7 @@ public class CastBRGCommanderTest extends CardTestCommanderDuelBase { // exile commander activateAbility(5, PhaseStep.PRECOMBAT_MAIN, playerA, "-3: Exile target permanent", "Daxos of Meletis"); - setChoice(playerB, "No"); // Move commander NOT to command zone + setChoice(playerB, false); // Move commander NOT to command zone // exile from hand 3 activateAbility(7, PhaseStep.PRECOMBAT_MAIN, playerA, "+4: Target player", playerA); @@ -126,7 +126,7 @@ public class CastBRGCommanderTest extends CardTestCommanderDuelBase { // - current version ignores a card's ZCC // - so ZCC are same after game restart and SBA can't react on commander new move // - logic can be changed in the future, so game can ask commander move again here - //setChoice(playerB, "No"); // Move commander NOT to command zone + //setChoice(playerB, false); // Move commander NOT to command zone setStopAt(9, PhaseStep.BEGIN_COMBAT); @@ -162,7 +162,7 @@ public class CastBRGCommanderTest extends CardTestCommanderDuelBase { castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Daxos of Meletis"); castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Mogg Infestation"); addTarget(playerA, playerB); - setChoice(playerB, "Yes"); // Move commander to command zone + setChoice(playerB, true); // Move commander to command zone setStopAt(3, PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastCommanderTest.java b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastCommanderTest.java index 8803c3aba9..63afc2ea02 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastCommanderTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastCommanderTest.java @@ -77,7 +77,7 @@ public class CastCommanderTest extends CardTestCommanderDuelBase { addCard(Zone.BATTLEFIELD, playerA, "Forest", 8); // Cost reduction does not work for getPlayable so you need to have 8 mana available castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Patron of the Orochi"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); addTarget(playerA, "Coiled Tinviper"); setStrictChooseMode(true); @@ -112,7 +112,7 @@ public class CastCommanderTest extends CardTestCommanderDuelBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Unexpectedly Absent", "Ob Nixilis of the Black Oath"); setChoice(playerA, "X=0"); - setChoice(playerA, "Yes"); // Move Commander to command zone instead library? + setChoice(playerA, true); // Move Commander to command zone instead library? setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CommanderAffinityTest.java b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CommanderAffinityTest.java index 488078b1aa..76c55a542b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CommanderAffinityTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CommanderAffinityTest.java @@ -49,12 +49,12 @@ public class CommanderAffinityTest extends CardTestCommanderDuelBase { // first cast for 12UU (-12 by abzan, -UU by islands) castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Blinkmoth Infusion"); - setChoice(playerA, "Yes"); // keep commander + setChoice(playerA, true); // keep commander checkCommandCardCount("after 1", 1, PhaseStep.BEGIN_COMBAT, playerA, "Blinkmoth Infusion", 1); // second cast for 12UU + 2 (-12 by abzan, -UU by islands, -2 by islands) castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Blinkmoth Infusion"); - setChoice(playerA, "No"); // remove commander to grave + setChoice(playerA, false); // remove commander to grave checkCommandCardCount("after 2", 1, PhaseStep.END_TURN, playerA, "Blinkmoth Infusion", 0); setStrictChooseMode(true); @@ -73,12 +73,12 @@ public class CommanderAffinityTest extends CardTestCommanderDuelBase { // first cast for 12UU (-12 by abzan, -UU by islands) castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Blinkmoth Infusion"); - setChoice(playerA, "Yes"); // keep commander + setChoice(playerA, true); // keep commander checkCommandCardCount("after 1", 1, PhaseStep.BEGIN_COMBAT, playerA, "Blinkmoth Infusion", 1); // second cast for 12UU + 2 (-12 by abzan, -UU by islands, -2 by abzan) castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Blinkmoth Infusion"); - setChoice(playerA, "No"); // remove commander to grave + setChoice(playerA, false); // remove commander to grave checkCommandCardCount("after 2", 1, PhaseStep.END_TURN, playerA, "Blinkmoth Infusion", 0); setStrictChooseMode(true); @@ -120,7 +120,7 @@ public class CommanderAffinityTest extends CardTestCommanderDuelBase { waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); checkCommandCardCount("after destroy ", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Karn, Silver Golem", 1); checkPlayableAbility("after destroy", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Karn, Silver Golem", false); - setChoice(playerA, "Yes"); // move to command zone + setChoice(playerA, true); // move to command zone waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); // can't do the second cast with additional cost (must pay 2 + 5, but have only R) diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CommanderColorChangeTest.java b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CommanderColorChangeTest.java index 55d909519a..e3cf24ae1e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CommanderColorChangeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CommanderColorChangeTest.java @@ -43,7 +43,7 @@ public class CommanderColorChangeTest extends CardTestCommanderDuelBase { // When a player casts a spell or a creature attacks, exile Norin the Wary. // Return it to the battlefield under its owner's control at the beginning of the next end step. castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Norin the Wary"); - setChoice(playerA, "Yes"); // Whenever a player casts a blue spell, you may gain 1 life. Choices: Yes - No + setChoice(playerA, true); // Whenever a player casts a blue spell, you may gain 1 life. Choices: Yes - No setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -98,9 +98,9 @@ public class CommanderColorChangeTest extends CardTestCommanderDuelBase { // When a player casts a spell or a creature attacks, exile Norin the Wary. // Return it to the battlefield under its owner's control at the beginning of the next end step. castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Norin the Wary"); - setChoice(playerA, "Yes"); // Whenever a player casts a blue spell, you may gain 1 life. Choices: Yes - No + setChoice(playerA, true); // Whenever a player casts a blue spell, you may gain 1 life. Choices: Yes - No castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Altar's Light", "Painter's Servant", "Norin the Wary"); - setChoice(playerA, "Yes"); // Whenever a player casts a blue spell, you may gain 1 life. Choices: Yes - No + setChoice(playerA, true); // Whenever a player casts a blue spell, you may gain 1 life. Choices: Yes - No setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CommanderReplaceEffectTest.java b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CommanderReplaceEffectTest.java index 732936901e..cfd47484f1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CommanderReplaceEffectTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CommanderReplaceEffectTest.java @@ -69,7 +69,7 @@ public class CommanderReplaceEffectTest extends CardTestCommanderDuelBase { // Destroy all creatures, then put an X/X colorless Horror artifact creature token onto the battlefield, where X is the number of creatures destroyed this way. castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Phyrexian Rebirth"); - setChoice(playerA, "No"); // Let the commander go to graveyard because of Gift of Immortality + setChoice(playerA, false); // Let the commander go to graveyard because of Gift of Immortality setStopAt(3, PhaseStep.UPKEEP); execute(); @@ -102,9 +102,9 @@ public class CommanderReplaceEffectTest extends CardTestCommanderDuelBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Daxos of Meletis"); castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Soulherder"); - setChoice(playerA, "Yes"); // Use Soulherder's triggered ability + setChoice(playerA, true); // Use Soulherder's triggered ability addTarget(playerA, "Daxos of Meletis"); - setChoice(playerA, "Yes"); // Move Daxos to command Zone + setChoice(playerA, true); // Move Daxos to command Zone setStopAt(2, PhaseStep.UPKEEP); execute(); @@ -139,13 +139,13 @@ public class CommanderReplaceEffectTest extends CardTestCommanderDuelBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Daxos of Meletis"); castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Soulherder"); - setChoice(playerA, "No"); // Use Soulherder's triggered ability + setChoice(playerA, false); // Use Soulherder's triggered ability attack(3, playerA, "Daxos of Meletis"); castSpell(3, PhaseStep.DECLARE_BLOCKERS, playerB, "Farm", "Daxos of Meletis"); - setChoice(playerA, "Yes"); // Move Daxos to command Zone + setChoice(playerA, true); // Move Daxos to command Zone setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/duel/MairsilThePretenderTest.java b/Mage.Tests/src/test/java/org/mage/test/commander/duel/MairsilThePretenderTest.java index 0fda037ddb..060aaa2d60 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/duel/MairsilThePretenderTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/duel/MairsilThePretenderTest.java @@ -47,16 +47,16 @@ public class MairsilThePretenderTest extends CardTestCommanderDuelBase { // {2}{U}{U}: Return Arcanis the Omnipotent to its owner's hand. addCard(Zone.HAND, playerA, "Arcanis the Omnipotent", 1); // Creature {3}{U}{U}{U} - setChoice(playerA, "Yes"); + setChoice(playerA, true); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mairsil, the Pretender"); - setChoice(playerA, "Yes"); // Exile a card + setChoice(playerA, true); // Exile a card setChoice(playerA, "Arcanis the Omnipotent"); castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Shifting Shadow", "Mairsil, the Pretender"); - setChoice(playerA, "Yes"); // Move commander to command zone + setChoice(playerA, true); // Move commander to command zone setStopAt(5, PhaseStep.PRECOMBAT_MAIN); setStrictChooseMode(true); @@ -106,17 +106,17 @@ public class MairsilThePretenderTest extends CardTestCommanderDuelBase { // {2}{U}{U}: Return Arcanis the Omnipotent to its owner's hand. addCard(Zone.HAND, playerA, "Arcanis the Omnipotent", 1); // Creature {3}{U}{U}{U} - setChoice(playerA, "Yes"); + setChoice(playerA, true); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mairsil, the Pretender"); - setChoice(playerA, "Yes"); // Exile a card + setChoice(playerA, true); // Exile a card setChoice(playerA, "Arcanis the Omnipotent"); castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Shifting Shadow", "Mairsil, the Pretender"); activateAbility(5, PhaseStep.UPKEEP, playerA, "{2}{U}{U}: Return", NO_TARGET, "At the beginning of your upkeep"); - setChoice(playerA, "No"); // Don't move commander to command zone because it goes to hand + setChoice(playerA, false); // Don't move commander to command zone because it goes to hand setStopAt(5, PhaseStep.PRECOMBAT_MAIN); @@ -162,18 +162,18 @@ public class MairsilThePretenderTest extends CardTestCommanderDuelBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mairsil, the Pretender"); - setChoice(playerA, "Yes"); // Exile a card - setChoice(playerA, "Yes"); // Exile from Hand + setChoice(playerA, true); // Exile a card + setChoice(playerA, true); // Exile from Hand setChoice(playerA, "Endling"); castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Shifting Shadow", "Mairsil, the Pretender"); activateAbility(5, PhaseStep.UPKEEP, playerA, "{B}: {this} gains undying", NO_TARGET, "At the beginning of your upkeep"); - setChoice(playerA, "No"); // Don't move commander to command zone because can come back by Undying + setChoice(playerA, false); // Don't move commander to command zone because can come back by Undying - setChoice(playerA, "Yes"); // Exile a card (Mairsil comes back from Undying) - setChoice(playerA, "Yes"); // Exile from hand + setChoice(playerA, true); // Exile a card (Mairsil comes back from Undying) + setChoice(playerA, true); // Exile from hand setChoice(playerA, "Arcanis the Omnipotent"); setStopAt(5, PhaseStep.PRECOMBAT_MAIN); diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/duel/MythUnboundTest.java b/Mage.Tests/src/test/java/org/mage/test/commander/duel/MythUnboundTest.java index 3375f7a23c..51d6aba932 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/duel/MythUnboundTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/duel/MythUnboundTest.java @@ -39,7 +39,7 @@ public class MythUnboundTest extends CardTestCommanderDuelBase { // destroy castSpell(1, PhaseStep.BEGIN_COMBAT, playerB, "Lightning Bolt", "Oviya Pashiri, Sage Lifecrafter"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); // cast 2 (G + 2 - 1 = 2 mana) castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Oviya Pashiri, Sage Lifecrafter"); diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/duel/NorinTheWaryTest.java b/Mage.Tests/src/test/java/org/mage/test/commander/duel/NorinTheWaryTest.java index 36a44ea0a9..1cd944bbea 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/duel/NorinTheWaryTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/duel/NorinTheWaryTest.java @@ -40,7 +40,7 @@ public class NorinTheWaryTest extends CardTestCommanderDuelBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Norin the Wary"); castSpell(1, PhaseStep.BEGIN_COMBAT, playerA, "Lightning Bolt", playerB); - setChoice(playerA, "No"); + setChoice(playerA, false); setStopAt(1, PhaseStep.END_COMBAT); execute(); @@ -59,7 +59,7 @@ public class NorinTheWaryTest extends CardTestCommanderDuelBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Norin the Wary"); castSpell(1, PhaseStep.BEGIN_COMBAT, playerA, "Lightning Bolt", playerB); - setChoice(playerA, "No"); + setChoice(playerA, false); setStopAt(2, PhaseStep.UPKEEP); execute(); @@ -78,7 +78,7 @@ public class NorinTheWaryTest extends CardTestCommanderDuelBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Norin the Wary"); castSpell(1, PhaseStep.BEGIN_COMBAT, playerA, "Lightning Bolt", playerB); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setStopAt(2, PhaseStep.UPKEEP); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/duel/YorvoLordOfGarenbrigOnCommandersTest.java b/Mage.Tests/src/test/java/org/mage/test/commander/duel/YorvoLordOfGarenbrigOnCommandersTest.java index 9fb0832ab5..91388e0fa5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/duel/YorvoLordOfGarenbrigOnCommandersTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/duel/YorvoLordOfGarenbrigOnCommandersTest.java @@ -67,8 +67,8 @@ public class YorvoLordOfGarenbrigOnCommandersTest extends CardTestCommanderDuelB setChoice(playerA, "Whenever another green creature enters the battlefield"); // get counters trigger //setChoice(playerA, "When {this} enters the battlefield, sacrifice it"); // sacrifice trigger must be on top - setChoice(playerA, "Yes"); // return commander to command zone - setChoice(playerA, "No"); // do not put land to battlefield + setChoice(playerA, true); // return commander to command zone + setChoice(playerA, false); // do not put land to battlefield waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); checkPermanentCounters("must get +2", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Yorvo, Lord of Garenbrig", CounterType.P1P1, 4 + 2); diff --git a/Mage.Tests/src/test/java/org/mage/test/multiplayer/VotingTest.java b/Mage.Tests/src/test/java/org/mage/test/multiplayer/VotingTest.java index 15f7820207..489d822d59 100644 --- a/Mage.Tests/src/test/java/org/mage/test/multiplayer/VotingTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/multiplayer/VotingTest.java @@ -168,7 +168,7 @@ public class VotingTest extends CardTestCommander4PlayersWithAIHelps { addCard(Zone.HAND, playerA, lieutenant); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, lieutenant); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoices("Yes", "Yes", "No", "No"); setStrictChooseMode(true); @@ -188,8 +188,8 @@ public class VotingTest extends CardTestCommander4PlayersWithAIHelps { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, lieutenant); setChoices("Yes", "Yes", "No", "No"); - setChoice(playerA, "Yes"); // to have an additional vote - setChoice(playerA, "No"); // the additional vote + setChoice(playerA, true); // to have an additional vote + setChoice(playerA, false); // the additional vote setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); @@ -269,7 +269,7 @@ public class VotingTest extends CardTestCommander4PlayersWithAIHelps { addCard(Zone.HAND, playerA, lieutenant); castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, lieutenant); - setChoice(playerB, "Yes"); + setChoice(playerB, true); setChoices("Yes", "No", "No", "No"); setStrictChooseMode(true); @@ -294,8 +294,8 @@ public class VotingTest extends CardTestCommander4PlayersWithAIHelps { addCard(Zone.HAND, playerA, lieutenant); castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, lieutenant); - setChoice(playerA, "No"); - setChoice(playerB, "No"); + setChoice(playerA, false); + setChoice(playerB, false); setChoices("Yes"); setStrictChooseMode(true); diff --git a/Mage.Tests/src/test/java/org/mage/test/rollback/CopyAnthemEffectTest.java b/Mage.Tests/src/test/java/org/mage/test/rollback/CopyAnthemEffectTest.java index 787559a83c..64edc0010c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/rollback/CopyAnthemEffectTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/rollback/CopyAnthemEffectTest.java @@ -23,7 +23,7 @@ public class CopyAnthemEffectTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Copy Enchantment"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Copy Enchantment"); - setChoice(playerA, "Yes"); + setChoice(playerA, true); setChoice(playerA, "Glorious Anthem"); rollbackTurns(3, PhaseStep.UPKEEP, playerA, 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/rollback/DemonicCollusionTest.java b/Mage.Tests/src/test/java/org/mage/test/rollback/DemonicCollusionTest.java index 24c5253243..3a1c1b9414 100644 --- a/Mage.Tests/src/test/java/org/mage/test/rollback/DemonicCollusionTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/rollback/DemonicCollusionTest.java @@ -29,7 +29,7 @@ public class DemonicCollusionTest extends CardTestPlayerBase { // cast with buyback castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Demonic Collusion"); - setChoice(playerA, "Yes"); // use buyback + setChoice(playerA, true); // use buyback setChoice(playerA, "Forest"); // pay setChoice(playerA, "Forest"); // pay addTarget(playerA, "Mountain"); // return from lib @@ -62,7 +62,7 @@ public class DemonicCollusionTest extends CardTestPlayerBase { // cast with buyback castSpell(5, PhaseStep.PRECOMBAT_MAIN, playerA, "Demonic Collusion"); - setChoice(playerA, "Yes"); // use buyback + setChoice(playerA, true); // use buyback setChoice(playerA, "Forest"); // pay setChoice(playerA, "Forest"); // pay addTarget(playerA, "Mountain"); // return from lib diff --git a/Mage.Tests/src/test/java/org/mage/test/rollback/DemonicPactTest.java b/Mage.Tests/src/test/java/org/mage/test/rollback/DemonicPactTest.java index 9124fac54a..220b7c8025 100644 --- a/Mage.Tests/src/test/java/org/mage/test/rollback/DemonicPactTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/rollback/DemonicPactTest.java @@ -102,11 +102,11 @@ public class DemonicPactTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Silvercoat Lion"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Pact of Negation", "Silvercoat Lion", "Silvercoat Lion"); - setChoice(playerB, "Yes"); + setChoice(playerB, true); rollbackTurns(2, PhaseStep.PRECOMBAT_MAIN, playerB, 0); - setChoice(playerB, "Yes"); + setChoice(playerB, true); setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java b/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java index 55b6d09d81..4de0d06b54 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java @@ -1912,7 +1912,7 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement } /** - * For use choices set "Yes" or "No" the the choice string.
+ * For use choices set "Yes" or "No" the the choice string or use boolean.
* For X values set "X=[xValue]" example: for X=3 set choice string to * "X=3".
* For ColorChoice use "Red", "Green", "Blue", "Black" or "White"
@@ -1922,6 +1922,10 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement * @param player * @param choice */ + public void setChoice(TestPlayer player, boolean choice) { + setChoice(player, choice ? "Yes" : "No"); + } + public void setChoice(TestPlayer player, String choice) { setChoice(player, choice, 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/turnmod/ExtraTurnsTest.java b/Mage.Tests/src/test/java/org/mage/test/turnmod/ExtraTurnsTest.java index 2a07f34a25..201637d8c9 100644 --- a/Mage.Tests/src/test/java/org/mage/test/turnmod/ExtraTurnsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/turnmod/ExtraTurnsTest.java @@ -121,13 +121,13 @@ public class ExtraTurnsTest extends CardTestPlayerBase { addCard(Zone.LIBRARY, playerB, "Temporal Mastery", 1); // Sorcery {5}{U}{U} skipInitShuffling(); - setChoice(playerB, "Yes"); // Would you like to reveal first drawn card (Temporal Mastery, you can copy it and cast {2} less)? - setChoice(playerB, "Yes"); // Would you like to copy Temporal Mastery and cast it {2} less? - setChoice(playerB, "Yes"); // Reveal Temporal Mastery to be able to use Miracle? - setChoice(playerB, "Yes"); // Miracle {1}{U} (You may cast this card for its miracle cost when you draw it if it's the first card you drew this turn.) + setChoice(playerB, true); // Would you like to reveal first drawn card (Temporal Mastery, you can copy it and cast {2} less)? + setChoice(playerB, true); // Would you like to copy Temporal Mastery and cast it {2} less? + setChoice(playerB, true); // Reveal Temporal Mastery to be able to use Miracle? + setChoice(playerB, true); // Miracle {1}{U} (You may cast this card for its miracle cost when you draw it if it's the first card you drew this turn.) - setChoice(playerB, "No"); // Would you like to reveal first drawn card? (Turn 3) - setChoice(playerB, "No"); // Would you like to reveal first drawn card? (Turn 4) + setChoice(playerB, false); // Would you like to reveal first drawn card? (Turn 3) + setChoice(playerB, false); // Would you like to reveal first drawn card? (Turn 4) // Turn 3 + 4 are extra turns setStopAt(4, PhaseStep.PRECOMBAT_MAIN);