Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #801 from kevlahnota/master

Browse Source 
Fix Compilation and add Tireless Tracker Test
This commit is contained in:
Anthony Calosa
2016-07-28 17:09:34 +08:00
committed by GitHub
parent e3ad9296bc 30dab27202
commit e8019bbb92
4 changed files with 48 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
projects/mtg/bin/Res/test/TirelessTracker.txt Normal file
View File

@@ -0,0 +1,33 @@
#Tireless Tracker counters
[INIT]
FIRSTMAIN
[PLAYER1]
inplay:Concordant Crossroads, Swamp, Tireless Tracker
library:Mountain
hand:Plains
[PLAYER2]
[DO]
Plains
Swamp
Plains
Clue
#begins
next
#attack
next
Tireless Tracker
next
#damage
next
#end
eot
#untap
[ASSERT]
UNTAP
[PLAYER1]
inplay:Concordant Crossroads, Swamp, Tireless Tracker, Plains
hand:Mountain
life:20
[PLAYER2]
life:16
[END]

1
projects/mtg/bin/Res/test/_tests.txt
View File

@@ -682,6 +682,7 @@ tidal_warrior_i646.txt
tidal_warrior_i649.txt
tidal_warrior_i652.txt
Timely_Reinforcements.txt
TirelessTracker.txt
titanic_ultimatum.txt
tokenizer.txt
tokenizer2.txt

4
projects/mtg/include/AllAbilities.h
View File

@@ -1370,8 +1370,8 @@ public:
{
WEventCardSacrifice * e = dynamic_cast<WEventCardSacrifice *> (event);
if (!e) return 0;
//if (e->istoken)
// return 1;
if (e->istoken)
return 1;
MTGCardInstance * check = e->cardAfter;
MTGGameZone * oldZone = e->cardAfter->currentZone;
check->currentZone = check->previousZone;

22
projects/mtg/src/GameObserver.cpp
View File

@@ -1132,20 +1132,22 @@ void GameObserver::Affinity()
}
///we handle trisnisphere seperately because its a desaster.
if(card->getManaCost())//make sure we check, abiliy$!/token dont have a mancost object.
if (card->has(Constants::TRINISPHERE))
{
for (int jj = card->getManaCost()->getConvertedCost(); jj < 3; jj++)
if (card->has(Constants::TRINISPHERE))
{
card->getManaCost()->add(Constants::MTG_COLOR_ARTIFACT, 1);
card->countTrini++;
for (int jj = card->getManaCost()->getConvertedCost(); jj < 3; jj++)
{
card->getManaCost()->add(Constants::MTG_COLOR_ARTIFACT, 1);
card->countTrini++;
}
}
}
else
{
if (card->countTrini)
else
{
card->getManaCost()->remove(Constants::MTG_COLOR_ARTIFACT, card->countTrini);
card->countTrini = 0;
if (card->countTrini)
{
card->getManaCost()->remove(Constants::MTG_COLOR_ARTIFACT, card->countTrini);
card->countTrini = 0;
}
}
}
///////////////////////