diff --git a/public/libs/actions.js b/public/libs/actions.js index ce1b3c7..3a43202 100644 --- a/public/libs/actions.js +++ b/public/libs/actions.js @@ -846,6 +846,12 @@ actions.prototype._sys_longClick_lockControl = function (x, y, px, py) { core.status.event.id == 'action' && core.status.event.data.type == 'text' ) { + const [now, next] = core.status.event.data.list; + if (next?.type !== 'text') { + const Store = Mota.require('@user/client-modules').TextboxStore; + const textbox = Store.get(now.textbox ?? 'main-textbox'); + textbox.hide(); + } core.doAction(); return true; } diff --git a/public/libs/maps.js b/public/libs/maps.js index 4679cea..51096a9 100644 --- a/public/libs/maps.js +++ b/public/libs/maps.js @@ -1101,8 +1101,8 @@ maps.prototype._canMoveDirectly_checkNextPoint = function (blocksObj, x, y) { const damage = core.status.thisMap.enemy.mapDamage[index]; if (damage) { if (damage.damage !== 0) return false; - if (damage.mockery) return false; - if (damage.hunt) return false; + if (damage.ambush) return false; + if (damage.repulse) return false; } return true;