Merge pull request #807 from kevlahnota/master

Add test and Fix unused variable error
This commit is contained in:
Anthony Calosa
2016-07-29 08:11:05 +08:00
committed by GitHub
3 changed files with 41 additions and 1 deletions

View File

@@ -0,0 +1,39 @@
#Tireless Tracker counters vs Graf Mole opponents
[INIT]
FIRSTMAIN
[PLAYER1]
inplay:Concordant Crossroads, Swamp, Tireless Tracker, Mortician Beetle
library:Mountain
hand:Plains
[PLAYER2]
inplay:Graf Mole
[DO]
Plains
Swamp
Plains
Clue
#Tireless Tracker gets a counter
#Mortician sacrificed event must not trigger
#Graf Mole in opponents must not trigger and his life must not change
#begins
next
#attack
next
Tireless Tracker
Mortician Beetle
next
#damage
next
#end
eot
#untap
[ASSERT]
UNTAP
[PLAYER1]
inplay:Concordant Crossroads, Swamp, Tireless Tracker, Plains, Mortician Beetle
hand:Mountain
life:20
[PLAYER2]
inplay:Graf Mole
life:15
[END]

View File

@@ -683,6 +683,7 @@ tidal_warrior_i649.txt
tidal_warrior_i652.txt
Timely_Reinforcements.txt
TirelessTracker.txt
TirelessGraf.txt
titanic_ultimatum.txt
tokenizer.txt
tokenizer2.txt

View File

@@ -1372,7 +1372,7 @@ public:
if (!e) return 0;
MTGCardInstance * check = e->cardAfter;
MTGGameZone * oldZone = e->cardAfter->currentZone;
MTGGameZone * currZone = check->currentZone;
//MTGGameZone * currZone = check->currentZone;
check->currentZone = check->previousZone;
if (check->next && (check->next->currentZone|| check->isToken))
{