|
@@ -9,7 +9,7 @@
|
|
|
/**
|
|
/**
|
|
|
* @typedef {import("../fpsManager.js").deps} deps
|
|
* @typedef {import("../fpsManager.js").deps} deps
|
|
|
*/
|
|
*/
|
|
|
-
|
|
|
|
|
|
|
+const assert = require("assert").strict;
|
|
|
const utils = require("./helpers/utils");
|
|
const utils = require("./helpers/utils");
|
|
|
const { ENTITY_HOOK_TYPE, RAW_HOOK_MODE, HOOK_SETTINGS, DESPAWN_TYPES, EVENTS, HPCHANGE, MPCHANGE } = require("./helpers/enums");
|
|
const { ENTITY_HOOK_TYPE, RAW_HOOK_MODE, HOOK_SETTINGS, DESPAWN_TYPES, EVENTS, HPCHANGE, MPCHANGE } = require("./helpers/enums");
|
|
|
|
|
|
|
@@ -20,6 +20,7 @@ class unitFps {
|
|
|
* @memberof unitFps
|
|
* @memberof unitFps
|
|
|
*/
|
|
*/
|
|
|
constructor(deps) {
|
|
constructor(deps) {
|
|
|
|
|
+ assert.ok(Object.keys(deps), "unitState: empty deps");
|
|
|
const data = deps.data;
|
|
const data = deps.data;
|
|
|
const mod = deps.mod;
|
|
const mod = deps.mod;
|
|
|
const tracker = deps.tracker;
|
|
const tracker = deps.tracker;
|
|
@@ -377,7 +378,7 @@ class unitFps {
|
|
|
//---------------------------------------
|
|
//---------------------------------------
|
|
|
// Combined hooks with complicated logic
|
|
// Combined hooks with complicated logic
|
|
|
//---------------------------------------
|
|
//---------------------------------------
|
|
|
- mod.hook(...proto.getData("S_INSTANCE_ARROW"), RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, blockAdditionalSkillEffectsHandler);
|
|
|
|
|
|
|
+ mod.hook(...proto.getData("S_INSTANCE_ARROW"), HOOK_SETTINGS.LAST, blockAdditionalSkillEffectsHandler);
|
|
|
mod.hook(...proto.getData("S_CREATURE_CHANGE_HP"), HOOK_SETTINGS.LAST, creatureChangeHpHandler);
|
|
mod.hook(...proto.getData("S_CREATURE_CHANGE_HP"), HOOK_SETTINGS.LAST, creatureChangeHpHandler);
|
|
|
mod.hook(...proto.getData("S_PLAYER_CHANGE_MP"), HOOK_SETTINGS.LAST, creatureChangeMpHandler);
|
|
mod.hook(...proto.getData("S_PLAYER_CHANGE_MP"), HOOK_SETTINGS.LAST, creatureChangeMpHandler);
|
|
|
|
|
|
|
@@ -391,7 +392,7 @@ class unitFps {
|
|
|
mod.hook(...proto.getData("S_ABNORMALITY_END"), HOOK_SETTINGS.LAST, abnormalsHandler);
|
|
mod.hook(...proto.getData("S_ABNORMALITY_END"), HOOK_SETTINGS.LAST, abnormalsHandler);
|
|
|
mod.hook(...proto.getData("S_ABNORMALITY_FAIL"), HOOK_SETTINGS.LAST, abnormalsHandler);
|
|
mod.hook(...proto.getData("S_ABNORMALITY_FAIL"), HOOK_SETTINGS.LAST, abnormalsHandler);
|
|
|
mod.hook(...proto.getData("S_ABNORMALITY_DAMAGE_ABSORB"), HOOK_SETTINGS.LAST, abnormalsHandler);
|
|
mod.hook(...proto.getData("S_ABNORMALITY_DAMAGE_ABSORB"), HOOK_SETTINGS.LAST, abnormalsHandler);
|
|
|
- mod.hook(...proto.getData("S_ABNORMALITY_RESIST"), HOOK_SETTINGS.LAST, abnormalsHandler);
|
|
|
|
|
|
|
+ //mod.hook(...proto.getData("S_ABNORMALITY_RESIST"), HOOK_SETTINGS.LAST, abnormalsHandler); //TODO: NEED MAP
|
|
|
|
|
|
|
|
mod.hook(...proto.getData("S_SPAWN_PROJECTILE"), HOOK_SETTINGS.LAST, projectileHandler);
|
|
mod.hook(...proto.getData("S_SPAWN_PROJECTILE"), HOOK_SETTINGS.LAST, projectileHandler);
|
|
|
mod.hook(...proto.getData("S_START_USER_PROJECTILE"), HOOK_SETTINGS.LAST, projectileHandler);
|
|
mod.hook(...proto.getData("S_START_USER_PROJECTILE"), HOOK_SETTINGS.LAST, projectileHandler);
|
|
@@ -401,7 +402,7 @@ class unitFps {
|
|
|
mod.hook(...proto.getData("S_USER_APPEARANCE_CHANGE"), HOOK_SETTINGS.LAST, appearanceChangeHandler);
|
|
mod.hook(...proto.getData("S_USER_APPEARANCE_CHANGE"), HOOK_SETTINGS.LAST, appearanceChangeHandler);
|
|
|
mod.hook(...proto.getData("S_USER_EXTERNAL_CHANGE"), HOOK_SETTINGS.LAST, appearanceChangeHandler);
|
|
mod.hook(...proto.getData("S_USER_EXTERNAL_CHANGE"), HOOK_SETTINGS.LAST, appearanceChangeHandler);
|
|
|
mod.hook(...proto.getData("S_UNICAST_TRANSFORM_DATA"), HOOK_SETTINGS.LAST, appearanceChangeHandler);
|
|
mod.hook(...proto.getData("S_UNICAST_TRANSFORM_DATA"), HOOK_SETTINGS.LAST, appearanceChangeHandler);
|
|
|
- mod.hook(...proto.getData("S_USER_CHANGE_FACE_CUSTOM"), HOOK_SETTINGS.LAST, appearanceChangeHandler);
|
|
|
|
|
|
|
+ //mod.hook(...proto.getData("S_USER_CHANGE_FACE_CUSTOM"), HOOK_SETTINGS.LAST, appearanceChangeHandler); // TODO: NEED MAP
|
|
|
|
|
|
|
|
deps.data.on(EVENTS.RECONFIGURE, () => {
|
|
deps.data.on(EVENTS.RECONFIGURE, () => {
|
|
|
console.log("DEBUG: unitFps -> constructor -> reconfigureEvent");
|
|
console.log("DEBUG: unitFps -> constructor -> reconfigureEvent");
|
|
@@ -421,6 +422,8 @@ class unitFps {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
for (const [key, value] of tracker.spawnedDrop.entries()) {
|
|
for (const [key, value] of tracker.spawnedDrop.entries()) {
|
|
|
|
|
+ assert.ok(Object.keys(value).length > 3, "reconfigure event: wrong object drop");
|
|
|
|
|
+
|
|
|
let needBlock = isDropBlockable(value);
|
|
let needBlock = isDropBlockable(value);
|
|
|
if (needBlock && !blockedDrop.has(key)) {
|
|
if (needBlock && !blockedDrop.has(key)) {
|
|
|
mod.send(...proto.getData("S_DESPAWN_DROPITEM"), { "gameId": value.gameId });
|
|
mod.send(...proto.getData("S_DESPAWN_DROPITEM"), { "gameId": value.gameId });
|
|
@@ -433,6 +436,8 @@ class unitFps {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
for (const [key, value] of tracker.spawnedPlayers.entries()) {
|
|
for (const [key, value] of tracker.spawnedPlayers.entries()) {
|
|
|
|
|
+ assert.ok(Object.keys(value).length > 3, "reconfigure event: wrong object players");
|
|
|
|
|
+
|
|
|
let needBlock = isUserBlockable(value);
|
|
let needBlock = isUserBlockable(value);
|
|
|
if (needBlock && !blockedPlayers.has(key)) {
|
|
if (needBlock && !blockedPlayers.has(key)) {
|
|
|
mod.send(...proto.getData("S_DESPAWN_USER"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW });
|
|
mod.send(...proto.getData("S_DESPAWN_USER"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW });
|
|
@@ -445,6 +450,8 @@ class unitFps {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
for (const [key, value] of tracker.spawnedServants.entries()) {
|
|
for (const [key, value] of tracker.spawnedServants.entries()) {
|
|
|
|
|
+ assert.ok(Object.keys(value).length > 3, "reconfigure event: wrong object servants");
|
|
|
|
|
+
|
|
|
let needBlock = isServantBlockable(value);
|
|
let needBlock = isServantBlockable(value);
|
|
|
if (needBlock && !blockedServants.has(key)) {
|
|
if (needBlock && !blockedServants.has(key)) {
|
|
|
mod.send(...proto.getData("S_REQUEST_DESPAWN_SERVANT"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW });
|
|
mod.send(...proto.getData("S_REQUEST_DESPAWN_SERVANT"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW });
|
|
@@ -457,6 +464,7 @@ class unitFps {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
for (const [key, value] of tracker.spawnedSummons.entries()) {
|
|
for (const [key, value] of tracker.spawnedSummons.entries()) {
|
|
|
|
|
+ assert.ok(Object.keys(value).length > 3, "reconfigure event: wrong object summons");
|
|
|
let needBlock = isSummonsBlockable(value);
|
|
let needBlock = isSummonsBlockable(value);
|
|
|
if (needBlock && !blockedSummons.has(key)) {
|
|
if (needBlock && !blockedSummons.has(key)) {
|
|
|
mod.send(...proto.getData("S_DESPAWN_NPC"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW, "loc": value.loc });
|
|
mod.send(...proto.getData("S_DESPAWN_NPC"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW, "loc": value.loc });
|
|
@@ -469,6 +477,7 @@ class unitFps {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
for (const [key, value] of tracker.spawnedNPCS.entries()) {
|
|
for (const [key, value] of tracker.spawnedNPCS.entries()) {
|
|
|
|
|
+ assert.ok(Object.keys(value).length > 3, "reconfigure event: wrong object NPCS");
|
|
|
let needBlock = isSummonsBlockable(value);
|
|
let needBlock = isSummonsBlockable(value);
|
|
|
if (needBlock && !blockedNpcs.has(key)) {
|
|
if (needBlock && !blockedNpcs.has(key)) {
|
|
|
mod.send(...proto.getData("S_DESPAWN_NPC"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW, "loc": value.loc });
|
|
mod.send(...proto.getData("S_DESPAWN_NPC"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW, "loc": value.loc });
|