diff --git a/projects/mtg/src/CardGui.cpp b/projects/mtg/src/CardGui.cpp index dc78f226f..a37941143 100644 --- a/projects/mtg/src/CardGui.cpp +++ b/projects/mtg/src/CardGui.cpp @@ -285,11 +285,7 @@ void CardGui::Render() sprintf(buffer, "%i/%i", card->power, card->life); renderer->FillRect(actX - (12 * actZ), actY + 6 * actZ, 25 * actZ, 12 * actZ, ARGB(((static_cast(actA))/2),0,0,0)); - if(card->wasDealtDamage && card->life <= 2) - mFont->SetColor(ARGB(static_cast(actA),255,0,0));//red - else if(!card->wasDealtDamage && card->pbonus > 0) - mFont->SetColor(ARGB(static_cast(actA),152,251,152));//pale green - else if(card->getRarity() == Constants::RARITY_M) + if(card->getRarity() == Constants::RARITY_M) mFont->SetColor(ARGB(static_cast(actA),255,165,0));//orange else if(card->getRarity() == Constants::RARITY_R) mFont->SetColor(ARGB(static_cast(actA),255,215,0));//gold @@ -299,6 +295,14 @@ void CardGui::Render() mFont->SetColor(ARGB(static_cast(actA),238,130,238));//violet else mFont->SetColor(ARGB(static_cast(actA),255,255,255));//white + //damaged or buffed or powered down + if(card->wasDealtDamage && card->life <= 2) + mFont->SetColor(ARGB(static_cast(actA),255,0,0));//red + else if(!card->wasDealtDamage && card->pbonus > 0) + mFont->SetColor(ARGB(static_cast(actA),152,251,152));//pale green + else if(!card->wasDealtDamage && card->pbonus < 0) + mFont->SetColor(ARGB(static_cast(actA),216,191,216));//thistle + mFont->SetScale(actZ); mFont->SetScale(actZ); mFont->DrawString(buffer, actX - 10 * actZ, actY + 8 * actZ); mFont->SetScale(1);