Improved implementation for isCommander and RingBearer card status (now they are no longer basic abilities but inner card properties in order to avoid conflicts with abilitiy modificators), added a white border on commanders to highlight them during match in the various game zones.

projects/mtg/include/MTGCardInstance.h

@@ -97,6 +97,8 @@ public:
     bool turningOver;
     bool isMorphed;
     int isFlipped;
+    int isCommander;
+    int isRingBearer;
     bool isDefeated;
     string MeldedFrom;
     bool isPhased;

projects/mtg/include/MTGDefinitions.h

@@ -291,7 +291,7 @@ class Constants
       HASOTHERKICKER = 163,
       PARTNER = 164,
       CANBECOMMANDER = 165,
-      ISCOMMANDER = 166,
+      POISONFOURTOXIC = 166,
       THREEBLOCKERS = 167,
       HANDDEATH = 168,
       INPLAYDEATH = 169,
@@ -319,7 +319,7 @@ class Constants
       PERPETUALDEATHTOUCH = 191,
       NONCOMBATVIGOR = 192,
       NOMOVETRIGGER = 193,
-      WASCOMMANDER = 194,
+      CANLOYALTYTWICE = 194,
       SHOWOPPONENTHAND = 195,
       SHOWCONTROLLERHAND = 196,
       HASREPLICATE = 197,
@@ -354,16 +354,13 @@ class Constants
       AFFINITYGRAVECREATURES = 226,
       AFFINITYATTACKINGCREATURES = 227,
       AFFINITYGRAVEINSTSORC = 228,
-      CANLOYALTYTWICE = 229,
-      POISONFOURTOXIC = 230,
-      POISONFIVETOXIC = 231,
-      POISONSIXTOXIC = 232,
-      POISONSEVENTOXIC = 233,
-      POISONEIGHTTOXIC = 234,
-      POISONNINETOXIC = 235,
-      POISONTENTOXIC = 236,
-      RINGBEARER = 237,
-      NB_BASIC_ABILITIES = 238,
+      POISONFIVETOXIC = 229,
+      POISONSIXTOXIC = 230,
+      POISONSEVENTOXIC = 231,
+      POISONEIGHTTOXIC = 232,
+      POISONNINETOXIC = 233,
+      POISONTENTOXIC = 234,
+      NB_BASIC_ABILITIES = 235,
 
     RARITY_S = 'S',   //Special Rarity
     RARITY_M = 'M',   //Mythics