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

more fixes from the review...

Browse Source
This commit is contained in:
omegablast2002@yahoo.com
2011-01-22 16:48:55 +00:00
parent 27e60fc605
commit 07802134e8
10 changed files with 59 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/MTGAbility.cpp
+5 -5
View File
@@ -173,9 +173,9 @@ int MTGAbility::allowedToAltCast(MTGCardInstance * card,Player * player)
if(opponenttypemin < opponentmin && less == false && more == false)
return 0;
}
if(less == true && more == false && opponenttypemin <= mytypemin)
if(less && more == false && opponenttypemin <= mytypemin)
return 0;
if(less == false && more == true && opponenttypemin >= mytypemin)
if(less == false && more && opponenttypemin >= mytypemin)
return 0;
return 1;
}
@@ -4276,13 +4276,13 @@ TriggerAtPhase::TriggerAtPhase(int id, MTGCardInstance * source, Targetable * ta
int TriggerAtPhase::trigger()
{
if(source->isPhased) return 0;
if(lifelost == true && source->controller()->opponent()->lifeLostThisTurn < lifeamount)
if(lifelost && source->controller()->opponent()->lifeLostThisTurn < lifeamount)
{
return 0;
}
if (sourceUntapped == true && source->isTapped() == 1)
if (sourceUntapped && source->isTapped() == 1)
return 0;
if (sourceTap == true && !source->isTapped())
if (sourceTap && !source->isTapped())
return 0;
if (testDestroy())
return 0; // http://code.google.com/p/wagic/issues/detail?id=426