diff --git a/public/images/selected.png b/public/images/selected.png index ae0b345..c16c6e5 100644 Binary files a/public/images/selected.png and b/public/images/selected.png differ 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 +