From de01da9f81860b866021bdc50ff85bdf3e458b8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ruben=20M=C3=BCller?= Date: Sun, 7 Dec 2014 17:41:21 +0100 Subject: [PATCH] Ntoes and HUD --- notes.org | 11 +---------- public/images/speechbubbles.png | Bin 1472 -> 1646 bytes public/images/speechbubbles.psd | Bin 40270 -> 46604 bytes src/game.coffee | 4 ++++ src/hud.coffee | 2 +- src/speechbubble.coffee | 1 + 6 files changed, 7 insertions(+), 11 deletions(-) diff --git a/notes.org b/notes.org index 6b545c2..15b4545 100644 --- a/notes.org +++ b/notes.org @@ -11,19 +11,10 @@ Title: Entire game on one screen * TODO HUD ** hud: energie progress bar :aaron: ** hud: resources "release to space" on click :aaron: -** Hint für shortcuts anzeigen :ruben: -** Preise für entities :ruben: * TODO Entities ** solarpanel item :aaron: -* TODO Polishing - * TODO OUTRO ** animation bei voller energybar: typ fliegt davon -** win screen - -* TODO EXTRA Polishing -** game balancing -** Miner verschieben -** Silos: Farben je nach Kapazität einfärben +** win screen \ No newline at end of file diff --git a/public/images/speechbubbles.png b/public/images/speechbubbles.png index aecfe104d7cfa38d7f95b6cfc38e231d6a064fd5..233fb02dbad24b01b3f5e40fec1084dfcc76254f 100644 GIT binary patch delta 747 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 diff --git a/src/game.coffee b/src/game.coffee index f482e2e..921da74 100644 --- a/src/game.coffee +++ b/src/game.coffee @@ -80,6 +80,8 @@ app.game = @currentSelectedTile.entity = new Miner else @speechbubble.say 'nores' + else + @speechbubble.say 'nosel' createSilo: -> if @currentSelectedTile @@ -90,6 +92,8 @@ app.game = @speechbubble.say 'nores' else @speechbubble.say 'toofar' + else + @speechbubble.say 'nosel' checkResource: (type, amount, drain = false) -> if @resources[type] >= amount diff --git a/src/hud.coffee b/src/hud.coffee index 61a9b5b..5df8b50 100644 --- a/src/hud.coffee +++ b/src/hud.coffee @@ -62,7 +62,7 @@ app.game.hud = showBuildInfo: -> clearTimeout(@timeout) if @timeout @buildinfo = true - @timeout = window.setTimeout @hideBuildInfo, 2000 + @timeout = window.setTimeout @hideBuildInfo, 4000 hideBuildInfo: -> app.game.hud.buildinfo = false diff --git a/src/speechbubble.coffee b/src/speechbubble.coffee index e48ca47..d32f2c5 100644 --- a/src/speechbubble.coffee +++ b/src/speechbubble.coffee @@ -9,6 +9,7 @@ app.game.speechbubble = when 'help' then @sprite = [0, 0, 27, 13] when 'toofar' then @sprite = [0, 13, 90, 13] when 'nores' then @sprite = [0, 26, 90, 13] + when 'nosel' then @sprite = [0, 39, 90, 13] @visible = true @timeout = window.setTimeout @hide, 1000