From 7829b493bdede0b70ddaeab7b6a576875bdf3b9f Mon Sep 17 00:00:00 2001 From: melvin Date: Mon, 26 Aug 2013 13:24:38 +0800 Subject: [PATCH] replace groovy script with ability in card script --- release/Magarena/scripts/Cumber_Stone.groovy | 10 ---------- release/Magarena/scripts/Cumber_Stone.txt | 2 +- release/Magarena/scripts/Mass_Hysteria.txt | 1 + src/magic/model/target/MagicTargetFilterFactory.java | 1 + 4 files changed, 3 insertions(+), 11 deletions(-) delete mode 100644 release/Magarena/scripts/Cumber_Stone.groovy diff --git a/release/Magarena/scripts/Cumber_Stone.groovy b/release/Magarena/scripts/Cumber_Stone.groovy deleted file mode 100644 index 8e6e2a8111..0000000000 --- a/release/Magarena/scripts/Cumber_Stone.groovy +++ /dev/null @@ -1,10 +0,0 @@ -[ - new MagicStatic( - MagicLayer.ModPT, - MagicTargetFilter.TARGET_CREATURE_YOUR_OPPONENT_CONTROLS) { - @Override - public void modPowerToughness(final MagicPermanent source,final MagicPermanent permanent,final MagicPowerToughness pt) { - pt.add(-1,0); - } - } -] diff --git a/release/Magarena/scripts/Cumber_Stone.txt b/release/Magarena/scripts/Cumber_Stone.txt index dadbdd996d..a9b170e862 100644 --- a/release/Magarena/scripts/Cumber_Stone.txt +++ b/release/Magarena/scripts/Cumber_Stone.txt @@ -6,6 +6,6 @@ removal=1 rarity=U type=Artifact cost={3}{U} +ability=lord pt creatures your opponents control get -1/-0 static=opponent timing=artifact -requires_groovy_code diff --git a/release/Magarena/scripts/Mass_Hysteria.txt b/release/Magarena/scripts/Mass_Hysteria.txt index 0e0db9bbd7..bda3a20215 100644 --- a/release/Magarena/scripts/Mass_Hysteria.txt +++ b/release/Magarena/scripts/Mass_Hysteria.txt @@ -6,4 +6,5 @@ rarity=R type=Enchantment cost={R} ability=lord ability all creatures have haste +static=a timing=enchantment diff --git a/src/magic/model/target/MagicTargetFilterFactory.java b/src/magic/model/target/MagicTargetFilterFactory.java index 028b8c756f..6eb743ccb2 100644 --- a/src/magic/model/target/MagicTargetFilterFactory.java +++ b/src/magic/model/target/MagicTargetFilterFactory.java @@ -14,6 +14,7 @@ public class MagicTargetFilterFactory { static { factory.put("creatures you control", TARGET_CREATURE_YOU_CONTROL); + factory.put("creatures your opponents control", TARGET_CREATURE_YOUR_OPPONENT_CONTROLS); factory.put("sliver creatures you control", TARGET_SLIVER_YOU_CONTROL); factory.put("dragon creatures you control", TARGET_DRAGON_YOU_CONTROL); factory.put("all sliver creatures", TARGET_SLIVER);