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

Last March Update

Browse Source 
Some bug fixing to the primitives, the fetchlands are so buggy that I restored to a simple version

Some minor UI improvements
This commit is contained in:
Eduardo
2019-03-31 20:53:13 -06:00
parent e4d73d95ec
commit 6eca5bea2f
6 changed files with 95 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/GameStateDeckViewer.cpp
+1 -1
View File
@@ -1353,7 +1353,7 @@ void GameStateDeckViewer::renderOnScreenMenu()
sprintf(buffer, STATS_TITLE_FORMAT.c_str(), mStatsWrapper->currentPage, _("Mana cost per color").c_str());
font->DrawString(buffer, 10 + 20 + leftTransition, 10);
font->DrawString(_("Total colored manasymbols in cards' casting costs:"), 20 + 20 + leftTransition, 30);
font->DrawString(_("Total colored mana symbols in cards' casting costs:"), 20 + 20 + leftTransition, 30);
posY = 50;
for (int i = 1; i < Constants::NB_Colors - 1; i++)
projects/mtg/src/GameStateOptions.cpp
+2 -2
View File
@@ -250,8 +250,8 @@ void GameStateOptions::Render()
"",
"Dev Team:",
"Abrasax, Almosthumane, Daddy32, DJardin, Dr.Solomat, J, Jeck,",
"kevlahnota, Leungclj, linshier, Mootpoint, Mnguyen, Psyringe,",
"Rolzad73, Salmelo, Superhiro, Wololo, Yeshua, Zethfox",
"kevlahnota, Leungclj, linshier, Mootpoint, Mnguyen, Ph34rbot,",
"Psyringe, Rolzad73, Salmelo, Superhiro, Wololo, Yeshua, Zethfox",
"",
"Music by Celestial Aeon Project, http://www.jamendo.com",
"",
projects/mtg/src/GuiStatic.cpp
+2 -2
View File
@@ -120,13 +120,13 @@ void GuiAvatar::Render()
case TOP_LEFT:
mFont->SetColor(ARGB((int)actA / 4, 0, 0, 0));
mFont->DrawString(buffer, actX + 2, actY - 2);
mFont->SetScale(1.3f);
mFont->SetScale(1.5f);
mFont->SetColor(ARGB((int)actA, lx, ly, lz));
mFont->DrawString(buffer, actX + 1, actY - 1);
mFont->SetScale(1);
break;
case BOTTOM_RIGHT:
mFont->SetScale(1.3f);
mFont->SetScale(1.4f);
mFont->SetColor(ARGB((int)actA, lx, ly, lz));
mFont->DrawString(buffer, actX, actY - 14, JGETEXT_RIGHT);
mFont->SetScale(1);
projects/mtg/src/MTGDeck.cpp
+4 -4
View File
@@ -1238,7 +1238,7 @@ void MTGDeck::printDetailedDeckText(std::ofstream& file )
string setName = setInfo->id;
string cardName = card->data->getName();
currentCard << "#" << nbCards << " x " << cardName << " (" << setName << "), ";
currentCard << "#" << nbCards << "x " << cardName << " (" << setName << "), ";
if ( !card->data->isLand() )
currentCard << card->data->getManaCost() << ", ";
@@ -1293,9 +1293,9 @@ void MTGDeck::printDetailedDeckText(std::ofstream& file )
ss_spells << numberOfSpells;
ss_lands << numberOfLands;
file << getCardBlockText( "Creatures x " + ss_creatures.str(), creatures.str() ) << endl;
file << getCardBlockText( "Spells x " + ss_spells.str(), spells.str() ) << endl;
file << getCardBlockText( "Lands x " + ss_lands.str(), lands.str() ) << endl;
file << getCardBlockText( "Creatures x" + ss_creatures.str(), creatures.str() ) ;
file << getCardBlockText( "Spells x" + ss_spells.str(), spells.str() ) ;
file << getCardBlockText( "Lands x" + ss_lands.str(), lands.str() ) ;
creatures.str("");
spells.str("");
lands.str("");
projects/mtg/src/WGui.cpp
+3 -3
View File
@@ -2127,7 +2127,7 @@ void WGuiFilterItem::updateValue()
}
else if (filterType == FILTER_CMC)
{
for (int i = 0; i < 20; i++)
for (int i = 0; i < 17; i++)
{
sprintf(buf_code, "cmc:%i;", i);
sprintf(buf_name, "%i Mana", i);
@@ -2136,7 +2136,7 @@ void WGuiFilterItem::updateValue()
}
else if (filterType == FILTER_POWER)
{
for (int i = 0; i < 14; i++)
for (int i = 0; i < 17; i++)
{
sprintf(buf_code, "pow:%i;", i);
sprintf(buf_name, "%i power", i);
@@ -2145,7 +2145,7 @@ void WGuiFilterItem::updateValue()
}
else if (filterType == FILTER_TOUGH)
{
for (int i = 0; i < 14; i++)
for (int i = 0; i < 17; i++)
{
sprintf(buf_code, "tgh:%i;", i);
sprintf(buf_name, "%i toughness", i);