|
@@ -34,7 +34,7 @@ class unitFps {
|
|
|
const blockedDrop = new Set();
|
|
const blockedDrop = new Set();
|
|
|
|
|
|
|
|
console.log("DEBUG: unitFps -> constructor");
|
|
console.log("DEBUG: unitFps -> constructor");
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
//-------------------------------------
|
|
//-------------------------------------
|
|
|
// Basic internal functions
|
|
// Basic internal functions
|
|
|
//-------------------------------------
|
|
//-------------------------------------
|
|
@@ -74,15 +74,17 @@ class unitFps {
|
|
|
return false;
|
|
return false;
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
- const isNpcsBlockable = (event) => {
|
|
|
|
|
- if (tracker.summons.has(event.gameId)) {
|
|
|
|
|
- if (data.activeMode.blockOwnSummons && isMe(event.owner)) {
|
|
|
|
|
- return true;
|
|
|
|
|
- }
|
|
|
|
|
- else if (data.activeMode.blockAreaSummons && !isMe(event.owner)) {
|
|
|
|
|
- return true;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ const isSummonsBlockable = (event) => {
|
|
|
|
|
+ if (data.activeMode.blockOwnSummons && isMe(event.owner)) {
|
|
|
|
|
+ return true;
|
|
|
|
|
+ }
|
|
|
|
|
+ else if (data.activeMode.blockAreaSummons && !isMe(event.owner)) {
|
|
|
|
|
+ return true;
|
|
|
}
|
|
}
|
|
|
|
|
+ return false;
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
|
|
+ const isNpcBlockable = (event) => {
|
|
|
if (data.activeMode.blockNpcs && data.activeMode.blockNpcsOptions) {
|
|
if (data.activeMode.blockNpcs && data.activeMode.blockNpcsOptions) {
|
|
|
if (utils.arraysHasIntersect(event.templateId, data.activeMode.blockNpcsOptions.templateId)) {
|
|
if (utils.arraysHasIntersect(event.templateId, data.activeMode.blockNpcsOptions.templateId)) {
|
|
|
return true;
|
|
return true;
|
|
@@ -90,7 +92,6 @@ class unitFps {
|
|
|
else if (utils.arraysHasIntersect(event.huntingZoneId, data.activeMode.blockNpcsOptions.huntingZoneId)) {
|
|
else if (utils.arraysHasIntersect(event.huntingZoneId, data.activeMode.blockNpcsOptions.huntingZoneId)) {
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
return false;
|
|
return false;
|
|
|
};
|
|
};
|
|
@@ -118,7 +119,7 @@ class unitFps {
|
|
|
blockedDrop.delete(event.gameId);
|
|
blockedDrop.delete(event.gameId);
|
|
|
break;
|
|
break;
|
|
|
case (ENTITY_HOOK_TYPE.SPAWN):
|
|
case (ENTITY_HOOK_TYPE.SPAWN):
|
|
|
- if(isDropBlockable(event)) {
|
|
|
|
|
|
|
+ if (isDropBlockable(event)) {
|
|
|
blockedDrop.add(event.gameId);
|
|
blockedDrop.add(event.gameId);
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
@@ -145,15 +146,14 @@ class unitFps {
|
|
|
blockedServants.delete(event.gameId);
|
|
blockedServants.delete(event.gameId);
|
|
|
break;
|
|
break;
|
|
|
case (ENTITY_HOOK_TYPE.SPAWN):
|
|
case (ENTITY_HOOK_TYPE.SPAWN):
|
|
|
- if(isServantBlockable(event)) {
|
|
|
|
|
|
|
+ if (isServantBlockable(event)) {
|
|
|
blockedServants.add(event.gameId);
|
|
blockedServants.add(event.gameId);
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
- const npcsHandler = (type, event) => {
|
|
|
|
|
|
|
+ const npcHandler = (type, event) => {
|
|
|
switch (type) {
|
|
switch (type) {
|
|
|
case (ENTITY_HOOK_TYPE.DESPAWN):
|
|
case (ENTITY_HOOK_TYPE.DESPAWN):
|
|
|
if (!blockedNpcs.has(event.gameId) && data.activeMode.blockNpcsDeathAnimations && event.type === DESPAWN_TYPES.DEAD) {
|
|
if (!blockedNpcs.has(event.gameId) && data.activeMode.blockNpcsDeathAnimations && event.type === DESPAWN_TYPES.DEAD) {
|
|
@@ -163,7 +163,11 @@ class unitFps {
|
|
|
blockedNpcs.delete(event.gameId);
|
|
blockedNpcs.delete(event.gameId);
|
|
|
break;
|
|
break;
|
|
|
case (ENTITY_HOOK_TYPE.SPAWN):
|
|
case (ENTITY_HOOK_TYPE.SPAWN):
|
|
|
- if(isNpcsBlockable(event)) {
|
|
|
|
|
|
|
+ if(tracker.summons.has(event.gameId) && isSummonsBlockable(event)) {
|
|
|
|
|
+ blockedSummons.add(event.gameId);
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
|
|
+ else if (isNpcBlockable(event)) {
|
|
|
blockedNpcs.add(event.gameId);
|
|
blockedNpcs.add(event.gameId);
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
@@ -195,8 +199,8 @@ class unitFps {
|
|
|
const blockAdditionalSkillEffectsHandler = (event) => {
|
|
const blockAdditionalSkillEffectsHandler = (event) => {
|
|
|
if (isEntityBlocked(event.gameId)) return false;
|
|
if (isEntityBlocked(event.gameId)) return false;
|
|
|
if (data.activeMode.blockAdditionalSkillEffects && data.activeMode.blockAdditionalSkillEffectsOptions) {
|
|
if (data.activeMode.blockAdditionalSkillEffects && data.activeMode.blockAdditionalSkillEffectsOptions) {
|
|
|
- if (data.activeMode.blockProjectilesOptions.players && tracker.users.has(event.gameId)) return false;
|
|
|
|
|
- if (data.activeMode.blockProjectilesOptions.own && isMe(event.gameId)) return false;
|
|
|
|
|
|
|
+ if (data.activeMode.blockAdditionalSkillEffectsOptions.players && tracker.users.has(event.gameId)) return false;
|
|
|
|
|
+ if (data.activeMode.blockAdditionalSkillEffectsOptions.own && isMe(event.gameId)) return false;
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
|
|
|
|
@@ -287,6 +291,8 @@ class unitFps {
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
|
|
+ const fontSwapHandler = () => (data.activeMode.blockDamageNumbers ? false : undefined);
|
|
|
|
|
+
|
|
|
const dropIfBlockedHandler = (event) => {
|
|
const dropIfBlockedHandler = (event) => {
|
|
|
let id = event.target || event.gameId;
|
|
let id = event.target || event.gameId;
|
|
|
if (isEntityBlocked(id)) return false;
|
|
if (isEntityBlocked(id)) return false;
|
|
@@ -335,8 +341,8 @@ class unitFps {
|
|
|
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));
|
|
|
mod.hook(...proto.getData("S_REQUEST_DESPAWN_SERVANT"), HOOK_SETTINGS.LAST, servantsHandler.bind(null, ENTITY_HOOK_TYPE.DESPAWN));
|
|
mod.hook(...proto.getData("S_REQUEST_DESPAWN_SERVANT"), HOOK_SETTINGS.LAST, servantsHandler.bind(null, ENTITY_HOOK_TYPE.DESPAWN));
|
|
|
|
|
|
|
|
- mod.hook(...proto.getData("S_SPAWN_NPC"), HOOK_SETTINGS.LAST, npcsHandler.bind(null, ENTITY_HOOK_TYPE.SPAWN));
|
|
|
|
|
- mod.hook(...proto.getData("S_DESPAWN_NPC"), HOOK_SETTINGS.LAST, npcsHandler.bind(null, ENTITY_HOOK_TYPE.DESPAWN));
|
|
|
|
|
|
|
+ mod.hook(...proto.getData("S_SPAWN_NPC"), HOOK_SETTINGS.LAST, npcHandler.bind(null, ENTITY_HOOK_TYPE.SPAWN));
|
|
|
|
|
+ mod.hook(...proto.getData("S_DESPAWN_NPC"), HOOK_SETTINGS.LAST, npcHandler.bind(null, ENTITY_HOOK_TYPE.DESPAWN));
|
|
|
|
|
|
|
|
mod.hook(...proto.getData("S_SPAWN_USER"), HOOK_SETTINGS.FIRST, userHandler.bind(null, ENTITY_HOOK_TYPE.SPAWN));
|
|
mod.hook(...proto.getData("S_SPAWN_USER"), HOOK_SETTINGS.FIRST, userHandler.bind(null, ENTITY_HOOK_TYPE.SPAWN));
|
|
|
mod.hook(...proto.getData("S_DESPAWN_USER"), HOOK_SETTINGS.FIRST, userHandler.bind(null, ENTITY_HOOK_TYPE.DESPAWN));
|
|
mod.hook(...proto.getData("S_DESPAWN_USER"), HOOK_SETTINGS.FIRST, userHandler.bind(null, ENTITY_HOOK_TYPE.DESPAWN));
|
|
@@ -357,9 +363,7 @@ class unitFps {
|
|
|
mod.hook(...proto.getData("S_CREATURE_ROTATE"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
|
|
mod.hook(...proto.getData("S_CREATURE_ROTATE"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
|
|
|
mod.hook(...proto.getData("S_CREATURE_LIFE"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
|
|
mod.hook(...proto.getData("S_CREATURE_LIFE"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
|
|
|
mod.hook(...proto.getData("S_NPC_LOCATION"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
|
|
mod.hook(...proto.getData("S_NPC_LOCATION"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
|
|
|
- mod.hook(...proto.getData("S_USER_LOCATION"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
|
|
|
|
|
- mod.hook(...proto.getData("S_USER_LOCATION_IN_ACTION"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
//---------------------------------------
|
|
//---------------------------------------
|
|
|
// Combined hooks with complicated logic
|
|
// Combined hooks with complicated logic
|
|
|
//---------------------------------------
|
|
//---------------------------------------
|
|
@@ -368,6 +372,7 @@ class unitFps {
|
|
|
mod.hook(...proto.getData("S_PLAYER_CHANGE_MP"), HOOK_SETTINGS.LAST, blockMpPopups);
|
|
mod.hook(...proto.getData("S_PLAYER_CHANGE_MP"), HOOK_SETTINGS.LAST, blockMpPopups);
|
|
|
|
|
|
|
|
mod.hook(...proto.getData("S_EACH_SKILL_RESULT"), HOOK_SETTINGS.LAST, eachSkillResultHandler);
|
|
mod.hook(...proto.getData("S_EACH_SKILL_RESULT"), HOOK_SETTINGS.LAST, eachSkillResultHandler);
|
|
|
|
|
+ mod.hook("S_FONT_SWAP_INFO", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, fontSwapHandler);
|
|
|
|
|
|
|
|
mod.hook(...proto.getData("S_ACTION_STAGE"), HOOK_SETTINGS.LAST, actionHandler);
|
|
mod.hook(...proto.getData("S_ACTION_STAGE"), HOOK_SETTINGS.LAST, actionHandler);
|
|
|
mod.hook(...proto.getData("S_ACTION_END"), HOOK_SETTINGS.LAST, actionHandler);
|
|
mod.hook(...proto.getData("S_ACTION_END"), HOOK_SETTINGS.LAST, actionHandler);
|
|
@@ -391,17 +396,17 @@ class unitFps {
|
|
|
deps.data.on(EVENTS.RECONFIGURE, () => {
|
|
deps.data.on(EVENTS.RECONFIGURE, () => {
|
|
|
console.log("DEBUG: unitFps -> constructor -> reconfigureEvent");
|
|
console.log("DEBUG: unitFps -> constructor -> reconfigureEvent");
|
|
|
changeShakeState();
|
|
changeShakeState();
|
|
|
- if(data.prevMode.blockCollections !== data.activeMode.blockCollections) {
|
|
|
|
|
- switch(data.activeMode.blockCollections) {
|
|
|
|
|
- case(true) :
|
|
|
|
|
|
|
+ if (data.prevMode.blockCollections !== data.activeMode.blockCollections) {
|
|
|
|
|
+ switch (data.activeMode.blockCollections) {
|
|
|
|
|
+ case (true):
|
|
|
// eslint-disable-next-line no-unused-vars
|
|
// eslint-disable-next-line no-unused-vars
|
|
|
- for (const [key, value] of tracker.collections.entries()) {
|
|
|
|
|
|
|
+ for (const value of tracker.collections.values()) {
|
|
|
mod.send(...proto.getData("S_DESPAWN_COLLECTION"), value);
|
|
mod.send(...proto.getData("S_DESPAWN_COLLECTION"), value);
|
|
|
}
|
|
}
|
|
|
break;
|
|
break;
|
|
|
- case(false):
|
|
|
|
|
|
|
+ case (false):
|
|
|
// eslint-disable-next-line no-unused-vars
|
|
// eslint-disable-next-line no-unused-vars
|
|
|
- for (const [key, value] of tracker.collections.entries()) {
|
|
|
|
|
|
|
+ for (const value of tracker.collections.values()) {
|
|
|
mod.send(...proto.getData("S_SPAWN_COLLECTION"), value);
|
|
mod.send(...proto.getData("S_SPAWN_COLLECTION"), value);
|
|
|
}
|
|
}
|
|
|
break;
|
|
break;
|
|
@@ -409,26 +414,62 @@ class unitFps {
|
|
|
}
|
|
}
|
|
|
for (const [key, value] of tracker.drop.entries()) {
|
|
for (const [key, value] of tracker.drop.entries()) {
|
|
|
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"), value);
|
|
mod.send(...proto.getData("S_DESPAWN_DROPITEM"), value);
|
|
|
- else if (!needBlock && blockedDrop.has(key))
|
|
|
|
|
|
|
+ blockedDrop.add(key);
|
|
|
|
|
+ }
|
|
|
|
|
+ else if (!needBlock && blockedDrop.has(key)) {
|
|
|
mod.send(...proto.getData("S_SPAWN_DROPITEM"), value);
|
|
mod.send(...proto.getData("S_SPAWN_DROPITEM"), value);
|
|
|
|
|
+ blockedDrop.delete(key);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
for (const [key, value] of tracker.users.entries()) {
|
|
for (const [key, value] of tracker.users.entries()) {
|
|
|
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"), value);
|
|
mod.send(...proto.getData("S_DESPAWN_USER"), value);
|
|
|
- else if (!needBlock && blockedPlayers.has(key))
|
|
|
|
|
|
|
+ blockedPlayers.add(key);
|
|
|
|
|
+ }
|
|
|
|
|
+ else if (!needBlock && blockedPlayers.has(key)) {
|
|
|
mod.send(...proto.getData("S_SPAWN_USER"), value);
|
|
mod.send(...proto.getData("S_SPAWN_USER"), value);
|
|
|
|
|
+ blockedPlayers.delete(key);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
for (const [key, value] of tracker.servants.entries()) {
|
|
for (const [key, value] of tracker.servants.entries()) {
|
|
|
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"), value);
|
|
mod.send(...proto.getData("S_REQUEST_DESPAWN_SERVANT"), value);
|
|
|
- else if (!needBlock && blockedServants.has(key))
|
|
|
|
|
|
|
+ blockedServants.add(key);
|
|
|
|
|
+ }
|
|
|
|
|
+ else if (!needBlock && blockedServants.has(key)) {
|
|
|
mod.send(...proto.getData("S_REQUEST_SPAWN_SERVANT"), value);
|
|
mod.send(...proto.getData("S_REQUEST_SPAWN_SERVANT"), value);
|
|
|
|
|
+ blockedServants.remove(key);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ for (const [key, value] of tracker.summons.entries()) {
|
|
|
|
|
+ let needBlock = isSummonsBlockable(value);
|
|
|
|
|
+ if (needBlock && !blockedSummons.has(key)) {
|
|
|
|
|
+ mod.send(...proto.getData("S_DESPAWN_NPC"), value);
|
|
|
|
|
+ blockedSummons.add(key);
|
|
|
|
|
+ }
|
|
|
|
|
+ else if (!needBlock && blockedSummons.has(key)) {
|
|
|
|
|
+ mod.send(...proto.getData("S_SPAWN_NPC"), value);
|
|
|
|
|
+ blockedSummons.remove(key);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ for (const [key, value] of tracker.npcs.entries()) {
|
|
|
|
|
+ let needBlock = isSummonsBlockable(value);
|
|
|
|
|
+ if (needBlock && !blockedNpcs.has(key)) {
|
|
|
|
|
+ mod.send(...proto.getData("S_DESPAWN_NPC"), value);
|
|
|
|
|
+ blockedNpcs.add(key);
|
|
|
|
|
+ }
|
|
|
|
|
+ else if (!needBlock && blockedNpcs.has(key)) {
|
|
|
|
|
+ mod.send(...proto.getData("S_SPAWN_NPC"), value);
|
|
|
|
|
+ blockedNpcs.remove(key);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|