jianghe2nd/mota-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

修复阻击推下悬崖问题

Browse Source
This commit is contained in:
ckcz123 2020-05-26 22:27:03 +08:00
parent 91f73e7c49
commit fa6f6cf0af
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/events.js
View File

@ -776,7 +776,7 @@ events.prototype.pushBox = function (data) {
// 检测能否推上去 // 检测能否推上去
if (!core.canMoveHero()) return; if (!core.canMoveHero()) return;
var canGoDeadZone = core.flags.canGoDeadZone; var canGoDeadZone = core.flags.canGoDeadZone;
core.flags.canGoDeadZone = false; core.flags.canGoDeadZone = true;
if (!core.canMoveHero(data.x, data.y, direction)) { if (!core.canMoveHero(data.x, data.y, direction)) {
core.flags.canGoDeadZone = canGoDeadZone; core.flags.canGoDeadZone = canGoDeadZone;
return; return;

6
libs/maps.js
View File

@ -511,9 +511,9 @@ maps.prototype._canMoveHero_checkPoint = function (x, y, direction, floorId, ext
return false; return false;
// 3. 检查是否能进将死的领域 // 3. 检查是否能进将死的领域
if (floorId == core.status.floorId if (floorId == core.status.floorId && !core.flags.canGoDeadZone &&
&& core.status.hero.hp <= (core.status.checkBlock.damage[nx + "," + ny]||0) core.status.hero.hp <= (core.status.checkBlock.damage[nx + "," + ny]||0)
&& !core.flags.canGoDeadZone && extraData.eventArray[ny][nx] == 0) && extraData.eventArray[ny][nx] == 0)
return false; return false;
return true; return true;

13
project/functions.js
View File

@ -126,6 +126,10 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
// ---------- 重绘新地图；这一步将会设置core.status.floorId ---------- // // ---------- 重绘新地图；这一步将会设置core.status.floorId ---------- //
core.drawMap(floorId); core.drawMap(floorId);
// item_ratio兼容性...
if (core.status.thisMap.ratio == null && core.status.thisMap.item_ratio != null) {
core.status.thisMap.ratio = core.status.thisMap.item_ratio;
}
// 切换楼层BGM // 切换楼层BGM
if (core.status.maps[floorId].bgm) { if (core.status.maps[floorId].bgm) {
@ -546,6 +550,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
} }
// TODO：如果有其他类型光环怪物在这里仿照添加检查 // TODO：如果有其他类型光环怪物在这里仿照添加检查
// 注：新增新的类光环属性（需要遍历全图的）需要在特殊属性定义那里的第五项写1，参见光环和支援的特殊属性定义。
} }
}); });
@ -1061,6 +1066,8 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
repulse = {}, // 每个点的阻击怪信息 repulse = {}, // 每个点的阻击怪信息
ambush = {}; // 每个点的捕捉信息 ambush = {}; // 每个点的捕捉信息
var needCache = false; var needCache = false;
var canGoDeadZone = core.flags.canGoDeadZone;
core.flags.canGoDeadZone = true;
// 计算血网和领域、阻击、激光的伤害，计算捕捉信息 // 计算血网和领域、阻击、激光的伤害，计算捕捉信息
for (var loc in blocks) { for (var loc in blocks) {
@ -1116,10 +1123,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
type[currloc]["阻击伤害"] = true; type[currloc]["阻击伤害"] = true;
var rdir = core.turnDirection(":back", dir); var rdir = core.turnDirection(":back", dir);
// 检查下一个点是否存在事件（从而判定是否移动） if (core.canMoveHero(x, y, rdir, floorId)) {
var rnx = x + core.utils.scan[rdir].x,
rny = y + core.utils.scan[rdir].y;
if (rnx >= 0 && rnx < width && rny >= 0 && rny < height && core.getBlock(rnx, rny, floorId) == null) {
repulse[currloc] = (repulse[currloc] || []).concat([ repulse[currloc] = (repulse[currloc] || []).concat([
[x, y, id, rdir] [x, y, id, rdir]
]); ]);
@ -1217,6 +1221,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
} }
} }
core.flags.canGoDeadZone = canGoDeadZone;
core.status.checkBlock = { core.status.checkBlock = {
damage: damage, damage: damage,
type: type, type: type,