From 30a34f06184a50fd6ec586b91b4fd93e5950a0a4 Mon Sep 17 00:00:00 2001 From: slapshot5 Date: Sat, 10 Sep 2011 23:37:33 +0000 Subject: [PATCH] AF_Animate now respects a "RemoveAllAbilities" param just like StaticAbility. Updated the 10 recently submitted cards to use this. --- res/cardsfolder/d/dream_thrush.txt | 2 +- res/cardsfolder/g/grixis_illusionist.txt | 2 +- res/cardsfolder/j/jinx.txt | 2 +- res/cardsfolder/m/moonbow_illusionist.txt | 2 +- res/cardsfolder/m/mystic_compass.txt | 2 +- res/cardsfolder/r/reef_shaman.txt | 2 +- res/cardsfolder/s/sea_snidd.txt | 2 +- res/cardsfolder/s/shimmering_mirage.txt | 2 +- res/cardsfolder/t/tideshaper_mystic.txt | 2 +- res/cardsfolder/u/unstable_frontier.txt | 2 +- .../forge/card/abilityFactory/AbilityFactory_Animate.java | 4 ++-- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/res/cardsfolder/d/dream_thrush.txt b/res/cardsfolder/d/dream_thrush.txt index ec35fd9cec2..89aac3e3bde 100644 --- a/res/cardsfolder/d/dream_thrush.txt +++ b/res/cardsfolder/d/dream_thrush.txt @@ -5,7 +5,7 @@ Text:no text PT:1/1 K:Flying A:AB$ ChooseType | Cost$ T | Defined$ You | Type$ Basic Land | SubAbility$ SVar=DBAnimate | SpellDescription$ Target land becomes the basic land type of your choice until end of turn. -SVar:DBAnimate:DB$ Animate | ValidTgts$ Land | TgtPrompt$ Select target land | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True | OverwriteAbilities$ True | OverwriteTriggers$ True +SVar:DBAnimate:DB$ Animate | ValidTgts$ Land | TgtPrompt$ Select target land | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True | RemoveAllAbilities$ True SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/dream_thrush.jpg diff --git a/res/cardsfolder/g/grixis_illusionist.txt b/res/cardsfolder/g/grixis_illusionist.txt index d132b1b9e0f..73883f3afb1 100644 --- a/res/cardsfolder/g/grixis_illusionist.txt +++ b/res/cardsfolder/g/grixis_illusionist.txt @@ -4,7 +4,7 @@ Types:Creature Human Wizard Text:no text PT:1/1 A:AB$ ChooseType | Cost$ T | Defined$ You | Type$ Basic Land | SubAbility$ SVar=DBAnimate | SpellDescription$ Target land you control becomes the basic land type of your choice until end of turn. -SVar:DBAnimate:DB$ Animate | ValidTgts$ Land.YouCtrl | TgtPrompt$ Select target land you control | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True | OverwriteAbilities$ True | OverwriteTriggers$ True +SVar:DBAnimate:DB$ Animate | ValidTgts$ Land.YouCtrl | TgtPrompt$ Select target land you control | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True | RemoveAllAbilities$ True SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/grixis_illusionist.jpg diff --git a/res/cardsfolder/j/jinx.txt b/res/cardsfolder/j/jinx.txt index 9f825e940df..f822ac3c01d 100644 --- a/res/cardsfolder/j/jinx.txt +++ b/res/cardsfolder/j/jinx.txt @@ -3,7 +3,7 @@ ManaCost:1 U Types:Instant Text:no text A:SP$ ChooseType | Cost$ T | Defined$ You | Type$ Basic Land | SubAbility$ DBAnimate | SpellDescription$ Target land becomes the basic land type of your choice until end of turn. Draw a card at the beginning of the next turn's upkeep. -SVar:DBAnimate:DB$ Animate | ValidTgts$ Land | TgtPrompt$ Select target land | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True | OverwriteAbilities$ True | OverwriteTriggers$ True | SubAbility$ DBDraw +SVar:DBAnimate:DB$ Animate | ValidTgts$ Land | TgtPrompt$ Select target land | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True | RemoveAllAbilities$ True | SubAbility$ DBDraw SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1 | NextUpkeep$ True SVar:RemAIDeck:True SVar:Rarity:Common diff --git a/res/cardsfolder/m/moonbow_illusionist.txt b/res/cardsfolder/m/moonbow_illusionist.txt index 16909be0795..38c971b791d 100644 --- a/res/cardsfolder/m/moonbow_illusionist.txt +++ b/res/cardsfolder/m/moonbow_illusionist.txt @@ -5,7 +5,7 @@ Text:no text PT:2/1 K:Flying A:AB$ ChooseType | Cost$ 2 Return <1/Land> | Defined$ You | Type$ Basic Land | SubAbility$ SVar=DBAnimate | SpellDescription$ Target land becomes the basic land type of your choice until end of turn. -SVar:DBAnimate:DB$ Animate | ValidTgts$ Land | TgtPrompt$ Select target land | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True | OverwriteAbilities$ True | OverwriteTriggers$ True +SVar:DBAnimate:DB$ Animate | ValidTgts$ Land | TgtPrompt$ Select target land | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True | RemoveAllAbilities$ True SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/moonbow_illusionist.jpg diff --git a/res/cardsfolder/m/mystic_compass.txt b/res/cardsfolder/m/mystic_compass.txt index 54c3194c85e..952178e1e62 100644 --- a/res/cardsfolder/m/mystic_compass.txt +++ b/res/cardsfolder/m/mystic_compass.txt @@ -3,7 +3,7 @@ ManaCost:2 Types:Artifact Text:no text A:AB$ ChooseType | Cost$ 1 T | Defined$ You | Type$ Basic Land | SubAbility$ SVar=DBAnimate | SpellDescription$ Target land becomes the basic land type of your choice until end of turn. -SVar:DBAnimate:DB$ Animate | ValidTgts$ Land | TgtPrompt$ Select target land | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True | OverwriteAbilities$ True | OverwriteTriggers$ True +SVar:DBAnimate:DB$ Animate | ValidTgts$ Land | TgtPrompt$ Select target land | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True | RemoveAllAbilities$ True SVar:RemAIDeck:True SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/mystic_compass.jpg diff --git a/res/cardsfolder/r/reef_shaman.txt b/res/cardsfolder/r/reef_shaman.txt index c421844e238..0a1bc270689 100644 --- a/res/cardsfolder/r/reef_shaman.txt +++ b/res/cardsfolder/r/reef_shaman.txt @@ -4,7 +4,7 @@ Types:Creature Merfolk Shaman Text:no text PT:0/2 A:AB$ ChooseType | Cost$ T | Defined$ You | Type$ Basic Land | SubAbility$ SVar=DBAnimate | SpellDescription$ Target land becomes the basic land type of your choice until end of turn. -SVar:DBAnimate:DB$ Animate | ValidTgts$ Land | TgtPrompt$ Select target land | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True | OverwriteAbilities$ True | OverwriteTriggers$ True +SVar:DBAnimate:DB$ Animate | ValidTgts$ Land | TgtPrompt$ Select target land | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True | RemoveAllAbilities$ True SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/reef_shaman.jpg diff --git a/res/cardsfolder/s/sea_snidd.txt b/res/cardsfolder/s/sea_snidd.txt index 5982aba73f0..5c587615efe 100644 --- a/res/cardsfolder/s/sea_snidd.txt +++ b/res/cardsfolder/s/sea_snidd.txt @@ -4,7 +4,7 @@ Types:Creature Beast Text:no text PT:3/3 A:AB$ ChooseType | Cost$ T | Defined$ You | Type$ Basic Land | SubAbility$ SVar=DBAnimate | SpellDescription$ Target land becomes the basic land type of your choice until end of turn. -SVar:DBAnimate:DB$ Animate | ValidTgts$ Land | TgtPrompt$ Select target land | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True | OverwriteAbilities$ True | OverwriteTriggers$ True +SVar:DBAnimate:DB$ Animate | ValidTgts$ Land | TgtPrompt$ Select target land | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True | RemoveAllAbilities$ True SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/sea_snidd.jpg diff --git a/res/cardsfolder/s/shimmering_mirage.txt b/res/cardsfolder/s/shimmering_mirage.txt index de448b3145c..b914f4b8f99 100644 --- a/res/cardsfolder/s/shimmering_mirage.txt +++ b/res/cardsfolder/s/shimmering_mirage.txt @@ -3,7 +3,7 @@ ManaCost:1 U Types:Instant Text:no text A:SP$ ChooseType | Cost$ T | Defined$ You | Type$ Basic Land | SubAbility$ DBAnimate | SpellDescription$ Target land becomes the basic land type of your choice until end of turn. Draw a card. -SVar:DBAnimate:DB$ Animate | ValidTgts$ Land | TgtPrompt$ Select target land | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True | OverwriteAbilities$ True | OverwriteTriggers$ True | SubAbility$ DBDraw +SVar:DBAnimate:DB$ Animate | ValidTgts$ Land | TgtPrompt$ Select target land | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True | RemoveAllAbilities$ True | SubAbility$ DBDraw SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1 SVar:RemAIDeck:True SVar:Rarity:Common diff --git a/res/cardsfolder/t/tideshaper_mystic.txt b/res/cardsfolder/t/tideshaper_mystic.txt index 02d38d98ecf..9eb6a8fb96f 100644 --- a/res/cardsfolder/t/tideshaper_mystic.txt +++ b/res/cardsfolder/t/tideshaper_mystic.txt @@ -4,7 +4,7 @@ Types:Creature Merfolk Wizard Text:no text PT:1/1 A:AB$ ChooseType | Cost$ T | Defined$ You | Type$ Basic Land | PlayerTurn$ True | SubAbility$ DBAnimate | SpellDescription$ Target land becomes the basic land type of your choice until end of turn. Activate this ability only during your turn. -SVar:DBAnimate:DB$ Animate | ValidTgts$ Land | TgtPrompt$ Select target land | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True | OverwriteAbilities$ True | OverwriteTriggers$ True +SVar:DBAnimate:DB$ Animate | ValidTgts$ Land | TgtPrompt$ Select target land | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True | RemoveAllAbilities$ True SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/tideshaper_mystic.jpg diff --git a/res/cardsfolder/u/unstable_frontier.txt b/res/cardsfolder/u/unstable_frontier.txt index f0857645f44..11fa5393ac0 100644 --- a/res/cardsfolder/u/unstable_frontier.txt +++ b/res/cardsfolder/u/unstable_frontier.txt @@ -4,7 +4,7 @@ Types:Land Text:no text A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool. A:AB$ ChooseType | Cost$ T | Defined$ You | Type$ Basic Land | SubAbility$ DBAnimate | SpellDescription$ Target land you control becomes the basic land type of your choice until end of turn. -SVar:DBAnimate:DB$ Animate | ValidTgts$ Land.YouCtrl | TgtPrompt$ Select target land you control | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True | OverwriteAbilities$ True | OverwriteTriggers$ True +SVar:DBAnimate:DB$ Animate | ValidTgts$ Land.YouCtrl | TgtPrompt$ Select target land you control | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True | RemoveAllAbilities$ True SVar:RemAIDeck:True SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/unstable_frontier.jpg diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_Animate.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_Animate.java index 724c503d1a6..9d23b36415e 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory_Animate.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_Animate.java @@ -532,7 +532,7 @@ public final class AbilityFactory_Animate { //remove abilities final ArrayList removedAbilities = new ArrayList(); - if (params.containsKey("OverwriteAbilities")) { + if (params.containsKey("OverwriteAbilities") || params.containsKey("RemoveAllAbilities")) { for (SpellAbility ab : c.getSpellAbilities()) { if (ab.isAbility()) { c.removeSpellAbility(ab); @@ -554,7 +554,7 @@ public final class AbilityFactory_Animate { //suppress triggers from the animated card final ArrayList removedTriggers = new ArrayList(); - if (params.containsKey("OverwriteTriggers")) { + if (params.containsKey("OverwriteTriggers") || params.containsKey("RemoveAllAbilities")) { ArrayList triggersToRemove = c.getTriggers(); for (Trigger trigger : triggersToRemove) { trigger.setSuppressed(true);