From ab75c1d5e2c0042a5c790b819a8f957657878dd2 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Wed, 13 Jul 2016 11:43:00 +0800 Subject: [PATCH 1/8] 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/8] 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); } From 6c9d2e5db7c39f4207744773b5a37f89126a7c6d Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Wed, 13 Jul 2016 13:09:34 +0800 Subject: [PATCH 3/8] tooltip graphic --- projects/mtg/bin/Res/graphics/tooltips.png | Bin 0 -> 21596 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 projects/mtg/bin/Res/graphics/tooltips.png diff --git a/projects/mtg/bin/Res/graphics/tooltips.png b/projects/mtg/bin/Res/graphics/tooltips.png new file mode 100644 index 0000000000000000000000000000000000000000..4498aaebdd38a7f369d32f02fdaf0f1665b7e6a7 GIT binary patch literal 21596 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 literal 0 HcmV?d00001 From e95b9f57fa2c07025ccf0b14bff9554e5774faad Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Wed, 13 Jul 2016 14:25:57 +0800 Subject: [PATCH 4/8] menubar --- projects/mtg/src/GameStateMenu.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/projects/mtg/src/GameStateMenu.cpp b/projects/mtg/src/GameStateMenu.cpp index 20f4c954c..92b424328 100644 --- a/projects/mtg/src/GameStateMenu.cpp +++ b/projects/mtg/src/GameStateMenu.cpp @@ -780,10 +780,22 @@ void GameStateMenu::Render() else sprintf(text, "%s", _("LOADING...").c_str()); } + //tooltip & overlay + JQuadPtr menubar; + menubar = WResourceManager::Instance()->RetrieveTempQuad("menubar.png");//new graphics menubar + if (menubar.get()) + { + float xscale = SCREEN_WIDTH / menubar->mWidth; + float yscale = mFont->GetHeight() / menubar->mHeight; + renderer->RenderQuad(menubar.get(), 0, (SCREEN_HEIGHT - menubar->mHeight) - 18,0,xscale,yscale); + } + else + { //rectangle 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); mFont->SetColor(ARGB(255,255,255,255)); From d88db28da8f45a45e2da7e6124c8810f4f528471 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Wed, 13 Jul 2016 14:27:33 +0800 Subject: [PATCH 5/8] menubar graphic --- projects/mtg/bin/Res/graphics/menubar.png | Bin 0 -> 25240 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 projects/mtg/bin/Res/graphics/menubar.png diff --git a/projects/mtg/bin/Res/graphics/menubar.png b/projects/mtg/bin/Res/graphics/menubar.png new file mode 100644 index 0000000000000000000000000000000000000000..20b0e40bba615d0c563312f09b3f12ad256ede3a GIT binary patch literal 25240 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 literal 0 HcmV?d00001 From d4e0ca3f03f06ac9d09ba45ecf5fc95982430317 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Thu, 14 Jul 2016 00:57:50 +0800 Subject: [PATCH 6/8] try to fix build --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ebf672af8..3a93a7164 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,8 @@ before_install: export PSPDEV="$TRAVIS_BUILD_DIR/opt/pspsdk" && export PSPSDK="$PSPDEV/psp/sdk" && export PATH="$PATH:$PSPDEV/bin:$PSPSDK/bin" && - wget -O sdk.lzma http://sourceforge.net/projects/minpspw/files/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma/download; + # wget -O sdk.lzma http://sourceforge.net/projects/minpspw/files/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma/download; + wget -O sdk.lzma http://downloads.sourceforge.net/project/minpspw/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma; fi # Building for Qt here - if [ "$BUILD_Qt" == "YES" ]; then From 9fe5ec6068da876eed35ba4bfbc9f8ca56dda105 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Thu, 14 Jul 2016 00:59:46 +0800 Subject: [PATCH 7/8] removed old path --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3a93a7164..53c7bc2d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,6 @@ before_install: export PSPDEV="$TRAVIS_BUILD_DIR/opt/pspsdk" && export PSPSDK="$PSPDEV/psp/sdk" && export PATH="$PATH:$PSPDEV/bin:$PSPSDK/bin" && - # wget -O sdk.lzma http://sourceforge.net/projects/minpspw/files/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma/download; wget -O sdk.lzma http://downloads.sourceforge.net/project/minpspw/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma; fi # Building for Qt here From 169e2b8477c5d8d9d4cace1c5db1b5b051a13ca7 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Thu, 14 Jul 2016 01:13:43 +0800 Subject: [PATCH 8/8] change path again --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 53c7bc2d2..a6815b8b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ before_install: export PSPDEV="$TRAVIS_BUILD_DIR/opt/pspsdk" && export PSPSDK="$PSPDEV/psp/sdk" && export PATH="$PATH:$PSPDEV/bin:$PSPSDK/bin" && - wget -O sdk.lzma http://downloads.sourceforge.net/project/minpspw/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma; + wget -O sdk.lzma http://superb-sea2.dl.sourceforge.net/project/minpspw/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma; fi # Building for Qt here - if [ "$BUILD_Qt" == "YES" ]; then