chooseacolor indicator

replaced text with color filled rectangle
This commit is contained in:
Anthony Calosa
2017-02-16 00:28:07 +08:00
parent 60d7675a36
commit 90ed6e1fdd
2 changed files with 25 additions and 8 deletions

View File

@@ -4183,6 +4183,8 @@ int AACloner::resolve()
Spell * spell = NEW Spell(game, myClone); Spell * spell = NEW Spell(game, myClone);
spell->source->isToken = 1; spell->source->isToken = 1;
spell->resolve(); spell->resolve();
spell->source->owner = targetPlayer;
spell->source->lastController = targetPlayer;
spell->source->fresh = 1; spell->source->fresh = 1;
spell->source->entersBattlefield = 1; spell->source->entersBattlefield = 1;
spell->source->model = spell->source; spell->source->model = spell->source;

View File

@@ -460,15 +460,30 @@ void CardGui::Render()
if(card->chooseacolor >= 1) if(card->chooseacolor >= 1)
{ {
if(card->chooseacolor == 1) if(card->chooseacolor == 1)
buff += "\n-Green"; {
renderer->FillRect(actX - 10 * actZ, actY - (1 * actZ), 6.f,6.f,ARGB(255,0,255,0));
renderer->DrawRect(actX - 10 * actZ, actY - (1 * actZ), 6.f,6.f,ARGB(180,10,10,10));
}
else if(card->chooseacolor == 2) else if(card->chooseacolor == 2)
buff += "\n-Blue"; {
renderer->FillRect(actX - 10 * actZ, actY - (1 * actZ), 6.f,6.f,ARGB(255,0,206,209));
renderer->DrawRect(actX - 10 * actZ, actY - (1 * actZ), 6.f,6.f,ARGB(180,10,10,10));
}
else if(card->chooseacolor == 3) else if(card->chooseacolor == 3)
buff += "\n-Red"; {
renderer->FillRect(actX - 10 * actZ, actY - (1 * actZ), 6.f,6.f,ARGB(255,255,0,0));
renderer->DrawRect(actX - 10 * actZ, actY - (1 * actZ), 6.f,6.f,ARGB(180,10,10,10));
}
else if(card->chooseacolor == 4) else if(card->chooseacolor == 4)
buff += "\n-Black"; {
renderer->FillRect(actX - 10 * actZ, actY - (1 * actZ), 6.f,6.f,ARGB(255,20,20,20));
renderer->DrawRect(actX - 10 * actZ, actY - (1 * actZ), 6.f,6.f,ARGB(180,210,210,210));
}
else if(card->chooseacolor == 5) else if(card->chooseacolor == 5)
buff += "\n-White"; {
renderer->FillRect(actX - 10 * actZ, actY - (1 * actZ), 6.f,6.f,ARGB(255,250,235,215));
renderer->DrawRect(actX - 10 * actZ, actY - (1 * actZ), 6.f,6.f,ARGB(180,10,10,10));
}
} }
if(!alternate && buff != "" && game->gameType() == GAME_TYPE_CLASSIC)//it seems that other game modes makes cards as tokens!!! hmmm... if(!alternate && buff != "" && game->gameType() == GAME_TYPE_CLASSIC)//it seems that other game modes makes cards as tokens!!! hmmm...
{ {
@@ -476,8 +491,8 @@ void CardGui::Render()
char buffer[200]; char buffer[200];
sprintf(buffer, "%s", buff.c_str()); sprintf(buffer, "%s", buff.c_str());
mFont->SetColor(ARGB(static_cast<unsigned char>(actA),255,215,0));//Gold indicator mFont->SetColor(ARGB(static_cast<unsigned char>(actA),255,215,0));//Gold indicator
mFont->SetScale(0.8f); mFont->SetScale(actZ);
mFont->DrawString(buffer, actX - 10 * actZ, actY - (16 * actZ)); mFont->DrawString(buffer, actX - 10 * actZ, actY - (18.3f * actZ));
mFont->SetScale(1); mFont->SetScale(1);
} }
@@ -497,7 +512,7 @@ void CardGui::Render()
sprintf(buffer, "%i", card->counters->counters[0]->nb); sprintf(buffer, "%i", card->counters->counters[0]->nb);
mFont->SetColor(ARGB(static_cast<unsigned char>(actA),255,255,255)); mFont->SetColor(ARGB(static_cast<unsigned char>(actA),255,255,255));
mFont->SetScale(actZ); mFont->SetScale(actZ);
mFont->DrawString(buffer, actX - 10 * actZ, actY - (12 * actZ)); mFont->DrawString(buffer, actX - 10 * actZ, actY - (10.8f * actZ));
mFont->SetScale(1); mFont->SetScale(1);
} }
} }