From cbe64235c897927a41e2c970cccfecee6ac978cb Mon Sep 17 00:00:00 2001 From: Sloth Date: Sun, 26 May 2013 12:47:50 +0000 Subject: [PATCH] - Converted Treacherous Link to script. --- res/cardsfolder/t/treacherous_link.txt | 6 +++++- src/main/java/forge/Card.java | 7 ------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/res/cardsfolder/t/treacherous_link.txt b/res/cardsfolder/t/treacherous_link.txt index b85d65e5796..4a773b218a5 100644 --- a/res/cardsfolder/t/treacherous_link.txt +++ b/res/cardsfolder/t/treacherous_link.txt @@ -1,9 +1,13 @@ Name:Treacherous Link ManaCost:1 B Types:Enchantment Aura -Text:All damage that would be dealt to enchanted creature is dealt to its controller instead. K:Enchant creature A:SP$ Attach | Cost$ 1 B | ValidTgts$ Creature | AILogic$ Curse +R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ Card.EnchantedBy | ReplaceWith$ DmgEnchanted | IsCombat$ False | Description$ All damage that would be dealt to enchanted creature is dealt to its controller instead. +R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ Card.EnchantedBy | ReplaceWith$ DmgEnchantedCombat | IsCombat$ True | Secondary$ True | Description$ All damage that would be dealt to enchanted creature is dealt to its controller instead. +SVar:DmgEnchanted:AB$ DealDamage | Cost$ 0 | Defined$ EnchantedOwner | DamageSource$ ReplacedSource | NumDmg$ X | References$ X +SVar:DmgEnchantedCombat:AB$ DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ EnchantedOwner | DamageSource$ ReplacedSource | NumDmg$ X | References$ X +SVar:X:ReplaceCount$DamageAmount SVar:RemAIDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/treacherous_link.jpg Oracle:Enchant creature\nAll damage that would be dealt to enchanted creature is dealt to its controller instead. diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index 3dca4820b79..44b53786ea0 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -7340,13 +7340,6 @@ public class Card extends GameEntity implements Comparable { return 0; } - final List auras = new ArrayList(this.getEnchantedBy()); - - if (Iterables.any(auras, CardPredicates.nameEquals("Treacherous Link"))) { - this.getController().addDamage(damageIn, source); - return 0; - } - return damageIn; }