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

Fixed card types and subtypes visualization, added C20 set and improved Android downloader.

Browse Source
This commit is contained in:
valfieri
2020-04-16 21:21:34 +02:00
parent 21778de9fb
commit b863188c3c
4 changed files with 2429 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
projects/mtg/src/CardGui.cpp
View File

@@ -841,26 +841,28 @@ void CardGui::AlternateRender(MTGCard * card, const Pos& pos)
if (found != string::npos)
{
string s = "";
for (int i = card->data->types.size() - 1; i > 0; --i)
if (card->data->basicAbilities[(int)Constants::CHANGELING])
{
if (card->data->basicAbilities[(int)Constants::CHANGELING])
{// this avoids drawing the list of subtypes on changeling cards.
s += _("Shapeshifter - ");
break;
// this avoids drawing the list of subtypes on changeling cards.
if (card->data->types.size()){
s = _(MTGAllCards::findType(card->data->types[0])) + _(" - Shapeshifter");
} else {
s = _("Shapeshifter");
}
else
{
} else {
for (unsigned int i = 0; i < card->data->types.size() - 1; i++)
{
s += _(MTGAllCards::findType(card->data->types[i]));
s += _(" - ");
if(!strcmp(_(MTGAllCards::findType(card->data->types[i])).c_str(),"Creature") || !strcmp(_(MTGAllCards::findType(card->data->types[i])).c_str(),"Land"))
s += _(" - ");
else
s += _(" ");
}
s += _(MTGAllCards::findType(card->data->types[card->data->types.size()-1]));
}
if (card->data->types.size())
s += _(MTGAllCards::findType(card->data->types[0]));
else
{
if (!card->data->types.size()){
DebugTrace("Typeless card: " << setlist[card->setId].c_str() << card->data->getName() << card->getId());
}
formattedfield = FormattedData(formattedfield, "types", s);
}
@@ -1140,26 +1142,28 @@ void CardGui::TinyCropRender(MTGCard * card, const Pos& pos, JQuad * quad)
if (found != string::npos)
{
string s = "";
for (int i = card->data->types.size() - 1; i > 0; --i)
if (card->data->basicAbilities[(int)Constants::CHANGELING])
{
if (card->data->basicAbilities[(int)Constants::CHANGELING])
{// this avoids drawing the list of subtypes on changeling cards.
s += _("Shapeshifter - ");
break;
// this avoids drawing the list of subtypes on changeling cards.
if (card->data->types.size()){
s = _(MTGAllCards::findType(card->data->types[0])) + _(" - Shapeshifter");
} else {
s = _("Shapeshifter");
}
else
{
} else {
for (unsigned int i = 0; i < card->data->types.size() - 1; i++)
{
s += _(MTGAllCards::findType(card->data->types[i]));
s += _(" - ");
if(!strcmp(_(MTGAllCards::findType(card->data->types[i])).c_str(),"Creature") || !strcmp(_(MTGAllCards::findType(card->data->types[i])).c_str(),"Land"))
s += _(" - ");
else
s += _(" ");
}
s += _(MTGAllCards::findType(card->data->types[card->data->types.size()-1]));
}
if (card->data->types.size())
s += _(MTGAllCards::findType(card->data->types[0]));
else
{
if (!card->data->types.size()){
DebugTrace("Typeless card: " << setlist[card->setId].c_str() << card->data->getName() << card->getId());
}
formattedfield = FormattedData(formattedfield, "types", s);
}