From 0bef4161f64f56757b03ee5200f99ccbe6cdc362 Mon Sep 17 00:00:00 2001 From: Martin Petricek Date: Tue, 23 Oct 2018 03:32:08 +0200 Subject: [PATCH] Add new cards that are variations to existing cards: (#1620) Abnormal Endurance Daybreak Chaplain Demonic Vigor Fearsome Awakening Fungal Infection Graveyard Marshal Invoke the Divine Lich's Caress Pinpoint Avalanche --- .../Abnormal_Endurance.txt | 2 +- .../Daybreak_Chaplain.txt | 0 .../Demonic_Vigor.txt | 4 +-- .../scripts/Fearsome_Awakening.groovy | 28 +++++++++++++++++++ .../Fearsome_Awakening.txt | 3 +- .../Fungal_Infection.txt | 2 +- .../Graveyard_Marshal.txt | 2 +- .../Invoke_the_Divine.txt | 2 +- .../Lich_s_Caress.txt | 2 +- .../scripts/Pinpoint_Avalanche.groovy | 23 +++++++++++++++ .../Pinpoint_Avalanche.txt | 3 +- 11 files changed, 60 insertions(+), 11 deletions(-) rename release/Magarena/{scripts_missing => scripts}/Abnormal_Endurance.txt (65%) rename release/Magarena/{scripts_missing => scripts}/Daybreak_Chaplain.txt (100%) rename release/Magarena/{scripts_missing => scripts}/Demonic_Vigor.txt (73%) create mode 100644 release/Magarena/scripts/Fearsome_Awakening.groovy rename release/Magarena/{scripts_missing => scripts}/Fearsome_Awakening.txt (64%) rename release/Magarena/{scripts_missing => scripts}/Fungal_Infection.txt (80%) rename release/Magarena/{scripts_missing => scripts}/Graveyard_Marshal.txt (86%) rename release/Magarena/{scripts_missing => scripts}/Invoke_the_Divine.txt (77%) rename release/Magarena/{scripts_missing => scripts}/Lich_s_Caress.txt (78%) create mode 100644 release/Magarena/scripts/Pinpoint_Avalanche.groovy rename release/Magarena/{scripts_missing => scripts}/Pinpoint_Avalanche.txt (70%) diff --git a/release/Magarena/scripts_missing/Abnormal_Endurance.txt b/release/Magarena/scripts/Abnormal_Endurance.txt similarity index 65% rename from release/Magarena/scripts_missing/Abnormal_Endurance.txt rename to release/Magarena/scripts/Abnormal_Endurance.txt index c7c3f32366..af5c4cc413 100644 --- a/release/Magarena/scripts_missing/Abnormal_Endurance.txt +++ b/release/Magarena/scripts/Abnormal_Endurance.txt @@ -4,6 +4,6 @@ value=2.500 rarity=C type=Instant cost={1}{B} -effect=Until end of turn, target creature gets +2/+0 and gains "When this creature dies, return it to the battlefield tapped under its owner's control." timing=removal +requires_groovy_code=Supernatural Stamina oracle=Until end of turn, target creature gets +2/+0 and gains "When this creature dies, return it to the battlefield tapped under its owner's control." diff --git a/release/Magarena/scripts_missing/Daybreak_Chaplain.txt b/release/Magarena/scripts/Daybreak_Chaplain.txt similarity index 100% rename from release/Magarena/scripts_missing/Daybreak_Chaplain.txt rename to release/Magarena/scripts/Daybreak_Chaplain.txt diff --git a/release/Magarena/scripts_missing/Demonic_Vigor.txt b/release/Magarena/scripts/Demonic_Vigor.txt similarity index 73% rename from release/Magarena/scripts_missing/Demonic_Vigor.txt rename to release/Magarena/scripts/Demonic_Vigor.txt index 73812d3008..b74df25161 100644 --- a/release/Magarena/scripts_missing/Demonic_Vigor.txt +++ b/release/Magarena/scripts/Demonic_Vigor.txt @@ -6,8 +6,8 @@ type=Enchantment subtype=Aura cost={B} ability=Enchant creature;\ - Enchanted creature gets +1/+1.;\ - When enchanted creature dies, return that card to its owner's hand. + Enchanted creature gets +1/+1. timing=aura enchant=default,creature oracle=Enchant creature\nEnchanted creature gets +1/+1.\nWhen enchanted creature dies, return that card to its owner's hand. +requires_groovy_code=Wind Zendikon diff --git a/release/Magarena/scripts/Fearsome_Awakening.groovy b/release/Magarena/scripts/Fearsome_Awakening.groovy new file mode 100644 index 0000000000..23a7dce29f --- /dev/null +++ b/release/Magarena/scripts/Fearsome_Awakening.groovy @@ -0,0 +1,28 @@ +[ + new MagicSpellCardEvent() { + @Override + public MagicEvent getEvent(final MagicCardOnStack cardOnStack, final MagicPayedCost payedCost) { + return new MagicEvent( + cardOnStack, + TARGET_CREATURE_CARD_FROM_GRAVEYARD, + MagicGraveyardTargetPicker.PutOntoBattlefield, + this, + "PN returns target creature card\$ from his or her graveyard to the " + + "battlefield. If it's a Dragon, PN puts two +1/+1 counters on it." + ); + } + + @Override + public void executeEvent(final MagicGame game, final MagicEvent event) { + event.processTargetCard(game, { + game.doAction(new ReturnCardAction(MagicLocationType.Graveyard,it,event.getPlayer(), { + final MagicPermanent perm -> + final MagicGame G = perm.getGame(); + if (perm.hasSubType(MagicSubType.Dragon)) { + G.doAction(new ChangeCountersAction(event.getPlayer(),perm,MagicCounterType.PlusOne,2)); + } + })); + }); + } + } +] diff --git a/release/Magarena/scripts_missing/Fearsome_Awakening.txt b/release/Magarena/scripts/Fearsome_Awakening.txt similarity index 64% rename from release/Magarena/scripts_missing/Fearsome_Awakening.txt rename to release/Magarena/scripts/Fearsome_Awakening.txt index b11864b744..b7904de21e 100644 --- a/release/Magarena/scripts_missing/Fearsome_Awakening.txt +++ b/release/Magarena/scripts/Fearsome_Awakening.txt @@ -4,7 +4,6 @@ value=2.500 rarity=U type=Sorcery cost={4}{B} -effect=Return target creature card from your graveyard to the battlefield. If it's a Dragon, put two +1/+1 counters on it. timing=main +requires_groovy_code oracle=Return target creature card from your graveyard to the battlefield. If it's a Dragon, put two +1/+1 counters on it. -status=needs groovy diff --git a/release/Magarena/scripts_missing/Fungal_Infection.txt b/release/Magarena/scripts/Fungal_Infection.txt similarity index 80% rename from release/Magarena/scripts_missing/Fungal_Infection.txt rename to release/Magarena/scripts/Fungal_Infection.txt index d768daf5e5..4d55b8ba0c 100644 --- a/release/Magarena/scripts_missing/Fungal_Infection.txt +++ b/release/Magarena/scripts/Fungal_Infection.txt @@ -4,6 +4,6 @@ value=2.500 rarity=C type=Instant cost={B} -effect=Target creature gets -1/-1 until end of turn. Create a 1/1 green Saproling creature token. +effect=Target creature gets -1/-1 until end of turn.~Create a 1/1 green Saproling creature token. timing=removal oracle=Target creature gets -1/-1 until end of turn. Create a 1/1 green Saproling creature token. diff --git a/release/Magarena/scripts_missing/Graveyard_Marshal.txt b/release/Magarena/scripts/Graveyard_Marshal.txt similarity index 86% rename from release/Magarena/scripts_missing/Graveyard_Marshal.txt rename to release/Magarena/scripts/Graveyard_Marshal.txt index 33081aa08a..e581d75d2c 100644 --- a/release/Magarena/scripts_missing/Graveyard_Marshal.txt +++ b/release/Magarena/scripts/Graveyard_Marshal.txt @@ -6,6 +6,6 @@ type=Creature subtype=Zombie,Soldier cost={B}{B} pt=3/2 -ability={2}{B}, Exile a creature card from your graveyard: Create a tapped 2/2 black Zombie creature token. +ability={2}{B}, Exile a creature card from your graveyard: Create a 2/2 black Zombie creature token that's tapped. timing=main oracle={2}{B}, Exile a creature card from your graveyard: Create a tapped 2/2 black Zombie creature token. diff --git a/release/Magarena/scripts_missing/Invoke_the_Divine.txt b/release/Magarena/scripts/Invoke_the_Divine.txt similarity index 77% rename from release/Magarena/scripts_missing/Invoke_the_Divine.txt rename to release/Magarena/scripts/Invoke_the_Divine.txt index 082712264d..5e01f6502c 100644 --- a/release/Magarena/scripts_missing/Invoke_the_Divine.txt +++ b/release/Magarena/scripts/Invoke_the_Divine.txt @@ -5,6 +5,6 @@ value=2.500 rarity=C type=Instant cost={2}{W} -effect=Destroy target artifact or enchantment. You gain 4 life. +effect=Destroy target artifact or enchantment.~You gain 4 life. timing=removal oracle=Destroy target artifact or enchantment. You gain 4 life. diff --git a/release/Magarena/scripts_missing/Lich_s_Caress.txt b/release/Magarena/scripts/Lich_s_Caress.txt similarity index 78% rename from release/Magarena/scripts_missing/Lich_s_Caress.txt rename to release/Magarena/scripts/Lich_s_Caress.txt index 93c78dbca3..acfde679ec 100644 --- a/release/Magarena/scripts_missing/Lich_s_Caress.txt +++ b/release/Magarena/scripts/Lich_s_Caress.txt @@ -4,6 +4,6 @@ value=2.500 rarity=C type=Sorcery cost={3}{B}{B} -effect=Destroy target creature. You gain 3 life. +effect=Destroy target creature.~You gain 3 life. timing=main oracle=Destroy target creature. You gain 3 life. diff --git a/release/Magarena/scripts/Pinpoint_Avalanche.groovy b/release/Magarena/scripts/Pinpoint_Avalanche.groovy new file mode 100644 index 0000000000..9fa57172dd --- /dev/null +++ b/release/Magarena/scripts/Pinpoint_Avalanche.groovy @@ -0,0 +1,23 @@ +[ + new MagicSpellCardEvent() { + @Override + public MagicEvent getEvent(final MagicCardOnStack cardOnStack,final MagicPayedCost payedCost) { + return new MagicEvent( + cardOnStack, + NEG_TARGET_CREATURE, + new MagicDamageTargetPicker(4,true), + this, + "SN deals 4 damage to target creature\$. " + + "The damage can't be prevented." + ); + } + @Override + public void executeEvent(final MagicGame game, final MagicEvent event) { + event.processTargetPermanent(game, { + final MagicDamage damage = new MagicDamage(event.getSource(),it,4); + damage.setUnpreventable(); + game.doAction(new DealDamageAction(damage)); + }); + } + } +] diff --git a/release/Magarena/scripts_missing/Pinpoint_Avalanche.txt b/release/Magarena/scripts/Pinpoint_Avalanche.txt similarity index 70% rename from release/Magarena/scripts_missing/Pinpoint_Avalanche.txt rename to release/Magarena/scripts/Pinpoint_Avalanche.txt index 324ca0ab2a..da36f4a1a6 100644 --- a/release/Magarena/scripts_missing/Pinpoint_Avalanche.txt +++ b/release/Magarena/scripts/Pinpoint_Avalanche.txt @@ -4,7 +4,6 @@ value=2.121 rarity=C type=Instant cost={3}{R}{R} -effect=SN deals 4 damage to target creature. The damage can't be prevented. timing=removal oracle=Pinpoint Avalanche deals 4 damage to target creature. The damage can't be prevented. -status=needs groovy +requires_groovy_code