From 5782dad45d19d44bdd16ddf6b89b72229d3a5850 Mon Sep 17 00:00:00 2001 From: MasterGordon Date: Wed, 21 Mar 2018 22:39:28 +0100 Subject: [PATCH] Fixed Inventory --- js/baseclasses.js | 2 +- js/game.js | 14 +++++--------- js/tiles.js | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/js/baseclasses.js b/js/baseclasses.js index c3b757a..e95707d 100644 --- a/js/baseclasses.js +++ b/js/baseclasses.js @@ -19,7 +19,7 @@ class Tile { work() { //Default Conveyor-Belt Verhalten - while (this.input.items.length > 1) { + while (this.input.items.length > 0) { var item = this.input.items.pop() item.setDFromDirection(this.direction) } diff --git a/js/game.js b/js/game.js index 05baab3..115b8e0 100644 --- a/js/game.js +++ b/js/game.js @@ -76,11 +76,8 @@ function gametick(timestep) { factorys[i].moveItems() } - if (time % 24 == 0) { - for (var i = 0; i < factorys.length; i++) { - factorys[i].moveItems() - factorys[i].workTiles() - } + for (var i = 0; i < factorys.length; i++) { + factorys[i].workTiles() } } @@ -105,7 +102,6 @@ function render() { var img = new Image img.src = "images/items/" + getItemFormId(item.id).name + ".png" ctx.drawImage(img, item.x, item.y, 48, 48) - console.log(item.x) } //RENDER TILE-LAYER1 for (var i = 0; i < tilesToRender.length; i++) { @@ -116,7 +112,7 @@ function render() { img.src = tmp drawRotatedImage(img, tile.x * 48 + 24, tile.y * 48 + 24, directions[tile.direction].degree) } - if(mode == "rotate"){ + if (mode == "rotate") { var img2 = new Image img2.src = "images/ui/rotationOverlay.png" ctx.globalAlpha = 0.4 @@ -204,9 +200,9 @@ function drawInfoBar() { var selectedX = -1; if (mode == "build" || mode == "selectbuilding") { selectedX = 0 - } else if(mode=="move"){ + } else if (mode == "move") { selectedX = 1 - } else if(mode=="rotate"){ + } else if (mode == "rotate") { selectedX = 2 } diff --git a/js/tiles.js b/js/tiles.js index b1ce7a8..dfa35c6 100644 --- a/js/tiles.js +++ b/js/tiles.js @@ -5,7 +5,7 @@ var tileClasses = [] class Conveyorbelt extends Tile { constructor(x, y) { super(x, y) - this.name = "conveyorbelt" + this.name = "conveyorbelt" this.texture = { "0": ["conveyorbelt00", "conveyorbelt01", "conveyorbelt02", "conveyorbelt03", "conveyorbelt04", "conveyorbelt05", "conveyorbelt06"], "1": []