From 247b61c0a8d35299e1a56e5902909cf36cc060fd Mon Sep 17 00:00:00 2001 From: melvin Date: Fri, 22 Nov 2013 09:41:43 +0800 Subject: [PATCH] upgraded to Groovy 2.2.0, removed explicit type coercion in scripts as 2.2.0 supports implicit closure coercion --- build.xml | 4 ++-- release/Magarena/scripts/AEther_Membrane.groovy | 2 +- release/Magarena/scripts/Ajani_s_Chosen.groovy | 2 +- release/Magarena/scripts/Arrogant_Bloodlord.groovy | 2 +- release/Magarena/scripts/Aurification.groovy | 2 +- release/Magarena/scripts/Aven_Mimeomancer.groovy | 2 +- release/Magarena/scripts/Battlegrace_Angel.groovy | 2 +- release/Magarena/scripts/Butcher_of_Malakir.groovy | 2 +- release/Magarena/scripts/Clone.groovy | 2 +- release/Magarena/scripts/Crown_of_Empires.groovy | 2 +- release/Magarena/scripts/Deadwood_Treefolk.groovy | 2 +- release/Magarena/scripts/Deathgazer.groovy | 2 +- release/Magarena/scripts/Diminish.groovy | 2 +- release/Magarena/scripts/Dungeon_Geists.groovy | 2 +- release/Magarena/scripts/Dwarven_Driller.groovy | 4 ++-- release/Magarena/scripts/Elvish_Branchbender.groovy | 2 +- release/Magarena/scripts/Enlightened_Tutor.groovy | 2 +- release/Magarena/scripts/Evil_Twin.groovy | 2 +- release/Magarena/scripts/Ferocity.groovy | 2 +- release/Magarena/scripts/Fettergeist.groovy | 2 +- release/Magarena/scripts/Frost_Titan.groovy | 2 +- release/Magarena/scripts/Fumiko_the_Lowblood.groovy | 2 +- release/Magarena/scripts/Grave_Exchange.groovy | 2 +- release/Magarena/scripts/Graveyard_Shovel.groovy | 4 ++-- release/Magarena/scripts/Guilty_Conscience.groovy | 2 +- release/Magarena/scripts/Hamlet_Captain.groovy | 2 +- release/Magarena/scripts/Idyllic_Tutor.groovy | 2 +- release/Magarena/scripts/Kamahl__Fist_of_Krosa.groovy | 2 +- release/Magarena/scripts/Karn__Silver_Golem.groovy | 2 +- release/Magarena/scripts/Karn_s_Touch.groovy | 2 +- release/Magarena/scripts/Lowland_Basilisk.groovy | 2 +- release/Magarena/scripts/Master_Thief.groovy | 2 +- release/Magarena/scripts/Memnarch.groovy | 2 +- release/Magarena/scripts/Minotaur_Explorer.groovy | 2 +- release/Magarena/scripts/Mugging.groovy | 2 +- release/Magarena/scripts/Mycoid_Shepherd.groovy | 2 +- release/Magarena/scripts/Mystical_Tutor.groovy | 2 +- release/Magarena/scripts/Nameless_Inversion.groovy | 2 +- release/Magarena/scripts/Olivia_Voldaren.groovy | 2 +- release/Magarena/scripts/Omnibian.groovy | 2 +- release/Magarena/scripts/Oona__Queen_of_the_Fae.groovy | 2 +- release/Magarena/scripts/Orim_s_Thunder.groovy | 4 ++-- release/Magarena/scripts/Parallax_Nexus.groovy | 4 ++-- release/Magarena/scripts/Personal_Tutor.groovy | 2 +- release/Magarena/scripts/Pestermite.groovy | 2 +- release/Magarena/scripts/Phantasmal_Image.groovy | 2 +- release/Magarena/scripts/Powerstone_Minefield.groovy | 2 +- release/Magarena/scripts/Primeval_Titan.groovy | 2 +- release/Magarena/scripts/Progenitor_Mimic.groovy | 2 +- release/Magarena/scripts/Pulmonic_Sliver.groovy | 2 +- release/Magarena/scripts/Rafiq_of_the_Many.groovy | 2 +- release/Magarena/scripts/Relic_of_Progenitus.groovy | 4 ++-- release/Magarena/scripts/Rise_from_the_Grave.groovy | 2 +- release/Magarena/scripts/Rock_Basilisk.groovy | 2 +- release/Magarena/scripts/Roil_Elemental.groovy | 2 +- release/Magarena/scripts/Seance.groovy | 2 +- release/Magarena/scripts/Shrine_of_Burning_Rage.groovy | 2 +- release/Magarena/scripts/Skarrg_Guildmage.groovy | 2 +- release/Magarena/scripts/Skullcrack.groovy | 2 +- release/Magarena/scripts/Sliver_Overlord.groovy | 2 +- release/Magarena/scripts/Sludge_Strider.groovy | 2 +- release/Magarena/scripts/Sosuke__Son_of_Seshiro.groovy | 2 +- release/Magarena/scripts/Spark_Jolt.groovy | 2 +- release/Magarena/scripts/Stitcher_s_Apprentice.groovy | 2 +- release/Magarena/scripts/Stream_of_Life.groovy | 2 +- release/Magarena/scripts/Subterranean_Shambler.groovy | 2 +- release/Magarena/scripts/Sydri__Galvanic_Genius.groovy | 2 +- release/Magarena/scripts/Sylvan_Tutor.groovy | 2 +- release/Magarena/scripts/Szadek__Lord_of_Secrets.groovy | 2 +- release/Magarena/scripts/Talruum_Champion.groovy | 2 +- release/Magarena/scripts/Tangle_Asp.groovy | 2 +- release/Magarena/scripts/Tariel__Reckoner_of_Souls.groovy | 2 +- release/Magarena/scripts/Tribute_to_Hunger.groovy | 4 ++-- release/Magarena/scripts/Turn_to_Frog.groovy | 2 +- release/Magarena/scripts/Vampiric_Tutor.groovy | 2 +- release/Magarena/scripts/Venom.groovy | 2 +- release/Magarena/scripts/Veteran_s_Armaments.groovy | 2 +- release/Magarena/scripts/Vigor.groovy | 2 +- release/Magarena/scripts/Voice_of_Resurgence.groovy | 2 +- release/Magarena/scripts/Warren_Weirding.groovy | 4 ++-- release/Magarena/scripts/Wings_of_Velis_Vel.groovy | 2 +- release/Magarena/scripts/Witherscale_Wurm.groovy | 2 +- 82 files changed, 90 insertions(+), 90 deletions(-) diff --git a/build.xml b/build.xml index 0a8e2f29ca..cf9cd7b2ed 100644 --- a/build.xml +++ b/build.xml @@ -7,7 +7,7 @@ - + @@ -22,7 +22,7 @@ - diff --git a/release/Magarena/scripts/AEther_Membrane.groovy b/release/Magarena/scripts/AEther_Membrane.groovy index 9e0c2d7d5f..e742089dd9 100644 --- a/release/Magarena/scripts/AEther_Membrane.groovy +++ b/release/Magarena/scripts/AEther_Membrane.groovy @@ -20,7 +20,7 @@ permanent, MagicAtEndOfCombatTrigger.Return )) - } as MagicPermanentAction); + }); } } ] diff --git a/release/Magarena/scripts/Ajani_s_Chosen.groovy b/release/Magarena/scripts/Ajani_s_Chosen.groovy index feee8ed80a..c44fd08484 100644 --- a/release/Magarena/scripts/Ajani_s_Chosen.groovy +++ b/release/Magarena/scripts/Ajani_s_Chosen.groovy @@ -33,7 +33,7 @@ E.getRefPermanent() )); } - } as MagicEventAction, + }, "You may\$ attach SN to RN." )); } diff --git a/release/Magarena/scripts/Arrogant_Bloodlord.groovy b/release/Magarena/scripts/Arrogant_Bloodlord.groovy index 006dca51de..cc8452fc35 100644 --- a/release/Magarena/scripts/Arrogant_Bloodlord.groovy +++ b/release/Magarena/scripts/Arrogant_Bloodlord.groovy @@ -19,7 +19,7 @@ permanent, MagicAtEndOfCombatTrigger.Destroy )) - } as MagicPermanentAction); + }); } } ] diff --git a/release/Magarena/scripts/Aurification.groovy b/release/Magarena/scripts/Aurification.groovy index 4f888e4eac..07897101fd 100644 --- a/release/Magarena/scripts/Aurification.groovy +++ b/release/Magarena/scripts/Aurification.groovy @@ -53,7 +53,7 @@ def ST = new MagicStatic(MagicLayer.Type) { game.doAction(new MagicChangeCountersAction(creature,MagicCounterType.Gold,1,true)); game.doAction(new MagicAddStaticAction(creature, AB)); game.doAction(new MagicAddStaticAction(creature, ST)); - } as MagicPermanentAction); + }); } }, new MagicWhenLeavesPlayTrigger() { diff --git a/release/Magarena/scripts/Aven_Mimeomancer.groovy b/release/Magarena/scripts/Aven_Mimeomancer.groovy index 2277968e4c..c2709712f2 100644 --- a/release/Magarena/scripts/Aven_Mimeomancer.groovy +++ b/release/Magarena/scripts/Aven_Mimeomancer.groovy @@ -56,7 +56,7 @@ def AB = new MagicStatic(MagicLayer.Ability) { game.doAction(new MagicChangeCountersAction(creature,MagicCounterType.Feather,1,true)); game.doAction(new MagicAddStaticAction(creature, PT)); game.doAction(new MagicAddStaticAction(creature, AB)); - } as MagicPermanentAction); + }); } } } diff --git a/release/Magarena/scripts/Battlegrace_Angel.groovy b/release/Magarena/scripts/Battlegrace_Angel.groovy index 933f5857ea..b54843d384 100644 --- a/release/Magarena/scripts/Battlegrace_Angel.groovy +++ b/release/Magarena/scripts/Battlegrace_Angel.groovy @@ -20,7 +20,7 @@ permanent, MagicAbility.Lifelink )); - } as MagicPermanentAction); + }); } } ] diff --git a/release/Magarena/scripts/Butcher_of_Malakir.groovy b/release/Magarena/scripts/Butcher_of_Malakir.groovy index ce42d9e67d..12facaba2c 100644 --- a/release/Magarena/scripts/Butcher_of_Malakir.groovy +++ b/release/Magarena/scripts/Butcher_of_Malakir.groovy @@ -8,7 +8,7 @@ def action = { MagicTargetChoice.SACRIFICE_CREATURE )); } -} as MagicEventAction +} def event = { final MagicPermanent permanent -> diff --git a/release/Magarena/scripts/Clone.groovy b/release/Magarena/scripts/Clone.groovy index 07e2cf9fc5..c5cae8215e 100644 --- a/release/Magarena/scripts/Clone.groovy +++ b/release/Magarena/scripts/Clone.groovy @@ -20,7 +20,7 @@ event.getCardOnStack(), chosen )); - } as MagicPermanentAction); + }); } else { game.doAction(new MagicPlayCardFromStackAction( event.getCardOnStack() diff --git a/release/Magarena/scripts/Crown_of_Empires.groovy b/release/Magarena/scripts/Crown_of_Empires.groovy index 14266d97c6..0be6954b62 100644 --- a/release/Magarena/scripts/Crown_of_Empires.groovy +++ b/release/Magarena/scripts/Crown_of_Empires.groovy @@ -37,7 +37,7 @@ player, perm )); - } as MagicPermanentAction); + }); }else{ event.processTargetPermanent(game, new MagicPermanentAction() { public void doAction(final MagicPermanent creature) { diff --git a/release/Magarena/scripts/Deadwood_Treefolk.groovy b/release/Magarena/scripts/Deadwood_Treefolk.groovy index 0696cd894b..c1395bf83d 100644 --- a/release/Magarena/scripts/Deadwood_Treefolk.groovy +++ b/release/Magarena/scripts/Deadwood_Treefolk.groovy @@ -6,7 +6,7 @@ def action = { game.doAction(new MagicMoveCardAction(targetCard,MagicLocationType.Graveyard,MagicLocationType.OwnersHand)); } }); -} as MagicEventAction +} def event = { final MagicPermanent permanent -> diff --git a/release/Magarena/scripts/Deathgazer.groovy b/release/Magarena/scripts/Deathgazer.groovy index a2eaacfe9f..126c66c0f7 100644 --- a/release/Magarena/scripts/Deathgazer.groovy +++ b/release/Magarena/scripts/Deathgazer.groovy @@ -20,7 +20,7 @@ permanent, MagicAtEndOfCombatTrigger.Destroy )) - } as MagicPermanentAction); + }); } } ] diff --git a/release/Magarena/scripts/Diminish.groovy b/release/Magarena/scripts/Diminish.groovy index b9f88f56a0..25f0ffe8e7 100644 --- a/release/Magarena/scripts/Diminish.groovy +++ b/release/Magarena/scripts/Diminish.groovy @@ -22,7 +22,7 @@ def PT = new MagicStatic(MagicLayer.SetPT, MagicStatic.UntilEOT) { event.processTargetPermanent(game, { MagicPermanent creature -> game.doAction(new MagicBecomesCreatureAction(creature,PT)); - } as MagicPermanentAction); + }); } } ] diff --git a/release/Magarena/scripts/Dungeon_Geists.groovy b/release/Magarena/scripts/Dungeon_Geists.groovy index 09d3146fed..b001c31dfc 100644 --- a/release/Magarena/scripts/Dungeon_Geists.groovy +++ b/release/Magarena/scripts/Dungeon_Geists.groovy @@ -45,7 +45,7 @@ def control = { game.doAction(new MagicTapAction(perm, true)); final MagicTargetFilter filter = new MagicTargetFilter.MagicPermanentTargetFilter(perm); game.doAction(new MagicAddStaticAction(source, control(source.getController().getIndex(), filter))); - } as MagicPermanentAction); + }); } } ] diff --git a/release/Magarena/scripts/Dwarven_Driller.groovy b/release/Magarena/scripts/Dwarven_Driller.groovy index c919b12675..4a9d8075c4 100644 --- a/release/Magarena/scripts/Dwarven_Driller.groovy +++ b/release/Magarena/scripts/Dwarven_Driller.groovy @@ -10,7 +10,7 @@ def action = { } else { game.doAction(new MagicDestroyAction(event.getRefPermanent())); } -} as MagicEventAction +} [ new MagicPermanentActivation( @@ -47,7 +47,7 @@ def action = { action, "PN may\$ have SN deal 2 damage to him or her." )); - } as MagicPermanentAction); + }); } } ] diff --git a/release/Magarena/scripts/Elvish_Branchbender.groovy b/release/Magarena/scripts/Elvish_Branchbender.groovy index 3ca57b6305..657f6a76f5 100644 --- a/release/Magarena/scripts/Elvish_Branchbender.groovy +++ b/release/Magarena/scripts/Elvish_Branchbender.groovy @@ -43,7 +43,7 @@ def ST = new MagicStatic(MagicLayer.Type, MagicStatic.UntilEOT) { } }; game.doAction(new MagicBecomesCreatureAction(land,PT,ST)); - } as MagicPermanentAction); + }); } } ] diff --git a/release/Magarena/scripts/Enlightened_Tutor.groovy b/release/Magarena/scripts/Enlightened_Tutor.groovy index cee736915f..3eb06bc670 100644 --- a/release/Magarena/scripts/Enlightened_Tutor.groovy +++ b/release/Magarena/scripts/Enlightened_Tutor.groovy @@ -24,7 +24,7 @@ def act = { } }); } -} as MagicEventAction +} def evt = { final MagicEvent event, final MagicChoice choice -> diff --git a/release/Magarena/scripts/Evil_Twin.groovy b/release/Magarena/scripts/Evil_Twin.groovy index edf4766680..921d416706 100644 --- a/release/Magarena/scripts/Evil_Twin.groovy +++ b/release/Magarena/scripts/Evil_Twin.groovy @@ -69,7 +69,7 @@ def GainAct = new MagicStatic(MagicLayer.Ability) { action.getPermanent(), GainAct )); - } as MagicPermanentAction); + }); } else { game.doAction(new MagicPlayCardFromStackAction( event.getCardOnStack() diff --git a/release/Magarena/scripts/Ferocity.groovy b/release/Magarena/scripts/Ferocity.groovy index 4586ffff77..e80fa6cf13 100644 --- a/release/Magarena/scripts/Ferocity.groovy +++ b/release/Magarena/scripts/Ferocity.groovy @@ -3,7 +3,7 @@ def action = { if (event.isYes()) { game.doAction(new MagicChangeCountersAction(event.getRefPermanent(),MagicCounterType.PlusOne,1,true)); } -} as MagicEventAction +} def event = { final MagicPermanent permanent, final MagicPermanent target -> diff --git a/release/Magarena/scripts/Fettergeist.groovy b/release/Magarena/scripts/Fettergeist.groovy index dc615b2888..0c82ed04e3 100644 --- a/release/Magarena/scripts/Fettergeist.groovy +++ b/release/Magarena/scripts/Fettergeist.groovy @@ -3,7 +3,7 @@ def action = { if (event.isNo()) { game.doAction(new MagicSacrificeAction(event.getPermanent())); } -} as MagicEventAction ; +} ; [ new MagicAtUpkeepTrigger() { diff --git a/release/Magarena/scripts/Frost_Titan.groovy b/release/Magarena/scripts/Frost_Titan.groovy index ca89d68417..99f0cb2e96 100644 --- a/release/Magarena/scripts/Frost_Titan.groovy +++ b/release/Magarena/scripts/Frost_Titan.groovy @@ -6,7 +6,7 @@ def action = { game.doAction(MagicChangeStateAction.Set(perm,MagicPermanentState.DoesNotUntapDuringNext)); } }); -} as MagicEventAction +} def event = { final MagicPermanent permanent -> diff --git a/release/Magarena/scripts/Fumiko_the_Lowblood.groovy b/release/Magarena/scripts/Fumiko_the_Lowblood.groovy index fa99c3153a..8961b74ebf 100644 --- a/release/Magarena/scripts/Fumiko_the_Lowblood.groovy +++ b/release/Magarena/scripts/Fumiko_the_Lowblood.groovy @@ -2,7 +2,7 @@ def action = { final MagicGame game, final MagicEvent event -> final int amount = event.getPlayer().getOpponent().getNrOfAttackers() + event.getPlayer().getNrOfAttackers(); game.doAction(new MagicChangeTurnPTAction(event.getPermanent(),amount,amount)); -} as MagicEventAction +} def event = { final MagicPermanent permanent -> diff --git a/release/Magarena/scripts/Grave_Exchange.groovy b/release/Magarena/scripts/Grave_Exchange.groovy index df76e33972..84e2dfb391 100644 --- a/release/Magarena/scripts/Grave_Exchange.groovy +++ b/release/Magarena/scripts/Grave_Exchange.groovy @@ -9,7 +9,7 @@ def action = { )); } }); -} as MagicEventAction +} [ new MagicSpellCardEvent() { diff --git a/release/Magarena/scripts/Graveyard_Shovel.groovy b/release/Magarena/scripts/Graveyard_Shovel.groovy index 5196f6df7c..926d8acb7f 100644 --- a/release/Magarena/scripts/Graveyard_Shovel.groovy +++ b/release/Magarena/scripts/Graveyard_Shovel.groovy @@ -9,7 +9,7 @@ def action = { } } }); -} as MagicEventAction +} [ new MagicPermanentActivation( @@ -46,7 +46,7 @@ def action = { "PN exiles a card\$ from his or her graveyard." )); } - } as MagicPlayerAction); + }); } } ] diff --git a/release/Magarena/scripts/Guilty_Conscience.groovy b/release/Magarena/scripts/Guilty_Conscience.groovy index d32691adf4..953acef869 100644 --- a/release/Magarena/scripts/Guilty_Conscience.groovy +++ b/release/Magarena/scripts/Guilty_Conscience.groovy @@ -17,7 +17,7 @@ amount ) )); - } as MagicEventAction, + }, "SN deals ${amount} damage to RN." ): MagicEvent.NONE; diff --git a/release/Magarena/scripts/Hamlet_Captain.groovy b/release/Magarena/scripts/Hamlet_Captain.groovy index 0aa9de8a88..2c7109a6c6 100644 --- a/release/Magarena/scripts/Hamlet_Captain.groovy +++ b/release/Magarena/scripts/Hamlet_Captain.groovy @@ -7,7 +7,7 @@ def Action = { game.doAction(new MagicChangeTurnPTAction(creature,1,1)); } } -} as MagicEventAction +} def Event = { final MagicPermanent permanent -> diff --git a/release/Magarena/scripts/Idyllic_Tutor.groovy b/release/Magarena/scripts/Idyllic_Tutor.groovy index f24eef4acb..a4bf4217ff 100644 --- a/release/Magarena/scripts/Idyllic_Tutor.groovy +++ b/release/Magarena/scripts/Idyllic_Tutor.groovy @@ -24,7 +24,7 @@ def act = { } }); } -} as MagicEventAction +} def evt = { final MagicEvent event, final MagicChoice choice -> diff --git a/release/Magarena/scripts/Kamahl__Fist_of_Krosa.groovy b/release/Magarena/scripts/Kamahl__Fist_of_Krosa.groovy index 10979aaffd..9aeaf68b77 100644 --- a/release/Magarena/scripts/Kamahl__Fist_of_Krosa.groovy +++ b/release/Magarena/scripts/Kamahl__Fist_of_Krosa.groovy @@ -36,7 +36,7 @@ def ST = new MagicStatic(MagicLayer.Type, MagicStatic.UntilEOT) { event.processTargetPermanent(game, { final MagicPermanent land -> game.doAction(new MagicBecomesCreatureAction(land,PT,ST)); - } as MagicPermanentAction); + }); } }, new MagicPermanentActivation( diff --git a/release/Magarena/scripts/Karn__Silver_Golem.groovy b/release/Magarena/scripts/Karn__Silver_Golem.groovy index 5841a08588..7ec7d55c3b 100644 --- a/release/Magarena/scripts/Karn__Silver_Golem.groovy +++ b/release/Magarena/scripts/Karn__Silver_Golem.groovy @@ -50,7 +50,7 @@ def TP = new MagicTargetPicker() { event.processTargetPermanent(game, { final MagicPermanent creature -> game.doAction(new MagicBecomesCreatureAction(creature,PT,ST)); - } as MagicPermanentAction); + }); } } ] diff --git a/release/Magarena/scripts/Karn_s_Touch.groovy b/release/Magarena/scripts/Karn_s_Touch.groovy index e6c2f4b641..04f6b91abe 100644 --- a/release/Magarena/scripts/Karn_s_Touch.groovy +++ b/release/Magarena/scripts/Karn_s_Touch.groovy @@ -41,7 +41,7 @@ def TP = new MagicTargetPicker() { event.processTargetPermanent(game, { final MagicPermanent creature -> game.doAction(new MagicBecomesCreatureAction(creature,PT,ST)); - } as MagicPermanentAction); + }); } } ] diff --git a/release/Magarena/scripts/Lowland_Basilisk.groovy b/release/Magarena/scripts/Lowland_Basilisk.groovy index c31228893f..271a10e018 100644 --- a/release/Magarena/scripts/Lowland_Basilisk.groovy +++ b/release/Magarena/scripts/Lowland_Basilisk.groovy @@ -20,7 +20,7 @@ permanent, MagicAtEndOfCombatTrigger.Destroy )) - } as MagicPermanentAction); + }); } } ] diff --git a/release/Magarena/scripts/Master_Thief.groovy b/release/Magarena/scripts/Master_Thief.groovy index 08f0938abd..1da657d64f 100644 --- a/release/Magarena/scripts/Master_Thief.groovy +++ b/release/Magarena/scripts/Master_Thief.groovy @@ -25,7 +25,7 @@ perm ) )); - } as MagicPermanentAction); + }); } } ] diff --git a/release/Magarena/scripts/Memnarch.groovy b/release/Magarena/scripts/Memnarch.groovy index 7505324e21..9f0b2d9e3f 100644 --- a/release/Magarena/scripts/Memnarch.groovy +++ b/release/Magarena/scripts/Memnarch.groovy @@ -62,7 +62,7 @@ event.getPlayer(), perm )); - } as MagicPermanentAction); + }); } } ] diff --git a/release/Magarena/scripts/Minotaur_Explorer.groovy b/release/Magarena/scripts/Minotaur_Explorer.groovy index ea67604d0d..29ddc8532f 100644 --- a/release/Magarena/scripts/Minotaur_Explorer.groovy +++ b/release/Magarena/scripts/Minotaur_Explorer.groovy @@ -16,7 +16,7 @@ { final MagicGame G, final MagicEvent E -> G.doAction(new MagicSacrificeAction(E.getPermanent())); - } as MagicEventAction, + }, "Sacrifice SN." ); } diff --git a/release/Magarena/scripts/Mugging.groovy b/release/Magarena/scripts/Mugging.groovy index 1dae45643f..4404559438 100644 --- a/release/Magarena/scripts/Mugging.groovy +++ b/release/Magarena/scripts/Mugging.groovy @@ -19,7 +19,7 @@ new MagicDamage(event.getSource(),target,2) )); game.doAction(new MagicGainAbilityAction(target, MagicAbility.CannotBlock)); - } as MagicPermanentAction); + }); } } ] diff --git a/release/Magarena/scripts/Mycoid_Shepherd.groovy b/release/Magarena/scripts/Mycoid_Shepherd.groovy index 0d2168a6f7..29373c251d 100644 --- a/release/Magarena/scripts/Mycoid_Shepherd.groovy +++ b/release/Magarena/scripts/Mycoid_Shepherd.groovy @@ -3,7 +3,7 @@ def action = { if (event.isYes()) { game.doAction(new MagicChangeLifeAction(event.getPlayer(),5)); } -} as MagicEventAction +} def event = { final MagicPermanent permanent -> diff --git a/release/Magarena/scripts/Mystical_Tutor.groovy b/release/Magarena/scripts/Mystical_Tutor.groovy index fb8ab0f988..5837fb11af 100644 --- a/release/Magarena/scripts/Mystical_Tutor.groovy +++ b/release/Magarena/scripts/Mystical_Tutor.groovy @@ -24,7 +24,7 @@ def act = { } }); } -} as MagicEventAction +} def evt = { final MagicEvent event, final MagicChoice choice -> diff --git a/release/Magarena/scripts/Nameless_Inversion.groovy b/release/Magarena/scripts/Nameless_Inversion.groovy index 4c052ba0c6..01eff69237 100644 --- a/release/Magarena/scripts/Nameless_Inversion.groovy +++ b/release/Magarena/scripts/Nameless_Inversion.groovy @@ -22,7 +22,7 @@ def TP = new MagicStatic(MagicLayer.Type, MagicStatic.UntilEOT) { MagicPermanent creature -> game.doAction(new MagicBecomesCreatureAction(creature,TP)); game.doAction(new MagicChangeTurnPTAction(creature,3,-3)); - } as MagicPermanentAction); + }); } } ] diff --git a/release/Magarena/scripts/Olivia_Voldaren.groovy b/release/Magarena/scripts/Olivia_Voldaren.groovy index 530588f831..f342ac43ea 100644 --- a/release/Magarena/scripts/Olivia_Voldaren.groovy +++ b/release/Magarena/scripts/Olivia_Voldaren.groovy @@ -87,7 +87,7 @@ perm ) )); - } as MagicPermanentAction); + }); } } ] diff --git a/release/Magarena/scripts/Omnibian.groovy b/release/Magarena/scripts/Omnibian.groovy index ff0cbb6b81..bb2e3f92c7 100644 --- a/release/Magarena/scripts/Omnibian.groovy +++ b/release/Magarena/scripts/Omnibian.groovy @@ -40,7 +40,7 @@ def ST = new MagicStatic(MagicLayer.Type, MagicStatic.UntilEOT) { event.processTargetPermanent(game, { final MagicPermanent creature -> game.doAction(new MagicBecomesCreatureAction(creature,PT,ST)); - } as MagicPermanentAction); + }); } } ] diff --git a/release/Magarena/scripts/Oona__Queen_of_the_Fae.groovy b/release/Magarena/scripts/Oona__Queen_of_the_Fae.groovy index e8f4ebc300..d473bf7e94 100644 --- a/release/Magarena/scripts/Oona__Queen_of_the_Fae.groovy +++ b/release/Magarena/scripts/Oona__Queen_of_the_Fae.groovy @@ -45,7 +45,7 @@ )); } } - } as MagicEventAction, + }, "Chosen color\$." )); } diff --git a/release/Magarena/scripts/Orim_s_Thunder.groovy b/release/Magarena/scripts/Orim_s_Thunder.groovy index 1b4621c87e..0f6c8c3a1a 100644 --- a/release/Magarena/scripts/Orim_s_Thunder.groovy +++ b/release/Magarena/scripts/Orim_s_Thunder.groovy @@ -6,7 +6,7 @@ def action = { game.doAction(new MagicDealDamageAction(damage)); } }); -} as MagicEventAction +} [ new MagicSpellCardEvent() { @@ -38,7 +38,7 @@ def action = { action, "SN deals RN damage to target creature\$." )); - } as MagicPermanentAction); + }); } } ] diff --git a/release/Magarena/scripts/Parallax_Nexus.groovy b/release/Magarena/scripts/Parallax_Nexus.groovy index 7c2df006ea..9b903cbdfb 100644 --- a/release/Magarena/scripts/Parallax_Nexus.groovy +++ b/release/Magarena/scripts/Parallax_Nexus.groovy @@ -9,7 +9,7 @@ def action = { )); } }); -} as MagicEventAction +} [ new MagicPermanentActivation( @@ -48,7 +48,7 @@ def action = { action, "PN exiles a card from his or her hand." )); - } as MagicPlayerAction); + }); } }, new MagicWhenLeavesPlayTrigger() { diff --git a/release/Magarena/scripts/Personal_Tutor.groovy b/release/Magarena/scripts/Personal_Tutor.groovy index 668cf4583b..5218467927 100644 --- a/release/Magarena/scripts/Personal_Tutor.groovy +++ b/release/Magarena/scripts/Personal_Tutor.groovy @@ -24,7 +24,7 @@ def act = { } }); } -} as MagicEventAction +} def evt = { final MagicEvent event, final MagicChoice choice -> diff --git a/release/Magarena/scripts/Pestermite.groovy b/release/Magarena/scripts/Pestermite.groovy index ac7eb6e4eb..6fee55aec1 100644 --- a/release/Magarena/scripts/Pestermite.groovy +++ b/release/Magarena/scripts/Pestermite.groovy @@ -29,7 +29,7 @@ G.doAction(new MagicTapAction(P, true)) } } - } as MagicEventAction, + }, "PN may\$ " + (perm.isTapped() ? "untap" : "tap") + " RN." )); } diff --git a/release/Magarena/scripts/Phantasmal_Image.groovy b/release/Magarena/scripts/Phantasmal_Image.groovy index b2ea336e36..6e363dd0f5 100644 --- a/release/Magarena/scripts/Phantasmal_Image.groovy +++ b/release/Magarena/scripts/Phantasmal_Image.groovy @@ -32,7 +32,7 @@ def ST = new MagicStatic(MagicLayer.Type) { final MagicPermanent perm = action.getPermanent(); game.doAction(new MagicAddStaticAction(perm, ST)); game.doAction(new MagicAddTriggerAction(perm, MagicWhenTargetedTrigger.SacWhenTargeted)); - } as MagicPermanentAction); + }); } else { game.doAction(new MagicPlayCardFromStackAction( event.getCardOnStack() diff --git a/release/Magarena/scripts/Powerstone_Minefield.groovy b/release/Magarena/scripts/Powerstone_Minefield.groovy index 70f9feb143..e01626f304 100644 --- a/release/Magarena/scripts/Powerstone_Minefield.groovy +++ b/release/Magarena/scripts/Powerstone_Minefield.groovy @@ -2,7 +2,7 @@ def Action = { final MagicGame game, final MagicEvent event -> final MagicDamage damage = new MagicDamage(event.getSource(),event.getRefPermanent(),2); game.doAction(new MagicDealDamageAction(damage)); -} as MagicEventAction +} def Event = { final MagicPermanent permanent, final MagicPermanent creature -> diff --git a/release/Magarena/scripts/Primeval_Titan.groovy b/release/Magarena/scripts/Primeval_Titan.groovy index a2ef1dc85d..c6d9876a39 100644 --- a/release/Magarena/scripts/Primeval_Titan.groovy +++ b/release/Magarena/scripts/Primeval_Titan.groovy @@ -10,7 +10,7 @@ def EventAction = { ); game.addEvent(search); game.addEvent(search); -} as MagicEventAction; +}; def Event = { final MagicPermanent permanent -> diff --git a/release/Magarena/scripts/Progenitor_Mimic.groovy b/release/Magarena/scripts/Progenitor_Mimic.groovy index 1e169ad7c7..4e73e43c3f 100644 --- a/release/Magarena/scripts/Progenitor_Mimic.groovy +++ b/release/Magarena/scripts/Progenitor_Mimic.groovy @@ -52,7 +52,7 @@ def GainTrig = new MagicStatic(MagicLayer.Ability) { game.doAction(action); final MagicPermanent perm = action.getPermanent(); game.doAction(new MagicAddStaticAction(perm, GainTrig)); - } as MagicPermanentAction); + }); } else { game.doAction(new MagicPlayCardFromStackAction( event.getCardOnStack() diff --git a/release/Magarena/scripts/Pulmonic_Sliver.groovy b/release/Magarena/scripts/Pulmonic_Sliver.groovy index cdd7aa7d3f..ee1d464eeb 100644 --- a/release/Magarena/scripts/Pulmonic_Sliver.groovy +++ b/release/Magarena/scripts/Pulmonic_Sliver.groovy @@ -17,7 +17,7 @@ def PulmonicTrigger = new MagicWouldBeMovedTrigger() { //needs to be delayed so it occurs after trigger is remove G.addDelayedAction(new MagicMoveCardAction(E.getRefCard(), act.fromLocation, MagicLocationType.Graveyard)); } - } as MagicEventAction, + }, "PN may\$ put SN on top of its owner's library." )); } diff --git a/release/Magarena/scripts/Rafiq_of_the_Many.groovy b/release/Magarena/scripts/Rafiq_of_the_Many.groovy index ab5fd91d30..d8348564ef 100644 --- a/release/Magarena/scripts/Rafiq_of_the_Many.groovy +++ b/release/Magarena/scripts/Rafiq_of_the_Many.groovy @@ -19,7 +19,7 @@ permanent, MagicAbility.DoubleStrike )); - } as MagicPermanentAction); + }); } } ] diff --git a/release/Magarena/scripts/Relic_of_Progenitus.groovy b/release/Magarena/scripts/Relic_of_Progenitus.groovy index bccf5be201..487df8c0c5 100644 --- a/release/Magarena/scripts/Relic_of_Progenitus.groovy +++ b/release/Magarena/scripts/Relic_of_Progenitus.groovy @@ -6,7 +6,7 @@ def action = { game.doAction(new MagicMoveCardAction(card,MagicLocationType.Graveyard,MagicLocationType.Exile)); } }); -} as MagicEventAction +} [ new MagicPermanentActivation( @@ -38,7 +38,7 @@ def action = { action, "PN exiles a card\$ from his or her graveyard." )); - } as MagicPlayerAction); + }); } }, new MagicPermanentActivation( diff --git a/release/Magarena/scripts/Rise_from_the_Grave.groovy b/release/Magarena/scripts/Rise_from_the_Grave.groovy index 29f9c84958..d1217455dd 100644 --- a/release/Magarena/scripts/Rise_from_the_Grave.groovy +++ b/release/Magarena/scripts/Rise_from_the_Grave.groovy @@ -21,7 +21,7 @@ event.getPlayer(), [MagicPlayMod.BLACK, MagicPlayMod.ZOMBIE] )); - } as MagicCardAction); + }); } } ] diff --git a/release/Magarena/scripts/Rock_Basilisk.groovy b/release/Magarena/scripts/Rock_Basilisk.groovy index 79db094989..b8a9890e29 100644 --- a/release/Magarena/scripts/Rock_Basilisk.groovy +++ b/release/Magarena/scripts/Rock_Basilisk.groovy @@ -20,7 +20,7 @@ permanent, MagicAtEndOfCombatTrigger.Destroy )) - } as MagicPermanentAction); + }); } } ] diff --git a/release/Magarena/scripts/Roil_Elemental.groovy b/release/Magarena/scripts/Roil_Elemental.groovy index caf5a3e9fb..dc40797e3b 100644 --- a/release/Magarena/scripts/Roil_Elemental.groovy +++ b/release/Magarena/scripts/Roil_Elemental.groovy @@ -24,7 +24,7 @@ perm ) )); - } as MagicPermanentAction); + }); } } } diff --git a/release/Magarena/scripts/Seance.groovy b/release/Magarena/scripts/Seance.groovy index dac14c5ec8..b50830bd0f 100644 --- a/release/Magarena/scripts/Seance.groovy +++ b/release/Magarena/scripts/Seance.groovy @@ -48,7 +48,7 @@ def Spirit = new MagicStatic(MagicLayer.Type) { final MagicPermanent permanent = action.getPermanent(); game.doAction(new MagicAddStaticAction(permanent, Spirit)); game.doAction(new MagicAddTriggerAction(permanent, MagicAtEndOfTurnTrigger.ExileAtEnd)); - } as MagicCardAction); + }); } } } diff --git a/release/Magarena/scripts/Shrine_of_Burning_Rage.groovy b/release/Magarena/scripts/Shrine_of_Burning_Rage.groovy index ede1ce288f..3729c1c960 100644 --- a/release/Magarena/scripts/Shrine_of_Burning_Rage.groovy +++ b/release/Magarena/scripts/Shrine_of_Burning_Rage.groovy @@ -6,7 +6,7 @@ def action = { 1, true )); -} as MagicEventAction +} def getEvent = { final MagicPermanent permanent -> diff --git a/release/Magarena/scripts/Skarrg_Guildmage.groovy b/release/Magarena/scripts/Skarrg_Guildmage.groovy index ffb3ae8736..633cd772a9 100644 --- a/release/Magarena/scripts/Skarrg_Guildmage.groovy +++ b/release/Magarena/scripts/Skarrg_Guildmage.groovy @@ -42,7 +42,7 @@ def SU = new MagicStatic(MagicLayer.Type, MagicStatic.UntilEOT) { event.processTargetPermanent(game, { final MagicPermanent land -> game.doAction(new MagicBecomesCreatureAction(land,PT,ST,SU)); - } as MagicPermanentAction); + }); } } ] diff --git a/release/Magarena/scripts/Skullcrack.groovy b/release/Magarena/scripts/Skullcrack.groovy index bf6304f072..49a8be02b2 100644 --- a/release/Magarena/scripts/Skullcrack.groovy +++ b/release/Magarena/scripts/Skullcrack.groovy @@ -37,7 +37,7 @@ def cantBePrevented = new MagicIfDamageWouldBeDealtTrigger() { final MagicDamage damage=new MagicDamage(event.getSource(),player,3); game.doAction(new MagicDealDamageAction(damage)); - } as MagicPlayerAction); + }); } } ] diff --git a/release/Magarena/scripts/Sliver_Overlord.groovy b/release/Magarena/scripts/Sliver_Overlord.groovy index abb6b867eb..6acad4e1ec 100644 --- a/release/Magarena/scripts/Sliver_Overlord.groovy +++ b/release/Magarena/scripts/Sliver_Overlord.groovy @@ -73,7 +73,7 @@ def A_SLIVER_CARD_FROM_LIBRARY = new MagicTargetChoice( event.getPlayer(), perm )); - } as MagicPermanentAction); + }); } } ] diff --git a/release/Magarena/scripts/Sludge_Strider.groovy b/release/Magarena/scripts/Sludge_Strider.groovy index e590263fd2..1b9c9f10f7 100644 --- a/release/Magarena/scripts/Sludge_Strider.groovy +++ b/release/Magarena/scripts/Sludge_Strider.groovy @@ -8,7 +8,7 @@ def action = { } }); } -} as MagicEventAction +} def event = { final MagicPermanent permanent -> diff --git a/release/Magarena/scripts/Sosuke__Son_of_Seshiro.groovy b/release/Magarena/scripts/Sosuke__Son_of_Seshiro.groovy index 4203893fcc..a26f0a8209 100644 --- a/release/Magarena/scripts/Sosuke__Son_of_Seshiro.groovy +++ b/release/Magarena/scripts/Sosuke__Son_of_Seshiro.groovy @@ -24,7 +24,7 @@ permanent, MagicAtEndOfCombatTrigger.Destroy )) - } as MagicPermanentAction); + }); } } ] diff --git a/release/Magarena/scripts/Spark_Jolt.groovy b/release/Magarena/scripts/Spark_Jolt.groovy index 0192f78e66..3202940f2b 100644 --- a/release/Magarena/scripts/Spark_Jolt.groovy +++ b/release/Magarena/scripts/Spark_Jolt.groovy @@ -19,7 +19,7 @@ new MagicDamage(event.getSource(),target,1) )); game.addEvent(new MagicScryEvent(event)); - } as MagicTargetAction); + }); } } ] diff --git a/release/Magarena/scripts/Stitcher_s_Apprentice.groovy b/release/Magarena/scripts/Stitcher_s_Apprentice.groovy index e96b96ad71..293cf363e1 100644 --- a/release/Magarena/scripts/Stitcher_s_Apprentice.groovy +++ b/release/Magarena/scripts/Stitcher_s_Apprentice.groovy @@ -5,7 +5,7 @@ def action = { game.doAction(new MagicSacrificeAction(permanent)); } }); -} as MagicEventAction; +}; [ new MagicPermanentActivation( diff --git a/release/Magarena/scripts/Stream_of_Life.groovy b/release/Magarena/scripts/Stream_of_Life.groovy index f91b043693..cb7e7a5961 100644 --- a/release/Magarena/scripts/Stream_of_Life.groovy +++ b/release/Magarena/scripts/Stream_of_Life.groovy @@ -15,7 +15,7 @@ event.processTargetPlayer(game, { final MagicPlayer player -> game.doAction(new MagicChangeLifeAction(player, event.getRefInt())); - } as MagicPlayerAction); + }); } } ] diff --git a/release/Magarena/scripts/Subterranean_Shambler.groovy b/release/Magarena/scripts/Subterranean_Shambler.groovy index 88faf47a39..9d069af950 100644 --- a/release/Magarena/scripts/Subterranean_Shambler.groovy +++ b/release/Magarena/scripts/Subterranean_Shambler.groovy @@ -7,7 +7,7 @@ def action = { final MagicDamage damage = new MagicDamage(source,creature,1); game.doAction(new MagicDealDamageAction(damage)); } -} as MagicEventAction +} def genEvent = { final MagicPermanent permanent -> diff --git a/release/Magarena/scripts/Sydri__Galvanic_Genius.groovy b/release/Magarena/scripts/Sydri__Galvanic_Genius.groovy index 5f4f14fbeb..2049ab53e7 100644 --- a/release/Magarena/scripts/Sydri__Galvanic_Genius.groovy +++ b/release/Magarena/scripts/Sydri__Galvanic_Genius.groovy @@ -50,7 +50,7 @@ def TP = new MagicTargetPicker() { event.processTargetPermanent(game, { final MagicPermanent creature -> game.doAction(new MagicBecomesCreatureAction(creature,PT,ST)); - } as MagicPermanentAction); + }); } } ] diff --git a/release/Magarena/scripts/Sylvan_Tutor.groovy b/release/Magarena/scripts/Sylvan_Tutor.groovy index 093153b532..01a49a3fa3 100644 --- a/release/Magarena/scripts/Sylvan_Tutor.groovy +++ b/release/Magarena/scripts/Sylvan_Tutor.groovy @@ -24,7 +24,7 @@ def act = { } }); } -} as MagicEventAction +} def evt = { final MagicEvent event, final MagicChoice choice -> diff --git a/release/Magarena/scripts/Szadek__Lord_of_Secrets.groovy b/release/Magarena/scripts/Szadek__Lord_of_Secrets.groovy index affe0cdaef..d543ff1765 100644 --- a/release/Magarena/scripts/Szadek__Lord_of_Secrets.groovy +++ b/release/Magarena/scripts/Szadek__Lord_of_Secrets.groovy @@ -26,7 +26,7 @@ E.getRefPlayer(), amount )); - } as MagicEventAction, + }, "Put ${amount} +1/+1 counters on SN and RN puts that many cards from the top of his or her library into his or her graveyard." ): MagicEvent.NONE; diff --git a/release/Magarena/scripts/Talruum_Champion.groovy b/release/Magarena/scripts/Talruum_Champion.groovy index 4c45fbe4b6..7233e340ba 100644 --- a/release/Magarena/scripts/Talruum_Champion.groovy +++ b/release/Magarena/scripts/Talruum_Champion.groovy @@ -21,7 +21,7 @@ def AB = new MagicStatic(MagicLayer.Ability, MagicStatic.UntilEOT) { event.processRefPermanent(game, { final MagicPermanent permanent -> game.doAction(new MagicAddStaticAction(permanent, AB)); - } as MagicPermanentAction); + }); } } ] diff --git a/release/Magarena/scripts/Tangle_Asp.groovy b/release/Magarena/scripts/Tangle_Asp.groovy index a08b91f287..22c28070e7 100644 --- a/release/Magarena/scripts/Tangle_Asp.groovy +++ b/release/Magarena/scripts/Tangle_Asp.groovy @@ -17,7 +17,7 @@ permanent, MagicAtEndOfCombatTrigger.Destroy )) - } as MagicPermanentAction); + }); } } ] diff --git a/release/Magarena/scripts/Tariel__Reckoner_of_Souls.groovy b/release/Magarena/scripts/Tariel__Reckoner_of_Souls.groovy index 33e88a902f..00604e40df 100644 --- a/release/Magarena/scripts/Tariel__Reckoner_of_Souls.groovy +++ b/release/Magarena/scripts/Tariel__Reckoner_of_Souls.groovy @@ -33,7 +33,7 @@ event.getPlayer() )); } - } as MagicPlayerAction); + }); } } ] diff --git a/release/Magarena/scripts/Tribute_to_Hunger.groovy b/release/Magarena/scripts/Tribute_to_Hunger.groovy index cdbd87eefc..7146b45a6e 100644 --- a/release/Magarena/scripts/Tribute_to_Hunger.groovy +++ b/release/Magarena/scripts/Tribute_to_Hunger.groovy @@ -7,7 +7,7 @@ def action = { game.doAction(new MagicChangeLifeAction(event.getRefPlayer(),toughness)); } }); -} as MagicEventAction +} [ new MagicSpellCardEvent() { @@ -34,7 +34,7 @@ def action = { action, "Choose a creature to sacrifice\$." )); - } as MagicPlayerAction); + }); } } ] diff --git a/release/Magarena/scripts/Turn_to_Frog.groovy b/release/Magarena/scripts/Turn_to_Frog.groovy index e8fd2777cd..61c8ce2d7a 100644 --- a/release/Magarena/scripts/Turn_to_Frog.groovy +++ b/release/Magarena/scripts/Turn_to_Frog.groovy @@ -43,7 +43,7 @@ def C = new MagicStatic(MagicLayer.Color, MagicStatic.UntilEOT) { //Does not lose static or triggers game.doAction(new MagicGainAbilityAction(creature,MagicAbility.CantActivateAbilities)); game.doAction(new MagicBecomesCreatureAction(creature,PT,AB,ST,C)); - } as MagicPermanentAction); + }); } } ] diff --git a/release/Magarena/scripts/Vampiric_Tutor.groovy b/release/Magarena/scripts/Vampiric_Tutor.groovy index 5e1b87f581..8d78066cd7 100644 --- a/release/Magarena/scripts/Vampiric_Tutor.groovy +++ b/release/Magarena/scripts/Vampiric_Tutor.groovy @@ -25,7 +25,7 @@ def act = { } }); } -} as MagicEventAction +} def evt = { final MagicEvent event, final MagicChoice choice -> diff --git a/release/Magarena/scripts/Venom.groovy b/release/Magarena/scripts/Venom.groovy index e17c5d3768..17cf42802f 100644 --- a/release/Magarena/scripts/Venom.groovy +++ b/release/Magarena/scripts/Venom.groovy @@ -23,7 +23,7 @@ permanent, MagicAtEndOfCombatTrigger.Destroy )) - } as MagicPermanentAction); + }); } } ] diff --git a/release/Magarena/scripts/Veteran_s_Armaments.groovy b/release/Magarena/scripts/Veteran_s_Armaments.groovy index f0f705ee86..5e8fdc8de2 100644 --- a/release/Magarena/scripts/Veteran_s_Armaments.groovy +++ b/release/Magarena/scripts/Veteran_s_Armaments.groovy @@ -2,7 +2,7 @@ def act = { final MagicGame game, final MagicEvent event -> final int amount = event.getPlayer().getOpponent().getNrOfAttackers() + event.getPlayer().getNrOfAttackers(); game.doAction(new MagicChangeTurnPTAction(event.getPermanent(),amount,amount)); -} as MagicEventAction +} def evt = { final MagicPermanent permanent -> diff --git a/release/Magarena/scripts/Vigor.groovy b/release/Magarena/scripts/Vigor.groovy index 93814f723a..56fc59e50d 100644 --- a/release/Magarena/scripts/Vigor.groovy +++ b/release/Magarena/scripts/Vigor.groovy @@ -23,7 +23,7 @@ amount, true )); - } as MagicEventAction, + }, "Prevent ${amount} damage and put ${amount} +1/+1 counters on RN" ): MagicEvent.NONE; diff --git a/release/Magarena/scripts/Voice_of_Resurgence.groovy b/release/Magarena/scripts/Voice_of_Resurgence.groovy index d0f7bcc05a..8dca6ebe9f 100644 --- a/release/Magarena/scripts/Voice_of_Resurgence.groovy +++ b/release/Magarena/scripts/Voice_of_Resurgence.groovy @@ -1,7 +1,7 @@ def Action = { final MagicGame game, final MagicEvent event -> game.doAction(new MagicPlayTokenAction(event.getPlayer(), TokenCardDefinitions.get("green and white Elemental creature token"))); -} as MagicEventAction +} def Event = { final MagicPermanent permanent -> diff --git a/release/Magarena/scripts/Warren_Weirding.groovy b/release/Magarena/scripts/Warren_Weirding.groovy index 28995de33d..e0010c6698 100644 --- a/release/Magarena/scripts/Warren_Weirding.groovy +++ b/release/Magarena/scripts/Warren_Weirding.groovy @@ -16,7 +16,7 @@ def action = { } } }); -} as MagicEventAction +} [ new MagicSpellCardEvent() { @@ -43,7 +43,7 @@ def action = { action, "Choose a creature to sacrifice\$." )); - } as MagicPlayerAction); + }); } } ] diff --git a/release/Magarena/scripts/Wings_of_Velis_Vel.groovy b/release/Magarena/scripts/Wings_of_Velis_Vel.groovy index 6dccdcbce3..b2590366be 100644 --- a/release/Magarena/scripts/Wings_of_Velis_Vel.groovy +++ b/release/Magarena/scripts/Wings_of_Velis_Vel.groovy @@ -33,7 +33,7 @@ def AB = new MagicStatic(MagicLayer.Ability, MagicStatic.UntilEOT) { MagicStatic.AllCreatureTypesUntilEOT, AB )); - } as MagicPermanentAction); + }); } } ] diff --git a/release/Magarena/scripts/Witherscale_Wurm.groovy b/release/Magarena/scripts/Witherscale_Wurm.groovy index 7c388276a2..6fb93a5051 100644 --- a/release/Magarena/scripts/Witherscale_Wurm.groovy +++ b/release/Magarena/scripts/Witherscale_Wurm.groovy @@ -17,7 +17,7 @@ permanent, MagicAbility.Wither )); - } as MagicPermanentAction); + }); } }, new MagicWhenDamageIsDealtTrigger() {