Fixed Inventory

This commit is contained in:
MasterGordon 2018-03-21 22:39:28 +01:00
parent 448db69ac8
commit 5782dad45d
3 changed files with 7 additions and 11 deletions

View File

@ -19,7 +19,7 @@ class Tile {
work() { work() {
//Default Conveyor-Belt Verhalten //Default Conveyor-Belt Verhalten
while (this.input.items.length > 1) { while (this.input.items.length > 0) {
var item = this.input.items.pop() var item = this.input.items.pop()
item.setDFromDirection(this.direction) item.setDFromDirection(this.direction)
} }

View File

@ -76,11 +76,8 @@ function gametick(timestep) {
factorys[i].moveItems() factorys[i].moveItems()
} }
if (time % 24 == 0) { for (var i = 0; i < factorys.length; i++) {
for (var i = 0; i < factorys.length; i++) { factorys[i].workTiles()
factorys[i].moveItems()
factorys[i].workTiles()
}
} }
} }
@ -105,7 +102,6 @@ function render() {
var img = new Image var img = new Image
img.src = "images/items/" + getItemFormId(item.id).name + ".png" img.src = "images/items/" + getItemFormId(item.id).name + ".png"
ctx.drawImage(img, item.x, item.y, 48, 48) ctx.drawImage(img, item.x, item.y, 48, 48)
console.log(item.x)
} }
//RENDER TILE-LAYER1 //RENDER TILE-LAYER1
for (var i = 0; i < tilesToRender.length; i++) { for (var i = 0; i < tilesToRender.length; i++) {
@ -116,7 +112,7 @@ function render() {
img.src = tmp img.src = tmp
drawRotatedImage(img, tile.x * 48 + 24, tile.y * 48 + 24, directions[tile.direction].degree) drawRotatedImage(img, tile.x * 48 + 24, tile.y * 48 + 24, directions[tile.direction].degree)
} }
if(mode == "rotate"){ if (mode == "rotate") {
var img2 = new Image var img2 = new Image
img2.src = "images/ui/rotationOverlay.png" img2.src = "images/ui/rotationOverlay.png"
ctx.globalAlpha = 0.4 ctx.globalAlpha = 0.4
@ -204,9 +200,9 @@ function drawInfoBar() {
var selectedX = -1; var selectedX = -1;
if (mode == "build" || mode == "selectbuilding") { if (mode == "build" || mode == "selectbuilding") {
selectedX = 0 selectedX = 0
} else if(mode=="move"){ } else if (mode == "move") {
selectedX = 1 selectedX = 1
} else if(mode=="rotate"){ } else if (mode == "rotate") {
selectedX = 2 selectedX = 2
} }

View File

@ -5,7 +5,7 @@ var tileClasses = []
class Conveyorbelt extends Tile { class Conveyorbelt extends Tile {
constructor(x, y) { constructor(x, y) {
super(x, y) super(x, y)
this.name = "conveyorbelt" this.name = "conveyorbelt"
this.texture = { this.texture = {
"0": ["conveyorbelt00", "conveyorbelt01", "conveyorbelt02", "conveyorbelt03", "conveyorbelt04", "conveyorbelt05", "conveyorbelt06"], "0": ["conveyorbelt00", "conveyorbelt01", "conveyorbelt02", "conveyorbelt03", "conveyorbelt04", "conveyorbelt05", "conveyorbelt06"],
"1": [] "1": []