Merge remote-tracking branch 'origin/master'

This commit is contained in:
Jonas1989 2014-12-07 13:47:26 +01:00
commit a509b65e0a
2 changed files with 52 additions and 41 deletions

View file

@ -22,12 +22,17 @@ app.game =
mousedown: (event)-> mousedown: (event)->
if @isMouseInView event.x, event.y if @isMouseInView event.x, event.y
switch event.button
when 'left'
tile = posToTile(event.x, event.y) tile = posToTile(event.x, event.y)
tile.click(event.button) tile.click(event.button)
@currentSelectedTile.deselect() if @currentSelectedTile @currentSelectedTile.deselect() if @currentSelectedTile
tile.select() tile.select()
@currentSelectedTile = tile @currentSelectedTile = tile
when 'right'
@currentSelectedTile.deselect() if @currentSelectedTile
@currentSelectedTile = null
mousemove: (event)-> mousemove: (event)->
if @isMouseInView event.x, event.y if @isMouseInView event.x, event.y

View file

@ -12,6 +12,8 @@ app.game.hud =
) )
render: -> render: ->
panelusage = 'resources'
app.layer.drawImage app.images.hud, 0, 11*8 app.layer.drawImage app.images.hud, 0, 11*8
currentSelectedTile = app.game.currentSelectedTile currentSelectedTile = app.game.currentSelectedTile
@ -19,11 +21,11 @@ app.game.hud =
app.layer.drawRegion app.images.layers, currentSelectedTile.getCurrentLayer().sprite, 15, 100 app.layer.drawRegion app.images.layers, currentSelectedTile.getCurrentLayer().sprite, 15, 100
if currentSelectedTile.entity if currentSelectedTile.entity
panelusage = 'entity'
app.layer.drawRegion app.images.entities, currentSelectedTile.entity.sprite(), 15, 100 app.layer.drawRegion app.images.entities, currentSelectedTile.entity.sprite(), 15, 100
# silo capacity # silo capacity
usedSiloStoragePercent = (100 / app.game.availableSiloStorage()) * app.game.usedSiloStorage() usedSiloStoragePercent = (100 / app.game.availableSiloStorage()) * app.game.usedSiloStorage()
for f in [0..100] for f in [0..100]
color = "#333" color = "#333"
color = "#fff" if f < usedSiloStoragePercent color = "#fff" if f < usedSiloStoragePercent
@ -33,6 +35,10 @@ app.game.hud =
app.layer.setPixel(color, x, y) app.layer.setPixel(color, x, y)
switch panelusage
when 'entity'
app.layer.drawRegion app.images.entities, currentSelectedTile.entity.sprite(), 44, 102
when 'resources'
# resources # resources
i = 0 i = 0
for type, amount of app.game.resources for type, amount of app.game.resources