Merge remote-tracking branch 'origin/master'

master
Jonas1989 8 years ago
commit 50322fedf5

@ -1,10 +1,4 @@
Title: Entire game on one screen
* TODO INTRO
** intro grafiken einbauen
* TODO HUD
** i key
* TODO OUTRO
** win screen
* TODO
** release

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

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

@ -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)
@ -57,11 +61,14 @@ app.game =
if @isMouseInView event.x/8, event.y/8
switch event.button
when 'left'
tile.click(event.button)
@currentSelectedTile.deselect() if @currentSelectedTile
tile.select()
@currentSelectedTile = tile
if event.x > 143 and event.x < 151 and event.y > 95 and event.y < 106
app.game.hud.showBuildInfo()
else
tile.click(event.button)
@currentSelectedTile.deselect() if @currentSelectedTile
tile.select()
@currentSelectedTile = tile
when 'right'
@currentSelectedTile.deselect() if @currentSelectedTile
@currentSelectedTile = null
@ -135,7 +142,7 @@ app.game =
else
@speechbubble.say 'nosel'
# TODO: OMG refactor this ...
# TODO: OMG refactor this ...
createSolarpanel: ->
if @currentSelectedTile
if @checkPosition(@currentSelectedTile)
@ -204,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

@ -18,6 +18,8 @@ app.game.hud =
panelusage = 'resources'
app.layer.drawImage app.images.hud, 0, 11*8
app.layer.drawImage app.images.info, 143, 95
# cursor
# app.layer.drawImage app.images.cursor, app.game.mouseX, app.game.mouseY

Loading…
Cancel
Save