use new hud sprite

krzysu · Nov 29, 2013 · 764a8d3 · 764a8d3
1 parent 4b8905c
commit 764a8d3
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 25 deletions.
diff --git a/app/data/hud.json b/app/data/hud.json
@@ -7,76 +7,104 @@
  "tileh": 71,
  "frames": 1
  },
- "hud_zombie": {
+ "hud_zombie_player": {
  "sx": 81,
  "sy": 0,
  "cols": 1,
+ "tilew": 81,
+ "tileh": 71,
+ "frames": 1
+ },
+ "hud_zombie": {
+ "sx": 162,
+ "sy": 0,
+ "cols": 1,
  "tilew": 76,
  "tileh": 63,
  "frames": 1
  },
+
  "hud_health": {
- "sx": 81,
- "sy": 71,
+ "sx": 60,
+ "sy": 119,
  "cols": 1,
  "tilew": 45,
- "tileh": 27,
+ "tileh": 29,
  "frames": 1
  },
+ "hud_health_half": {
+ "sx": 105,
+ "sy": 119,
+ "cols": 1,
+ "tilew": 45,
+ "tileh": 29,
+ "frames": 1
+ },
+
  "hud_bullets": {
- "sx": 97,
- "sy": 102,
+ "sx": 0,
+ "sy": 119,
  "cols": 1,
  "tilew": 60,
- "tileh": 27,
+ "tileh": 29,
  "frames": 1
  },
+
  "hud_key_empty": {
- "sx": 0,
- "sy": 71,
+ "sx": 162,
+ "sy": 121,
  "cols": 1,
  "tilew": 30,
  "tileh": 31,
  "frames": 1
  },
  "hud_key_collected": {
- "sx": 30,
- "sy": 71,
+ "sx": 192,
+ "sy": 121,
  "cols": 1,
  "tilew": 30,
  "tileh": 31,
  "frames": 1
  },
+
  "hud_settings_button": {
- "sx": 0,
- "sy": 102,
+ "sx": 44,
+ "sy": 71,
  "cols": 1,
  "tilew": 44,
- "tileh": 49,
+ "tileh": 47,
+ "frames": 1
+ },
+ "hud_back_button": {
+ "sx": 88,
+ "sy": 71,
+ "cols": 1,
+ "tilew": 44,
+ "tileh": 47,
  "frames": 1
  },
  "hud_pause_button": {
- "sx": 45,
- "sy": 102,
+ "sx": 0,
+ "sy": 71,
  "cols": 1,
  "tilew": 44,
- "tileh": 49,
+ "tileh": 47,
  "frames": 1
  },
  "hud_audio_on_button": {
- "sx": 0,
- "sy": 102,
+ "sx": 132,
+ "sy": 71,
  "cols": 1,
  "tilew": 44,
- "tileh": 49,
+ "tileh": 47,
  "frames": 1
  },
  "hud_audio_off_button": {
- "sx": 45,
- "sy": 102,
+ "sx": 176,
+ "sy": 71,
  "cols": 1,
  "tilew": 44,
- "tileh": 49,
+ "tileh": 47,
  "frames": 1
  }
 }
diff --git a/app/images/hud-sprite.png b/app/images/hud-sprite.png
diff --git a/app/images/hud.png b/app/images/hud.png
diff --git a/app/scripts/game.js b/app/scripts/game.js
diff --git a/app/scripts/game/sprites/ui/menu_button.coffee b/app/scripts/game/sprites/ui/menu_button.coffee
@@ -7,7 +7,7 @@ Q.UI.MenuButton = Q.UI.Button.extend "UI.MenuButton",
  y: 170
  z: 100
  type: Q.SPRITE_UI | Q.SPRITE_DEFAULT
- sheet: "hud_settings_button"
+ sheet: "hud_back_button"
  keyActionName: "escape" # button that will trigger click event
 
  @on 'click', =>