@@ -83,7 +83,7 @@ define([ | |||||
dx = ~~(dx / Math.abs(dx)); | dx = ~~(dx / Math.abs(dx)); | ||||
dy = ~~(dy / Math.abs(dy)); | dy = ~~(dy / Math.abs(dy)); | ||||
for (var l = 0; l < this.pushback; l++) { | 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 + dx, targetPos.y)) { | ||||
if (physics.isTileBlocking(targetPos.x, targetPos.y + dy)) { | if (physics.isTileBlocking(targetPos.x, targetPos.y + dy)) { | ||||
break; | break; | ||||
@@ -39,7 +39,7 @@ define([ | |||||
random: { | random: { | ||||
damage: [6.7, 13.3], | damage: [6.7, 13.3], | ||||
i_radius: [1, 2.2], | i_radius: [1, 2.2], | ||||
i_pushback: [1, 4] | |||||
i_pushback: [5, 10] | |||||
} | } | ||||
}, | }, | ||||
'smite': { | 'smite': { | ||||
@@ -266,11 +266,12 @@ define([ | |||||
x = ~~x; | x = ~~x; | ||||
y = ~~y; | y = ~~y; | ||||
//Colliders d | |||||
var node = this.graph.grid[x][y]; | var node = this.graph.grid[x][y]; | ||||
if (node) | if (node) | ||||
return node.isWall(); | return node.isWall(); | ||||
else | else | ||||
return false; | |||||
return true; | |||||
}, | }, | ||||
isCellOpen: function(x, y) { | isCellOpen: function(x, y) { | ||||
if ((x < 0) || (y < 0) || (x >= this.width) | (y >= this.height)) | if ((x < 0) || (y < 0) || (x >= this.width) | (y >= this.height)) | ||||