From 5a752c47a07556650ca96d81aed051d8dcdf903e Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 14:17:07 +0000 Subject: [PATCH] clean up some more into play -> onto the battlefield --- src/forge/CardFactory.java | 14 +++---- src/forge/CardFactoryUtil.java | 12 +++--- src/forge/CardFactory_Creatures.java | 62 ++++++++++++++-------------- src/forge/CombatUtil.java | 16 +++---- src/forge/GameActionUtil.java | 52 +++++++++++------------ 5 files changed, 78 insertions(+), 78 deletions(-) diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index 371a0d57043..f873cf65181 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -5060,7 +5060,7 @@ public class CardFactory implements NewConstants { public void execute() { StringBuilder sb = new StringBuilder(); - sb.append("When ").append(card.getName()).append(" comes into play, choose a creature type."); + sb.append("When ").append(card.getName()).append(" enters the battlefield, choose a creature type."); ability.setStackDescription(sb.toString()); AllZone.Stack.add(ability); @@ -5136,7 +5136,7 @@ public class CardFactory implements NewConstants { }; StringBuilder sb = new StringBuilder(); sb.append(card.getName()).append(" - ").append(card.getController()); - sb.append(" puts a 1/1 ").append(t).append(" token into play"); + sb.append(" puts a 1/1 ").append(t).append(" token onto the battlefield"); a1.setStackDescription(sb.toString()); card.addSpellAbility(a1); @@ -5350,7 +5350,7 @@ public class CardFactory implements NewConstants { && CardFactoryUtil.canTarget(card, getTargetCard())) { AllZone.GameAction.exile(getTargetCard()); - //put permanent into play + //put permanent onto the battlefield Card c = getSourceCard(); AllZone.getZone(Constant.Zone.Battlefield, c.getController()).add(c); } @@ -5587,11 +5587,11 @@ public class CardFactory implements NewConstants { } }; - necrogen.setDescription("2: Exile target creature card in a graveyard. Put a 1/1 green Saproling creature token into play."); + necrogen.setDescription("2: Exile target creature card in a graveyard. Put a 1/1 green Saproling creature token onto the battlefield."); StringBuilder sb = new StringBuilder(); sb.append(card.getController()); - sb.append(" exiles target creature card in a graveyard. Puts a 1/1 green Saproling creature token into play."); + sb.append(" exiles target creature card in a graveyard. Puts a 1/1 green Saproling creature token onto the battlefield."); necrogen.setStackDescription(sb.toString()); necrogen.setAfterPayMana(necroTarget); @@ -6175,7 +6175,7 @@ public class CardFactory implements NewConstants { // the landfall ability AllZone.GameAction.sacrifice(getSourceCard()); - // Put two basic lands into play tapped + // Put two basic lands onto the battlefield tapped AllZone.GameAction.searchLibraryTwoBasicLand(card.getController(), Constant.Zone.Battlefield, true, Constant.Zone.Battlefield, true); } @@ -6237,7 +6237,7 @@ public class CardFactory implements NewConstants { private static final long serialVersionUID = -7679939432259603542L; public void execute() { - ability.setStackDescription("If Mox Diamond would come into play, you may discard a land card instead. If you do, put Mox Diamond into play. If you don't, put it into its owner's graveyard."); + ability.setStackDescription("If Mox Diamond would enter the battlefield, you may discard a land card instead. If you do, put Mox Diamond onto the battlefield. If you don't, put it into its owner's graveyard."); AllZone.Stack.add(ability); } }; diff --git a/src/forge/CardFactoryUtil.java b/src/forge/CardFactoryUtil.java index 560ecfb07cd..0b9e97ce1b0 100644 --- a/src/forge/CardFactoryUtil.java +++ b/src/forge/CardFactoryUtil.java @@ -1175,11 +1175,11 @@ public class CardFactoryUtil { }; StringBuilder sbDesc = new StringBuilder(); sbDesc.append(cost).append(", tap: Search your library for a Mercenary permanent card with converted mana cost "); - sbDesc.append(cost).append(" or less and put it into play. Then shuffle your library."); + sbDesc.append(cost).append(" or less and put it onto the battlefield. Then shuffle your library."); ability.setDescription(sbDesc.toString()); StringBuilder sbStack = new StringBuilder(); - sbStack.append(sourceCard.getName()).append(" - search for a Mercenary and put it into play."); + sbStack.append(sourceCard.getName()).append(" - search for a Mercenary and put it onto the battlefield."); ability.setStackDescription(sbStack.toString()); return ability; @@ -1288,11 +1288,11 @@ public class CardFactoryUtil { }; StringBuilder sbDesc = new StringBuilder(); sbDesc.append(cost).append(", tap: Search your library for a Rebel permanent card with converted mana cost "); - sbDesc.append(converted).append(" or less and put it into play. Then shuffle your library."); + sbDesc.append(converted).append(" or less and put it onto the battlefield. Then shuffle your library."); ability.setDescription(sbDesc.toString()); StringBuilder sbStack = new StringBuilder(); - sbStack.append(sourceCard.getName()).append(" - search for a Rebel and put it into play."); + sbStack.append(sourceCard.getName()).append(" - search for a Rebel and put it onto the battlefield."); ability.setStackDescription(sbStack.toString()); return ability; @@ -2073,7 +2073,7 @@ public class CardFactoryUtil { public void execute() { - //testAndSet - only needed when comes into play. + //testAndSet - only needed when enters the battlefield. if(firstTime) { sourceCard.addCounter(Counters.FADE, Power); } @@ -2090,7 +2090,7 @@ public class CardFactoryUtil { public void execute() { - //testAndSet - only needed when comes into play. + //testAndSet - only needed when enters the battlefield if(firstTime) { sourceCard.addCounter(Counters.TIME, Power); } diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java index 83ff5d1a2e1..f14f583b003 100644 --- a/src/forge/CardFactory_Creatures.java +++ b/src/forge/CardFactory_Creatures.java @@ -174,7 +174,7 @@ public class CardFactory_Creatures { AllZone.Stack.add(ability); } };//Command - ability.setStackDescription("Caller of the Claw - Put a 2/2 green Bear creature token into play for each nontoken creature put into your graveyard from play this turn."); + ability.setStackDescription("Caller of the Claw - Put a 2/2 green Bear creature token onto the battlefield for each nontoken creature put into your graveyard from play this turn."); card.addComesIntoPlayCommand(comesIntoPlay); SpellAbility spell = new Spell_Permanent(card) { @@ -236,7 +236,7 @@ public class CardFactory_Creatures { //CardFactory cf = new CardFactory("cards.txt"); - //copy creature and put it into play + //copy creature and put it onto the battlefield //copy = getCard(getTargetCard(), getTargetCard().getName(), card.getController()); copy = cfact.getCard(getTargetCard().getName(), getTargetCard().getOwner()); @@ -414,9 +414,9 @@ public class CardFactory_Creatures { }; ability.setBeforePayMana(removeCard); - ability.setDescription("Grandeur - Discard Korlash and put two Swamps from your library into play tapped."); + ability.setDescription("Grandeur Ñ Discard another card named Korlash, Heir to Blackblade: Search your library for up to two Swamp cards, put them onto the battlefield tapped, then shuffle your library."); StringBuilder sb = new StringBuilder(); - sb.append(card.getName()).append(" - Search for two swamps and put them into play tapped."); + sb.append(card.getName()).append(" - Search for two swamps and put them onto the battlefield tapped."); ability.setStackDescription(sb.toString()); card.addSpellAbility(ability); @@ -548,11 +548,11 @@ public class CardFactory_Creatures { StringBuilder sbDesc = new StringBuilder(); sbDesc.append("Grandeur - Discard another card named Baru, Fist of Krosa: Put an X/X "); - sbDesc.append("green Wurm creature token into play, where X is the number of lands that you control."); + sbDesc.append("green Wurm creature token onto the battlefield, where X is the number of lands that you control."); ability.setDescription(sbDesc.toString()); StringBuilder sbStack = new StringBuilder(); - sbStack.append(cardName).append(" - put X/X token into play."); + sbStack.append(cardName).append(" - put X/X token onto the battlefield."); ability.setStackDescription(sbStack.toString()); card.addSpellAbility(ability); @@ -1153,7 +1153,7 @@ public class CardFactory_Creatures { Player opponent = card.getController().getOpponent(); StringBuilder sb = new StringBuilder(); - sb.append(card.getName()).append(" - ").append(opponent).append(" puts a 3/3 flying token into play"); + sb.append(card.getName()).append(" - ").append(opponent).append(" puts a 3/3 flying token onto the battlefield"); ability.setStackDescription(sb.toString()); AllZone.Stack.add(ability); @@ -1618,7 +1618,7 @@ public class CardFactory_Creatures { public void execute() { StringBuilder sb = new StringBuilder(); - sb.append("Symbiotic Elf - ").append(card.getController()).append(" puts two 1/1 tokens into play"); + sb.append("Symbiotic Elf - ").append(card.getController()).append(" puts two 1/1 tokens onto the battlefield"); ability.setStackDescription(sb.toString()); AllZone.Stack.add(ability); @@ -2251,7 +2251,7 @@ public class CardFactory_Creatures { } }; - ability.setStackDescription("When Sleeper Agent comes into play, target opponent gains control of it."); + ability.setStackDescription("When Sleeper Agent enters the battlefield, target opponent gains control of it."); Command intoPlay = new Command() { private static final long serialVersionUID = -3934471871041458847L; @@ -3006,7 +3006,7 @@ public class CardFactory_Creatures { public void execute() { StringBuilder sb = new StringBuilder(); - sb.append(card.getController()).append(" puts a 3/3 creature into play from Penumbra Kavu"); + sb.append(card.getController()).append(" puts a 3/3 creature onto the battlefield from Penumbra Kavu"); ability.setStackDescription(sb.toString()); AllZone.Stack.add(ability); @@ -3033,7 +3033,7 @@ public class CardFactory_Creatures { public void execute() { StringBuilder sb = new StringBuilder(); - sb.append(card.getController()).append(" puts a 2/1 creature into play from Penumbra Bobcat"); + sb.append(card.getController()).append(" puts a 2/1 creature onto the battlefield from Penumbra Bobcat"); ability.setStackDescription(sb.toString()); AllZone.Stack.add(ability); @@ -3060,7 +3060,7 @@ public class CardFactory_Creatures { public void execute() { StringBuilder sb = new StringBuilder(); sb.append(card.getController()); - sb.append(" puts a 2/4 Black Spider creature into play from Penumbra Spider"); + sb.append(" puts a 2/4 Black Spider creature onto the battlefield from Penumbra Spider"); ability.setStackDescription(sb.toString()); AllZone.Stack.add(ability); @@ -3087,7 +3087,7 @@ public class CardFactory_Creatures { public void execute() { StringBuilder sb = new StringBuilder(); sb.append(card.getController()); - sb.append(" puts a 6/6 Black Wurm creature with trample into play from Penumbra Wurm"); + sb.append(" puts a 6/6 Black Wurm creature with trample onto the battlefield from Penumbra Wurm"); ability.setStackDescription(sb.toString()); AllZone.Stack.add(ability); @@ -3480,7 +3480,7 @@ public class CardFactory_Creatures { while(!list.isEmpty()) { ((PlayerZone_ComesIntoPlay) AllZone.Human_Battlefield).setTriggers(false); ((PlayerZone_ComesIntoPlay) AllZone.Computer_Battlefield).setTriggers(false); - //so "comes into play" abilities don't trigger + //so "enters the battlefield" abilities don't trigger ///list.get(0).addComesIntoPlayCommand(Command.Blank); oppPlay.add(list.get(0)); @@ -4038,7 +4038,7 @@ public class CardFactory_Creatures { ability.setTargetPlayer(card.getController()); StringBuilder sb = new StringBuilder(); - sb.append(card).append(" - ").append(card.getController()).append(" puts tokens into play"); + sb.append(card).append(" - ").append(card.getController()).append(" puts tokens onto the battlefield"); ability.setStackDescription(sb.toString()); AllZone.Stack.add(ability); @@ -4058,7 +4058,7 @@ public class CardFactory_Creatures { PlayerZone play = AllZone.getZone(Constant.Zone.Battlefield, card.getController()); PlayerZone oldPlay = AllZone.getZone(getTargetCard()); - //so "comes into play" abilities don't trigger + //so "enters the battlefield" abilities don't trigger //getTargetCard().addComesIntoPlayCommand(Command.Blank); ((PlayerZone_ComesIntoPlay) AllZone.Human_Battlefield).setTriggers(false); @@ -6030,7 +6030,7 @@ public class CardFactory_Creatures { card.addSpellAbility(ability); ability.setDescription("W, Sacrifice Transluminant: Put a 1/1 white Spirit creature token with flying onto the battlefield at the beginning of the next end step."); - ability.setStackDescription("Put a 1/1 white Spirit creature token with flying into play at end of turn."); + ability.setStackDescription("Put a 1/1 white Spirit creature token with flying onto the battlefield at end of turn."); ability.setBeforePayMana(new Input_PayManaCost_Ability(ability.getManaCost(), new Command() { private static final long serialVersionUID = -6553009833190713980L; @@ -6212,7 +6212,7 @@ public class CardFactory_Creatures { sb.append("Goldmeadow Harrier onto the battlefield. It has \"W, tap : Tap target creature.\""); ability.setDescription(sb.toString()); - ability.setStackDescription(cardName+" - Put a 1/1 token into play"); + ability.setStackDescription(cardName+" - Put a 1/1 token onto the battlefield"); }//*************** END ************ END ************************** @@ -6830,7 +6830,7 @@ public class CardFactory_Creatures { } else // human { if(basic.size() > 0) { - Object o = AllZone.Display.getChoiceOptional("Select Plains card to put into play: ", + Object o = AllZone.Display.getChoiceOptional("Select Plains card to put onto the battlefield: ", basic.toArray()); if(o != null) { Card c = (Card) o; @@ -6862,7 +6862,7 @@ public class CardFactory_Creatures { if(self.size() < opp.size()) { StringBuilder sb = new StringBuilder(); - sb.append(card.getName()).append(" - search library for a plains and put it into play"); + sb.append(card.getName()).append(" - search library for a plains and put it onto the battlefield"); ability.setStackDescription(sb.toString()); AllZone.Stack.add(ability); @@ -7323,7 +7323,7 @@ public class CardFactory_Creatures { public void execute() { StringBuilder sb = new StringBuilder(); - sb.append(card.getName()).append(" - put three 1/1 Saproling creature tokens into play."); + sb.append(card.getName()).append(" - put three 1/1 Saproling creature tokens onto the battlefield."); ability.setStackDescription(sb.toString()); AllZone.Stack.add(ability); @@ -7357,7 +7357,7 @@ public class CardFactory_Creatures { public void execute() { StringBuilder sb = new StringBuilder(); - sb.append(card.getName()).append(" - put creature tokens into play."); + sb.append(card.getName()).append(" - put creature tokens onto the battlefield."); ability.setStackDescription(sb.toString()); AllZone.Stack.add(ability); } @@ -7393,7 +7393,7 @@ public class CardFactory_Creatures { { if(basic.size() > 0) { Object o = AllZone.Display.getChoiceOptional( - "Select Basic Land card to put into play tapped: ", basic.toArray()); + "Select Basic Land card to put onto the battlefield tapped: ", basic.toArray()); if(o != null) { Card c = (Card) o; lib.remove(c); @@ -7411,7 +7411,7 @@ public class CardFactory_Creatures { public void execute() { StringBuilder sb = new StringBuilder(); - sb.append(card.getName()).append(" - search library for a basic land card and put it into play tapped."); + sb.append(card.getName()).append(" - search library for a basic land card and put it onto the battlefield tapped."); ability.setStackDescription(sb.toString()); AllZone.Stack.add(ability); @@ -9904,7 +9904,7 @@ public class CardFactory_Creatures { landInLib.get(0).tap(); play.add(landInLib.get(0)); } else { - Object o = AllZone.Display.getChoiceOptional("Select plains card to put into play: ", + Object o = AllZone.Display.getChoiceOptional("Select plains card to put onto the battlefield: ", landInLib.toArray()); if(o != null) { Card crd = (Card) o; @@ -10329,7 +10329,7 @@ public class CardFactory_Creatures { lands = lands.getType("Forest"); if(player.equals(AllZone.HumanPlayer) && lands.size() > 0) { - Object o = AllZone.Display.getChoiceOptional("Pick a forest card to put into play", + Object o = AllZone.Display.getChoiceOptional("Pick a forest card to put onto the battlefield", lands.toArray()); if(o != null) { Card card = (Card) o; @@ -10355,7 +10355,7 @@ public class CardFactory_Creatures { public void execute() { StringBuilder sb = new StringBuilder(); - sb.append(card.getController()).append(" searches his library for a Forest card to put that card into play."); + sb.append(card.getController()).append(" searches his library for a Forest card to put that card onto the battlefield."); ability.setStackDescription(sb.toString()); AllZone.Stack.add(ability); @@ -10951,7 +10951,7 @@ public class CardFactory_Creatures { private static final long serialVersionUID = -7067218066522935060L; public void execute() { - ability.setStackDescription("Kinsbaile Borderguard comes into play with a +1/+1 counter on it for each other Kithkin you control."); + ability.setStackDescription("Kinsbaile Borderguard enters the battlefield with a +1/+1 counter on it for each other Kithkin you control."); AllZone.Stack.add(ability); } }; @@ -10975,7 +10975,7 @@ public class CardFactory_Creatures { public void execute() { ability2.setStackDescription("When Kinsbaile Borderguard is put into a graveyard from play, put a 1/1 white " + - "Kithkin Soldier creature token into play for each counter on it."); + "Kithkin Soldier creature token onto the battlefield for each counter on it."); AllZone.Stack.add(ability2); } }; @@ -11862,7 +11862,7 @@ public class CardFactory_Creatures { }; StringBuilder sb = new StringBuilder(); - sb.append(cardName).append(" - comes into play with a +1/+1 counter on it for each other spell played this turn."); + sb.append(cardName).append(" - enters the battlefield with a +1/+1 counter on it for each other spell played this turn."); intoPlay.setStackDescription(sb.toString()); card.addComesIntoPlayCommand(comesIntoPlay); @@ -12274,7 +12274,7 @@ public class CardFactory_Creatures { public void execute() { StringBuilder sb = new StringBuilder(); - sb.append("Symbiotic Wurm - ").append(card.getController()).append(" puts seven 1/1 tokens into play"); + sb.append("Symbiotic Wurm - ").append(card.getController()).append(" puts seven 1/1 tokens onto the battlefield"); ability.setStackDescription(sb.toString()); AllZone.Stack.add(ability); diff --git a/src/forge/CombatUtil.java b/src/forge/CombatUtil.java index 3298dd0a985..bfa15c6f068 100644 --- a/src/forge/CombatUtil.java +++ b/src/forge/CombatUtil.java @@ -1309,7 +1309,7 @@ public class CombatUtil { if(enchantments.size() > 0) { if(c.getController().isHuman()) { - Object o = AllZone.Display.getChoiceOptional("Pick an enchantment to put into play", + Object o = AllZone.Display.getChoiceOptional("Pick an enchantment to put onto the battlefield", enchantments.toArray()); if(o != null) { Card crd = (Card) o; @@ -1375,7 +1375,7 @@ public class CombatUtil { if(creatures.size() > 0) { if(c.getController().isHuman()) { - Object o = AllZone.Display.getChoiceOptional("Pick a creature to put into play", + Object o = AllZone.Display.getChoiceOptional("Pick a creature to put onto the battlefield", creatures.toArray()); if(o != null) { Card card = (Card) o; @@ -1384,7 +1384,7 @@ public class CombatUtil { card.tap(); AllZone.Combat.addAttacker(card); - //the card that gets put into play tapped and attacking might trigger another ability: + //the card that gets put onto the battlefield tapped and attacking might trigger another ability: //however, this turns out to be incorrect rules-wise //checkDeclareAttackers(card); } @@ -1676,7 +1676,7 @@ public class CombatUtil { }; //Ability StringBuilder sb2 = new StringBuilder(); - sb2.append(c.getName()).append(" - put a 2/2 green Cat Warrior creature token with forestwalk into play."); + sb2.append(c.getName()).append(" - put a 2/2 green Cat Warrior creature token with forestwalk onto the battlefield."); ability2.setStackDescription(sb2.toString()); AllZone.Stack.add(ability2); @@ -1697,7 +1697,7 @@ public class CombatUtil { }; //Ability StringBuilder sb2 = new StringBuilder(); - sb2.append(c.getName()).append(" - put a 2/2 black Zombie creature token into play."); + sb2.append(c.getName()).append(" - put a 2/2 black Zombie creature token onto the battlefield."); ability2.setStackDescription(sb2.toString()); AllZone.Stack.add(ability2); @@ -1793,7 +1793,7 @@ public class CombatUtil { if(soldiers.size() > 0) { if(c.getController().equals(AllZone.HumanPlayer)) { - Object o = AllZone.Display.getChoiceOptional("Pick a soldier to put into play", + Object o = AllZone.Display.getChoiceOptional("Pick a soldier to put onto the battlefield", soldiers.toArray()); if(o != null) { Card card = (Card) o; @@ -1802,7 +1802,7 @@ public class CombatUtil { card.tap(); AllZone.Combat.addAttacker(card); - //the card that gets put into play tapped and attacking might trigger another ability: + //the card that gets put onto the battlefield tapped and attacking might trigger another ability: //however, this turns out to be incorrect rules-wise //checkDeclareAttackers(card); card.setCreatureAttackedThisCombat(true); @@ -2686,7 +2686,7 @@ public class CombatUtil { StringBuilder sb4 = new StringBuilder(); sb4.append(c).append(" - (Exalted) searches library for an Aura card that could enchant that creature, "); - sb4.append("put it into play attached to that creature, then shuffles library."); + sb4.append("put it onto the battlefield attached to that creature, then shuffles library."); ability4.setStackDescription(sb4.toString()); AllZone.Stack.add(ability4); diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index 1a987dc9336..37f2886d409 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -2773,7 +2773,7 @@ public class GameActionUtil { StringBuilder sb = new StringBuilder(); sb.append(card.getName()).append(" - ").append(c.getController()); - sb.append(" puts a 4/4 White Angel token with flying into play."); + sb.append(" puts a 4/4 White Angel token with flying onto the battlefield."); ability2.setStackDescription(sb.toString()); AllZone.Stack.add(ability2); @@ -2936,7 +2936,7 @@ public class GameActionUtil { StringBuilder sb = new StringBuilder(); sb.append(card.getName()).append(" - ").append(c.getController()); - sb.append(" played a blue spell, put a 1/1 blue Bird token with flying into play."); + sb.append(" played a blue spell, put a 1/1 blue Bird token with flying onto the battlefield."); ability2.setStackDescription(sb.toString()); AllZone.Stack.add(ability2); @@ -2958,7 +2958,7 @@ public class GameActionUtil { StringBuilder sb = new StringBuilder(); sb.append(card.getName()).append(" - ").append(c.getController()); - sb.append(" played a green spell, put a 2/2 green Wolf token into play."); + sb.append(" played a green spell, put a 2/2 green Wolf token onto the battlefield."); ability.setStackDescription(sb.toString()); AllZone.Stack.add(ability); @@ -4930,7 +4930,7 @@ public class GameActionUtil { // Get a list of all mountains CardList mountainList = AllZoneUtil.getPlayerTypeInPlay(valakutCard.getController(), "Mountain"); - // Don't count the one that just came into play + // Don't count the one that just entered the battlefield if (mountainList.contains(mtn)) mountainList.remove(mtn); @@ -6505,14 +6505,14 @@ public class GameActionUtil { "Creature", "Elemental"}, 2, 2, new String[] {"Trample"}); for(Card c:cl) { - c.setText("Whenever Spawnwrithe deals combat damage to a player, put a token into play that's a copy of Spawnwrithe."); + c.setText("Whenever Spawnwrithe deals combat damage to a player, put a token that's a copy of Spawnwrithe onto the battlefield."); c.setCopiedToken(true); } } };// ability2 StringBuilder sb = new StringBuilder(); - sb.append(c.getName()).append(" - ").append(player).append(" puts copy into play."); + sb.append(c.getName()).append(" - ").append(player).append(" puts copy onto the battlefield."); ability2.setStackDescription(sb.toString()); AllZone.Stack.add(ability2); @@ -6540,7 +6540,7 @@ public class GameActionUtil { if(goblins.size() > 0) { if(card.getController().equals(AllZone.HumanPlayer)) { - Object o = AllZone.Display.getChoiceOptional("Select a Goblin to put into play", + Object o = AllZone.Display.getChoiceOptional("Select a Goblin to put onto the battlefield", goblins.toArray()); if(o != null) { @@ -6559,7 +6559,7 @@ public class GameActionUtil { StringBuilder sb = new StringBuilder(); sb.append(c.getName()).append(" - ").append(c.getController()); - sb.append(" puts a goblin into play from his or her hand."); + sb.append(" puts a goblin onto the battlefield from his or her hand."); ability2.setStackDescription(sb.toString()); AllZone.Stack.add(ability2); @@ -6588,7 +6588,7 @@ public class GameActionUtil { if(goblins.size() > 0) { if(card.getController().equals(AllZone.HumanPlayer)) { - Object o = AllZone.Display.getChoiceOptional("Select a Goblin to put into play", + Object o = AllZone.Display.getChoiceOptional("Select a Goblin to put onto the battlefield", goblins.toArray()); if(o != null) { @@ -6607,7 +6607,7 @@ public class GameActionUtil { StringBuilder sb = new StringBuilder(); sb.append(c.getName()).append(" - ").append(c.getController()); - sb.append(" puts a goblin into play from his or her hand."); + sb.append(" puts a goblin onto the battlefield from his or her hand."); ability2.setStackDescription(sb.toString()); AllZone.Stack.add(ability2); @@ -8663,7 +8663,7 @@ public class GameActionUtil { if (player.isHuman()) { StringBuilder question = new StringBuilder(); question.append("Your top card is ").append(peek[0].getName()); - question.append(". Reveal card and put a 2/2 green Wolf creature token into play?"); + question.append(". Reveal card and put a 2/2 green Wolf creature token onto the battlefield?"); if (showYesNoDialog(k, question.toString())) { wantToken = true; } @@ -8780,7 +8780,7 @@ public class GameActionUtil { creatures = creatures.getType("Creature"); if(player.equals(AllZone.HumanPlayer)) { - Object o = AllZone.Display.getChoiceOptional("Pick a creature to put into play", + Object o = AllZone.Display.getChoiceOptional("Pick a creature to put onto the battlefield", creatures.toArray()); if(o != null) { Card card = (Card) o; @@ -8832,7 +8832,7 @@ public class GameActionUtil { creatures = creatures.getType("Creature"); if(player.equals(AllZone.HumanPlayer)) { - Object o = AllZone.Display.getChoiceOptional("Pick a creature to put into play", + Object o = AllZone.Display.getChoiceOptional("Pick a creature to put onto the battlefield", creatures.toArray()); if(o != null) { Card card = (Card) o; @@ -8918,7 +8918,7 @@ public class GameActionUtil { creatures = creatures.getType("Creature"); if(player.equals(AllZone.HumanPlayer)) { - Object o = AllZone.Display.getChoiceOptional("Pick a creature to put into play", + Object o = AllZone.Display.getChoiceOptional("Pick a creature to put onto the battlefield", creatures.toArray()); if(o != null) { Card card = (Card) o; @@ -9170,7 +9170,7 @@ public class GameActionUtil { // sacrifice Defense of the Heart AllZone.GameAction.sacrifice(card); - // search library for a creature, put it into play + // search library for a creature, put it onto the battlefield Card creature1 = getCreatureFromLibrary(); if(creature1 != null) { library.remove(creature1); @@ -9214,7 +9214,7 @@ public class GameActionUtil { StringBuilder sb = new StringBuilder(); sb.append("Defense of the Heart - ").append(player); sb.append(" sacrifices Defense of the Heart to search their library for up to two "); - sb.append("creature cards and put those creatures into play. Then shuffle's their library."); + sb.append("creature cards and put those creatures onto the battlefield. Then shuffle's their library."); ability.setStackDescription(sb.toString()); AllZone.Stack.add(ability); @@ -10237,7 +10237,7 @@ public class GameActionUtil { };// Ability StringBuilder sb = new StringBuilder(); - sb.append("Greener Pastures - ").append(mostLands).append(" puts a 1/1 green Saproling token into play."); + sb.append("Greener Pastures - ").append(mostLands).append(" puts a 1/1 green Saproling token onto the battlefield."); ability.setStackDescription(sb.toString()); AllZone.Stack.add(ability); @@ -10263,7 +10263,7 @@ public class GameActionUtil { };// Ability StringBuilder sb = new StringBuilder(); - sb.append("Bitterblossom - ").append(player).append(" loses 1 life and puts a 1/1 token into play."); + sb.append("Bitterblossom - ").append(player).append(" loses 1 life and puts a 1/1 token onto the battlefield."); ability.setStackDescription(sb.toString()); AllZone.Stack.add(ability); @@ -10519,7 +10519,7 @@ public class GameActionUtil { StringBuilder sb = new StringBuilder(); sb.append("Mycoloth - ").append(player); - sb.append(" puts a 1/1 green Saproling into play for each +1/+1 counter on Mycoloth."); + sb.append(" puts a 1/1 green Saproling onto the battlefield for each +1/+1 counter on Mycoloth."); ability.setStackDescription(sb.toString()); AllZone.Stack.add(ability); @@ -10544,7 +10544,7 @@ public class GameActionUtil { CardFactoryUtil.makeTokenSaproling(card.getController()); } };// Ability - ability.setStackDescription("Verdant Force - put a 1/1 green Saproling token into play."); + ability.setStackDescription("Verdant Force - put a 1/1 green Saproling token onto the battlefield."); AllZone.Stack.add(ability); }// for @@ -10677,7 +10677,7 @@ public class GameActionUtil { } };// Ability - ability.setStackDescription("Dragon Broodmother - put a 1/1 red and green Dragon token into play."); + ability.setStackDescription("Dragon Broodmother - put a 1/1 red and green Dragon token onto the battlefield."); AllZone.Stack.add(ability); }// for @@ -11320,7 +11320,7 @@ public class GameActionUtil { StringBuilder sb = new StringBuilder(); sb.append(list.get(i)).append(" - ").append(list.get(i).getController()); - sb.append(" puts a 1/1 colorless Spirit creature token into play for each Shrine he controls."); + sb.append(" puts a 1/1 colorless Spirit creature token onto the battlefield for each Shrine he controls."); ability.setStackDescription(sb.toString()); AllZone.Stack.add(ability); @@ -11483,7 +11483,7 @@ public class GameActionUtil { StringBuilder sb = new StringBuilder(); sb.append("Creakwood Liege - ").append(player); - sb.append(" puts a 1/1 Green Black Worm creature token into play."); + sb.append(" puts a 1/1 Green Black Worm creature token onto the battlefield."); ability.setStackDescription(sb.toString()); AllZone.Stack.add(ability); @@ -11513,7 +11513,7 @@ public class GameActionUtil { }; // ability - ability.setStackDescription("Mirror-Sigil Sergeant - put a token into play that's a copy of Mirror-Sigil Sergeant."); + ability.setStackDescription("Mirror-Sigil Sergeant - put a token onto the battlefield that's a copy of Mirror-Sigil Sergeant."); AllZone.Stack.add(ability); } // for } //upkeep_Mirror_Sigil_Sergeant @@ -12615,7 +12615,7 @@ public class GameActionUtil { // check if newList has anything that oldList doesn't have boolean newSnake(CardList oldList, CardList newList) { - // check if a Snake came into play under your control + // check if a Snake enters the battlefield under your control for(int i = 0; i < newList.size(); i++) if(!oldList.contains(newList.get(i))) return true; @@ -12750,7 +12750,7 @@ public class GameActionUtil { StringBuilder sb = new StringBuilder(); sb.append(hivemasterList.get(outer).getName()).append(" - ").append(hivemasterList.get(outer).getController()); - sb.append(" puts ").append(n[0]).append(" insect tokens into play."); + sb.append(" puts ").append(n[0]).append(" insect tokens onto the battlefield."); ability.setStackDescription(sb.toString()); if(n[0] != 0) {