From f06c82ef72b6630b7001411aa8d5540f7b2c9582 Mon Sep 17 00:00:00 2001 From: MasterGordon Date: Mon, 9 Apr 2018 18:18:50 +0200 Subject: [PATCH] Smaler Save --- js/game.js | 11 +++++++---- js/tiles.js | 30 +++++++++++++++--------------- js/util.js | 6 ++++++ 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/js/game.js b/js/game.js index 5499414..989ae0e 100644 --- a/js/game.js +++ b/js/game.js @@ -66,8 +66,8 @@ function save() { for (var y = 0; y < 12; y++) { if (factorys[i].tiles[x][y] != 0) { game.factorys[i].tiles[x][y] = {} - game.factorys[i].tiles[x][y].index = factorys[i].tiles[x][y].index - game.factorys[i].tiles[x][y].direction = factorys[i].tiles[x][y].direction + game.factorys[i].tiles[x][y].i = factorys[i].tiles[x][y].i + game.factorys[i].tiles[x][y].d = directions[factorys[i].tiles[x][y].direction].d game.factorys[i].tiles[x][y].x = factorys[i].tiles[x][y].x game.factorys[i].tiles[x][y].y = factorys[i].tiles[x][y].y if (factorys[i].tiles[x][y].options != undefined) { @@ -102,10 +102,13 @@ function loadGameData() { for (var y = 0; y < 12; y++) { if (game.factorys[i].tiles[x][y] != 0) { var keys = Object.keys(game.factorys[i].tiles[x][y]) - factorys[i].tiles[x][y] = new tileClasses[game.factorys[i].tiles[x][y].index](game.factorys[i].tiles[x][y].x, game.factorys[i].tiles[x][y].y) + factorys[i].tiles[x][y] = new tileClasses[game.factorys[i].tiles[x][y].i](game.factorys[i].tiles[x][y].x, game.factorys[i].tiles[x][y].y) factorys[i].tiles[x][y].factory = factorys[i] for (var key = 0; key < keys.length; key++) { - factorys[i].tiles[x][y][keys[key]] = game.factorys[i].tiles[x][y][keys[key]] + if (keys[key] == "d") + factorys[i].tiles[x][y].direction = d[game.factorys[i].tiles[x][y]["d"]] + else + factorys[i].tiles[x][y][keys[key]] = game.factorys[i].tiles[x][y][keys[key]] } } } diff --git a/js/tiles.js b/js/tiles.js index 4ee23d2..586d3e2 100644 --- a/js/tiles.js +++ b/js/tiles.js @@ -7,7 +7,7 @@ class Conveyorbelt extends Tile { super(x, y, factory) this.name = "conveyorbelt" this.hasNoInventory = true - this.index = 0 + this.i = 0 this.cost = [{ "id": 0, "count": 20 @@ -19,7 +19,6 @@ class Conveyorbelt extends Tile { this.loadImages() } } -tileClasses.push(Conveyorbelt) class Treefarm extends Tile { constructor(x, y, factory) { @@ -27,7 +26,7 @@ class Treefarm extends Tile { this.maxwork = 96 * 5 this.currentwork = 0 this.name = "treefarm" - this.index = 1 + this.i = 1 this.hasNoInventory = true this.cost = [{ "id": 0, @@ -49,7 +48,6 @@ class Treefarm extends Tile { } } } -tileClasses.push(Treefarm) class Saw extends Tile { constructor(x, y, factory) { @@ -57,7 +55,7 @@ class Saw extends Tile { this.maxwork = 48 this.currentwork = 0 this.name = "saw" - this.index = 2 + this.i = 2 this.cost = [{ "id": 0, "count": 750 @@ -94,7 +92,6 @@ class Saw extends Tile { } } } -tileClasses.push(Saw) class Charcoalmeiler extends Tile { constructor(x, y, factory) { @@ -102,7 +99,7 @@ class Charcoalmeiler extends Tile { this.maxwork = 96 * 10 this.currentwork = 0 this.name = "charcoalmeiler" - this.index = 3 + this.i = 3 this.cost = [{ "id": 0, "count": 1000 @@ -146,13 +143,12 @@ class Charcoalmeiler extends Tile { } } } -tileClasses.push(Charcoalmeiler) class Quarry extends Tile { constructor(x, y, factory) { super(x, y, factory) this.maxwork = 96 * 3 - this.index = 4 + this.i = 4 this.currentwork = 0 this.name = "quarry" this.hasNoInventory = true @@ -179,14 +175,13 @@ class Quarry extends Tile { } } } -tileClasses.push(Quarry) class Collector extends Tile { constructor(x, y, factory) { super(x, y, factory) this.name = "collector" this.hasNoInventory = true - this.index = 5 + this.i = 5 this.cost = [{ "id": 0, "count": 50 @@ -206,14 +201,13 @@ class Collector extends Tile { } } } -tileClasses.push(Collector) class Spliter extends Tile { constructor(x, y, factory) { super(x, y, factory) this.name = "spliter" this.hasNoInventory = true - this.index = 6 + this.i = 6 this.odd = true this.cost = [{ "id": 0, @@ -266,7 +260,6 @@ class Spliter extends Tile { } } } -tileClasses.push(Spliter) class Warehouse extends Tile { constructor(x, y, factory) { @@ -275,7 +268,7 @@ class Warehouse extends Tile { this.hasNoInventory = true this.maxwork = 48 * 10 this.sellPower = 500 - this.index = 7 + this.i = 7 this.cost = [{ "id": 0, "count": 20000 @@ -310,4 +303,11 @@ class Warehouse extends Tile { } } } +tileClasses.push(Conveyorbelt) +tileClasses.push(Treefarm) +tileClasses.push(Saw) +tileClasses.push(Charcoalmeiler) +tileClasses.push(Quarry) +tileClasses.push(Collector) +tileClasses.push(Spliter) tileClasses.push(Warehouse) diff --git a/js/util.js b/js/util.js index 626d757..21cb052 100644 --- a/js/util.js +++ b/js/util.js @@ -1,26 +1,32 @@ var directions = { "right": { + "d": 0, "degree": 0, "dx": 1, "dy": 0 }, "down": { + "d": 1, "degree": 90, "dx": 0, "dy": 1 }, "left": { + "d": 2, "degree": 180, "dx": -1, "dy": 0 }, "up": { + "d": 3, "degree": 270, "dx": 0, "dy": -1 } } +var d = ["right","down","left","up"] + //Umrechnung von Grad zu Bogenmaß var TO_RADIANS = Math.PI / 180;