From e831a8e40049fcb78a5f29bde1716c61e78bd9ef Mon Sep 17 00:00:00 2001
From: "wagic.the.homebrew"
 <wagic.the.homebrew@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Tue, 20 Jan 2009 13:15:52 +0000
Subject: [PATCH] Erwan - a few card updates - back to original font for menus

---
 projects/mtg/bin/Res/graphics/simon.dat  | Bin 2048 -> 2048 bytes
 projects/mtg/bin/Res/graphics/simon.png  | Bin 3882 -> 2791 bytes
 projects/mtg/bin/Res/sets/10E/todo.dat   |   2 ++
 projects/mtg/bin/Res/sets/ALA/_cards.dat |  44 +++++++++++++++++++++++
 projects/mtg/bin/Res/sets/ALA/todo.dat   |  41 ++-------------------
 projects/mtg/include/GameStateMenu.h     |   1 -
 projects/mtg/include/MTGDefinitions.h    |   7 ++--
 projects/mtg/include/SimpleMenu.h        |   2 +-
 projects/mtg/src/GameApp.cpp             |   4 +--
 projects/mtg/src/GameStateDuel.cpp       |   2 +-
 projects/mtg/src/GameStateMenu.cpp       |  10 +++---
 projects/mtg/src/MTGAbility.cpp          |   2 +-
 projects/mtg/src/MTGGameZones.cpp        |   5 ++-
 projects/mtg/src/MTGGuiPlay.cpp          | Bin 11876 -> 23754 bytes
 projects/mtg/src/SimpleMenu.cpp          |   2 +-
 projects/mtg/src/SimpleMenuItem.cpp      |   8 ++---
 16 files changed, 74 insertions(+), 56 deletions(-)

diff --git a/projects/mtg/bin/Res/graphics/simon.dat b/projects/mtg/bin/Res/graphics/simon.dat
index 76f1b8e158a53edd867c5369e950807c7d786056..5f1321458accb4c2d149cebd9ed58d2eea67550f 100644
GIT binary patch
literal 2048
zcmeIxOD{t~6ae74@v2v;dQ=tlT!`3+*oa6hgcUY|1qqRO29ZW1A;H4Wrgy&RUecA$
z=F6O!oO9>gnIyD^+UN*vso9W8E&N1kV~Pu0=9>MR+~J<}Bc6$0h4wVxqk7NQ6L#5`
zGcR(6i(KJ4x46qg`A_7#Q1^}%zS>`}AJ3Z?FL91bT;&G0xzA&s^OhC9@r#YCAOGjI
zI#2rXV*dGCKkmzz|Gob)&w)Iryj1tzyvlbr?)>q--Gr9(-aYv5RrmWNjfPOK9|Jw&
zS@v^)gB)goMV2_hGN(Dqc_xfs8FZ`m9^>d_H+$K~9P=FF2uC@_aZa*XKQ^M-|JaB4
LiktWEzr4S1%JL<e

literal 2048
zcmeIyu`7gO90%~{E?t+TOP8cex^zj>rAwD2Ns^2PgV|s(8w@6+LH+>AY><pH$zYNs
z86<<@2HjwixcB*Vw~IyhE}x#?^Ynb*_xC>Un-1B~xVl4UVj<)b%iop8HOpnLant%8
z?(@+6DKFJ;Lszoji@Z1UY38jf8do^a6|QrOyFB2D{m<=pE%%W%epuhikI!3DuX2&A
z+~79%c*HYa@qsmdGM9>Zf0rNM=bgM){dhOdHuK}UochoEANM)7&joMfJ{i~9(aev1
z$gBTe|KoYP51HiLJ$vtU=R1>1%AwW&IPQyt0tY$7VUDuQ3agyr4ClDOC8ingGU!&&
qjSzaw_p+Y@EV9HAj&Yn5oa8jy`LPl0{>MJVueg2w;$P|ie}7+twnsMr

diff --git a/projects/mtg/bin/Res/graphics/simon.png b/projects/mtg/bin/Res/graphics/simon.png
index e82520eeef597d84e16c029f6bed94ae378a6fcf..262ae500d0c44216d0005a809972d9d7093cd3b2 100644
GIT binary patch
delta 2618
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

delta 3603
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

diff --git a/projects/mtg/bin/Res/sets/10E/todo.dat b/projects/mtg/bin/Res/sets/10E/todo.dat
index 569bcaf30..99bde671b 100644
--- a/projects/mtg/bin/Res/sets/10E/todo.dat
+++ b/projects/mtg/bin/Res/sets/10E/todo.dat
@@ -70,6 +70,8 @@ subtype=Aura
 [/card]
 [card]
 text={T}: Draw three cards.     {2}{U}{U}: Return Arcanis the Omnipotent to its owner's hand.
+auto={T}:draw 3
+auto={2}{U}{U}:moveTo(hand)
 abilities=legendary
 auto={T}:Draw:3
 id=106426
diff --git a/projects/mtg/bin/Res/sets/ALA/_cards.dat b/projects/mtg/bin/Res/sets/ALA/_cards.dat
index 4d1ec8108..b4272f3fe 100644
--- a/projects/mtg/bin/Res/sets/ALA/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ALA/_cards.dat
@@ -106,6 +106,15 @@ subtype=Human Archer
 toughness=3
 [/card]
 [card]
+text=Dragon creatures you control get +3/+3.
+auto=lord(dragon|myinplay) 3/3
+id=179426
+name=Crucible of Fire
+rarity=R
+type=Enchantment
+mana={3}{R}
+[/card]
+[card]
 text=Crumbling Necropolis comes into play tapped.     {T}: Add {U}, {B}, or {R} to your mana pool.
 auto=tap
 auto={T}:Add{U}
@@ -356,6 +365,18 @@ type=Basic Land
 subtype=Island
 [/card]
 [card]
+text=Jhessian Infiltrator is unblockable.
+abilities=unblockable
+id=175392
+name=Jhessian Infiltrator
+rarity=U
+type=Creature
+mana={G}{U}
+power=2
+subtype=Human Rogue
+toughness=2
+[/card]
+[card]
 text=
 id=176428
 name=Jhessian Lookout
@@ -469,6 +490,19 @@ type=Instant
 mana={1}{G}
 [/card]
 [card]
+text={R}, {T}: Target creature gets +2/+0 until end of turn.     {W}, {T}: Tap target creature.
+auto={R},{T}:2/0 target(creature)
+auto={W},{T}:tap target(creature)
+id=174944
+name=Naya Battlemage
+rarity=U
+type=Creature
+mana={2}{G}
+power=2
+subtype=Human Shaman
+toughness=2
+[/card]
+[card]
 text={T}: Add {G}, {W}, or {U} to your mana pool.
 auto={T}:Add{G}
 auto={T}:Add{W}
@@ -641,6 +675,16 @@ rarity=U
 type=Land
 [/card]
 [card]
+text=Remove target card in a graveyard from the game. You gain 3 life.
+target=*|graveyard
+auto=moveto(removedfromgame)
+id=177473
+name=Shadowfeed
+rarity=C
+type=Instant
+mana={B}
+[/card]
+[card]
 text={U}: Shore Snapper gains islandwalk until end of turn.
 id=175390
 auto={U}:islandwalk
diff --git a/projects/mtg/bin/Res/sets/ALA/todo.dat b/projects/mtg/bin/Res/sets/ALA/todo.dat
index f199d6e8a..e3f36b6ad 100644
--- a/projects/mtg/bin/Res/sets/ALA/todo.dat
+++ b/projects/mtg/bin/Res/sets/ALA/todo.dat
@@ -290,14 +290,7 @@ rarity=R
 type=Enchantment
 mana={3}{W}
 [/card]
-[card]
-text=Dragon creatures you control get +3/+3.
-id=179426
-name=Crucible of Fire
-rarity=R
-type=Enchantment
-mana={3}{R}
-[/card]
+
 [card]
 text=Target opponent sacrifices a creature, discards three cards, then loses 5 life. You return a creature card from your graveyard to your hand, draw three cards, then gain 5 life.
 id=175079
@@ -688,17 +681,7 @@ rarity=R
 type=Sorcery
 mana={6}{W}{W}
 [/card]
-[card]
-text=Jhessian Infiltrator is unblockable.
-id=175392
-name=Jhessian Infiltrator
-rarity=U
-type=Creature
-mana={G}{U}
-power=2
-subtype=Human Rogue
-toughness=2
-[/card]
+
 [card]
 text={B}, {T}: Target player loses 1 life.     {G}, {T}: Put a 1/1 green Saproling creature token into play.
 id=175050
@@ -933,17 +916,7 @@ power=4
 subtype=Fungus
 toughness=4
 [/card]
-[card]
-text={R}, {T}: Target creature gets +2/+0 until end of turn.     {W}, {T}: Tap target creature.
-id=174944
-name=Naya Battlemage
-rarity=U
-type=Creature
-mana={2}{G}
-power=2
-subtype=Human Shaman
-toughness=2
-[/card]
+
 [card]
 text=Choose one - Naya Charm deals 3 damage to target creature; or return target card in a graveyard to its owner's hand; or tap all creatures target player controls.
 id=137905
@@ -1290,14 +1263,6 @@ subtype=Zombie Warrior
 toughness=5
 [/card]
 [card]
-text=Remove target card in a graveyard from the game. You gain 3 life.
-id=177473
-name=Shadowfeed
-rarity=C
-type=Instant
-mana={B}
-[/card]
-[card]
 text=Flying     Whenever an artifact creature you control deals combat damage to a player, you may put a 1/1 blue Thopter artifact creature token with flying into play.
 id=174881
 name=Sharding Sphinx
diff --git a/projects/mtg/include/GameStateMenu.h b/projects/mtg/include/GameStateMenu.h
index 74e0ab8bd..d896d3ef1 100644
--- a/projects/mtg/include/GameStateMenu.h
+++ b/projects/mtg/include/GameStateMenu.h
@@ -11,7 +11,6 @@ class GameStateMenu: public GameState, public JGuiListener
  private:
   JGuiController* mGuiController;
   SimpleMenu* subMenuController;
-  JLBFont* mFont;
   JQuad * mIcons[10];
   JTexture * mIconsTexture;
   JTexture * bgTexture;
diff --git a/projects/mtg/include/MTGDefinitions.h b/projects/mtg/include/MTGDefinitions.h
index d24ba818b..a5855fe90 100644
--- a/projects/mtg/include/MTGDefinitions.h
+++ b/projects/mtg/include/MTGDefinitions.h
@@ -1,7 +1,9 @@
 #ifndef _MTGDEFINITION_H_
 #define _MTGDEFINITION_H_
 
-#define DEFAULT_MAIN_FONT_SCALE 0.5
+#define DEFAULT_MENU_FONT_SCALE 1.0
+#define DEFAULT_MAIN_FONT_SCALE 1.0
+#define DEFAULT_TEXT_FONT_SCALE 1.0
 
 class Constants
 {
@@ -106,7 +108,8 @@ class Constants
 
 
     MAIN_FONT = 0,
-    MAGIC_FONT = 1,
+    MENU_FONT = 1,
+    MAGIC_FONT = 2,
   };
 
   static char MTGColorChars[];
diff --git a/projects/mtg/include/SimpleMenu.h b/projects/mtg/include/SimpleMenu.h
index f57fbdbd7..ddd167db8 100644
--- a/projects/mtg/include/SimpleMenu.h
+++ b/projects/mtg/include/SimpleMenu.h
@@ -43,7 +43,7 @@ class SimpleMenu:public JGuiController{
   void drawVertPole(int x, int y, int height);
 
  public:
-  SimpleMenu(int id, JGuiListener* listener, JLBFont* font, int x, int y, const char * _title = "", int _maxItems = 10);
+  SimpleMenu(int id, JGuiListener* listener, JLBFont* font, int x, int y, const char * _title = "", int _maxItems = 7);
   void Render();
   void Update(float dt);
   void Add(int id, const char * Text);
diff --git a/projects/mtg/src/GameApp.cpp b/projects/mtg/src/GameApp.cpp
index 78cdf5f0a..7d5c19b46 100644
--- a/projects/mtg/src/GameApp.cpp
+++ b/projects/mtg/src/GameApp.cpp
@@ -99,8 +99,8 @@ void GameApp::Create()
   CommonRes->CreateQuad("stars", "graphics/particles.png", 64, 0, 32, 32);
   CommonRes->GetQuad("stars")->SetHotSpot(16,16);
 
-  CommonRes->LoadJLBFont("graphics/simon",22);
-  CommonRes->GetJLBFont("graphics/simon")->SetTracking(-2);
+  CommonRes->LoadJLBFont("graphics/simon",11);
+  CommonRes->GetJLBFont("graphics/simon")->SetTracking(-1);
   CommonRes->LoadJLBFont("graphics/f3",16);
   CommonRes->LoadJLBFont("graphics/magic",16);
 
diff --git a/projects/mtg/src/GameStateDuel.cpp b/projects/mtg/src/GameStateDuel.cpp
index 237508d26..ef6a0fd7b 100644
--- a/projects/mtg/src/GameStateDuel.cpp
+++ b/projects/mtg/src/GameStateDuel.cpp
@@ -68,7 +68,7 @@ void GameStateDuel::Start()
 
   mGamePhase = DUEL_STATE_CHOOSE_DECK1;
 
-  mFont = GameApp::CommonRes->GetJLBFont("graphics/simon");
+  mFont = GameApp::CommonRes->GetJLBFont(Constants::MENU_FONT);
   mFont->SetBase(0);	// using 2nd font
   opponentMenuFont = mFont; //NEW JLBFont("graphics/simon",22);
 
diff --git a/projects/mtg/src/GameStateMenu.cpp b/projects/mtg/src/GameStateMenu.cpp
index dc74fc250..20877ae96 100644
--- a/projects/mtg/src/GameStateMenu.cpp
+++ b/projects/mtg/src/GameStateMenu.cpp
@@ -90,7 +90,7 @@ void GameStateMenu::Create()
 	}
     }
 
-  mFont = GameApp::CommonRes->GetJLBFont("graphics/simon");
+  JLBFont * mFont = GameApp::CommonRes->GetJLBFont(Constants::MENU_FONT);
   //mFont->SetBase(0);	// using 2nd font
   mGuiController = NEW JGuiController(100, this);
   //mGuiController->SetShadingBackground(10, 45, 80, 100, ARGB(255,0,0,0));
@@ -345,13 +345,13 @@ void GameStateMenu::Render()
 {
   JRenderer * renderer = JRenderer::GetInstance();
   renderer->ClearScreen(ARGB(0,0,0,0));
-
+  JLBFont * mFont = GameApp::CommonRes->GetJLBFont(Constants::MENU_FONT);
   if ((currentState & MENU_STATE_MAJOR) == MENU_STATE_MAJOR_LOADING_CARDS){
     char text[512];
     sprintf(text, "LOADING SET: %s", mCurrentSetName);
     mFont->DrawString(text,SCREEN_WIDTH/2,SCREEN_HEIGHT/2,JGETEXT_CENTER);
   }else{
-
+    mFont = GameApp::CommonRes->GetJLBFont(Constants::MAIN_FONT);
     PIXEL_TYPE colors[] =
       {
 	ARGB(255, 3, 2, 0),
@@ -365,7 +365,7 @@ void GameStateMenu::Render()
     if (yW < 2*SCREEN_HEIGHT) renderer->RenderQuad(mMovingW, SCREEN_WIDTH/2 - 10, yW, angleW);
     if (mGuiController!=NULL)
       mGuiController->Render();
-
+    
     mFont->SetScale(DEFAULT_MAIN_FONT_SCALE);
     mFont->SetColor(ARGB(128,255,255,255));
     mFont->DrawString(GAME_VERSION, SCREEN_WIDTH-10,SCREEN_HEIGHT-15,JGETEXT_RIGHT);
@@ -396,6 +396,7 @@ void GameStateMenu::Render()
 
 void GameStateMenu::ButtonPressed(int controllerId, int controlId)
 {
+JLBFont * mFont = GameApp::CommonRes->GetJLBFont(Constants::MENU_FONT);
 #if defined (WIN32) || defined (LINUX)
   char buf[4096];
   sprintf(buf, "cnotrollerId: %i", controllerId);
@@ -410,6 +411,7 @@ void GameStateMenu::ButtonPressed(int controllerId, int controlId)
     switch (controlId)
       {
       case MENUITEM_PLAY:
+
 #ifdef TESTSUITE
 	subMenuController = NEW SimpleMenu(102, this, mFont, 150,60);
 #else
diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp
index 377d78da6..644656241 100644
--- a/projects/mtg/src/MTGAbility.cpp
+++ b/projects/mtg/src/MTGAbility.cpp
@@ -301,7 +301,7 @@ int AbilityFactory::magicText(int id, Spell * spell, MTGCardInstance * card){
             game->addObserver(NEW AZoneMover(id,card,tc,szone,cost));
           }
         }else{
-          MTGGameZone * fromZone = target->getCurrentZone();
+          MTGGameZone * fromZone = target->getCurrentZone();//this is technically incorrect. The initial zone should be as described in the targetchooser
           MTGGameZone * destZone = MTGGameZone::stringToZone(szone, target);
           target->controller()->game->putInZone(target,fromZone,destZone);
         }
diff --git a/projects/mtg/src/MTGGameZones.cpp b/projects/mtg/src/MTGGameZones.cpp
index 82b75c3ba..279001f06 100644
--- a/projects/mtg/src/MTGGameZones.cpp
+++ b/projects/mtg/src/MTGGameZones.cpp
@@ -337,6 +337,7 @@ MTGGameZone * MTGGameZone::stringToZone(string zoneName, MTGCardInstance * sourc
   if(zoneName.compare("mygraveyard") == 0)return p->game->graveyard;
   if(zoneName.compare("opponentgraveyard") == 0) return p->opponent()->game->graveyard;
   if(zoneName.compare("ownergraveyard") == 0) return source->owner->game->graveyard;
+  if(zoneName.compare("graveyard") == 0) return source->owner->game->graveyard;
 
   if(zoneName.compare("myinplay") == 0)return p->game->inPlay;
   if(zoneName.compare("opponentinplay") == 0) return p->opponent()->game->inPlay;
@@ -345,9 +346,11 @@ MTGGameZone * MTGGameZone::stringToZone(string zoneName, MTGCardInstance * sourc
   if(zoneName.compare("myhand") == 0)return p->game->hand;
   if(zoneName.compare("opponenthand") == 0) return p->opponent()->game->hand;
   if(zoneName.compare("ownerhand") == 0) return source->owner->game->hand;
+  if(zoneName.compare("hand") == 0) return source->owner->game->hand;
 
   if(zoneName.compare("myremovedfromgame") == 0)return p->game->removedFromGame;
   if(zoneName.compare("opponentremovedfromgame") == 0) return p->opponent()->game->removedFromGame;
-  if(zoneName.compare("ownerhremovedfromgame") == 0) return source->owner->game->removedFromGame;
+  if(zoneName.compare("ownerremovedfromgame") == 0) return source->owner->game->removedFromGame;
+  if(zoneName.compare("removedfromgame") == 0) return source->owner->game->removedFromGame;
   return NULL;
 }
diff --git a/projects/mtg/src/MTGGuiPlay.cpp b/projects/mtg/src/MTGGuiPlay.cpp
index 742ea96041c3f58f760d31e641c902da3757e4cb..3039460637a5dfec31490e68553b1ecc1fee3420 100644
GIT binary patch
literal 23754
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
W;T6vd;i=@W_3f=}He0Rj7ylPloC}@+

literal 11876
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

diff --git a/projects/mtg/src/SimpleMenu.cpp b/projects/mtg/src/SimpleMenu.cpp
index 9935147fa..7a746544a 100644
--- a/projects/mtg/src/SimpleMenu.cpp
+++ b/projects/mtg/src/SimpleMenu.cpp
@@ -7,7 +7,7 @@
 const unsigned SimpleMenu::SIDE_SIZE = 7;
 const unsigned SimpleMenu::VMARGIN = 16;
 const unsigned SimpleMenu::HMARGIN = 30;
-const signed SimpleMenu::LINE_HEIGHT = 28;
+const signed SimpleMenu::LINE_HEIGHT = 20;
 const char* SimpleMenu::spadeLPath = "graphics/spade_ul.png";
 const char* SimpleMenu::spadeRPath = "graphics/spade_ur.png";
 const char* SimpleMenu::jewelPath = "graphics/jewel.png";
diff --git a/projects/mtg/src/SimpleMenuItem.cpp b/projects/mtg/src/SimpleMenuItem.cpp
index d4a1c5832..51022efd9 100644
--- a/projects/mtg/src/SimpleMenuItem.cpp
+++ b/projects/mtg/src/SimpleMenuItem.cpp
@@ -12,13 +12,13 @@ SimpleMenuItem::SimpleMenuItem(SimpleMenu* _parent, int id, JLBFont *font, const
 
   if (hasFocus)
     Entering();
-  //  mFont->SetScale(1.2f);
+  mFont->SetScale(1.2f);
 }
 
 
 void SimpleMenuItem::RenderWithOffset(float yOffset)
 {
-  //  mFont->SetScale(mScale);
+  mFont->SetScale(mScale);
   //mFont->SetColor(ARGB(255,255,255,255));
   mFont->DrawString(mText.c_str(), mX, mY + yOffset, JGETEXT_CENTER);
   //  mFont->SetScale(1.0f);
@@ -31,7 +31,7 @@ void SimpleMenuItem::Render()
 
 void SimpleMenuItem::Update(float dt)
 {
-  /*  if (mScale < mTargetScale)
+    if (mScale < mTargetScale)
     {
       mScale += 8.0f*dt;
       if (mScale > mTargetScale)
@@ -42,7 +42,7 @@ void SimpleMenuItem::Update(float dt)
       mScale -= 8.0f*dt;
       if (mScale < mTargetScale)
 	mScale = mTargetScale;
-	}*/
+	}
 }