diff --git a/release/Magarena/scripts/Agility.groovy b/release/Magarena/scripts/Agility.groovy deleted file mode 100644 index 01017c4d53..0000000000 --- a/release/Magarena/scripts/Agility.groovy +++ /dev/null @@ -1,13 +0,0 @@ -[ - new MagicStatic(MagicLayer.Ability) { - @Override - public void modAbilityFlags(final MagicPermanent source, final MagicPermanent permanent, final Set flags) { - flags.add(MagicAbility.Flanking); - permanent.addAbility(MagicFlankingTrigger.create()); - } - @Override - public boolean accept(final MagicGame game,final MagicPermanent source,final MagicPermanent target) { - return MagicStatic.acceptLinked(game, source, target); - } - } -] diff --git a/release/Magarena/scripts/Agility.txt b/release/Magarena/scripts/Agility.txt index c517516663..f76f36ef0b 100644 --- a/release/Magarena/scripts/Agility.txt +++ b/release/Magarena/scripts/Agility.txt @@ -7,6 +7,6 @@ type=Enchantment subtype=Aura cost={1}{R} given_pt=1/1 +given_ability=flanking timing=aura enchant=pump,pos creature -requires_groovy_code diff --git a/release/Magarena/scripts/Eldrazi_Conscription.groovy b/release/Magarena/scripts/Eldrazi_Conscription.groovy deleted file mode 100644 index 58e6d16715..0000000000 --- a/release/Magarena/scripts/Eldrazi_Conscription.groovy +++ /dev/null @@ -1,14 +0,0 @@ -def Annihilator2 = new MagicAnnihilatorTrigger(2); - -[ - new MagicStatic(MagicLayer.Ability) { - @Override - public void modAbilityFlags(final MagicPermanent source, final MagicPermanent permanent, final Set flags) { - permanent.addAbility(Annihilator2); - } - @Override - public boolean accept(final MagicGame game,final MagicPermanent source,final MagicPermanent target) { - return MagicStatic.acceptLinked(game, source, target); - } - } -] diff --git a/release/Magarena/scripts/Eldrazi_Conscription.txt b/release/Magarena/scripts/Eldrazi_Conscription.txt index e40204aa31..5a44a32403 100644 --- a/release/Magarena/scripts/Eldrazi_Conscription.txt +++ b/release/Magarena/scripts/Eldrazi_Conscription.txt @@ -7,7 +7,6 @@ type=Tribal,Enchantment subtype=Eldrazi,Aura cost={8} given_pt=10/10 -given_ability=trample +given_ability=trample;annihilator 2 timing=aura enchant=pump,pos creature -requires_groovy_code diff --git a/release/Magarena/scripts/Gemhide_Sliver.groovy b/release/Magarena/scripts/Gemhide_Sliver.groovy deleted file mode 100644 index da84ae1136..0000000000 --- a/release/Magarena/scripts/Gemhide_Sliver.groovy +++ /dev/null @@ -1,13 +0,0 @@ -def TapAddAny = new MagicTapManaActivation(MagicManaType.ALL_TYPES); - -[ - new MagicStatic( - MagicLayer.Ability, - MagicTargetFilter.TARGET_SLIVER - ) { - @Override - public void modAbilityFlags(final MagicPermanent source,final MagicPermanent permanent,final Set flags) { - permanent.addAbility(TapAddAny); - } - } -] diff --git a/release/Magarena/scripts/Gemhide_Sliver.txt b/release/Magarena/scripts/Gemhide_Sliver.txt index ab0937f9d5..9307c63f26 100644 --- a/release/Magarena/scripts/Gemhide_Sliver.txt +++ b/release/Magarena/scripts/Gemhide_Sliver.txt @@ -7,6 +7,6 @@ type=Creature subtype=Sliver cost={1}{G} pt=1/1 +ability=lord all sliver creatures have tap add mana any static=all timing=main -requires_groovy_code diff --git a/release/Magarena/scripts/Hermetic_Study.txt b/release/Magarena/scripts/Hermetic_Study.txt index 1b2a533091..38a8852d85 100644 --- a/release/Magarena/scripts/Hermetic_Study.txt +++ b/release/Magarena/scripts/Hermetic_Study.txt @@ -6,6 +6,6 @@ rarity=C type=Enchantment subtype=Aura cost={1}{U} +given_ability=ping 1 timing=aura enchant=pump,pos creature -requires_groovy_code=Psionic Gift diff --git a/release/Magarena/scripts/Manaweft_Sliver.groovy b/release/Magarena/scripts/Manaweft_Sliver.groovy deleted file mode 100644 index 2831791920..0000000000 --- a/release/Magarena/scripts/Manaweft_Sliver.groovy +++ /dev/null @@ -1,13 +0,0 @@ -def TapAddAny = new MagicTapManaActivation(MagicManaType.ALL_TYPES); - -[ - new MagicStatic( - MagicLayer.Ability, - MagicTargetFilter.TARGET_SLIVER_YOU_CONTROL - ) { - @Override - public void modAbilityFlags(final MagicPermanent source,final MagicPermanent permanent,final Set flags) { - permanent.addAbility(TapAddAny); - } - } -] diff --git a/release/Magarena/scripts/Manaweft_Sliver.txt b/release/Magarena/scripts/Manaweft_Sliver.txt index c6b324999e..e44d0f674d 100644 --- a/release/Magarena/scripts/Manaweft_Sliver.txt +++ b/release/Magarena/scripts/Manaweft_Sliver.txt @@ -7,6 +7,6 @@ type=Creature subtype=Sliver cost={1}{G} pt=1/1 +ability=lord sliver creatures you control have tap add mana any static=player timing=main -requires_groovy_code diff --git a/release/Magarena/scripts/Mikaeus__the_Unhallowed.groovy b/release/Magarena/scripts/Mikaeus__the_Unhallowed.groovy index 7f21fb10ff..9975004fd0 100644 --- a/release/Magarena/scripts/Mikaeus__the_Unhallowed.groovy +++ b/release/Magarena/scripts/Mikaeus__the_Unhallowed.groovy @@ -1,18 +1,4 @@ [ - new MagicStatic( - MagicLayer.Ability, - MagicTargetFilter.TARGET_NONHUMAN_CREATURE_YOU_CONTROL - ) { - @Override - public void modAbilityFlags(final MagicPermanent source,final MagicPermanent permanent,final Set flags) { - flags.add(MagicAbility.Undying); - permanent.addAbility(MagicUndyingTrigger.create()); - } - @Override - public boolean condition(final MagicGame game,final MagicPermanent source,final MagicPermanent target) { - return source != target; - } - }, new MagicWhenDamageIsDealtTrigger() { @Override public MagicEvent executeTrigger( diff --git a/release/Magarena/scripts/Mikaeus__the_Unhallowed.txt b/release/Magarena/scripts/Mikaeus__the_Unhallowed.txt index 6f94827b24..c63a3a8e1f 100644 --- a/release/Magarena/scripts/Mikaeus__the_Unhallowed.txt +++ b/release/Magarena/scripts/Mikaeus__the_Unhallowed.txt @@ -8,7 +8,8 @@ subtype=Zombie,Cleric cost={3}{B}{B}{B} pt=5/5 ability=intimidate;\ - lord other non-human creatures you control get +1/+1 + lord other non-human creatures you control get +1/+1;\ + lord other non-human creatures you control have undying static=player timing=main requires_groovy_code diff --git a/release/Magarena/scripts/Sidewinder_Sliver.groovy b/release/Magarena/scripts/Sidewinder_Sliver.groovy deleted file mode 100644 index 18a4be416c..0000000000 --- a/release/Magarena/scripts/Sidewinder_Sliver.groovy +++ /dev/null @@ -1,12 +0,0 @@ -[ - new MagicStatic( - MagicLayer.Ability, - MagicTargetFilter.TARGET_SLIVER - ) { - @Override - public void modAbilityFlags(final MagicPermanent source, final MagicPermanent permanent, final Set flags) { - flags.add(MagicAbility.Flanking); - permanent.addAbility(MagicFlankingTrigger.create()); - } - } -] diff --git a/release/Magarena/scripts/Sidewinder_Sliver.txt b/release/Magarena/scripts/Sidewinder_Sliver.txt index a57b8fcf47..7c262c00f0 100644 --- a/release/Magarena/scripts/Sidewinder_Sliver.txt +++ b/release/Magarena/scripts/Sidewinder_Sliver.txt @@ -7,6 +7,6 @@ type=Creature subtype=Sliver cost={W} pt=1/1 +ability=lord all sliver creatures have flanking static=all timing=main -requires_groovy_code