Merge pull request #13 from WagicProject/master

getting master

CHANGELOG.md

@@ -1,7 +1,14 @@
 # Changelog
 
 ## [latest-master] (https://github.com/WagicProject/wagic/tree/latest-master)
+#### 7/7/16
+- *Merged pull-request:* Sorted Primitives and Cleanup Tabs [#\727] (https://github.com/WagicProject/wagic/pull/719) ([kevlahnota](https://github.com/kevlahnota))
+
+- *Merged pull-request:* push to wagicproject [#\725] (https://github.com/WagicProject/wagic/pull/725) ([zethfoxster](https://github.com/zethfoxster))
+
 #### 7/4/16
+- *Merged pull-request:* Sorted Primitives & Updated Premium Deck Series [#\719] (https://github.com/WagicProject/wagic/pull/719) ([kevlahnota](https://github.com/kevlahnota))
+
 - *Merged pull-request:* Fails but I have no idea why [#\717] (https://github.com/WagicProject/wagic/pull/717) ([zethfoxster](https://github.com/zethfoxster))
 
 - *Merged pull-request:* Updated Sets [#\715] (https://github.com/WagicProject/wagic/pull/715) ([kevlahnota](https://github.com/kevlahnota))

projects/mtg/bin/Res/test/_tests.txt

@@ -455,6 +455,7 @@ library_of_alexandria3.txt
 lifeforce.txt
 lifeline.txt
 lifetap.txt
+lifetap2.txt
 lightmine_field.txt
 lightmine_field2.txt
 living_artifact_i169.txt

projects/mtg/bin/Res/test/lifetap2.txt

@@ -0,0 +1,22 @@
+#Player 2 must not gain life because Shocklands enters tha battlefied tapped...
+[INIT]
+firstmain
+[PLAYER1]
+hand:Stomping Ground, Temple Garden
+inplay:Exploration
+[PLAYER2]
+inplay:Lifetap
+life:20
+[DO]
+Stomping Ground
+choice 1
+Temple Garden
+choice 1
+[ASSERT]
+firstmain
+[PLAYER1]
+inplay:Exploration, Stomping Ground, Temple Garden
+[PLAYER2]
+inplay:Lifetap
+life:20
+[END]

projects/mtg/include/MTGCardInstance.h

@@ -113,6 +113,7 @@ public:
     bool isDualWielding;
     bool stillNeeded;
     Player * lastController;
+    Player * previousController;
     MTGGameZone * getCurrentZone();
     MTGGameZone * previousZone;
     MTGCardInstance * previous;

projects/mtg/src/AllAbilities.cpp

@@ -3843,6 +3843,13 @@ AAMover::AAMover(GameObserver* observer, int _id, MTGCardInstance * _source, MTG
 MTGGameZone * AAMover::destinationZone(Targetable * target)
 {
     MTGCardInstance * _target = (MTGCardInstance *) target;
+    if(destination == "previousbattlefield")
+    {
+        if(_target->previousController)
+            return _target->previousController->inPlay();
+        else
+            return _target->controller()->inPlay();
+    }
     return MTGGameZone::stringToZone(game, destination, source, _target);
 }
 

projects/mtg/src/MTGCardInstance.cpp

@@ -49,6 +49,7 @@ MTGCardInstance::MTGCardInstance(MTGCard * card, MTGPlayerCards * arg_belongs_to
     if (arg_belongs_to)
         owner = arg_belongs_to->library->owner;
     lastController = owner;
+    previousController = owner;
     defenser = NULL;
     banding = NULL;
     life = toughness;

projects/mtg/src/MTGGameZones.cpp

@@ -576,6 +576,7 @@ MTGCardInstance * MTGGameZone::removeCard(MTGCardInstance * card, int createCopy
                 copy->storedCard = card->storedCard;
                 copy->storedSourceCard = card->storedSourceCard;
                 copy->lastController = card->controller();
+                copy->previousController = card->controller();
                 for (int i = 0; i < ManaCost::MANA_PAID_WITH_OVERLOAD +1; i++)
                     copy->alternateCostPaid[i] = card->alternateCostPaid[i];