Merge pull request #19 from WagicProject/master

getting master

.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://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://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

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

projects/mtg/src/GameStateMenu.cpp

@@ -780,11 +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->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);
         mFont->SetColor(ARGB(255,255,255,255));

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));
     

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);
 }