small fixes after merge
This commit is contained in:
parent
89bc084f43
commit
280b293fb7
2 changed files with 5 additions and 6 deletions
|
@ -89,8 +89,8 @@ app.game =
|
||||||
if @checkPosition(@currentSelectedTile)
|
if @checkPosition(@currentSelectedTile)
|
||||||
if @checkResource('stardust', 20, true)
|
if @checkResource('stardust', 20, true)
|
||||||
@currentSelectedTile.entity = new Silo
|
@currentSelectedTile.entity = new Silo
|
||||||
else
|
else
|
||||||
@speechbubble.say 'nores'
|
@speechbubble.say 'nores'
|
||||||
else
|
else
|
||||||
@speechbubble.say 'toofar'
|
@speechbubble.say 'toofar'
|
||||||
|
|
||||||
|
@ -100,8 +100,8 @@ app.game =
|
||||||
if @checkPosition(@currentSelectedTile)
|
if @checkPosition(@currentSelectedTile)
|
||||||
if @checkResource('notch', 10, true)
|
if @checkResource('notch', 10, true)
|
||||||
@currentSelectedTile.entity = new Solarpanel
|
@currentSelectedTile.entity = new Solarpanel
|
||||||
else
|
else
|
||||||
@speechbubble.say 'nores'
|
@speechbubble.say 'nores'
|
||||||
else
|
else
|
||||||
@speechbubble.say 'toofar'
|
@speechbubble.say 'toofar'
|
||||||
checkResource: (type, amount, drain = false) ->
|
checkResource: (type, amount, drain = false) ->
|
||||||
|
|
|
@ -16,7 +16,6 @@ app.game.hud =
|
||||||
|
|
||||||
render: ->
|
render: ->
|
||||||
panelusage = 'resources'
|
panelusage = 'resources'
|
||||||
|
|
||||||
app.layer.drawImage app.images.hud, 0, 11*8
|
app.layer.drawImage app.images.hud, 0, 11*8
|
||||||
|
|
||||||
if @buildinfo
|
if @buildinfo
|
||||||
|
@ -32,7 +31,7 @@ app.game.hud =
|
||||||
panelusage = 'entity'
|
panelusage = 'entity'
|
||||||
app.layer.drawRegion app.images.entitydetails, currentSelectedTile.entity.spritedetail(), 12, 95
|
app.layer.drawRegion app.images.entitydetails, currentSelectedTile.entity.spritedetail(), 12, 95
|
||||||
else
|
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
|
# silo capacity
|
||||||
usedSiloStoragePercent = Math.round((100 / app.game.availableSiloStorage()) * app.game.usedSiloStorage())
|
usedSiloStoragePercent = Math.round((100 / app.game.availableSiloStorage()) * app.game.usedSiloStorage())
|
||||||
|
|
Loading…
Reference in a new issue