diff --git a/common/player.js b/common/player.js index 5b7c68e..cc589de 100644 --- a/common/player.js +++ b/common/player.js @@ -34,10 +34,12 @@ function Player(you, isPlayer) { Player.prototype.bump = function () { let player = this; - if (player.ticks < 10) { + if (player.ticks < 7) { player.dir *= -1; } + console.log(player.ticks) + player.vel.x *= 0.3; player.vel.y *= 0.3; diff --git a/index.js b/index.js index 024c2d5..f3486f5 100644 --- a/index.js +++ b/index.js @@ -30,8 +30,8 @@ app.ws('/', function (ws, req) { console.log(err); data = {}; } - let { vel, dir, you } = data; - let data2 = { vel, dir, you }; + let { vel, dir, you, ticks } = data; + let data2 = { vel, dir, you, ticks }; game.entities[playerI] = Object.assign(game.entities[playerI], data2); }) diff --git a/static/js/index.js b/static/js/index.js index a5ba318..32734ff 100644 --- a/static/js/index.js +++ b/static/js/index.js @@ -36,7 +36,7 @@ class Game extends GameBasic { ctx.translate(player.camera.x + cs / 2, player.camera.y + cs / 2); - ctx.drawImage(assetsIn[2],-width/2,-height/2,width,height); + ctx.drawImage(assetsIn[2], -width / 2, -height / 2, width, height); for (let ent of entities) { if (ent.health <= 0) continue; @@ -50,7 +50,7 @@ class Game extends GameBasic { ctx.restore(); ctx.drawImage(assetsIn[0], ent.pos.x - 64 / 2, ent.pos.y - 64 / 2, 64, 64); - + ctx.fillStyle = ent.you.split('-')[0]; ctx.strokeStyle = "rgb(255,255,255)"; ctx.lineWidth = "8"; @@ -91,12 +91,12 @@ class Game extends GameBasic { sync() { let { player } = this; - let { vel, dir, you } = player; + let { vel, dir, you, ticks } = player; - this.ws.send(JSON.stringify({ vel, dir, you })); + this.ws.send(JSON.stringify({ vel, dir, you, ticks })); } - recv({data}) { - let {player} = this; + recv({ data }) { + let { player } = this; let you = player.you; let entList = JSON.parse(data); @@ -104,10 +104,10 @@ class Game extends GameBasic { x.handleTick = Player.prototype.handleTick; return x; }) - + let matchingPlayer = entList.filter(x => x.you == you) - this.player = Object.assign(this.player || new Player(false,false),matchingPlayer[0]); + this.player = Object.assign(this.player || new Player(false, false), matchingPlayer[0]); this.entities = entList; @@ -120,7 +120,7 @@ class Game extends GameBasic { this.ws = new WebSocket(window.location.href); - this.ws.addEventListener('message',function(e) { that.recv(e) }); + this.ws.addEventListener('message', function (e) { that.recv(e) }); setInterval(function () { that.render() }, 1000 / 60); setInterval(function () { that.sync() }, 1000 / 5);