Erwan

- replaced variables canPutLandsIntoPlay and landsPlayerCanStillPlay with a PlayRestrictions class.
- Added  seenThisTurn(TargetChooser * tc) in MTGGameZones, which allows to count how many cards matching a targetChooser have been in a given zone in the current turn. With minor work, this can probably be reused by the ability parser for some cards that need to count how many **** where played or put on the stack during a turn.
-- for example player->game->stack->seenThisTurn([put a TypeTargetChooser("creature") here]) would give you the number of creature spells cast by the player this turn.
- This is the first step of a refactor that aims at removing all the adhoc variables for "cant cast". I plan to get rid of the following variables in Player.h (and the associated code, which hopefully will become smaller):  
    int castedspellsthisturn;
    bool onlyonecast;
    int castcount;
    bool nocreatureinstant;
    bool nospellinstant;
    bool onlyoneinstant;
    bool castrestrictedcreature;
    bool castrestrictedspell;
    bool onlyoneboth;
    bool bothrestrictedspell;
    bool bothrestrictedcreature;

They will be replaced by the PlayRestrictions system, and hopefully I'll have time to update the parser to make this more generic as well.
My initial goal with this change was to move the limit of 1 land per turn outside of the code, and make it an external rule in Rules/mtg.txt. I have yet to do it.

projects/mtg/src/MTGGameZones.cpp

@@ -68,10 +68,28 @@ MTGPlayerCards::~MTGPlayerCards()
     SAFE_DELETE(removedFromGame);
     SAFE_DELETE(garbage);
     SAFE_DELETE(temp);
+    SAFE_DELETE(playRestrictions);
+}
+
+void MTGPlayerCards::beforeBeginPhase()
+{
+    delete garbage;
+    garbage = NEW MTGGameZone();
+    garbage->setOwner(this->owner);
+
+    library->beforeBeginPhase();
+    graveyard->beforeBeginPhase();
+    hand->beforeBeginPhase();
+    inPlay->beforeBeginPhase();
+    stack->beforeBeginPhase();
+    removedFromGame->beforeBeginPhase();
+    garbage->beforeBeginPhase();
+    temp->beforeBeginPhase();
 }
 
 void MTGPlayerCards::setOwner(Player * player)
 {
+    this->owner = player;
     library->setOwner(player);
     graveyard->setOwner(player);
     hand->setOwner(player);
@@ -241,6 +259,11 @@ void MTGPlayerCards::init()
     exile = removedFromGame;
     garbage = NEW MTGGameZone();
     temp = NEW MTGGameZone();
+
+    //This is a Rule that should ideally be moved as an ability in the game...
+    playRestrictions = NEW PlayRestrictions();
+    TargetChooser * tc = NEW TypeTargetChooser("land");
+    playRestrictions->addRestriction(NEW MaxPerTurnRestriction(PlayRestriction::LANDS_RULE_ID, tc, 1, inPlay));
 }
 
 void MTGPlayerCards::showHand()
@@ -312,7 +335,7 @@ MTGCardInstance * MTGPlayerCards::putInZone(MTGCardInstance * card, MTGGameZone
 
     //The "Temp" zone are purely for code purposes, and we don't want the abilities engine to
     //Trigger when cards move in this zone
-    // Additionally, when they mve "from" this zone,
+    // Additionally, when they move "from" this zone,
     // we trick the engine into believing that they moved from the zone the card was previously in
     // See http://code.google.com/p/wagic/issues/detail?id=335
     {
@@ -391,6 +414,11 @@ MTGGameZone::~MTGGameZone()
     owner = NULL;
 }
 
+void MTGGameZone::beforeBeginPhase()
+{
+    cardsSeenThisTurn.clear();
+};
+
 void MTGGameZone::setOwner(Player * player)
 {
     for (int i = 0; i < nb_cards; i++)
@@ -583,6 +611,22 @@ int MTGGameZone::hasAbility(int ability)
     return 0;
 }
 
+int MTGGameZone::seenThisTurn(TargetChooser * tc)
+{
+    //The following 2 lines modify the passed TargetChooser. Call this function with care :/
+    tc->setAllZones(); // This is to allow targetting cards without caring about the actual zone
+    tc->targetter = NULL;
+
+    int count = 0;
+    for (vector<MTGCardInstance *>::iterator iter = cardsSeenThisTurn.begin(); iter != cardsSeenThisTurn.end(); ++iter)
+    {
+        if (tc->canTarget(*iter))
+            count++;
+    }
+    return count;
+}
+
+
 void MTGGameZone::cleanupPhase()
 {
     for (int i = 0; i < (nb_cards); i++)
@@ -599,6 +643,7 @@ void MTGGameZone::addCard(MTGCardInstance * card)
     if (!card)
         return;
     cards.push_back(card);
+    cardsSeenThisTurn.push_back(card);
     nb_cards++;
     cardsMap[card] = 1;
     card->lastController = this->owner;