Fixed primitives, added "notshare!" keyword (e.g. to search cards with different names), improved decks selection according to chosen game mode (e.g. Game will show commander decks only in commander mode and it will hide them in other modes).

projects/mtg/include/CardDescriptor.h

@@ -30,7 +30,9 @@ class CardDescriptor: public MTGCardInstance
  public:
   enum Operator{
       CD_OR = 1,
-      CD_AND = 2
+      CD_AND = 2,
+      CD_NOR = 3,
+      CD_NAND = 4
   };
 
   Operator mode;

projects/mtg/include/DeckMetaData.h

@@ -24,7 +24,7 @@ private:
     int mDeckId;
     string mAvatarFilename;
     string  mColorIndex;
-    
+
     // statistical information
     int mGamesPlayed, mVictories, mPercentVictories, mDifficulty;
     int getAvatarId();
@@ -33,7 +33,7 @@ private:
 
 public:
 
-
+    bool isCommanderDeck; //Added to read the command tag in deck's metafile.
     DeckMetaData(const string& filename, bool isAI = false);
     void LoadDeck();
     void LoadStats();

projects/mtg/include/GameState.h

@@ -73,14 +73,11 @@ public:
     // it makes it easier to manipulate the deck information menus.
 
     // generate the Deck Meta Data and build the menu items of the menu given
-    static vector<DeckMetaData *> fillDeckMenu(SimpleMenu * _menu, const string& path, const string& smallDeckPrefix = "", Player * statsPlayer = NULL);
-
-    // generate the Deck Meta Data and build the menu items of the menu given
-    // Will display up to maxDecks if maxDecks is non 0,all decks in path otherwise
-    static vector<DeckMetaData *> fillDeckMenu(DeckMenu * _menu, const string& path, const string& smallDeckPrefix = "", Player * statsPlayer = NULL, int maxDecks = 0);
+    // Will display up to maxDecks if maxDecks is non 0,all decks in path otherwise and it will show or not commander decks according to the current game type
+    static vector<DeckMetaData *> fillDeckMenu(DeckMenu * _menu, const string& path, const string& smallDeckPrefix = "", Player * statsPlayer = NULL, int maxDecks = 0, GameType type = GAME_TYPE_CLASSIC);
 
     // build a vector of decks with the information passsed in.
-    static vector<DeckMetaData *> BuildDeckList(const string& path, const string& smallDeckPrefix = "", Player * statsPlayer = NULL, int maxDecks = 0);
+    static vector<DeckMetaData *> BuildDeckList(const string& path, const string& smallDeckPrefix = "", Player * statsPlayer = NULL, int maxDecks = 0, GameType type = GAME_TYPE_CLASSIC);
 
     // build menu items based on the vector<DeckMetaData *>
     static void renderDeckMenu(SimpleMenu * _menu, const vector<DeckMetaData *>& deckMetaDataList);

projects/mtg/include/MTGDeck.h

@@ -217,6 +217,7 @@ public:
     map<int, int> cards;
     string meta_desc;
     string meta_name;
+    bool meta_commander;
     vector<string> meta_AIHints;
     vector<string> Sideboard;
     vector<string> CommandZone;