From cccb2eff5b0ccf66b5f88485c6ed27db44b1fd89 Mon Sep 17 00:00:00 2001 From: Aaron Mueller Date: Sat, 6 Dec 2014 23:17:58 +0100 Subject: [PATCH] More refactoring work .... --- src/game.coffee | 12 ++---------- src/tools.coffee | 8 ++++++-- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/game.coffee b/src/game.coffee index 023d34c..a3791d3 100644 --- a/src/game.coffee +++ b/src/game.coffee @@ -17,10 +17,8 @@ app.game = @hud.render() - step: -> - mousedown: (event)-> - tile = @posToTile(event.x, event.y) + tile = posToTile(event.x, event.y) tile.click(event.button) @currentSelectedTile.deselect() if @currentSelectedTile @@ -28,7 +26,7 @@ app.game = @currentSelectedTile = tile mousemove: (event)-> - tile = @posToTile(event.x, event.y) + tile = posToTile(event.x, event.y) if tile if tile != @currentHoveredTile @@ -50,12 +48,6 @@ app.game = createMiner: -> if @currentSelectedTile and @checkRessources 'lubinit', 30, true @currentSelectedTile.entity = new Miner - @currentSelectedTile.deselect() if @currentSelectedTile - @currentSelectedTile = null - - posToTile: (x, y)-> - pos = (Math.floor(y/8)*20) + Math.floor(x/8) - @map[pos] checkRessources: (type, amount, drain = false) -> if @resources[type] >= amount diff --git a/src/tools.coffee b/src/tools.coffee index a2e8dab..91de026 100644 --- a/src/tools.coffee +++ b/src/tools.coffee @@ -1,5 +1,9 @@ getRandomInt = (min, max) -> - Math.floor(Math.random() * (max - min + 1)) + min; + Math.floor(Math.random() * (max - min + 1)) + min; allResourceTypes = -> - (k for own k of app.game.resources) + (k for own k of app.game.resources) + +posToTile = (x, y)-> + pos = (Math.floor(y/8)*20) + Math.floor(x/8) + app.game.map[pos]