|
@@ -122,6 +122,8 @@ class unitFps {
|
|
|
const isSkillBlockable = (event) => {
|
|
const isSkillBlockable = (event) => {
|
|
|
if (isMe(event.gameId) || event.skill.npc) return false;
|
|
if (isMe(event.gameId) || event.skill.npc) return false;
|
|
|
if (data.activeMode.blockSkills) {
|
|
if (data.activeMode.blockSkills) {
|
|
|
|
|
+ if (data.activeMode.blockSkills.keepClass && utils.arraysHasIntersect(data.userTemplateToClassMap[event.templateId], data.activeMode.blockSkills.keepClass))
|
|
|
|
|
+ return false;
|
|
|
if (data.activeMode.blockSkills.all)
|
|
if (data.activeMode.blockSkills.all)
|
|
|
return true;
|
|
return true;
|
|
|
if (data.activeMode.blockSkills.class && utils.arraysHasIntersect(data.userTemplateToClassMap[event.templateId], data.activeMode.blockSkills.class))
|
|
if (data.activeMode.blockSkills.class && utils.arraysHasIntersect(data.userTemplateToClassMap[event.templateId], data.activeMode.blockSkills.class))
|
|
@@ -359,7 +361,7 @@ class unitFps {
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
const projectileEndHandler = (event) => {
|
|
const projectileEndHandler = (event) => {
|
|
|
- if(blockedProjectiles.has(event.id)) {
|
|
|
|
|
|
|
+ if (blockedProjectiles.has(event.id)) {
|
|
|
blockedProjectiles.delete(event.id);
|
|
blockedProjectiles.delete(event.id);
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
@@ -467,7 +469,7 @@ class unitFps {
|
|
|
const actionHandler = (event) => {
|
|
const actionHandler = (event) => {
|
|
|
if (isEntityBlocked(event.gameId)) return false;
|
|
if (isEntityBlocked(event.gameId)) return false;
|
|
|
if (isSkillBlockable(event)) {
|
|
if (isSkillBlockable(event)) {
|
|
|
- mod.send(...proto.getData("S_INSTANT_MOVE"), {"gameId": event.gameId, "w": event.w, "loc": event.loc});
|
|
|
|
|
|
|
+ mod.send(...proto.getData("S_INSTANT_MOVE"), { "gameId": event.gameId, "w": event.w, "loc": event.loc });
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
@@ -492,11 +494,11 @@ class unitFps {
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
const noctanHandler = () => {
|
|
const noctanHandler = () => {
|
|
|
- if(isNoctsBlockable()) return false;
|
|
|
|
|
|
|
+ if (isNoctsBlockable()) return false;
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
const actionScriptHandler = (event) => {
|
|
const actionScriptHandler = (event) => {
|
|
|
- if(isActionScriptBlockable(event)) return false;
|
|
|
|
|
|
|
+ if (isActionScriptBlockable(event)) return false;
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
const partyMemberListHandler = (event) => {
|
|
const partyMemberListHandler = (event) => {
|
|
@@ -546,11 +548,11 @@ class unitFps {
|
|
|
mod.hook("S_UPDATE_ACHIEVEMENT_PROGRESS", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, achievementHandler);
|
|
mod.hook("S_UPDATE_ACHIEVEMENT_PROGRESS", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, achievementHandler);
|
|
|
mod.hook("S_NOCTAN_VARIATION_INFO", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, noctanHandler);
|
|
mod.hook("S_NOCTAN_VARIATION_INFO", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, noctanHandler);
|
|
|
mod.hook("S_FONT_SWAP_INFO", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, fontSwapHandler);
|
|
mod.hook("S_FONT_SWAP_INFO", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, fontSwapHandler);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
mod.hook(...proto.getData("S_START_ACTION_SCRIPT"), HOOK_SETTINGS.LAST, actionScriptHandler);
|
|
mod.hook(...proto.getData("S_START_ACTION_SCRIPT"), HOOK_SETTINGS.LAST, actionScriptHandler);
|
|
|
mod.hook(...proto.getData("S_QUEST_BALLOON"), HOOK_SETTINGS.LAST, baloonsHandler);
|
|
mod.hook(...proto.getData("S_QUEST_BALLOON"), HOOK_SETTINGS.LAST, baloonsHandler);
|
|
|
mod.hook(...proto.getData("S_SYSTEM_MESSAGE"), HOOK_SETTINGS.LAST, smtHandler);
|
|
mod.hook(...proto.getData("S_SYSTEM_MESSAGE"), HOOK_SETTINGS.LAST, smtHandler);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
mod.hook(...proto.getData("S_DESPAWN_COLLECTION"), HOOK_SETTINGS.LAST, collectionHandler.bind(null, ENTITY_HOOK_TYPE.DESPAWN));
|
|
mod.hook(...proto.getData("S_DESPAWN_COLLECTION"), HOOK_SETTINGS.LAST, collectionHandler.bind(null, ENTITY_HOOK_TYPE.DESPAWN));
|
|
|
mod.hook(...proto.getData("S_SPAWN_COLLECTION"), HOOK_SETTINGS.LAST, collectionHandler.bind(null, ENTITY_HOOK_TYPE.SPAWN));
|
|
mod.hook(...proto.getData("S_SPAWN_COLLECTION"), HOOK_SETTINGS.LAST, collectionHandler.bind(null, ENTITY_HOOK_TYPE.SPAWN));
|
|
|
mod.hook(...proto.getData("S_REQUEST_SPAWN_SERVANT"), HOOK_SETTINGS.LAST, servantsHandler.bind(null, ENTITY_HOOK_TYPE.SPAWN));
|
|
mod.hook(...proto.getData("S_REQUEST_SPAWN_SERVANT"), HOOK_SETTINGS.LAST, servantsHandler.bind(null, ENTITY_HOOK_TYPE.SPAWN));
|