Erwan
-fix issue 187 (Double Strike + First Strike)
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user