arg/ld31-space-diggers
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
Conflicts:
	src/app.coffee
This commit is contained in:
Ruben Müller 2014-12-07 18:54:11 +01:00
commit 68838fa3c9
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
public/images/titlescreen.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.6 KiB

2
src/app.coffee
View file

@ -5,7 +5,7 @@ app = playground(
smoothing: false,
create: ->
@loadImages "layers", "active", "progress", "selected", "entities", "hud", "actions", "speechbubbles", "deadtiles", "layerdetails", "entitydetails", "buildinfo", "cursor", "info"
@loadImages "layers", "active", "progress", "selected", "entities", "hud", "actions", "speechbubbles", "deadtiles", "layerdetails", "entitydetails", "buildinfo", "cursor", "info", "end"
@currentHoveredTile = new Tile
ready: ->

7
src/game.coffee
View file

@ -41,6 +41,10 @@ app.game =
app.game.speechbubble.setMouse()
render: ->
if @gameEndCheck()
app.layer.drawImage app.images.end, 0, 0, 20*8, 15*8
return
for tile, i in @map
y = Math.floor(i/20)
x = i-(y*20)
@ -138,7 +142,7 @@ app.game =
else
@speechbubble.say 'nosel'
# TODO: OMG refactor this ...
# TODO: OMG refactor this ...
createSolarpanel: ->
if @currentSelectedTile
if @checkPosition(@currentSelectedTile)
@ -207,6 +211,7 @@ app.game =
solarpanelCount: ->
energy = 0
for tile in app.game.map
# FIXME: Thats not a sane solution hahahah :D
energy += 1 if tile.entity and tile.entity.energyProvided > 10
energy