diff --git a/release/Magarena/scripts/Grapeshot.groovy b/release/Magarena/scripts/Grapeshot.groovy new file mode 100644 index 0000000000..48489e69e8 --- /dev/null +++ b/release/Magarena/scripts/Grapeshot.groovy @@ -0,0 +1,27 @@ +[ + new MagicSpellCardEvent() { + @Override + public MagicEvent getEvent(final MagicCardOnStack cardOnStack, final MagicPayedCost payedCost) { + return new MagicEvent( + cardOnStack, + MagicTargetChoice.NEG_TARGET_CREATURE_OR_PLAYER, + new MagicDamageTargetPicker(1), + this, + "SN deals 1 damage to target creature or player$." + ); + } + @Override + public void executeEvent(final MagicGame game, final MagicEvent event) { + event.processTarget(game,new MagicTargetAction() { + public void doAction(final MagicTarget target) { + final MagicDamage damage = new MagicDamage( + event.getSource(), + target, + 1 + ); + game.doAction(new MagicDealDamageAction(damage)); + } + }); + } + } +] diff --git a/release/Magarena/scripts/Grapeshot.txt b/release/Magarena/scripts/Grapeshot.txt index 37b43761e1..a0abbe07cb 100644 --- a/release/Magarena/scripts/Grapeshot.txt +++ b/release/Magarena/scripts/Grapeshot.txt @@ -8,4 +8,4 @@ type=Sorcery cost={1}{R} timing=storm ability=storm -requires_card_code +requires_groovy_code diff --git a/src/magic/card/Grapeshot.java b/src/magic/card/Grapeshot.java deleted file mode 100644 index 44176d9f12..0000000000 --- a/src/magic/card/Grapeshot.java +++ /dev/null @@ -1,44 +0,0 @@ -package magic.card; - -import magic.model.MagicDamage; -import magic.model.MagicGame; -import magic.model.MagicPayedCost; -import magic.model.action.MagicDealDamageAction; -import magic.model.action.MagicTargetAction; -import magic.model.choice.MagicTargetChoice; -import magic.model.event.MagicEvent; -import magic.model.event.MagicSpellCardEvent; -import magic.model.stack.MagicCardOnStack; -import magic.model.target.MagicDamageTargetPicker; -import magic.model.target.MagicTarget; - -public class Grapeshot { - public static final MagicSpellCardEvent S = new MagicSpellCardEvent() { - @Override - public MagicEvent getEvent( - final MagicCardOnStack cardOnStack, - final MagicPayedCost payedCost) { - return new MagicEvent( - cardOnStack, - MagicTargetChoice.NEG_TARGET_CREATURE_OR_PLAYER, - new MagicDamageTargetPicker(1), - this, - "SN deals 1 damage to target creature or player$."); - } - @Override - public void executeEvent( - final MagicGame game, - final MagicEvent event) { - event.processTarget(game,new MagicTargetAction() { - public void doAction(final MagicTarget target) { - final MagicDamage damage = new MagicDamage( - event.getSource(), - target, - 1 - ); - game.doAction(new MagicDealDamageAction(damage)); - } - }); - } - }; -}