Erwan

- deprecated the following keywords (see list below for new usage)
-- cantcreaturecast => auto=maxCast(creature)0
-- cantspellcast => auto=maxCast(*)0
-- onlyonecast => auto=maxCast(*)1 
-- bothcantcast => auto=maxCast(*)0 auto=maxCast(*)0 opponent
-- bothnocreature => auto=maxCast(creature)0 auto=maxCast(creature)0 opponent
-- oneboth => auto=maxCast(*)1 auto=maxCast(*)1 opponent

Strangely enough, I couldn't find most of these keywords in mtg.txt?

I also removed variables such as "spellCastedThisTurn" and stuff like that... now if you want to know how many spells were cast in one turn by a given player, use player->game->stack->seenThisTurn("*").
seenThisTurn can take a string representing a TargetChooser, or better, a TargetChooser.

I can't guarantee I didn't break anything, but the test suite passes and the AI seems to run ok

projects/mtg/include/MTGDefinitions.h

@@ -147,13 +147,13 @@ class Constants
 	  CANTLOSE = 59,
     CANTLIFELOSE = 60,
     CANTMILLLOSE = 61,
-    CANTCASTCREATURE = 62,
-	  CANTCAST = 63,
-		CANTCASTTWO = 64,
-	  STORM = 65,
-	  BOTHCANTCAST = 66,
-	  BOTHNOCREATURE = 67,
-	  ONLYONEBOTH = 68,
+    SNOWWALK = 62,
+    NONBASICWALK = 63,
+    STRONG = 64,
+	STORM = 65,
+    PHASING = 66,
+    SPLITSECOND = 67,
+    WEAK = 68,
     AFFINITYARTIFACTS = 69,
 	  AFFINITYPLAINS = 70,
 		AFFINITYFOREST = 71,
@@ -176,14 +176,11 @@ SNOWPLAINSWALK = 87,
 SNOWMOUNTAINWALK = 88,
 SNOWISLANDWALK = 89,
 SNOWSWAMPWALK = 90,
-SNOWWALK = 91,
-NONBASICWALK = 92,
-STRONG = 93,
-WEAK = 94,
-PHASING = 95,
-SPLITSECOND = 96,
 
-    NB_BASIC_ABILITIES = 97,
+
+
+
+    NB_BASIC_ABILITIES = 91,
 
 
     RARITY_S = 'S',   //Special Rarity

projects/mtg/include/MTGGameZones.h

@@ -97,7 +97,11 @@ class MTGGameZone {
    int hasName(string value);
    int hasColor(int value); //returns 1 if one of the cards in the zone has the color, 0 otherwise
    int hasX();
-   int seenThisTurn(TargetChooser * tc); //How many cards matching a TargetChooser have been put in this zone during the turn
+
+   //How many cards matching a TargetChooser have been put in this zone during the turn
+   int seenThisTurn(TargetChooser * tc); 
+   int seenThisTurn(string s); 
+
    void setOwner(Player * player);
    MTGCardInstance * lastCardDrawn;
    static MTGGameZone * stringToZone(string zoneName, MTGCardInstance * source, MTGCardInstance * target);

projects/mtg/include/Player.h

@@ -28,14 +28,6 @@ public:
     JQuadPtr mAvatar;
     int playMode;
     bool nomaxhandsize;
-    int castedspellsthisturn;
-    bool onlyonecast;
-    int castcount;
-    bool castrestrictedcreature;
-    bool castrestrictedspell;
-    bool onlyoneboth;
-    bool bothrestrictedspell;
-    bool bothrestrictedcreature;
     bool isPoisoned;
     MTGPlayerCards * game;
     string deckFile;