diff --git a/release/Magarena/scripts/Ambush_Commander.groovy b/release/Magarena/scripts/Ambush_Commander.groovy index 7397caf46f..37b32f90b9 100644 --- a/release/Magarena/scripts/Ambush_Commander.groovy +++ b/release/Magarena/scripts/Ambush_Commander.groovy @@ -29,41 +29,5 @@ public int getTypeFlags(final MagicPermanent permanent,final int flags) { return flags|MagicType.Creature.getMask(); } - }, - new MagicPermanentActivation( - new MagicActivationHints(MagicTiming.Pump), - "Pump" - ) { - - @Override - public Iterable getCostEvent(final MagicPermanent source) { - return [ - new MagicPayManaCostEvent(source,"{1}{G}"), - new MagicSacrificePermanentEvent( - source, - new MagicTargetChoice("an Elf you control") - ) - ]; - } - - @Override - public MagicEvent getPermanentEvent(final MagicPermanent source, final MagicPayedCost payedCost) { - return new MagicEvent( - source, - MagicTargetChoice.POS_TARGET_CREATURE, - MagicPumpTargetPicker.create(), - this, - "Target creature\$ gets +3/+3 until end of turn." - ); - } - - @Override - public void executeEvent(final MagicGame game, final MagicEvent event) { - event.processTargetPermanent(game,new MagicPermanentAction() { - public void doAction(final MagicPermanent creature) { - game.doAction(new MagicChangeTurnPTAction(creature,3,3)); - } - }); - } } ] diff --git a/release/Magarena/scripts/Ambush_Commander.txt b/release/Magarena/scripts/Ambush_Commander.txt index f1895456f9..e3fa2f3786 100644 --- a/release/Magarena/scripts/Ambush_Commander.txt +++ b/release/Magarena/scripts/Ambush_Commander.txt @@ -7,5 +7,6 @@ type=Creature subtype=Elf cost={3}{G}{G} pt=2/2 +ability=pay {1}{G}, Sacrifice an Elf: Target creature gets +3/+3 until end of turn. timing=main requires_groovy_code diff --git a/src/magic/model/choice/MagicTargetChoice.java b/src/magic/model/choice/MagicTargetChoice.java index 36d4f0a8a8..0d2b04c18b 100644 --- a/src/magic/model/choice/MagicTargetChoice.java +++ b/src/magic/model/choice/MagicTargetChoice.java @@ -444,6 +444,9 @@ public class MagicTargetChoice extends MagicChoice { public static final MagicTargetChoice SACRIFICE_BAT = new MagicTargetChoice("a Bat to sacrifice"); + public static final MagicTargetChoice SACRIFICE_ELF = + new MagicTargetChoice("an Elf to sacrifice"); + public static final MagicTargetChoice SACRIFICE_BEAST = new MagicTargetChoice("a Beast to sacrifice"); diff --git a/src/magic/model/event/MagicPermanentActivation.java b/src/magic/model/event/MagicPermanentActivation.java index 34e96b0449..84d593d6a2 100644 --- a/src/magic/model/event/MagicPermanentActivation.java +++ b/src/magic/model/event/MagicPermanentActivation.java @@ -140,6 +140,8 @@ public abstract class MagicPermanentActivation extends MagicActivation