From 13a95b2c9af38992342eec735abdb7643a9648ed Mon Sep 17 00:00:00 2001 From: jendave Date: Sun, 7 Aug 2011 00:35:31 +0000 Subject: [PATCH] - Little fix in the stack description of AF tap. - Added Maddening Wind. --- .gitattributes | 1 + res/cardsfolder/maddening_wind.txt | 11 +++++++++++ .../abilityFactory/AbilityFactory_PermanentState.java | 6 ++++-- 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 res/cardsfolder/maddening_wind.txt diff --git a/.gitattributes b/.gitattributes index 47852338d14..1af2c91b5e7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4178,6 +4178,7 @@ res/cardsfolder/macabre_waltz.txt -text svneol=native#text/plain res/cardsfolder/macetail_hystrodon.txt -text svneol=native#text/plain res/cardsfolder/machinate.txt -text svneol=native#text/plain res/cardsfolder/mad_auntie.txt -text svneol=native#text/plain +res/cardsfolder/maddening_wind.txt -text svneol=native#text/plain res/cardsfolder/madrush_cyclops.txt -text svneol=native#text/plain res/cardsfolder/maelstrom_nexus.txt -text svneol=native#text/plain res/cardsfolder/maelstrom_pulse.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/maddening_wind.txt b/res/cardsfolder/maddening_wind.txt new file mode 100644 index 00000000000..26b4c074b31 --- /dev/null +++ b/res/cardsfolder/maddening_wind.txt @@ -0,0 +1,11 @@ +Name:Maddening Wind +ManaCost:2 G +Types:Enchantment Aura +Text:no text +K:Enchant Creature Curse +K:Cumulative upkeep:G +T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ EnchantedController | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of the upkeep of enchanted creature's controller, CARDNAME deals 2 damage to that player. +SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Defined$ EnchantedController | NumDmg$ 2 +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/maddening_wind.jpg +End \ No newline at end of file diff --git a/src/forge/card/abilityFactory/AbilityFactory_PermanentState.java b/src/forge/card/abilityFactory/AbilityFactory_PermanentState.java index 1a2ee8f021a..f5189a8ae47 100644 --- a/src/forge/card/abilityFactory/AbilityFactory_PermanentState.java +++ b/src/forge/card/abilityFactory/AbilityFactory_PermanentState.java @@ -507,7 +507,9 @@ public class AbilityFactory_PermanentState { public static String tapStackDescription(AbilityFactory af, SpellAbility sa){ // when getStackDesc is called, just build exactly what is happening - StringBuilder sb = new StringBuilder(); + StringBuilder sb = new StringBuilder(); + final HashMap params = af.getMapParams(); + Card hostCard = sa.getSourceCard(); if (sa instanceof Ability_Sub) sb.append(" "); @@ -522,7 +524,7 @@ public class AbilityFactory_PermanentState { tgtCards = tgt.getTargetCards(); else{ tgtCards = new ArrayList(); - tgtCards.add(af.getHostCard()); + tgtCards = AbilityFactory.getDefinedCards(hostCard, params.get("Defined"), sa); } Iterator it = tgtCards.iterator();