From f43cf9395c25762baed7c7ab4d2cbdd2d72f527d Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 19:27:11 +0000 Subject: [PATCH] convert Guilty Conscience to triggers --- res/cardsfolder/guilty_conscience.txt | 5 +++- src/forge/GameActionUtil.java | 39 --------------------------- 2 files changed, 4 insertions(+), 40 deletions(-) diff --git a/res/cardsfolder/guilty_conscience.txt b/res/cardsfolder/guilty_conscience.txt index 4fdde1b2126..e389bb7288a 100644 --- a/res/cardsfolder/guilty_conscience.txt +++ b/res/cardsfolder/guilty_conscience.txt @@ -1,8 +1,11 @@ Name:Guilty Conscience ManaCost:W Types:Enchantment Aura -Text:Whenever enchanted creature deals damage, Guilty Conscience deals that much damage to that creature. +Text:no text K:Enchant creature +T:Mode$ DamageDone | ValidSource$ Card.AttachedBy | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature deals damage, CARDNAME deals that much damage to that creature. +SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Defined$ Enchanted | NumDmg$ X +SVar:X:Count$TriggeredDamageAmount SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/guilty_conscience.jpg SetInfo:SCG|Common|http://magiccards.info/scans/en/sc/17.jpg diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index 9bd8ef070ab..9c4104cbd13 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -2914,45 +2914,6 @@ public class GameActionUtil { if(source.getKeyword().contains("Deathtouch") && affected.isCreature()) AllZone.GameAction.destroy(affected); } - - public static void executeGuiltyConscienceEffects(Card c, Card source) { - int pwr = c.getNetCombatDamage(); - final int damage = pwr; - final Card src = source; - - final Card crd = c; - Ability ability2 = new Ability(c, "0") { - @Override - public void resolve() { - crd.addDamage(damage, src); - } - }; // ability2 - - StringBuilder sb = new StringBuilder(); - sb.append("Guilty Conscience deals ").append(damage).append(" damage to ").append(c.getName()); - ability2.setStackDescription(sb.toString()); - - if (damage >= 0) - AllZone.Stack.add(ability2); - } - - public static void executeGuiltyConscienceEffects(Card c, Card source, int n) { - final int damage = n; - final Card crd = c; - final Card src = source; - Ability ability2 = new Ability(c, "0") { - @Override - public void resolve() { - crd.addDamage(damage, src); - } - }; // ability2 - - StringBuilder sb = new StringBuilder(); - sb.append("Guilty Conscience deals ").append(n).append(" damage to ").append(c.getName()); - ability2.setStackDescription(sb.toString()); - - AllZone.Stack.add(ability2); - } public static void executeSwordOfLightAndShadowEffects(final Card source) { final Card src = source;