From dbc5376135a7421bff2709d90e3a87d58e35db1a Mon Sep 17 00:00:00 2001
From: "omegablast2002@yahoo.com"
 <omegablast2002@yahoo.com@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Thu, 31 Mar 2011 16:39:28 +0000
Subject: [PATCH] added "abilities=canattack" Warmonger's Chariot 6/15/2010:
 The second ability doesn't cause the equipped creature to lose defender. It
 just lets it attack.

---
 projects/mtg/include/MTGDefinitions.h | 3 ++-
 projects/mtg/src/MTGCardInstance.cpp  | 2 +-
 projects/mtg/src/MTGDefinitions.cpp   | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/projects/mtg/include/MTGDefinitions.h b/projects/mtg/include/MTGDefinitions.h
index 05bc2623b..31b280e9a 100644
--- a/projects/mtg/include/MTGDefinitions.h
+++ b/projects/mtg/include/MTGDefinitions.h
@@ -176,11 +176,12 @@ SNOWPLAINSWALK = 87,
 SNOWMOUNTAINWALK = 88,
 SNOWISLANDWALK = 89,
 SNOWSWAMPWALK = 90,
+CANATTACK = 91,
 
 
 
 
-    NB_BASIC_ABILITIES = 91,
+    NB_BASIC_ABILITIES = 92,
 
 
     RARITY_S = 'S',   //Special Rarity
diff --git a/projects/mtg/src/MTGCardInstance.cpp b/projects/mtg/src/MTGCardInstance.cpp
index 90fc1825c..807128d4f 100644
--- a/projects/mtg/src/MTGCardInstance.cpp
+++ b/projects/mtg/src/MTGCardInstance.cpp
@@ -529,7 +529,7 @@ int MTGCardInstance::canAttack()
         return 0;
     if (hasSummoningSickness())
         return 0;
-    if (basicAbilities[Constants::DEFENSER] || basicAbilities[Constants::CANTATTACK])
+    if ((basicAbilities[Constants::DEFENSER] || basicAbilities[Constants::CANTATTACK]) && !basicAbilities[Constants::CANATTACK])
         return 0;
     if (!isCreature())
         return 0;
diff --git a/projects/mtg/src/MTGDefinitions.cpp b/projects/mtg/src/MTGDefinitions.cpp
index 213d64b48..3850063ff 100644
--- a/projects/mtg/src/MTGDefinitions.cpp
+++ b/projects/mtg/src/MTGDefinitions.cpp
@@ -117,7 +117,8 @@ const char* Constants::MTGBasicAbilities[] = {
     "snowplainslandwalk",
     "snowmountainlandwalk",
     "snowislandlandwalk",
-    "snowswamplandwalk"
+    "snowswamplandwalk",
+    "canattack"
 };
 
 map<string,int> Constants::MTGBasicAbilitiesMap;