From 3c664073b9687fc8c9d6274e21ca4ef7c0a2cdd7 Mon Sep 17 00:00:00 2001 From: melvin Date: Wed, 16 Oct 2013 21:21:37 +0800 Subject: [PATCH] replace groovy code with ability in card script --- .../scripts/Hibernation_Sliver.groovy | 40 ------------------- .../Magarena/scripts/Hibernation_Sliver.txt | 4 +- .../model/event/MagicPermanentActivation.java | 2 + 3 files changed, 4 insertions(+), 42 deletions(-) delete mode 100644 release/Magarena/scripts/Hibernation_Sliver.groovy diff --git a/release/Magarena/scripts/Hibernation_Sliver.groovy b/release/Magarena/scripts/Hibernation_Sliver.groovy deleted file mode 100644 index 3cd95a3276..0000000000 --- a/release/Magarena/scripts/Hibernation_Sliver.groovy +++ /dev/null @@ -1,40 +0,0 @@ - -def HibernationBounce = new MagicPermanentActivation( - new MagicActivationHints(MagicTiming.Removal), - "Bounce" -) { - - @Override - public Iterable getCostEvent(final MagicPermanent source) { - return [new MagicPayLifeEvent(source,2)]; - } - - @Override - public MagicEvent getPermanentEvent(final MagicPermanent source,final MagicPayedCost payedCost) { - return new MagicEvent( - source, - this, - "Return SN to its owner's hand." - ); - } - - @Override - public void executeEvent(final MagicGame game, final MagicEvent event) { - game.doAction(new MagicRemoveFromPlayAction( - event.getPermanent(), - MagicLocationType.OwnersHand - )); - } -}; - -[ - new MagicStatic( - MagicLayer.Ability, - MagicTargetFilter.TARGET_SLIVER - ) { - @Override - public void modAbilityFlags(final MagicPermanent source,final MagicPermanent permanent,final Set flags) { - permanent.addAbility(HibernationBounce); - } - } -] diff --git a/release/Magarena/scripts/Hibernation_Sliver.txt b/release/Magarena/scripts/Hibernation_Sliver.txt index 1be66931eb..c97d04520a 100644 --- a/release/Magarena/scripts/Hibernation_Sliver.txt +++ b/release/Magarena/scripts/Hibernation_Sliver.txt @@ -7,6 +7,6 @@ type=Creature subtype=Sliver cost={U}{B} pt=2/2 -timing=main +ability=lord all slivers have pay {L2} Return SN to its owner's hand. static=all -requires_groovy_code +timing=main diff --git a/src/magic/model/event/MagicPermanentActivation.java b/src/magic/model/event/MagicPermanentActivation.java index 3b6f86e454..a11813cd04 100644 --- a/src/magic/model/event/MagicPermanentActivation.java +++ b/src/magic/model/event/MagicPermanentActivation.java @@ -139,6 +139,8 @@ public abstract class MagicPermanentActivation extends MagicActivation