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

Merge pull request #751 from kevlahnota/master

Browse Source 
adjust simple menu & textscroller
This commit is contained in:
Anthony Calosa
2016-07-13 13:11:39 +08:00
committed by GitHub
parent 6c9d2e5db7 d6d147187d
commit 1859fc87ae
4 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109805,8 +109805,8 @@ type=Enchantment
[/card] [/card]
[card] [card]
name=Teferi's Puzzle Box name=Teferi's Puzzle Box
auto=@each my upkeep:all(*|myhand) transforms((,newability[bottomoflibrary],newability[draw:1])) ueot auto=@each my draw:name(recycle draw) count(type:*:myhand) && bottomoflibrary all(*|myhand) && draw:countedamount controller
auto=@each my upkeep:all(*|opponenthand) transforms((,newability[bottomoflibrary],newability[draw:1])) ueot auto=@each opponent draw:name(recycle draw) count(type:*:opponenthand) && bottomoflibrary all(*|opponenthand) && draw:countedamount opponent
text=At the beginning of each player's draw step, that player puts the cards in his or her hand on the bottom of his or her library in any order, then draws that many cards. text=At the beginning of each player's draw step, that player puts the cards in his or her hand on the bottom of his or her library in any order, then draws that many cards.
mana={4} mana={4}
type=Artifact type=Artifact
@@ -123540,7 +123540,7 @@ type=Land
[/card] [/card]
[card] [card]
name=Westvale Cult Leader name=Westvale Cult Leader
anyzone=type:creature:mybattlefield/type:creature:mybattlefield cdaactive auto=foreach(creature|mybattlefield) 1/1
auto=@each my endofturn:token(Human Cleric,Creature Human Cleric,1/1,white,black) auto=@each my endofturn:token(Human Cleric,Creature Human Cleric,1/1,white,black)
text=Westvale Cult Leader's power and toughness are each equal to the number of creatures you control. -- At the beginning of your end step, put a 1/1 white and black Human Cleric creature token onto the battlefield. text=Westvale Cult Leader's power and toughness are each equal to the number of creatures you control. -- At the beginning of your end step, put a 1/1 white and black Human Cleric creature token onto the battlefield.
type=Creature type=Creature

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

@@ -781,9 +781,8 @@ void GameStateMenu::Render()
sprintf(text, "%s", _("LOADING...").c_str()); sprintf(text, "%s", _("LOADING...").c_str());
} }
//rectangle //rectangle
renderer->FillRect(0, SCREEN_HEIGHT - 50, SCREEN_WIDTH + 1.5f, mFont->GetHeight(),ARGB(225,5,5,5)); renderer->FillRect(0, SCREEN_HEIGHT - 50, SCREEN_WIDTH + 1.5f, mFont->GetHeight(),ARGB(225,5,5,5));;
//renderer->FillRect(0, SCREEN_HEIGHT - 50, SCREEN_WIDTH + 1.5f, mFont->GetHeight(),ARGB(25,205,0,0)); renderer->DrawRect(0, SCREEN_HEIGHT - 50, SCREEN_WIDTH + 1.5f, mFont->GetHeight(),ARGB(200, 204, 153, 0));
renderer->DrawRect(0, SCREEN_HEIGHT - 50, SCREEN_WIDTH + 1.5f, mFont->GetHeight(),ARGB(200, 204, 153, 0));
//end //end
mFont->SetColor(ARGB(170,0,0,0)); mFont->SetColor(ARGB(170,0,0,0));
mFont->DrawString(text, SCREEN_WIDTH / 2 + 2, SCREEN_HEIGHT - 50 + 2, JGETEXT_CENTER); mFont->DrawString(text, SCREEN_WIDTH / 2 + 2, SCREEN_HEIGHT - 50 + 2, JGETEXT_CENTER);

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

@@ -176,6 +176,8 @@ void SimpleMenu::Render()
if(!title.empty()) if(!title.empty())
adjustme += 3.f; adjustme += 3.f;
else
adjustme += 5.f;
//renderer->FillRect(mX, mY, mWidth, height - heightPadding, ARGB(180,0,0,0)); //renderer->FillRect(mX, mY, mWidth, height - heightPadding, ARGB(180,0,0,0));

16
projects/mtg/src/TextScroller.cpp
View File

@@ -67,10 +67,18 @@ void TextScroller::Update(float dt)
void TextScroller::Render() void TextScroller::Render()
{ {
WFont * mFont = WResourceManager::Instance()->GetWFont(fontId); WFont * mFont = WResourceManager::Instance()->GetWFont(fontId);
//JRenderer::GetInstance()->DrawLine(mX,mY,mX+mWidth,mY, ARGB(100, 255, 255, 255)); //tooltip
JRenderer::GetInstance()->FillRoundRect(mX,mY,mWidth,mFont->GetHeight(), 1, ARGB(225,5,5,5)); JQuadPtr tooltips;
//JRenderer::GetInstance()->FillRect(mX,mY,mWidth,mFont->GetHeight(), ARGB(25,205,0,0)); tooltips = WResourceManager::Instance()->RetrieveTempQuad("tooltips.png");//new graphics tooltips
//JRenderer::GetInstance()->DrawLine(mX,mY+11,mX+mWidth,mY+11, ARGB(100, 255, 255, 255)); if (tooltips.get())
{
float xscale = (mWidth+(mWidth/18)) / tooltips->mWidth;
float yscale = mFont->GetHeight() / tooltips->mHeight;
JRenderer::GetInstance()->RenderQuad(tooltips.get(), mX-4.5f, mY+0.5f,0,xscale,yscale);
}
else
JRenderer::GetInstance()->FillRoundRect(mX,mY,mWidth,mFont->GetHeight(), 1, ARGB(225,5,5,5));
//end tooltip
mFont->DrawString(mText.c_str(), mX, mY, JGETEXT_LEFT, start, mWidth); mFont->DrawString(mText.c_str(), mX, mY, JGETEXT_LEFT, start, mWidth);
} }