From 63b2f23ec1a8ee2a2ccd71f18fd518d4628bf7d9 Mon Sep 17 00:00:00 2001 From: Big Bad Waffle Date: Tue, 28 Feb 2017 21:20:36 +0200 Subject: [PATCH] Removed testing code that was left in --- src/server/config/spells/spellFireblast.js | 2 +- src/server/config/spellsConfig.js | 2 +- src/server/world/physics.js | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/server/config/spells/spellFireblast.js b/src/server/config/spells/spellFireblast.js index c6a183b9..3bc10018 100644 --- a/src/server/config/spells/spellFireblast.js +++ b/src/server/config/spells/spellFireblast.js @@ -83,7 +83,7 @@ define([ dx = ~~(dx / Math.abs(dx)); dy = ~~(dy / Math.abs(dy)); for (var l = 0; l < this.pushback; l++) { - if (physics.isTileBlocking(targetPos.x + dx, targetPos.y + dy, true)) { + if (physics.isTileBlocking(targetPos.x + dx, targetPos.y + dy)) { if (physics.isTileBlocking(targetPos.x + dx, targetPos.y)) { if (physics.isTileBlocking(targetPos.x, targetPos.y + dy)) { break; diff --git a/src/server/config/spellsConfig.js b/src/server/config/spellsConfig.js index ad095155..69092cc5 100644 --- a/src/server/config/spellsConfig.js +++ b/src/server/config/spellsConfig.js @@ -39,7 +39,7 @@ define([ random: { damage: [6.7, 13.3], i_radius: [1, 2.2], - i_pushback: [5, 10] + i_pushback: [1, 4] } }, 'smite': { diff --git a/src/server/world/physics.js b/src/server/world/physics.js index 0bbd9f91..11dab380 100644 --- a/src/server/world/physics.js +++ b/src/server/world/physics.js @@ -266,7 +266,6 @@ define([ x = ~~x; y = ~~y; - //Colliders d var node = this.graph.grid[x][y]; if (node) return node.isWall();