From b4e2e742a14fa7083a37e080b61dc38b2379da59 Mon Sep 17 00:00:00 2001 From: Ada Joule Date: Mon, 26 Nov 2018 05:19:37 +0700 Subject: [PATCH] Rename ReturnCardAction to PutOntoBattlefieldAction fixes #1632 --- release/Magarena/scripts/Abduction.groovy | 2 +- release/Magarena/scripts/Aether_Vial.groovy | 2 +- release/Magarena/scripts/Aetherplasm.groovy | 2 +- release/Magarena/scripts/Call_of_the_Wild.groovy | 2 +- release/Magarena/scripts/Chaos_Warp.groovy | 2 +- release/Magarena/scripts/Coiling_Oracle.groovy | 2 +- release/Magarena/scripts/Conqueror_s_Galleon.groovy | 2 +- release/Magarena/scripts/Deathrender.groovy | 2 +- release/Magarena/scripts/Defy_Death.groovy | 2 +- release/Magarena/scripts/Druidic_Satchel.groovy | 2 +- release/Magarena/scripts/Dubious_Challenge.groovy | 4 ++-- release/Magarena/scripts/Elvish_Rejuvenator.groovy | 2 +- release/Magarena/scripts/Explorer_s_Scope.groovy | 2 +- release/Magarena/scripts/Fearsome_Awakening.groovy | 2 +- release/Magarena/scripts/Genesis_Wave.groovy | 2 +- release/Magarena/scripts/Helm_of_Obedience.groovy | 2 +- release/Magarena/scripts/Impromptu_Raid.groovy | 2 +- release/Magarena/scripts/Into_the_Wilds.groovy | 2 +- release/Magarena/scripts/Isareth_the_Awakener.groovy | 2 +- release/Magarena/scripts/Journey_to_Eternity.groovy | 4 ++-- release/Magarena/scripts/Long_Road_Home.groovy | 2 +- release/Magarena/scripts/Lurking_Predators.groovy | 2 +- release/Magarena/scripts/Madcap_Experiment.groovy | 2 +- release/Magarena/scripts/Miraculous_Recovery.groovy | 2 +- release/Magarena/scripts/Nahiri__the_Lithomancer.groovy | 2 +- release/Magarena/scripts/Nazahn__Revered_Bladesmith.groovy | 2 +- release/Magarena/scripts/Nezahal__Primal_Tide.groovy | 2 +- release/Magarena/scripts/Nissa__Nature_s_Artisan.groovy | 2 +- release/Magarena/scripts/Obzedat__Ghost_Council.groovy | 2 +- release/Magarena/scripts/Pattern_of_Rebirth.groovy | 2 +- release/Magarena/scripts/Siren_s_Ruse.groovy | 2 +- release/Magarena/scripts/Skyward_Eye_Prophets.groovy | 2 +- release/Magarena/scripts/Telemin_Performance.groovy | 2 +- release/Magarena/scripts/Thrasios__Triton_Hero.groovy | 2 +- release/Magarena/scripts/Traveling_Plague.groovy | 2 +- release/Magarena/scripts/World_Shaper.groovy | 2 +- release/Magarena/scripts/Zoologist.groovy | 2 +- ...{ReturnCardAction.java => PutOntoBattlefieldAction.java} | 6 +++--- src/magic/model/action/ReturnLinkedExileAction.java | 2 +- src/magic/model/event/MagicNinjutsuActivation.java | 4 ++-- src/magic/model/event/MagicPutOntoBattlefieldEvent.java | 4 ++-- src/magic/model/event/MagicRuleEventAction.java | 4 ++-- src/magic/model/event/MagicSearchOntoBattlefieldEvent.java | 6 +++--- 43 files changed, 52 insertions(+), 52 deletions(-) rename src/magic/model/action/{ReturnCardAction.java => PutOntoBattlefieldAction.java} (69%) diff --git a/release/Magarena/scripts/Abduction.groovy b/release/Magarena/scripts/Abduction.groovy index a1e37add9a..66356fb662 100644 --- a/release/Magarena/scripts/Abduction.groovy +++ b/release/Magarena/scripts/Abduction.groovy @@ -15,7 +15,7 @@ @Override public void executeEvent(final MagicGame game, final MagicEvent event) { final MagicCard died = event.getRefCard(); - game.doAction(new ReturnCardAction( + game.doAction(new PutOntoBattlefieldAction( MagicLocationType.Graveyard, died, died.getOwner() diff --git a/release/Magarena/scripts/Aether_Vial.groovy b/release/Magarena/scripts/Aether_Vial.groovy index 09c08cf9bc..3d71ecef2d 100644 --- a/release/Magarena/scripts/Aether_Vial.groovy +++ b/release/Magarena/scripts/Aether_Vial.groovy @@ -33,7 +33,7 @@ @Override public void executeEvent(final MagicGame game, final MagicEvent event) { event.processTargetCard(game, { - game.doAction(new ReturnCardAction(MagicLocationType.OwnersHand,it,event.getPlayer())); + game.doAction(new PutOntoBattlefieldAction(MagicLocationType.OwnersHand,it,event.getPlayer())); }); } } diff --git a/release/Magarena/scripts/Aetherplasm.groovy b/release/Magarena/scripts/Aetherplasm.groovy index 872df95856..94bcb7f847 100644 --- a/release/Magarena/scripts/Aetherplasm.groovy +++ b/release/Magarena/scripts/Aetherplasm.groovy @@ -11,7 +11,7 @@ def action = { final MagicGame game, final MagicEvent event -> if (event.isYes()) { event.processTargetCard(game, { - game.doAction(new ReturnCardAction( + game.doAction(new PutOntoBattlefieldAction( MagicLocationType.OwnersHand, it, event.getPlayer(), diff --git a/release/Magarena/scripts/Call_of_the_Wild.groovy b/release/Magarena/scripts/Call_of_the_Wild.groovy index f3e90ee478..f4f5220262 100644 --- a/release/Magarena/scripts/Call_of_the_Wild.groovy +++ b/release/Magarena/scripts/Call_of_the_Wild.groovy @@ -25,7 +25,7 @@ for (final MagicCard card : cards) { game.doAction(new RevealAction(card)); if (card.hasType(MagicType.Creature)) { - game.doAction(new ReturnCardAction(MagicLocationType.OwnersLibrary, card, player)); + game.doAction(new PutOntoBattlefieldAction(MagicLocationType.OwnersLibrary, card, player)); } else { game.doAction(new ShiftCardAction(card, MagicLocationType.OwnersLibrary, MagicLocationType.Graveyard)); game.logAppendMessage(player, "${player.getName()} puts ${card.getName()} into the graveyard.") diff --git a/release/Magarena/scripts/Chaos_Warp.groovy b/release/Magarena/scripts/Chaos_Warp.groovy index 161575109e..09f49dcc84 100644 --- a/release/Magarena/scripts/Chaos_Warp.groovy +++ b/release/Magarena/scripts/Chaos_Warp.groovy @@ -19,7 +19,7 @@ final MagicCard topCard = it.getOwner().getLibrary().getCardAtTop(); game.doAction(new RevealAction(topCard)); if (topCard.isPermanentCard()) { - game.doAction(new ReturnCardAction(MagicLocationType.OwnersLibrary, topCard, it.getOwner())); + game.doAction(new PutOntoBattlefieldAction(MagicLocationType.OwnersLibrary, topCard, it.getOwner())); } }); } diff --git a/release/Magarena/scripts/Coiling_Oracle.groovy b/release/Magarena/scripts/Coiling_Oracle.groovy index 0c0c54ef11..d3377ebc82 100644 --- a/release/Magarena/scripts/Coiling_Oracle.groovy +++ b/release/Magarena/scripts/Coiling_Oracle.groovy @@ -14,7 +14,7 @@ for (final MagicCard card : event.getPlayer().getLibrary().getCardsFromTop(1)) { game.doAction(new RevealAction(card)); if (card.hasType(MagicType.Land)) { - game.doAction(new ReturnCardAction( + game.doAction(new PutOntoBattlefieldAction( MagicLocationType.OwnersLibrary, card, event.getPlayer() diff --git a/release/Magarena/scripts/Conqueror_s_Galleon.groovy b/release/Magarena/scripts/Conqueror_s_Galleon.groovy index ef350f30cb..efd20a1a66 100644 --- a/release/Magarena/scripts/Conqueror_s_Galleon.groovy +++ b/release/Magarena/scripts/Conqueror_s_Galleon.groovy @@ -11,7 +11,7 @@ def endOfCombatTrigger = new AtEndOfCombatTrigger() { public void executeEvent(final MagicGame game, final MagicEvent event) { final MagicPermanent sourcePermanent = event.getPermanent(); game.doAction(new RemoveFromPlayAction(sourcePermanent, MagicLocationType.Exile)); - game.doAction(new ReturnCardAction( + game.doAction(new PutOntoBattlefieldAction( MagicLocationType.Exile, sourcePermanent.getCard(), event.getPlayer(), diff --git a/release/Magarena/scripts/Deathrender.groovy b/release/Magarena/scripts/Deathrender.groovy index e35e7591e1..efcb43fce0 100644 --- a/release/Magarena/scripts/Deathrender.groovy +++ b/release/Magarena/scripts/Deathrender.groovy @@ -20,7 +20,7 @@ if (event.isYes()) { event.processTargetCard(game, { final MagicPermanent sn = event.getPermanent(); - game.doAction(new ReturnCardAction(MagicLocationType.OwnersHand,it,event.getPlayer(), { + game.doAction(new PutOntoBattlefieldAction(MagicLocationType.OwnersHand,it,event.getPlayer(), { final MagicPermanent perm -> final MagicGame G = perm.getGame(); G.doAction(new AttachAction(sn.map(G), perm)); diff --git a/release/Magarena/scripts/Defy_Death.groovy b/release/Magarena/scripts/Defy_Death.groovy index 4cadef7893..df64ac33e8 100644 --- a/release/Magarena/scripts/Defy_Death.groovy +++ b/release/Magarena/scripts/Defy_Death.groovy @@ -15,7 +15,7 @@ @Override public void executeEvent(final MagicGame game, final MagicEvent event) { event.processTargetCard(game, { - game.doAction(new ReturnCardAction(MagicLocationType.Graveyard,it,event.getPlayer(), { + game.doAction(new PutOntoBattlefieldAction(MagicLocationType.Graveyard,it,event.getPlayer(), { final MagicPermanent perm -> final MagicGame G = perm.getGame(); if (perm.hasSubType(MagicSubType.Angel)) { diff --git a/release/Magarena/scripts/Druidic_Satchel.groovy b/release/Magarena/scripts/Druidic_Satchel.groovy index e44f68710d..3d594f755c 100644 --- a/release/Magarena/scripts/Druidic_Satchel.groovy +++ b/release/Magarena/scripts/Druidic_Satchel.groovy @@ -32,7 +32,7 @@ game.doAction(new PlayTokensAction(event.getPlayer(), CardDefinitions.getToken("1/1 green Saproling creature token"), 1)); } if (card.hasType(MagicType.Land)) { - game.doAction(new ReturnCardAction(MagicLocationType.OwnersLibrary, card, event.getPlayer())); + game.doAction(new PutOntoBattlefieldAction(MagicLocationType.OwnersLibrary, card, event.getPlayer())); } if (!card.hasType(MagicType.Creature) && !card.hasType(MagicType.Land)) { game.doAction(new ChangeLifeAction(event.getPlayer(), 2)); diff --git a/release/Magarena/scripts/Dubious_Challenge.groovy b/release/Magarena/scripts/Dubious_Challenge.groovy index 7eeca60f88..665253387a 100644 --- a/release/Magarena/scripts/Dubious_Challenge.groovy +++ b/release/Magarena/scripts/Dubious_Challenge.groovy @@ -5,10 +5,10 @@ def putOntoBattlefieldAction = { final MagicCardList rest = new MagicCardList(event.getRefCardList()); event.processChosenCards(game, { rest.remove(it); - game.doAction(new ReturnCardAction(MagicLocationType.Exile, it, opponent)); + game.doAction(new PutOntoBattlefieldAction(MagicLocationType.Exile, it, opponent)); }); rest.each { - game.doAction(new ReturnCardAction(MagicLocationType.Exile, it, controller)); + game.doAction(new PutOntoBattlefieldAction(MagicLocationType.Exile, it, controller)); } } diff --git a/release/Magarena/scripts/Elvish_Rejuvenator.groovy b/release/Magarena/scripts/Elvish_Rejuvenator.groovy index d8c10b67ae..53e438dc5a 100644 --- a/release/Magarena/scripts/Elvish_Rejuvenator.groovy +++ b/release/Magarena/scripts/Elvish_Rejuvenator.groovy @@ -2,7 +2,7 @@ def action = { final MagicGame game, final MagicEvent event -> final MagicCardList topCards = new MagicCardList(event.getRefCardList()); event.processChosenCards(game, { - game.doAction(new ReturnCardAction( + game.doAction(new PutOntoBattlefieldAction( MagicLocationType.OwnersLibrary, it, event.getPlayer(), diff --git a/release/Magarena/scripts/Explorer_s_Scope.groovy b/release/Magarena/scripts/Explorer_s_Scope.groovy index 6fe8e9f36d..f124ecc06f 100644 --- a/release/Magarena/scripts/Explorer_s_Scope.groovy +++ b/release/Magarena/scripts/Explorer_s_Scope.groovy @@ -3,7 +3,7 @@ def action = { if (event.isYes()) { final MagicCard card = event.getRefCard(); final MagicPlayer player = event.getPlayer(); - game.doAction(new ReturnCardAction(MagicLocationType.OwnersLibrary, card, event.getPlayer(), MagicPlayMod.TAPPED)); + game.doAction(new PutOntoBattlefieldAction(MagicLocationType.OwnersLibrary, card, event.getPlayer(), MagicPlayMod.TAPPED)); game.logAppendMessage(player, "${player} puts (${card}) it onto the battlefield tapped.") } } diff --git a/release/Magarena/scripts/Fearsome_Awakening.groovy b/release/Magarena/scripts/Fearsome_Awakening.groovy index 9f967c908b..32fa5ba61f 100644 --- a/release/Magarena/scripts/Fearsome_Awakening.groovy +++ b/release/Magarena/scripts/Fearsome_Awakening.groovy @@ -15,7 +15,7 @@ @Override public void executeEvent(final MagicGame game, final MagicEvent event) { event.processTargetCard(game, { - game.doAction(new ReturnCardAction(MagicLocationType.Graveyard,it,event.getPlayer(), { + game.doAction(new PutOntoBattlefieldAction(MagicLocationType.Graveyard,it,event.getPlayer(), { final MagicPermanent perm -> final MagicGame G = perm.getGame(); if (perm.hasSubType(MagicSubType.Dragon)) { diff --git a/release/Magarena/scripts/Genesis_Wave.groovy b/release/Magarena/scripts/Genesis_Wave.groovy index 12d8756f18..28c6cdfbb2 100644 --- a/release/Magarena/scripts/Genesis_Wave.groovy +++ b/release/Magarena/scripts/Genesis_Wave.groovy @@ -2,7 +2,7 @@ def toBattlefield = { final MagicGame game, final MagicEvent event -> event.processChosenCards(game, { final MagicCard card -> - game.doAction(new ReturnCardAction( + game.doAction(new PutOntoBattlefieldAction( MagicLocationType.OwnersLibrary, card, event.getPlayer() diff --git a/release/Magarena/scripts/Helm_of_Obedience.groovy b/release/Magarena/scripts/Helm_of_Obedience.groovy index 41ad01a58e..9a6e277bca 100644 --- a/release/Magarena/scripts/Helm_of_Obedience.groovy +++ b/release/Magarena/scripts/Helm_of_Obedience.groovy @@ -44,7 +44,7 @@ if (it.getGraveyard().contains(card)) { creatureCards++; game.doAction(new SacrificeAction(event.getPermanent())); - game.doAction(new ReturnCardAction( + game.doAction(new PutOntoBattlefieldAction( MagicLocationType.Graveyard, card, event.getPlayer() diff --git a/release/Magarena/scripts/Impromptu_Raid.groovy b/release/Magarena/scripts/Impromptu_Raid.groovy index 6d6daecabd..d0ce506ff2 100644 --- a/release/Magarena/scripts/Impromptu_Raid.groovy +++ b/release/Magarena/scripts/Impromptu_Raid.groovy @@ -29,7 +29,7 @@ game.doAction(new ShiftCardAction(card, MagicLocationType.OwnersLibrary, MagicLocationType.Graveyard)); game.logAppendMessage(player, "${player.getName()} puts ${card.getName()} into the graveyard."); } else { - game.doAction(new ReturnCardAction( + game.doAction(new PutOntoBattlefieldAction( MagicLocationType.OwnersLibrary, card, player, diff --git a/release/Magarena/scripts/Into_the_Wilds.groovy b/release/Magarena/scripts/Into_the_Wilds.groovy index 06d29972d6..fe1ae3efb1 100644 --- a/release/Magarena/scripts/Into_the_Wilds.groovy +++ b/release/Magarena/scripts/Into_the_Wilds.groovy @@ -3,7 +3,7 @@ def action = { if (event.isYes()) { final MagicCard card = event.getRefCard(); final MagicPlayer player = event.getPlayer(); - game.doAction(new ReturnCardAction(MagicLocationType.OwnersLibrary, card, event.getPlayer())); + game.doAction(new PutOntoBattlefieldAction(MagicLocationType.OwnersLibrary, card, event.getPlayer())); game.logAppendMessage(player, "${player} puts (${card}) it onto the battlefield.") } } diff --git a/release/Magarena/scripts/Isareth_the_Awakener.groovy b/release/Magarena/scripts/Isareth_the_Awakener.groovy index 83f5ce41df..7b982f0bae 100644 --- a/release/Magarena/scripts/Isareth_the_Awakener.groovy +++ b/release/Magarena/scripts/Isareth_the_Awakener.groovy @@ -6,7 +6,7 @@ def action = { final MagicEvent manaCost = new MagicPayManaCostEvent(event.getSource(), "{${cost}}"); if (manaCost.isSatisfied()) { game.addEvent(manaCost); - game.doAction(new ReturnCardAction( + game.doAction(new PutOntoBattlefieldAction( MagicLocationType.Graveyard, card, event.getPlayer(), diff --git a/release/Magarena/scripts/Journey_to_Eternity.groovy b/release/Magarena/scripts/Journey_to_Eternity.groovy index 4b013031ee..1f1029d132 100644 --- a/release/Magarena/scripts/Journey_to_Eternity.groovy +++ b/release/Magarena/scripts/Journey_to_Eternity.groovy @@ -16,12 +16,12 @@ } @Override public void executeEvent(final MagicGame game, final MagicEvent event) { - game.doAction(new ReturnCardAction( + game.doAction(new PutOntoBattlefieldAction( MagicLocationType.Graveyard, event.getRefPermanent().getCard(), event.getPlayer() )); - game.doAction(new ReturnCardAction( + game.doAction(new PutOntoBattlefieldAction( MagicLocationType.Graveyard, event.getPermanent().getCard(), event.getPlayer(), diff --git a/release/Magarena/scripts/Long_Road_Home.groovy b/release/Magarena/scripts/Long_Road_Home.groovy index 315ac1d953..4dcb63b83a 100644 --- a/release/Magarena/scripts/Long_Road_Home.groovy +++ b/release/Magarena/scripts/Long_Road_Home.groovy @@ -17,7 +17,7 @@ def DelayedTrigger = { } @Override public void executeEvent(final MagicGame game, final MagicEvent event) { - game.doAction(new ReturnCardAction( + game.doAction(new PutOntoBattlefieldAction( MagicLocationType.Exile, event.getCard(), event.getPlayer(), diff --git a/release/Magarena/scripts/Lurking_Predators.groovy b/release/Magarena/scripts/Lurking_Predators.groovy index 4f1cd6ea7d..538ad98486 100644 --- a/release/Magarena/scripts/Lurking_Predators.groovy +++ b/release/Magarena/scripts/Lurking_Predators.groovy @@ -27,7 +27,7 @@ def action = { for (final MagicCard card : cards) { game.doAction(new RevealAction(card)); if (card.hasType(MagicType.Creature) == true) { - game.doAction(new ReturnCardAction(MagicLocationType.OwnersLibrary, card, event.getPlayer())); + game.doAction(new PutOntoBattlefieldAction(MagicLocationType.OwnersLibrary, card, event.getPlayer())); } else { game.addEvent(new MagicEvent( event.getSource(), diff --git a/release/Magarena/scripts/Madcap_Experiment.groovy b/release/Magarena/scripts/Madcap_Experiment.groovy index e9d9fb45bd..6148c1953b 100644 --- a/release/Magarena/scripts/Madcap_Experiment.groovy +++ b/release/Magarena/scripts/Madcap_Experiment.groovy @@ -23,7 +23,7 @@ game.doAction(new RevealAction(topCard)); amount++; if (predicate(topCard)) { - game.doAction(new ReturnCardAction(MagicLocationType.OwnersLibrary, topCard, player)); + game.doAction(new PutOntoBattlefieldAction(MagicLocationType.OwnersLibrary, topCard, player)); break; } else { revealed.add(topCard); diff --git a/release/Magarena/scripts/Miraculous_Recovery.groovy b/release/Magarena/scripts/Miraculous_Recovery.groovy index 5e28401489..f87b49bee7 100644 --- a/release/Magarena/scripts/Miraculous_Recovery.groovy +++ b/release/Magarena/scripts/Miraculous_Recovery.groovy @@ -14,7 +14,7 @@ @Override public void executeEvent(final MagicGame game, final MagicEvent event) { event.processTargetCard(game, { - game.doAction(new ReturnCardAction(MagicLocationType.Graveyard,it,event.getPlayer(),{ + game.doAction(new PutOntoBattlefieldAction(MagicLocationType.Graveyard,it,event.getPlayer(),{ final MagicPermanent perm -> final MagicGame G = perm.getGame(); G.doAction(new ChangeCountersAction(event.getPlayer().map(G), perm, MagicCounterType.PlusOne, 1)); diff --git a/release/Magarena/scripts/Nahiri__the_Lithomancer.groovy b/release/Magarena/scripts/Nahiri__the_Lithomancer.groovy index afb3abb823..36a31c6e7a 100644 --- a/release/Magarena/scripts/Nahiri__the_Lithomancer.groovy +++ b/release/Magarena/scripts/Nahiri__the_Lithomancer.groovy @@ -63,7 +63,7 @@ def AN_EQUIPMENT_YOU_CONTROL = new MagicTargetChoice("an Equipment you control") if (event.isYes()) { event.processTargetCard(game, { final MagicLocationType from = it.isInHand() ? MagicLocationType.OwnersHand : MagicLocationType.Graveyard; - game.doAction(new ReturnCardAction(from,it,event.getPlayer())); + game.doAction(new PutOntoBattlefieldAction(from,it,event.getPlayer())); }); } } diff --git a/release/Magarena/scripts/Nazahn__Revered_Bladesmith.groovy b/release/Magarena/scripts/Nazahn__Revered_Bladesmith.groovy index 9e7392a3f4..9915b45816 100644 --- a/release/Magarena/scripts/Nazahn__Revered_Bladesmith.groovy +++ b/release/Magarena/scripts/Nazahn__Revered_Bladesmith.groovy @@ -18,7 +18,7 @@ def choice = new MagicTargetChoice("an Equipment card from your library"); event.processTargetCard(game, { game.doAction(new RevealAction(it)); if (it.getName().equals("Hammer of Nazahn")) { - game.doAction(new ReturnCardAction(MagicLocationType.OwnersLibrary,it,event.getPlayer())); + game.doAction(new PutOntoBattlefieldAction(MagicLocationType.OwnersLibrary,it,event.getPlayer())); } else { game.doAction(new ShiftCardAction(it, MagicLocationType.OwnersLibrary, MagicLocationType.OwnersHand)); } diff --git a/release/Magarena/scripts/Nezahal__Primal_Tide.groovy b/release/Magarena/scripts/Nezahal__Primal_Tide.groovy index a986d7f423..d9cad760b2 100644 --- a/release/Magarena/scripts/Nezahal__Primal_Tide.groovy +++ b/release/Magarena/scripts/Nezahal__Primal_Tide.groovy @@ -18,7 +18,7 @@ def trigger = { } @Override public void executeEvent(final MagicGame game, final MagicEvent event) { - game.doAction(new ReturnCardAction( + game.doAction(new PutOntoBattlefieldAction( MagicLocationType.Exile, event.getCard(), event.getPlayer(), diff --git a/release/Magarena/scripts/Nissa__Nature_s_Artisan.groovy b/release/Magarena/scripts/Nissa__Nature_s_Artisan.groovy index 5bd5243fb3..ddb24727a6 100644 --- a/release/Magarena/scripts/Nissa__Nature_s_Artisan.groovy +++ b/release/Magarena/scripts/Nissa__Nature_s_Artisan.groovy @@ -17,7 +17,7 @@ game.doAction(new RevealAction(cards)); for (final MagicCard card : cards) { if (card.hasType(MagicType.Land)) { - game.doAction(new ReturnCardAction(MagicLocationType.OwnersLibrary, card, player)); + game.doAction(new PutOntoBattlefieldAction(MagicLocationType.OwnersLibrary, card, player)); } else { game.doAction(new ShiftCardAction(card, MagicLocationType.OwnersLibrary, MagicLocationType.OwnersHand)); } diff --git a/release/Magarena/scripts/Obzedat__Ghost_Council.groovy b/release/Magarena/scripts/Obzedat__Ghost_Council.groovy index 939d2bf878..53d8274fa8 100644 --- a/release/Magarena/scripts/Obzedat__Ghost_Council.groovy +++ b/release/Magarena/scripts/Obzedat__Ghost_Council.groovy @@ -21,7 +21,7 @@ def DelayedTrigger = { } @Override public void executeEvent(final MagicGame game, final MagicEvent event) { - game.doAction(new ReturnCardAction( + game.doAction(new PutOntoBattlefieldAction( MagicLocationType.Exile, event.getCard(), event.getPlayer(), diff --git a/release/Magarena/scripts/Pattern_of_Rebirth.groovy b/release/Magarena/scripts/Pattern_of_Rebirth.groovy index b1de8e0e17..0027b2b601 100644 --- a/release/Magarena/scripts/Pattern_of_Rebirth.groovy +++ b/release/Magarena/scripts/Pattern_of_Rebirth.groovy @@ -18,7 +18,7 @@ public void executeEvent(final MagicGame game, final MagicEvent event) { if (event.isYes()) { event.processTargetCard(game,{ - game.doAction(new ReturnCardAction(MagicLocationType.OwnersLibrary, it, event.getPlayer())); + game.doAction(new PutOntoBattlefieldAction(MagicLocationType.OwnersLibrary, it, event.getPlayer())); game.doAction(new ShuffleLibraryAction(event.getPlayer())); }); } diff --git a/release/Magarena/scripts/Siren_s_Ruse.groovy b/release/Magarena/scripts/Siren_s_Ruse.groovy index f3540a4522..800d7de870 100644 --- a/release/Magarena/scripts/Siren_s_Ruse.groovy +++ b/release/Magarena/scripts/Siren_s_Ruse.groovy @@ -14,7 +14,7 @@ public void executeEvent(final MagicGame game, final MagicEvent event) { event.processTargetPermanent(game, { game.doAction(new RemoveFromPlayAction(it, MagicLocationType.Exile)); - game.doAction(new ReturnCardAction(MagicLocationType.Exile, it.getCard(), it.getOwner())); + game.doAction(new PutOntoBattlefieldAction(MagicLocationType.Exile, it.getCard(), it.getOwner())); if (it.hasSubType(MagicSubType.Pirate)) { game.doAction(new DrawAction(event.getPlayer())); } diff --git a/release/Magarena/scripts/Skyward_Eye_Prophets.groovy b/release/Magarena/scripts/Skyward_Eye_Prophets.groovy index bbf6ece9ca..7536d02d7b 100644 --- a/release/Magarena/scripts/Skyward_Eye_Prophets.groovy +++ b/release/Magarena/scripts/Skyward_Eye_Prophets.groovy @@ -25,7 +25,7 @@ for (final MagicCard card : cards) { game.doAction(new RevealAction(card)); if (card.hasType(MagicType.Land)) { - game.doAction(new ReturnCardAction(MagicLocationType.OwnersLibrary, card, player)); + game.doAction(new PutOntoBattlefieldAction(MagicLocationType.OwnersLibrary, card, player)); } else { game.doAction(new ShiftCardAction(card, MagicLocationType.OwnersLibrary, MagicLocationType.OwnersHand)); } diff --git a/release/Magarena/scripts/Telemin_Performance.groovy b/release/Magarena/scripts/Telemin_Performance.groovy index ee7dc0ce93..fcd542bba1 100644 --- a/release/Magarena/scripts/Telemin_Performance.groovy +++ b/release/Magarena/scripts/Telemin_Performance.groovy @@ -23,7 +23,7 @@ game.doAction(new MillLibraryAction(it,1)); } else { creatureCards++; - game.doAction(new ReturnCardAction( + game.doAction(new PutOntoBattlefieldAction( MagicLocationType.OwnersLibrary, library.getCardAtTop(), event.getPlayer() diff --git a/release/Magarena/scripts/Thrasios__Triton_Hero.groovy b/release/Magarena/scripts/Thrasios__Triton_Hero.groovy index 3d8c8e9de7..93fab5e650 100644 --- a/release/Magarena/scripts/Thrasios__Triton_Hero.groovy +++ b/release/Magarena/scripts/Thrasios__Triton_Hero.groovy @@ -4,7 +4,7 @@ def action = { for (final MagicCard card : player.getLibrary().getCardsFromTop(1)) { game.doAction(new RevealAction(card)); if (card.hasType(MagicType.Land)) { - game.doAction(new ReturnCardAction(MagicLocationType.OwnersLibrary,card,event.getPlayer(),MagicPlayMod.TAPPED)); + game.doAction(new PutOntoBattlefieldAction(MagicLocationType.OwnersLibrary,card,event.getPlayer(),MagicPlayMod.TAPPED)); } else { game.doAction(new DrawAction(event.getPlayer())); } diff --git a/release/Magarena/scripts/Traveling_Plague.groovy b/release/Magarena/scripts/Traveling_Plague.groovy index 2897bcc026..d865970bf2 100644 --- a/release/Magarena/scripts/Traveling_Plague.groovy +++ b/release/Magarena/scripts/Traveling_Plague.groovy @@ -16,7 +16,7 @@ public void executeEvent(final MagicGame game, final MagicEvent event) { final MagicCard card = event.getPermanent().getCard(); if (card.isInGraveyard()) { - game.doAction(new ReturnCardAction( + game.doAction(new PutOntoBattlefieldAction( MagicLocationType.Graveyard, event.getPermanent().getCard(), event.getPlayer() diff --git a/release/Magarena/scripts/World_Shaper.groovy b/release/Magarena/scripts/World_Shaper.groovy index 0af90b1f39..e1cf520be6 100644 --- a/release/Magarena/scripts/World_Shaper.groovy +++ b/release/Magarena/scripts/World_Shaper.groovy @@ -11,7 +11,7 @@ @Override public void executeEvent(final MagicGame game, final MagicEvent event) { card(MagicType.Land).from(MagicTargetType.Graveyard).filter(event.getPlayer()) each { - game.doAction(new ReturnCardAction( + game.doAction(new PutOntoBattlefieldAction( MagicLocationType.Graveyard, it, event.getPlayer(), diff --git a/release/Magarena/scripts/Zoologist.groovy b/release/Magarena/scripts/Zoologist.groovy index 0aea52e720..bb2ec92c3a 100644 --- a/release/Magarena/scripts/Zoologist.groovy +++ b/release/Magarena/scripts/Zoologist.groovy @@ -25,7 +25,7 @@ for (final MagicCard card : event.getPlayer().getLibrary().getCardsFromTop(1)) { game.doAction(new RevealAction(card)); if (card.hasType(MagicType.Creature)) { - game.doAction(new ReturnCardAction( + game.doAction(new PutOntoBattlefieldAction( MagicLocationType.OwnersLibrary, card, event.getPlayer() diff --git a/src/magic/model/action/ReturnCardAction.java b/src/magic/model/action/PutOntoBattlefieldAction.java similarity index 69% rename from src/magic/model/action/ReturnCardAction.java rename to src/magic/model/action/PutOntoBattlefieldAction.java index 03e036ea8c..41716f7dca 100644 --- a/src/magic/model/action/ReturnCardAction.java +++ b/src/magic/model/action/PutOntoBattlefieldAction.java @@ -7,21 +7,21 @@ import magic.model.MagicGame; import magic.model.MagicLocationType; import magic.model.MagicPlayer; -public class ReturnCardAction extends MagicAction { +public class PutOntoBattlefieldAction extends MagicAction { private final MagicPlayer controller; private final MagicCard card; private final MagicLocationType from; private final List modifications; - public ReturnCardAction(final MagicLocationType aFrom, final MagicCard aCard, final MagicPlayer aController, final List aModifications) { + public PutOntoBattlefieldAction(final MagicLocationType aFrom, final MagicCard aCard, final MagicPlayer aController, final List aModifications) { card = aCard; controller = aController; from = aFrom; modifications = aModifications; } - public ReturnCardAction(final MagicLocationType aFrom, final MagicCard aCard, final MagicPlayer aController, final MagicPermanentAction... aModifications) { + public PutOntoBattlefieldAction(final MagicLocationType aFrom, final MagicCard aCard, final MagicPlayer aController, final MagicPermanentAction... aModifications) { this(aFrom, aCard, aController, Arrays.asList(aModifications)); } diff --git a/src/magic/model/action/ReturnLinkedExileAction.java b/src/magic/model/action/ReturnLinkedExileAction.java index 74416f3fe5..174b5e6f8f 100644 --- a/src/magic/model/action/ReturnLinkedExileAction.java +++ b/src/magic/model/action/ReturnLinkedExileAction.java @@ -45,7 +45,7 @@ public class ReturnLinkedExileAction extends MagicAction { for (final MagicCard card : cardList) { if (card.isInExile()) { if (location == MagicLocationType.Battlefield) { - game.doAction(new ReturnCardAction( + game.doAction(new PutOntoBattlefieldAction( MagicLocationType.Exile, card, controller.isValid() ? controller : card.getOwner(), diff --git a/src/magic/model/event/MagicNinjutsuActivation.java b/src/magic/model/event/MagicNinjutsuActivation.java index f041257b65..745ed9e467 100644 --- a/src/magic/model/event/MagicNinjutsuActivation.java +++ b/src/magic/model/event/MagicNinjutsuActivation.java @@ -6,7 +6,7 @@ import magic.model.MagicLocationType; import magic.model.MagicManaCost; import magic.model.MagicPayedCost; import magic.model.action.MagicPlayMod; -import magic.model.action.ReturnCardAction; +import magic.model.action.PutOntoBattlefieldAction; import magic.model.choice.MagicTargetChoice; import magic.model.condition.MagicCondition; @@ -52,7 +52,7 @@ public class MagicNinjutsuActivation extends MagicCardAbilityActivation { @Override public void executeEvent(final MagicGame game, final MagicEvent event) { - game.doAction(new ReturnCardAction( + game.doAction(new PutOntoBattlefieldAction( MagicLocationType.OwnersHand, event.getCard(), event.getPlayer(), diff --git a/src/magic/model/event/MagicPutOntoBattlefieldEvent.java b/src/magic/model/event/MagicPutOntoBattlefieldEvent.java index a09abc0251..01ca23553a 100644 --- a/src/magic/model/event/MagicPutOntoBattlefieldEvent.java +++ b/src/magic/model/event/MagicPutOntoBattlefieldEvent.java @@ -10,7 +10,7 @@ import magic.model.MagicPlayer; import magic.model.MagicSource; import magic.model.MagicTuple; import magic.model.action.MagicPermanentAction; -import magic.model.action.ReturnCardAction; +import magic.model.action.PutOntoBattlefieldAction; import magic.model.choice.MagicChoice; import magic.model.target.MagicGraveyardTargetPicker; @@ -45,7 +45,7 @@ public class MagicPutOntoBattlefieldEvent extends MagicEvent { event.getPlayer(), MagicMessage.format("Chosen (%s).", card) ); - game.doAction(new ReturnCardAction(MagicLocationType.OwnersHand,card,event.getPlayer(),tup.getMods())); + game.doAction(new PutOntoBattlefieldAction(MagicLocationType.OwnersHand,card,event.getPlayer(),tup.getMods())); }); } }; diff --git a/src/magic/model/event/MagicRuleEventAction.java b/src/magic/model/event/MagicRuleEventAction.java index d18b87299c..a6c0a8ece9 100644 --- a/src/magic/model/event/MagicRuleEventAction.java +++ b/src/magic/model/event/MagicRuleEventAction.java @@ -376,7 +376,7 @@ public enum MagicRuleEventAction { it, MagicLocationType.Exile )); - game.doAction(new ReturnCardAction( + game.doAction(new PutOntoBattlefieldAction( MagicLocationType.Exile, it.getCard(), event.getPlayer() @@ -402,7 +402,7 @@ public enum MagicRuleEventAction { it, MagicLocationType.Exile )); - game.doAction(new ReturnCardAction( + game.doAction(new PutOntoBattlefieldAction( MagicLocationType.Exile, it.getCard(), it.getOwner(), diff --git a/src/magic/model/event/MagicSearchOntoBattlefieldEvent.java b/src/magic/model/event/MagicSearchOntoBattlefieldEvent.java index 913fa41157..a09c85d595 100644 --- a/src/magic/model/event/MagicSearchOntoBattlefieldEvent.java +++ b/src/magic/model/event/MagicSearchOntoBattlefieldEvent.java @@ -10,7 +10,7 @@ import magic.model.MagicSource; import magic.model.MagicTuple; import magic.model.action.AIRevealAction; import magic.model.action.MagicPermanentAction; -import magic.model.action.ReturnCardAction; +import magic.model.action.PutOntoBattlefieldAction; import magic.model.action.ShuffleLibraryAction; import magic.model.choice.MagicCardChoiceResult; import magic.model.choice.MagicChoice; @@ -53,7 +53,7 @@ public class MagicSearchOntoBattlefieldEvent extends MagicEvent { MagicMessage.format("Found (%s).", card) ); game.doAction(new AIRevealAction(card)); - game.doAction(new ReturnCardAction(card.getLocation(),card,event.getPlayer(),tup.getMods())); + game.doAction(new PutOntoBattlefieldAction(card.getLocation(),card,event.getPlayer(),tup.getMods())); }); game.doAction(new ShuffleLibraryAction(event.getPlayer())); } else { @@ -63,7 +63,7 @@ public class MagicSearchOntoBattlefieldEvent extends MagicEvent { MagicMessage.format("Found (%s).", card) ); game.doAction(new AIRevealAction(card)); - game.doAction(new ReturnCardAction(card.getLocation(),card,event.getPlayer(),tup.getMods())); + game.doAction(new PutOntoBattlefieldAction(card.getLocation(),card,event.getPlayer(),tup.getMods())); }); game.doAction(new ShuffleLibraryAction(event.getPlayer())); }