-fix issue 187 (Double Strike + First Strike)
This commit is contained in:
wagic.the.homebrew@gmail.com
2009-11-15 10:23:37 +00:00
parent f6a75a0e43
commit d85b1d66de
6 changed files with 28 additions and 6 deletions
+7 -5
View File
@@ -420,12 +420,14 @@ void GameStateDuel::Render()
mFont->DrawString(buf,0,SCREEN_HEIGHT/2);
nbFailed = testSuite->nbAIFailed;
nbTests = testSuite->nbAITests;
if (!nbFailed){
sprintf(buf, "AI Tests: All %i tests successful!", nbTests);
}else{
sprintf(buf, "AI Tests: %i tests out of %i FAILED!", nbFailed, nbTests);
if (nbTests){
if (!nbFailed){
sprintf(buf, "AI Tests: All %i tests successful!", nbTests);
}else{
sprintf(buf, "AI Tests: %i tests out of %i FAILED!", nbFailed, nbTests);
}
mFont->DrawString(buf,0,SCREEN_HEIGHT/2+20);
}
mFont->DrawString(buf,0,SCREEN_HEIGHT/2+20);
}
#endif
break;
+1 -1
View File
@@ -680,7 +680,7 @@ int MTGCardInstance::stepPower(CombatStep step)
case DAMAGE :
case END_DAMAGE :
default :
if (has(Constants::FIRSTSTRIKE)) return 0; else return MAX(0, power);
if (has(Constants::FIRSTSTRIKE) && !has(Constants::DOUBLESTRIKE)) return 0; else return MAX(0, power);
}
}