From d266258052cd47f2a0a6f0462638fd5839d101ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ruben=20M=C3=BCller?= <mail@rubenartus.com>
Date: Sun, 7 Dec 2014 01:08:39 +0100
Subject: [PATCH] HUD stuff

---
 public/images/selected.png | Bin 148 -> 2827 bytes
 src/game.coffee            |   6 +++---
 src/hud.coffee             |  17 ++++++++++++++++-
 src/tiles/tile.coffee      |  11 +++++++----
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/public/images/selected.png b/public/images/selected.png
index ae0b3455e803090a751d1c3c644d0de37af63e54..c16c6e50d90f0306fed71170749d7b593e896385 100644
GIT binary patch
delta 2799
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
BM6dt=

delta 99
zcmeAco5DE3B8Gvz#M9T6{T>gSn4Sd7ZtYnN3=GDeE{-7*my@U5`TNkGnZ>|pLDPR8
zAn>tJd6)zux@JglFuc<E(eM7xUU<{=4VA(SZco`SPj=Gc1ZrpSboFyt=akR{04LWV
A+yDRo

diff --git a/src/game.coffee b/src/game.coffee
index 34981f6..d601502 100644
--- a/src/game.coffee
+++ b/src/game.coffee
@@ -5,7 +5,7 @@ app.game =
     @map[20*5+10].entity = new Base
     
     @currentHoveredTile = new Tile
-    @currentSelectedTile = new Tile
+    @currentSelectedTile = null
 
     # Start the game tick
     window.setInterval @tick, 1000
@@ -72,9 +72,9 @@ app.game =
   maxTileAmount: 15
 
   availableSiloStorage: ->
-    space = 0
+    space = 50
     for tile in app.game.map
-      space += tile.spaceProvided
+      space += tile.spaceProvided if tile.spaceProvided
     space
 
   usedSiloStorage: ->
diff --git a/src/hud.coffee b/src/hud.coffee
index 68f4da4..a8f6853 100644
--- a/src/hud.coffee
+++ b/src/hud.coffee
@@ -14,10 +14,25 @@ app.game.hud =
   render: ->
     app.layer.drawImage app.images.hud, 0, 11*8
 
+    if app.game.currentSelectedTile != null
+      app.layer.drawRegion app.images.layers, app.game.currentSelectedTile.getCurrentLayer().sprite, 15, 100
+
+    # silo capacity
+    usedSiloStoragePercent = (100 / app.game.availableSiloStorage()) * app.game.usedSiloStorage()
+
+    for f in [0..100]
+      color = "#333"
+      color = "#fff" if f < usedSiloStoragePercent
+
+      x = 44+f
+      y = 112
+
+      app.layer.setPixel(color, x, y)
+
+    # resources
     i = 0
     for type, amount of app.game.resources
       if amount > 0
-        #console.log @resources[type]
         tileLayer = @resources[type]
 
         spritePosition = {
diff --git a/src/tiles/tile.coffee b/src/tiles/tile.coffee
index a5677cb..fa31bcc 100644
--- a/src/tiles/tile.coffee
+++ b/src/tiles/tile.coffee
@@ -37,8 +37,11 @@ class Tile
   deselect: ->
     @isSelected = false
 
+  getCurrentLayer: ->
+    @layers[@currentLayer]
+
   render: (x, y)->
-    tileLayer = @layers[@currentLayer]
+    tileLayer = @getCurrentLayer()
     app.layer.drawRegion app.images.layers, tileLayer.sprite, x*8, y*8
 
     if @entity
@@ -52,11 +55,11 @@ class Tile
         color = ["#f00", "#a00", "#f60", "#aa0", "#0a0", "#0a0"][numPercent]
         color = ["#f00", "#f00", "#f80", "#ff0", "#0f0", "#0f0"][numPercent] if i == numPercent
         app.layer.setPixel(color, x*8+1+i, y*8+6)
-
-    if @isSelected    
-      app.layer.drawImage app.images.selected, x*8, y*8
     
     if @isActive
       app.layer.drawImage app.images.active, x*8, y*8
 
+    if @isSelected    
+      app.layer.drawImage app.images.selected, x*8, y*8
+