diff --git a/release/Magarena/scripts/Beastmaster_Ascension.groovy b/release/Magarena/scripts/Beastmaster_Ascension.groovy new file mode 100644 index 0000000000..a0c1ceca97 --- /dev/null +++ b/release/Magarena/scripts/Beastmaster_Ascension.groovy @@ -0,0 +1,47 @@ +[ + new MagicStatic( + MagicLayer.ModPT, + MagicTargetFilter.TARGET_CREATURE_YOU_CONTROL + ) { + @Override + public void modPowerToughness( + final MagicPermanent source, + final MagicPermanent permanent, + final MagicPowerToughness pt) { + pt.add(5,5); + } + @Override + public boolean condition(final MagicGame game,final MagicPermanent source,final MagicPermanent target) { + return source != target && source.getCounters(MagicCounterType.Charge) >= 7; + } + }, + new MagicWhenAttacksTrigger() { + @Override + public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPermanent creature) { + return creature.isFriend(permanent) ? + new MagicEvent( + permanent, + new MagicSimpleMayChoice( + MagicSimpleMayChoice.ADD_CHARGE_COUNTER, + 1, + MagicSimpleMayChoice.DEFAULT_YES + ), + this, + "PN may\$ put a quest counter on SN." + ) : + MagicEvent.NONE; + } + + @Override + public void executeEvent(final MagicGame game, final MagicEvent event) { + if (event.isYes()) { + game.doAction(new MagicChangeCountersAction( + event.getPermanent(), + MagicCounterType.Charge, + 1, + true + )); + } + } + } +] diff --git a/release/Magarena/scripts/Beastmaster_Ascension.txt b/release/Magarena/scripts/Beastmaster_Ascension.txt index f833f029ba..6cf17f6b2e 100644 --- a/release/Magarena/scripts/Beastmaster_Ascension.txt +++ b/release/Magarena/scripts/Beastmaster_Ascension.txt @@ -6,4 +6,4 @@ rarity=R type=Enchantment cost={2}{G} timing=enchantment -requires_card_code +requires_groovy_code diff --git a/src/magic/card/Beastmaster_Ascension.java b/src/magic/card/Beastmaster_Ascension.java deleted file mode 100644 index ff01a8708d..0000000000 --- a/src/magic/card/Beastmaster_Ascension.java +++ /dev/null @@ -1,60 +0,0 @@ -package magic.card; - -import magic.model.MagicCounterType; -import magic.model.MagicGame; -import magic.model.MagicPermanent; -import magic.model.MagicPowerToughness; -import magic.model.action.MagicChangeCountersAction; -import magic.model.choice.MagicSimpleMayChoice; -import magic.model.event.MagicEvent; -import magic.model.mstatic.MagicLayer; -import magic.model.mstatic.MagicStatic; -import magic.model.target.MagicTargetFilter; -import magic.model.trigger.MagicWhenAttacksTrigger; - -public class Beastmaster_Ascension { - public static final MagicStatic S = new MagicStatic( - MagicLayer.ModPT, - MagicTargetFilter.TARGET_CREATURE_YOU_CONTROL) { - @Override - public void modPowerToughness( - final MagicPermanent source, - final MagicPermanent permanent, - final MagicPowerToughness pt) { - pt.add(5,5); - } - @Override - public boolean condition(final MagicGame game,final MagicPermanent source,final MagicPermanent target) { - return source != target && source.getCounters(MagicCounterType.Charge) >= 7; - } - }; - - public static final MagicWhenAttacksTrigger T = new MagicWhenAttacksTrigger() { - @Override - public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPermanent creature) { - return creature.isFriend(permanent) ? - new MagicEvent( - permanent, - new MagicSimpleMayChoice( - MagicSimpleMayChoice.ADD_CHARGE_COUNTER, - 1, - MagicSimpleMayChoice.DEFAULT_YES), - this, - "PN may$ put a quest counter on SN.") : - MagicEvent.NONE; - } - - @Override - public void executeEvent( - final MagicGame game, - final MagicEvent event) { - if (event.isYes()) { - game.doAction(new MagicChangeCountersAction( - event.getPermanent(), - MagicCounterType.Charge, - 1, - true)); - } - } - }; -}