Rearrange Info menu with fixed positions

clintbellanger · Jan 9, 2014 · f5c179f · f5c179f
1 parent c49e4ef
commit f5c179f
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 40 deletions.
diff --git a/release/js/action.js b/release/js/action.js
@@ -7,14 +7,14 @@ var SELECT_SIZE = 20;
 var BUTTON_OFFSET = 2;
 
 var BUTTON_POS_INFO = {x:140, y:0, w:20, h:20};
-var BUTTON_POS_ATTACK = {x:120, y:30, w:20, h:20};
-var BUTTON_POS_RUN = {x:140, y:30, w:20, h:20};
-var BUTTON_POS_HEAL = {x:120, y:60, w:20, h:20};
-var BUTTON_POS_BURN = {x:140, y:60, w:20, h:20};
-var BUTTON_POS_UNLOCK = {x:120, y:80, w:20, h:20};
-var BUTTON_POS_LIGHT = {x:140, y:80, w:20, h:20};
-var BUTTON_POS_FREEZE = {x:120, y:100, w:20, h:20};
-var BUTTON_POS_REFLECT = {x:140, y:100, w:20, h:20};
+var BUTTON_POS_ATTACK = {x:120, y:20, w:20, h:20};
+var BUTTON_POS_RUN = {x:140, y:20, w:20, h:20};
+var BUTTON_POS_HEAL = {x:120, y:40, w:20, h:20};
+var BUTTON_POS_BURN = {x:140, y:40, w:20, h:20};
+var BUTTON_POS_UNLOCK = {x:120, y:60, w:20, h:20};
+var BUTTON_POS_LIGHT = {x:140, y:60, w:20, h:20};
+var BUTTON_POS_FREEZE = {x:120, y:80, w:20, h:20};
+var BUTTON_POS_REFLECT = {x:140, y:80, w:20, h:20};
 
 
 var action = new Object();

diff --git a/release/js/combat.js b/release/js/combat.js
@@ -345,6 +345,7 @@ function combat_render_victory() {
   bitfont_render("Victory!", 80, 60, JUSTIFY_CENTER);
   bitfont_render(combat.reward_result, 80, 70, JUSTIFY_CENTER);
   treasure_render_gold(combat.gold_treasure);
+  info_render_gold();
 }
 
 function combat_render_defeat() {
@@ -353,8 +354,8 @@ function combat_render_defeat() {
   combat_render_offense_log();
   combat_render_defense_log();
   info_render_hpmp();
-  bitfont_render("You are defeated...", 158, 110, JUSTIFY_RIGHT);
-  bitfont_render("Final Gold: " + avatar.gold, 158, 100, JUSTIFY_RIGHT);
+  bitfont_render("You are defeated...", 158, 100, JUSTIFY_RIGHT);
+  info_render_gold();
 }
 
 function combat_render_offense_log() {

diff --git a/release/js/dialog.js b/release/js/dialog.js
@@ -151,7 +151,7 @@ function dialog_render() {
 
   // only render gold if there is something for sale
   if (dialog.items_for_sale) {
-    bitfont_render(avatar.gold + " Gold", 158, 110, JUSTIFY_RIGHT);
+    info_render_gold();
   }
 
   dialog_render_button(dialog.option[0].button, BUTTON_POS_OPT0);

diff --git a/release/js/info.js b/release/js/info.js
@@ -6,7 +6,7 @@
 // consts
 var AVATAR_SPRITE_W = 80;
 var AVATAR_SPRITE_H = 100;
-var AVATAR_DRAW_X = 40;
+var AVATAR_DRAW_X = 55;
 var AVATAR_DRAW_Y = 20;
 var TYPE_ARMOR = 0;
 var TYPE_WEAPON = 1;
@@ -45,14 +45,14 @@ function info_init() {
   info.weapons[6] = {name:"Battle Axe",  atk_min:7,  atk_max:16, gold:20000};
   info.weapons[7] = {name:"Great Sword", atk_min:8,  atk_max:18, gold:100000};
 
-  info.armors[0] = {name:"No Armor",        def:0,  gold:0};
-  info.armors[1] = {name:"Serf Rags",       def:2,  gold:0};
-  info.armors[2] = {name:"Travel Cloak",    def:4,  gold:50};
-  info.armors[3] = {name:"Hide Cuirass",    def:6,  gold:200};
-  info.armors[4] = {name:"Studded Leather", def:8,  gold:1000};
-  info.armors[5] = {name:"Chain Maille",    def:10, gold:5000};
-  info.armors[6] = {name:"Plate Armor",     def:12, gold:20000};
-  info.armors[7] = {name:"Wyvern Scale",    def:14, gold:100000};
+  info.armors[0] = {name:"No Armor",      def:0,  gold:0};
+  info.armors[1] = {name:"Serf Rags",     def:2,  gold:0};
+  info.armors[2] = {name:"Travel Cloak",  def:4,  gold:50};
+  info.armors[3] = {name:"Hide Cuirass",  def:6,  gold:200};
+  info.armors[4] = {name:"Rivet Leather", def:8,  gold:1000};
+  info.armors[5] = {name:"Chain Maille",  def:10, gold:5000};
+  info.armors[6] = {name:"Plate Armor",   def:12, gold:20000};
+  info.armors[7] = {name:"Wyvern Scale",  def:14, gold:100000};
 
   info.spells[0] = {name:"No Spell", gold:0};
   info.spells[1] = {name:"Heal", gold:0};
@@ -122,20 +122,18 @@ function info_render() {
   mazemap_render(avatar.x, avatar.y, avatar.facing);
 
   bitfont_render("INFO", 80, 2, JUSTIFY_CENTER);
-  bitfont_render("Spells:", 158, 50, JUSTIFY_RIGHT);
+
+  if (avatar.spellbook > 0) {
+    bitfont_render("Spells", 158, 30, JUSTIFY_RIGHT);
+  }
 
   info_render_equipment();
   info_render_button();
   info_render_itemlist();
   info_render_hpmp();
-  action_render();
-
-
-  if (!info_render_messages()) {
-
-    // only display the minimap if messages aren't showing
-    minimap_render();
-  }
+  info_render_gold();
+  action_render();  
+  minimap_render();
 
 }
 
@@ -169,20 +167,29 @@ function info_render_equiplayer(itemtier, itemtype) {
 function info_render_itemlist() {
   var item_string;
 
-  item_string = info.weapons[avatar.weapon].name;
-  if (avatar.bonus_atk > 0) item_string += " +" + avatar.bonus_atk;
-  bitfont_render(item_string, 2, 15, JUSTIFY_LEFT);
-
-  item_string = info.armors[avatar.armor].name;
-  if (avatar.bonus_def > 0) item_string += " +" + avatar.bonus_def;
-  bitfont_render(item_string, 2, 25, JUSTIFY_LEFT);
+  item_string = info.weapons[avatar.weapon].name;  
+  if (avatar.bonus_atk > 0) {
+    item_string += " +";
+    item_string += avatar.bonus_atk;    
+  }
+  bitfont_render(item_string, 2, 75, JUSTIFY_LEFT);
 
-  bitfont_render("Gold: " + avatar.gold, 2, 35, JUSTIFY_LEFT);
+  item_string = info.armors[avatar.armor].name;  
+  if (avatar.bonus_def > 0) {
+    item_string += " +";
+    item_string += avatar.bonus_def;
+  }
+  bitfont_render(item_string, 2, 85, JUSTIFY_LEFT);
+
 }
 
 function info_render_hpmp() { 
-  bitfont_render("HP: " + avatar.hp + "/" + avatar.max_hp, 2, 100, JUSTIFY_LEFT);
-  bitfont_render("MP: " + avatar.mp + "/" + avatar.max_mp, 2, 110, JUSTIFY_LEFT); 
+  bitfont_render("HP " + avatar.hp + "/" + avatar.max_hp, 2, 100, JUSTIFY_LEFT);
+  bitfont_render("MP " + avatar.mp + "/" + avatar.max_mp, 2, 110, JUSTIFY_LEFT); 
+}
+
+function info_render_gold() {
+  bitfont_render(avatar.gold + " Gold", 158, 110, JUSTIFY_RIGHT);
 }
 
 function info_render_button() {

diff --git a/release/js/minimap.js b/release/js/minimap.js
@@ -11,7 +11,7 @@ var MINIMAP_ICON_WALKABLE = 1;
 var MINIMAP_ICON_EXIT = 3;
 
 var MINIMAP_CENTER_X = 30;
-var MINIMAP_CENTER_Y = 71;
+var MINIMAP_CENTER_Y = 30;
 
 var MINIMAP_CURSOR_WEST = 0;
 var MINIMAP_CURSOR_NORTH = 1;