Merge remote-tracking branch 'origin/master'

src/entities/tile.coffee

@@ -9,18 +9,20 @@ class Tile extends BaseEntity
       @layers.push new Tilelayer(
         type: restype,
         depth: i,
-        amount: Math.random(5)+10
+        amount: Math.round(Math.random(app.game.maxTileAmount-10)+10)
       )
     
     @currentLayer = 0
     @isActive = false
 
   click: (button)->
-	@isSelected = true
+    #@isSelected = true
-    if button == "left" and @layers[@currentLayer].collect()
+    if button == "left"
-      name = app.layerIndexToName(@currentLayer)
+      if @layers[@currentLayer].collect()
-      console.log(name)
+        name = app.layerIndexToName(@currentLayer)
-      app.game.resources[name] += 1
+        app.game.resources[name] += 1
+      else
+        @currentLayer += 1 
 
   moveIn: ->
     @isActive = true
@@ -35,7 +37,15 @@ class Tile extends BaseEntity
     tileLayer = @layers[@currentLayer]
     app.layer.drawRegion app.images.layers, tileLayer.sprite, x*8, y*8
 
-    if @isSelected    
+    #if @isSelected    
-      app.layer.drawImage app.images.selected, x*8, y*8
+    #  app.layer.drawImage app.images.selected, x*8, y*8
-    else if @isActive
+    if @isActive
       app.layer.drawImage app.images.active, x*8, y*8
+      # Draw the status indicator.
+      for i in [0..5]
+        color = "#0a0"
+        color = "#0f0" if i == 5
+        app.layer.setPixel(color, x*8+1+i, y*8+6)
+
+    
+    

src/game.coffee

@@ -5,6 +5,8 @@ app.game =
 
     @miners = []
     @miners.push = new Miner
+    
+    @currentHoveredTile = new Tile
 
   render: ->
     app.layer.save().scale(5, 5)
@@ -20,11 +22,28 @@ app.game =
 
   step: ->
 
+  mousedown: (event)->
+    @posToTile(event.x, event.y).click(event.button)
+
+  mousemove: (event)->
+    tile = @posToTile(event.x, event.y)
+
+    if tile
+      if tile != @currentHoveredTile
+        tile.moveIn()
+        @currentHoveredTile.moveOut()
+        @currentHoveredTile = tile
+
+  posToTile: (x, y)->
+    pos = (Math.floor(y/8/5)*20) + Math.floor(x/8/5)
+    @map[pos]
+
   map: []
+  maxTileAmount: 15
 
   resources:
-    stardust: 10
+    stardust: 0
-    bedrock: 1
+    bedrock: 0
     lubinit: 0
     oxodum: 0
     notch: 0

src/main.coffee

@@ -14,24 +14,10 @@ app = playground(
   
   step: ->
 
-  mousedown: (event)->
-    @posToTile(event.x, event.y).click(event.button)
-
-  mousemove: (event)->
-    tile = @posToTile(event.x, event.y)
-    if tile != @currentHoveredTile
-      tile.moveIn()
-      @currentHoveredTile.moveOut()
-      @currentHoveredTile = tile
-
   render: ->
     @layer.clear "#00f"
     @game.render()
 
-  posToTile: (x, y)->
-    pos = (Math.floor(y/8/5)*20) + Math.floor(x/8/5)
-    @game.map[pos]
-
   layerIndexToName: (index)->
     resTypes = (k for own k of @game.resources)
     resTypes[index]