diff --git a/index.html b/index.html index c31da0e..b4f764e 100644 --- a/index.html +++ b/index.html @@ -52,6 +52,7 @@ ??? Dollar + diff --git a/js/baseclasses.js b/js/baseclasses.js index 16bab1a..a324720 100644 --- a/js/baseclasses.js +++ b/js/baseclasses.js @@ -186,11 +186,16 @@ class Factory { moveItems() { 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] - if (tile != 0) { - if (tile.input.items.indexOf(this.items[i]) == -1) - tile.input.addItem(this.items[i]) + if (this.items[i].x <= 0 || this.items[i].x >= 1200 || this.items[i].y <= 0 || this.items[i].y >= 576) { + console.log("removed Item") + this.deleteItem(this.items[i]) + } else { + 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] + if (tile != 0) { + if (tile.input.items.indexOf(this.items[i]) == -1) + tile.input.addItem(this.items[i]) + } } } } diff --git a/js/game.js b/js/game.js index 3275ea4..a80cbe5 100644 --- a/js/game.js +++ b/js/game.js @@ -128,7 +128,7 @@ function loadLang() { lang = json } -function loopp(timestamp) { +function loop(timestamp) { //Check Gametick Rate if (timestamp < lastFrameTimeMs + (1000 / 48)) { requestAnimationFrame(loop) @@ -152,7 +152,7 @@ function loopp(timestamp) { var lastRender = 0 -function loop(timestamp) { +function loopp(timestamp) { var progress = timestamp - lastRender gametick(progress) @@ -161,6 +161,7 @@ function loop(timestamp) { lastRender = timestamp window.requestAnimationFrame(loop) } +var tick = [] function gametick(timestep) { //time gibt an in den Wievielten von 40 Ticks man sich befindet @@ -172,6 +173,11 @@ function gametick(timestep) { factorys[i].workTiles() factorys[i].despawnOldItems() } + tick.push(new Date().getTime()) + if (tick.length > 48) { + tick = tick.splice(1) + $("#speed").text("Game Speed: " + ((tick[47] - tick[0]+30) / 10) + "%") + } } function render() { diff --git a/test.html b/test.html new file mode 100644 index 0000000..c7ff840 --- /dev/null +++ b/test.html @@ -0,0 +1,26 @@ + + + + + + Hello World + + + + + + + +