diff --git a/README.md b/README.md index 9bc5edf..fad4648 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Das Ziel dieses Projektes ist es ein auf Javascript und HTML5 basierten "clon" v ## Features - Produktion von Items in Maschinen -- Verkaufen Items für Geld +- Verkaufen von Items für Geld - Bau von neuen Maschinen aus Items und Geld - Verbessern von Maschinen mit Items und Geld - Eröffnen von neuen Fabriken diff --git a/images/tiles/convayorbelt.png b/images/tiles/convayorbelt.png deleted file mode 100644 index 9dd84b0..0000000 Binary files a/images/tiles/convayorbelt.png and /dev/null differ diff --git a/images/tiles/conveyorbelt00.png b/images/tiles/conveyorbelt00.png new file mode 100644 index 0000000..29bcdde Binary files /dev/null and b/images/tiles/conveyorbelt00.png differ diff --git a/images/tiles/conveyorbelt01.png b/images/tiles/conveyorbelt01.png new file mode 100644 index 0000000..ad3907f Binary files /dev/null and b/images/tiles/conveyorbelt01.png differ diff --git a/images/tiles/conveyorbelt02.png b/images/tiles/conveyorbelt02.png new file mode 100644 index 0000000..4d45d8a Binary files /dev/null and b/images/tiles/conveyorbelt02.png differ diff --git a/images/tiles/conveyorbelt03.png b/images/tiles/conveyorbelt03.png new file mode 100644 index 0000000..474462f Binary files /dev/null and b/images/tiles/conveyorbelt03.png differ diff --git a/images/tiles/conveyorbelt04.png b/images/tiles/conveyorbelt04.png new file mode 100644 index 0000000..6a1b473 Binary files /dev/null and b/images/tiles/conveyorbelt04.png differ diff --git a/images/tiles/conveyorbelt05.png b/images/tiles/conveyorbelt05.png new file mode 100644 index 0000000..e91cec1 Binary files /dev/null and b/images/tiles/conveyorbelt05.png differ diff --git a/images/tiles/conveyorbelt06.png b/images/tiles/conveyorbelt06.png new file mode 100644 index 0000000..63d1d38 Binary files /dev/null and b/images/tiles/conveyorbelt06.png differ diff --git a/images/tiles/lazer0.png b/images/tiles/lazer0.png new file mode 100644 index 0000000..86013fc Binary files /dev/null and b/images/tiles/lazer0.png differ diff --git a/images/tiles/lazer1.png b/images/tiles/lazer1.png new file mode 100644 index 0000000..47512cc Binary files /dev/null and b/images/tiles/lazer1.png differ diff --git a/index.html b/index.html index 87e7054..48e0975 100644 --- a/index.html +++ b/index.html @@ -7,7 +7,9 @@ + + diff --git a/js/baseclasses.js b/js/baseclasses.js index 670fb0b..bba7dcd 100644 --- a/js/baseclasses.js +++ b/js/baseclasses.js @@ -4,6 +4,12 @@ class Tile { this.y = y this.direction = "right" this.input = new Inventory() + this.frames = 1 + this.name = "base" + } + + nextFrame(fulltime) { + return (fulltime % this.frames); } work() { @@ -61,22 +67,9 @@ class Item { } setDFromDirection(direction) { - if (direction == "left") { - this.dx = -1 - this.dy = 0 - } else if (direction == "right") { - this.dx = 1 - this.dy = 0 - } else if (direction == "up") { - this.dx = 0 - this.dy = -1 - } else if (direction == "down") { - this.dx = 0 - this.dy = 1 - } else { - this.dx = 0 - this.dy = 0 - } + this.dx = directions[direction].dx + this.dy = directions[direction].dy + this.dy = 0 this.x += this.dx this.y += this.dy } @@ -108,7 +101,7 @@ class Factory { for (var i = 0; i < this.items.length; i++) { this.items[i].move() if (this.items[i].x % 48 == 0 && this.items[i].y % 48 == 0) { - var tile = this.tiles [this.items[i].x / 48] [this.items[i].y / 48] + var tile = this.tiles[this.items[i].x / 48][this.items[i].y / 48] if (tile != 0) { tile.input.addItem(this.items[i]) } @@ -116,6 +109,18 @@ class Factory { } } + getTiles() { + var temp = [] + for (var x = 0; x < 32; x++) { + for (var y = 0; y < 16; y++) { + if (this.tiles[x][y] != 0) { + temp.push(this.tiles[x][y]) + } + } + } + return temp + } + workTiles() { for (var x = 0; x < 32; x++) { for (var y = 0; y < 16; y++) { diff --git a/js/game.js b/js/game.js index 810b434..57a546b 100644 --- a/js/game.js +++ b/js/game.js @@ -8,6 +8,7 @@ var delta = 0 var lastFrameTimeMs = 0 var ctx = {} var currentFactory = 0 +var fulltime = 0 $(document).ready(function() { loadGameData() @@ -21,7 +22,7 @@ function loadGameData() { factorys.push(new Factory()) } -function loadItems(){ +function loadItems() { var itemRequest = new XMLHttpRequest(); itemRequest.open('GET', 'js/items.json', false) itemRequest.send(null) @@ -53,45 +54,53 @@ function loop(timestamp) { function gametick(timestep) { //time gibt an in den Wievielten von 40 Ticks man sich befindet - time ++ - time = time%48 + time++ + time = time % 48 //Wird 40 mal in einer Sekunde aufgerufen - for(var i=0;i