From 53f27022731352cf63762e9ee314efcf06a71f69 Mon Sep 17 00:00:00 2001 From: bigbadwaffle Date: Fri, 24 Feb 2017 12:23:34 +0200 Subject: [PATCH] Fixes #10 --- src/server/config/spells/spellFireblast.js | 2 +- src/server/config/spellsConfig.js | 2 +- src/server/world/physics.js | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/server/config/spells/spellFireblast.js b/src/server/config/spells/spellFireblast.js index 3bc10018..c6a183b9 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)) { + if (physics.isTileBlocking(targetPos.x + dx, targetPos.y + dy, true)) { 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 69092cc5..ad095155 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: [1, 4] + i_pushback: [5, 10] } }, 'smite': { diff --git a/src/server/world/physics.js b/src/server/world/physics.js index 3fdf5c79..0bbd9f91 100644 --- a/src/server/world/physics.js +++ b/src/server/world/physics.js @@ -266,11 +266,12 @@ define([ x = ~~x; y = ~~y; + //Colliders d var node = this.graph.grid[x][y]; if (node) return node.isWall(); else - return false; + return true; }, isCellOpen: function(x, y) { if ((x < 0) || (y < 0) || (x >= this.width) | (y >= this.height))