Merge remote-tracking branch 'origin/master'

Conflicts:
	public/images/layers.png
This commit is contained in:
Jonas1989 2014-12-06 21:12:06 +01:00
commit 8132294369
3 changed files with 28 additions and 7 deletions

BIN
public/images/Thumbs.db Normal file

Binary file not shown.

View file

@ -15,14 +15,21 @@ class Tile extends BaseEntity
@currentLayer = 0
@isActive = false
died: false
click: (button)->
if button == "left"
if button == "left" and !@died
if @layers[@currentLayer].collect()
name = app.layerIndexToName(@currentLayer)
app.game.resources[name] += 1
else
@currentLayer += 1
if @currentLayer > Object.keys(app.game.resources).length
@died = true
@currentMiner = null if @currentMiner
tick: ->
@currentMiner.tick @
@ -45,6 +52,10 @@ class Tile extends BaseEntity
detachMiner: ->
@currentMiner = null
gameTick: ->
if @currentMiner
@layers[@currentLayer].collect()
render: (x, y)->
tileLayer = @layers[@currentLayer]
app.layer.drawRegion app.images.layers, tileLayer.sprite, x*8, y*8

View file

@ -6,6 +6,9 @@ app.game =
@currentHoveredTile = new Tile
@currentSelectedTile = new Tile
# Start the game tick
window.setInterval(@gameTick, 1000)
render: ->
for tile, i in @map
y = Math.floor(i/20)
@ -41,6 +44,9 @@ app.game =
@currentSelectedTile.deselect() if @currentSelectedTile
@currentSelectedTile = null
gameTick: ->
tile.gameTick() for tile in @map
createMiner: ->
if @currentSelectedTile and @checkRessources 'lubinit', 30, true
newMiner = new Miner
@ -71,7 +77,11 @@ app.game =
resources:
stardust: 0
dirt: 0
bedrock: 0
lubinit: 0
oxodum: 0
lubinit: 0
darkana: 0
bio: 0
notch: 0
lava: 0