small fixes after merge

This commit is contained in:
Aaron Mueller 2014-12-07 17:56:52 +01:00
parent 89bc084f43
commit 280b293fb7
2 changed files with 5 additions and 6 deletions

View file

@ -89,8 +89,8 @@ app.game =
if @checkPosition(@currentSelectedTile)
if @checkResource('stardust', 20, true)
@currentSelectedTile.entity = new Silo
else
@speechbubble.say 'nores'
else
@speechbubble.say 'nores'
else
@speechbubble.say 'toofar'
@ -100,8 +100,8 @@ app.game =
if @checkPosition(@currentSelectedTile)
if @checkResource('notch', 10, true)
@currentSelectedTile.entity = new Solarpanel
else
@speechbubble.say 'nores'
else
@speechbubble.say 'nores'
else
@speechbubble.say 'toofar'
checkResource: (type, amount, drain = false) ->

View file

@ -16,7 +16,6 @@ app.game.hud =
render: ->
panelusage = 'resources'
app.layer.drawImage app.images.hud, 0, 11*8
if @buildinfo
@ -32,7 +31,7 @@ app.game.hud =
panelusage = 'entity'
app.layer.drawRegion app.images.entitydetails, currentSelectedTile.entity.spritedetail(), 12, 95
else
app.layer.drawRegion app.images.layerdetails, currentSelectedTile.getCurrentLayer().spritedetail, 1, 95
app.layer.drawRegion app.images.layerdetails, currentSelectedTile.getCurrentLayer().spritedetail, 12, 95
# silo capacity
usedSiloStoragePercent = Math.round((100 / app.game.availableSiloStorage()) * app.game.usedSiloStorage())