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

corrections

Browse Source
This commit is contained in:
Anthony Calosa
2017-03-08 22:44:34 +08:00
parent 5c159e86d7
commit 57f55e4270
4 changed files with 353 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

685
projects/mtg/bin/Res/sets/primitives/mtg.txt
View File

File diff suppressed because it is too large Load Diff

6
projects/mtg/src/ActionStack.cpp
View File

@@ -1395,11 +1395,11 @@ void ActionStack::Render()
//stack fill
renderer->FillRect(x0 - 7, y0+2, width + 17, height + 14, ARGB(225,5,5,5));
//top stack fill
renderer->FillRect(x0 - 6, y0+37, width + 15, 40.5f, ARGB(60,135,206,235));
renderer->FillRect(x0 - 6, y0+37, width + 15, 40.5f, ARGB(20,135,206,235));
//stack highlight
renderer->FillRect(x0 - 6, y0+3, width + 15, 30, ARGB(255,89,89,89));
renderer->FillRect(x0 - 6, y0+3, width + 15, 31.f, ARGB(255,89,89,89));
//another border
renderer->DrawRect(x0 - 6, y0+33, width + 15, height - 18, ARGB(255,89,89,89));
renderer->DrawRect(x0 - 6, y0+34.5f, width + 15, height - 19.5f, ARGB(255,89,89,89));
//stack border
renderer->DrawRect(x0 - 7, y0+2, width + 17, height + 14, ARGB(255,240,240,240));

2
projects/mtg/src/GameStateMenu.cpp
View File

@@ -841,6 +841,7 @@ void GameStateMenu::Render()
renderer->RenderQuad(mBg.get(), SCREEN_WIDTH_F/2, 2, 0, 256 / mBg->mWidth, 166 / mBg->mHeight);
RenderTopMenu();
/*
//credits on lower left if available
std::ostringstream streamC;
streamC << "Credits: " << GameApp::mycredits;
@@ -852,6 +853,7 @@ void GameStateMenu::Render()
mFont->SetScale(DEFAULT_MAIN_FONT_SCALE);
mFont = WResourceManager::Instance()->GetWFont(Fonts::MENU_FONT);
//end
*/
}
if (subMenuController)
{

6
projects/mtg/src/MTGAbility.cpp
View File

@@ -673,6 +673,12 @@ int AbilityFactory::parseCastRestrictions(MTGCardInstance * card, Player * playe
if(player->game->inPlay->hasName(card->name))
return 0;
}
check = restriction[i].find("before attackers");
if(check != string::npos)
{
if(cPhase > MTG_PHASE_COMBATBEGIN)
return 0;
}
check = restriction[i].find("before battle damage");
if(check != string::npos)
{