From ab75c1d5e2c0042a5c790b819a8f957657878dd2 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Wed, 13 Jul 2016 11:43:00 +0800 Subject: [PATCH 1/2] adjust simple menu adjust simple menu and fix some cards --- projects/mtg/bin/Res/sets/primitives/mtg.txt | 6 +++--- projects/mtg/src/SimpleMenu.cpp | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt index a41b0f8f2..dce17eaad 100644 --- a/projects/mtg/bin/Res/sets/primitives/mtg.txt +++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt @@ -109805,8 +109805,8 @@ type=Enchantment [/card] [card] name=Teferi's Puzzle Box -auto=@each my upkeep:all(*|myhand) transforms((,newability[bottomoflibrary],newability[draw:1])) ueot -auto=@each my upkeep:all(*|opponenthand) 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 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. mana={4} type=Artifact @@ -123540,7 +123540,7 @@ type=Land [/card] [card] 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) 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 diff --git a/projects/mtg/src/SimpleMenu.cpp b/projects/mtg/src/SimpleMenu.cpp index 6d922858c..57ae4498a 100644 --- a/projects/mtg/src/SimpleMenu.cpp +++ b/projects/mtg/src/SimpleMenu.cpp @@ -176,6 +176,8 @@ void SimpleMenu::Render() if(!title.empty()) adjustme += 3.f; + else + adjustme += 5.f; //renderer->FillRect(mX, mY, mWidth, height - heightPadding, ARGB(180,0,0,0)); From d6d147187ddf211c74d11c2d63df237085003a4b Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Wed, 13 Jul 2016 13:07:29 +0800 Subject: [PATCH 2/2] add tooltip on textscroller --- projects/mtg/src/GameStateMenu.cpp | 5 ++--- projects/mtg/src/TextScroller.cpp | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/projects/mtg/src/GameStateMenu.cpp b/projects/mtg/src/GameStateMenu.cpp index 64df9f7af..20f4c954c 100644 --- a/projects/mtg/src/GameStateMenu.cpp +++ b/projects/mtg/src/GameStateMenu.cpp @@ -781,9 +781,8 @@ void GameStateMenu::Render() sprintf(text, "%s", _("LOADING...").c_str()); } //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(25,205,0,0)); - renderer->DrawRect(0, SCREEN_HEIGHT - 50, SCREEN_WIDTH + 1.5f, mFont->GetHeight(),ARGB(200, 204, 153, 0)); + renderer->FillRect(0, SCREEN_HEIGHT - 50, SCREEN_WIDTH + 1.5f, mFont->GetHeight(),ARGB(225,5,5,5));; + renderer->DrawRect(0, SCREEN_HEIGHT - 50, SCREEN_WIDTH + 1.5f, mFont->GetHeight(),ARGB(200, 204, 153, 0)); //end mFont->SetColor(ARGB(170,0,0,0)); mFont->DrawString(text, SCREEN_WIDTH / 2 + 2, SCREEN_HEIGHT - 50 + 2, JGETEXT_CENTER); diff --git a/projects/mtg/src/TextScroller.cpp b/projects/mtg/src/TextScroller.cpp index 4c0ea5213..e539831e4 100644 --- a/projects/mtg/src/TextScroller.cpp +++ b/projects/mtg/src/TextScroller.cpp @@ -67,10 +67,18 @@ void TextScroller::Update(float dt) void TextScroller::Render() { WFont * mFont = WResourceManager::Instance()->GetWFont(fontId); - //JRenderer::GetInstance()->DrawLine(mX,mY,mX+mWidth,mY, ARGB(100, 255, 255, 255)); - JRenderer::GetInstance()->FillRoundRect(mX,mY,mWidth,mFont->GetHeight(), 1, ARGB(225,5,5,5)); - //JRenderer::GetInstance()->FillRect(mX,mY,mWidth,mFont->GetHeight(), ARGB(25,205,0,0)); - //JRenderer::GetInstance()->DrawLine(mX,mY+11,mX+mWidth,mY+11, ARGB(100, 255, 255, 255)); + //tooltip + JQuadPtr tooltips; + tooltips = WResourceManager::Instance()->RetrieveTempQuad("tooltips.png");//new graphics tooltips + 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); }