diff --git a/release/Magarena/scripts/Cosmic_Larva.groovy b/release/Magarena/scripts/Cosmic_Larva.groovy index 66c59db34b..a008a21934 100644 --- a/release/Magarena/scripts/Cosmic_Larva.groovy +++ b/release/Magarena/scripts/Cosmic_Larva.groovy @@ -1,25 +1,25 @@ -[ - new MagicAtUpkeepTrigger() { - @Override - public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPlayer upkeepPlayer) { - return permanent.isController(upkeepPlayer) ? - new MagicEvent( - permanent, - new MagicMayChoice("Sacrifice two lands?"), - this, - "PN may\$ sacrifice two lands. If PN doesn't, sacrifice SN." - ): - MagicEvent.NONE; - } - - @Override - public void executeEvent(final MagicGame game, final MagicEvent event) { - if (event.getPlayer().getNrOfPermanents(MagicType.Land) >=2 && event.isYes()) { - game.addEvent(new MagicSacrificePermanentEvent(event.getPermanent(),event.getPlayer(),MagicTargetChoice.SACRIFICE_LAND)); - game.addEvent(new MagicSacrificePermanentEvent(event.getPermanent(),event.getPlayer(),MagicTargetChoice.SACRIFICE_LAND)); - } else { - game.doAction(new MagicSacrificeAction(event.getPermanent())); - } - } - } -] +[ + new MagicAtUpkeepTrigger() { + @Override + public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPlayer upkeepPlayer) { + return permanent.isController(upkeepPlayer) ? + new MagicEvent( + permanent, + new MagicMayChoice("Sacrifice two lands?"), + this, + "PN may\$ sacrifice two lands. If PN doesn't, sacrifice SN." + ): + MagicEvent.NONE; + } + + @Override + public void executeEvent(final MagicGame game, final MagicEvent event) { + if (event.isYes() && event.getPlayer().getNrOfPermanents(MagicType.Land) >= 2) { + game.addEvent(new MagicSacrificePermanentEvent(event.getPermanent(),event.getPlayer(),MagicTargetChoice.SACRIFICE_LAND)); + game.addEvent(new MagicSacrificePermanentEvent(event.getPermanent(),event.getPlayer(),MagicTargetChoice.SACRIFICE_LAND)); + } else { + game.doAction(new MagicSacrificeAction(event.getPermanent())); + } + } + } +] diff --git a/release/Magarena/scripts/Cosmic_Larva.txt b/release/Magarena/scripts/Cosmic_Larva.txt index 758a7c413b..9f9d832cde 100644 --- a/release/Magarena/scripts/Cosmic_Larva.txt +++ b/release/Magarena/scripts/Cosmic_Larva.txt @@ -1,12 +1,12 @@ -name=Cosmic Larva -image=http://mtgimage.com/card/cosmic%20larva.jpg -value=2.500 -rarity=R -type=Creature -subtype=Beast -cost={1}{R}{R} -pt=7/6 -ability=Trample -timing=main -requires_groovy_code -oracle=Trample. At the beginning of your upkeep, sacrifice Cosmic Larva unless you sacrifice two lands. +name=Cosmic Larva +image=http://mtgimage.com/card/cosmic%20larva.jpg +value=2.500 +rarity=R +type=Creature +subtype=Beast +cost={1}{R}{R} +pt=7/6 +ability=Trample +timing=main +requires_groovy_code +oracle=Trample. At the beginning of your upkeep, sacrifice Cosmic Larva unless you sacrifice two lands. diff --git a/release/Magarena/scripts_missing/Cosmic_Larva.txt b/release/Magarena/scripts_missing/Cosmic_Larva.txt deleted file mode 100644 index aac6082a8a..0000000000 --- a/release/Magarena/scripts_missing/Cosmic_Larva.txt +++ /dev/null @@ -1,12 +0,0 @@ -name=Cosmic Larva -image=http://mtgimage.com/card/cosmic%20larva.jpg -value=2.500 -rarity=R -type=Creature -subtype=Beast -cost={1}{R}{R} -pt=7/6 -ability=Trample;\ - At the beginning of your upkeep, sacrifice SN unless you sacrifice two lands. -timing=main -oracle=Trample. At the beginning of your upkeep, sacrifice Cosmic Larva unless you sacrifice two lands.