Merge remote-tracking branch 'origin/master'

This commit is contained in:
Jonas1989 2014-12-07 18:01:03 +01:00
commit 243645658c
3 changed files with 13 additions and 0 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

View file

@ -68,10 +68,22 @@ app.game =
when "i" then app.game.hud.showBuildInfo() when "i" then app.game.hud.showBuildInfo()
when "s" then @createSilo() when "s" then @createSilo()
when "c" then @cheatah() when "c" then @cheatah()
when "1" then @releaseRes 'stardust'
when "2" then @releaseRes 'dirt'
when "3" then @releaseRes 'bedrock'
when "4" then @releaseRes 'oxodum'
when "5" then @releaseRes 'lubinit'
when "6" then @releaseRes 'darkana'
when "7" then @releaseRes 'bio'
when "8" then @releaseRes 'notch'
when "9" then @releaseRes 'lava'
when "space" when "space"
@currentSelectedTile.deselect() if @currentSelectedTile @currentSelectedTile.deselect() if @currentSelectedTile
@currentSelectedTile = null @currentSelectedTile = null
releaseRes: (string) ->
@resources[string] = 0
tick: => tick: =>
tile.tick() for tile in app.game.map tile.tick() for tile in app.game.map

View file

@ -22,6 +22,7 @@ app.game.hud =
app.layer.drawRegion app.images.buildinfo, [0, 0, 106, 10], 1, 1 app.layer.drawRegion app.images.buildinfo, [0, 0, 106, 10], 1, 1
app.layer.drawRegion app.images.buildinfo, [0, 10, 106, 10], 1, 12 app.layer.drawRegion app.images.buildinfo, [0, 10, 106, 10], 1, 12
app.layer.drawRegion app.images.buildinfo, [0, 20, 106, 10], 1, 23 app.layer.drawRegion app.images.buildinfo, [0, 20, 106, 10], 1, 23
app.layer.drawRegion app.images.buildinfo, [0, 30, 106, 10], 1, 34
currentSelectedTile = app.game.currentSelectedTile currentSelectedTile = app.game.currentSelectedTile
if currentSelectedTile != null if currentSelectedTile != null