From 51a2d28f49b24962ecd80c8915676845fb8ece30 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 09:09:23 +0000 Subject: [PATCH] - Fixed the typo in "Prevent all combat damage that would be dealt by CARDNAME." --- res/cardsfolder/demonic_torment.txt | 2 +- src/forge/GameAction.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/res/cardsfolder/demonic_torment.txt b/res/cardsfolder/demonic_torment.txt index 937177c6304..8b70f1392e2 100644 --- a/res/cardsfolder/demonic_torment.txt +++ b/res/cardsfolder/demonic_torment.txt @@ -3,7 +3,7 @@ ManaCost:2 B Types:Enchantment Aura Text:Enchanted creature can't attack.\r\nPrevent all combat damage that would be dealt by enchanted creature. K:Enchant creature -K:enPumpCurse:HIDDEN CARDNAME can't attack. & HIDDEN Prevent all combat damage that would be dealt dealt by CARDNAME. +K:enPumpCurse:HIDDEN CARDNAME can't attack. & HIDDEN Prevent all combat damage that would be dealt by CARDNAME. SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/demonic_torment.jpg End \ No newline at end of file diff --git a/src/forge/GameAction.java b/src/forge/GameAction.java index 1112c62b724..9298b8254f8 100644 --- a/src/forge/GameAction.java +++ b/src/forge/GameAction.java @@ -3727,7 +3727,7 @@ public class GameAction { //AllZone.GameAction.addDamage(c, crd , assignedDamageMap.get(crd)); if (source.getKeyword().contains("Prevent all combat damage that would be dealt to and dealt by CARDNAME.") - || source.getKeyword().contains("Prevent all combat damage that would be dealt dealt by CARDNAME.")) + || source.getKeyword().contains("Prevent all combat damage that would be dealt by CARDNAME.")) damageToAdd = 0; else { if((source.getKeyword().contains("Wither") || source.getKeyword().contains("Infect")) && card.isCreature()) { @@ -3857,7 +3857,7 @@ public class GameAction { public void addCombatDamage(String player, Card source, int damage) { if (source.getKeyword().contains("Prevent all combat damage that would be dealt to and dealt by CARDNAME.") - || source.getKeyword().contains("Prevent all combat damage that would be dealt dealt by CARDNAME.")) + || source.getKeyword().contains("Prevent all combat damage that would be dealt by CARDNAME.")) damage = 0; //addDamage(player, source, damage); if (source.getKeyword().contains("Infect"))