Merge pull request #629 from kevlahnota/master

added M15 cards :)

projects/mtg/include/AllAbilities.h

@@ -546,6 +546,16 @@ private:
         {
             intValue = target->controller()->life;
         }
+        else if (s == "startinglife")
+        {
+            intValue = target->controller()->initLife;
+        }
+        else if (s == "abundantlife")//current life is morethan or equal to starting life
+        {
+            intValue = 0;
+            if (target->controller()->life >= target->controller()->initLife)
+                intValue = 1;
+        }
         else if (s == "highestlifetotal")
         {
             intValue = target->controller()->life <= target->controller()->opponent()->life? target->controller()->opponent()->life:target->controller()->life;

projects/mtg/include/Player.h

@@ -43,6 +43,7 @@ public:
     int extraTurn;
     int drawCounter;
     int epic;
+    int initLife;
     vector<string> prowledTypes;
     vector<MTGCardInstance*>curses;
     Player(GameObserver *observer, string deckFile, string deckFileSmall, MTGDeck * deck = NULL);

projects/mtg/src/Rules.cpp

@@ -404,6 +404,7 @@ void Rules::initGame(GameObserver *g, bool currentPlayerSet)
     {
         Player * p = g->players[i];
         p->life = initState.playerData[i].player->life;
+        p->initLife = initState.playerData[i].player->life;
         p->poisonCount = initState.playerData[i].player->poisonCount;
         p->damageCount = initState.playerData[i].player->damageCount;
         p->preventable = initState.playerData[i].player->preventable;