From 020fc1ec8fa61fe4630c80c1c9d7b315b7bb63fd Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 19:04:21 +0000 Subject: [PATCH] - Converting Animate Wall to enPump: - Fixing Rolling Stones to only pump Walls - Removing hardcoded references to these cards --- res/cardsfolder/animate_wall.txt | 3 ++- res/cardsfolder/rolling_stones.txt | 2 +- src/forge/CombatUtil.java | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/res/cardsfolder/animate_wall.txt b/res/cardsfolder/animate_wall.txt index 858b84db7d5..8fa399910ce 100644 --- a/res/cardsfolder/animate_wall.txt +++ b/res/cardsfolder/animate_wall.txt @@ -1,8 +1,9 @@ Name:Animate Wall ManaCost:W Types:Enchantment Aura -Text:Enchanted Wall can attack as though it didn't have defender. +Text:no text K:Enchant Wall +K:enPump:HIDDEN CARDNAME can attack as though it didn't have defender.:Enchanted Wall can attack as though it didn't have defender. SVar:RemAIDeck:True SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/animate_wall.jpg diff --git a/res/cardsfolder/rolling_stones.txt b/res/cardsfolder/rolling_stones.txt index b2db3659e84..a8e5fb59d15 100644 --- a/res/cardsfolder/rolling_stones.txt +++ b/res/cardsfolder/rolling_stones.txt @@ -2,7 +2,7 @@ Name:Rolling Stones ManaCost:1 W Types:Enchantment Text:no text -K:stPumpAll:Creature.withDefender:0/0/HIDDEN CARDNAME can attack as though it didn't have defender.:No Condition:Wall creatures can attack as though they didn't have defender. +K:stPumpAll:Creature.Wall:0/0/HIDDEN CARDNAME can attack as though it didn't have defender.:No Condition:Wall creatures can attack as though they didn't have defender. SVar:PlayMain1:TRUE SVar:RemAIDeck:True SVar:Rarity:Rare diff --git a/src/forge/CombatUtil.java b/src/forge/CombatUtil.java index 9d6b476fa5d..cb5959aa4de 100644 --- a/src/forge/CombatUtil.java +++ b/src/forge/CombatUtil.java @@ -450,8 +450,7 @@ public class CombatUtil { || (AllZoneUtil.isCardInPlay("Reverence", c.getController().getOpponent()) && c.getNetAttack() < 3)) return false; - if(c.getKeyword().contains("Defender") && !(c.isType("Wall") && AllZoneUtil.isCardInPlay("Rolling Stones")) && - (!(c.isType("Wall") && c.isEnchantedBy("Animate Wall"))) && !c.hasKeyword("CARDNAME can attack as though it didn't have defender.")) { + if(c.getKeyword().contains("Defender") && !c.hasKeyword("CARDNAME can attack as though it didn't have defender.")) { return false; }