From d77fa5033e43f84d955e62a8d41d625cf4c88f57 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 04:38:42 +0000
Subject: [PATCH] 1) Changed the keyword:

"This creature can't attack"

to this new updated form:

"CARDNAME can't attack."

2) I updated these cards.txt card entries and moved them to the top of file:

Cagemail
Cessation
---
 res/cards.txt                    | 30 +++++++++++++++---------------
 src/forge/CardFactoryUtil.java   |  4 ++--
 src/forge/CardFactory_Auras.java |  4 ++--
 src/forge/CombatUtil.java        |  2 +-
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/res/cards.txt b/res/cards.txt
index cdd7fec3950..447dda301c7 100644
--- a/res/cards.txt
+++ b/res/cards.txt
@@ -1,3 +1,18 @@
+Cagemail
+1 W
+Enchantment Aura
+Enchanted creature gets +2/+2 and can't attack.
+Enchant creature
+enPumpCurse:+2/+2/CARDNAME can't attack.
+
+Cessation
+2 W
+Enchantment Aura
+Enchanted creature can't attack.
+Enchant creature
+enPumpCurse:CARDNAME can't attack.
+When CARDNAME is put into a graveyard from the battlefield, return CARDNAME to its owner's hand.
+
 Bound in Silence
 2 W
 Tribal Enchantment Rebel Aura
@@ -190,14 +205,6 @@ Enchant creature
 enPump:+1/+2
 When CARDNAME is put into a graveyard from the battlefield, return CARDNAME to its owner's hand.
 
-Cessation
-2 W
-Enchantment Aura
-Enchanted creature can't attack.
-Enchant creature
-enPumpCurse:This creature can't attack
-When CARDNAME is put into a graveyard from the battlefield, return CARDNAME to its owner's hand.
-
 Despondency
 1 B
 Enchantment Aura
@@ -3086,13 +3093,6 @@ Goblin Assault
 Enchantment
 At the beginning of your upkeep, put a 1/1 red Goblin creature token with haste onto the battlefield. Goblin creatures attack each turn if able.
 
-Cagemail
-1 W
-Enchantment Aura
-Enchanted creature gets +2/+2 and can't attack.
-Enchant creature
-enPumpCurse:+2/+2/This creature can't attack
-
 Cursed Flesh
 B
 Enchantment Aura
diff --git a/src/forge/CardFactoryUtil.java b/src/forge/CardFactoryUtil.java
index e21c1f38fb0..d86d4771800 100644
--- a/src/forge/CardFactoryUtil.java
+++ b/src/forge/CardFactoryUtil.java
@@ -1826,12 +1826,12 @@ public class CardFactoryUtil {
                 
                 //else we may need to filter the list and remove inappropriate targets
                 
-                // If extrinsicKeywords contains "This creature can't attack" or "CARDNAME can't attack or block."
+                // If extrinsicKeywords contains "CARDNAME can't attack." or "CARDNAME can't attack or block."
                 //     then remove creatures with Defender from the list
                 
                 final ArrayList<String> extKeywords = new ArrayList<String>(Arrays.asList(extrinsicKeywords));
                 
-                if (extKeywords.contains("This creature can't attack") || extKeywords.contains("CARDNAME can't attack or block.")) {
+                if (extKeywords.contains("CARDNAME can't attack.") || extKeywords.contains("CARDNAME can't attack or block.")) {
                     list = list.filter(new CardListFilter() {
                         public boolean addCard(Card c) {
                         	return c.isCreature() && !c.getKeyword().contains("Defender");
diff --git a/src/forge/CardFactory_Auras.java b/src/forge/CardFactory_Auras.java
index cfd0fa216ee..16f2975467b 100644
--- a/src/forge/CardFactory_Auras.java
+++ b/src/forge/CardFactory_Auras.java
@@ -1649,7 +1649,7 @@ class CardFactory_Auras {
                 public void execute() {
                     if(card.isEnchanting()) {
                         Card crd = card.getEnchanting().get(0);
-                        crd.addExtrinsicKeyword("This creature can't attack");
+                        crd.addExtrinsicKeyword("CARDNAME can't attack.");
                     }
                 }//execute()
             };//Command
@@ -1661,7 +1661,7 @@ class CardFactory_Auras {
                 public void execute() {
                     if(card.isEnchanting()) {
                         Card crd = card.getEnchanting().get(0);
-                        crd.removeExtrinsicKeyword("This creature can't attack");
+                        crd.removeExtrinsicKeyword("CARDNAME can't attack.");
                     }
                     
                 }//execute()
diff --git a/src/forge/CombatUtil.java b/src/forge/CombatUtil.java
index 3aa4c58e832..f03c0b71a70 100644
--- a/src/forge/CombatUtil.java
+++ b/src/forge/CombatUtil.java
@@ -295,7 +295,7 @@ public class CombatUtil {
         }
         
         if(c.isTapped() || c.hasSickness() || c.getKeyword().contains("Defender") || moatPrevented
-                || oppControlsBlazingArchon(c) || c.getKeyword().contains("This creature can't attack")
+                || oppControlsBlazingArchon(c) || c.getKeyword().contains("CARDNAME can't attack.")
                 || c.getKeyword().contains("CARDNAME can't attack or block.")) return false;
         
         //if Card has Haste, Card.hasSickness() will return false