Merge branch 'master' of https://github.com/arg-games/ld31

src/entities/base.coffee

@@ -22,4 +22,5 @@ class Base
       @frame += 1
 
   spaceProvided: 300
+  energyProvided: 7
   isDockable: true

src/entities/miner.coffee

@@ -22,4 +22,5 @@ class Miner
       @frame += 1
 
   spaceProvided: 5
+  energyProvided: 0
   isDockable: false

src/entities/silo.coffee

@@ -21,6 +21,7 @@ class Silo
       @frame += 1
 
   spaceProvided: 150
+  energyProvided: 0
 
   isDockable: true
 

src/entities/solarpanel.coffee

@@ -11,4 +11,5 @@ class Solarpanel
     false
 
   spaceProvided: 0
+  energyProvided: 15
   isDockable: true

src/game.coffee

@@ -4,6 +4,8 @@ app.game =
       @map[i] = new Tile(i)
     @map[20*5+10].entity = new Base
 
+    # TODO: BUG BUG: ... the base is some time replaced by a tile ...
+
     @mouseX = 0
     @mouseY = 0    
     @currentHoveredTile = new Tile(-1)
@@ -199,6 +201,16 @@ app.game =
     space += amount for resource, amount of @resources
     space
 
+  solarpanelCount: ->
+    energy = 0
+    for tile in app.game.map
+      energy += 1 if tile.entity and tile.entity.energyProvided > 10
+    energy
+
+  gameEndCheck: ->
+    return true if @solarpanelCount() >= 4
+    false
+
   resources:
     stardust: 0
     dirt: 0

src/hud.coffee

@@ -48,9 +48,16 @@ app.game.hud =
 
       x = 44+f
       y = 112
-
       app.layer.setPixel(resourcePanelColor, x, y)
 
+    # Energy production (47)
+    
+    length = Math.round(((25*app.game.solarpanelCount())*45)/100)
+    for i in [0..length]
+      app.layer.setPixel("#228ca5", 49+i, 91)
+      app.layer.setPixel("#8ddaed", 50+i, 92)
+      app.layer.setPixel("#228ca5", 49+i, 93)
+
     switch panelusage
       when 'tile'
         @showResources()