|
@@ -11,7 +11,7 @@
|
|
|
*/
|
|
*/
|
|
|
|
|
|
|
|
const utils = require("./helpers/utils");
|
|
const utils = require("./helpers/utils");
|
|
|
-const { ENTITY_HOOK_TYPE, RAW_HOOK_MODE, HOOK_SETTINGS, DESPAWN_TYPES, EVENTS } = require("./helpers/enums");
|
|
|
|
|
|
|
+const { ENTITY_HOOK_TYPE, RAW_HOOK_MODE, HOOK_SETTINGS, DESPAWN_TYPES, EVENTS, HPCHANGE, MPCHANGE } = require("./helpers/enums");
|
|
|
|
|
|
|
|
class unitFps {
|
|
class unitFps {
|
|
|
/**
|
|
/**
|
|
@@ -238,17 +238,21 @@ class unitFps {
|
|
|
if (data.activeMode.blockOnScreenEffectsBuffs && data.onScreenEffectsBuffs.has(event.id)) return false;
|
|
if (data.activeMode.blockOnScreenEffectsBuffs && data.onScreenEffectsBuffs.has(event.id)) return false;
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
- const blockHpPopups = (event) => {
|
|
|
|
|
- if (data.activeMode.blockHpPopups && isMe(event.target)) {
|
|
|
|
|
- event.type = 10;
|
|
|
|
|
- return true;
|
|
|
|
|
|
|
+ const creatureChangeHpHandler = (event) => {
|
|
|
|
|
+ if (data.activeMode.blockNumbersPopups && data.activeMode.blockNumbersPopupsOptions.hp && isMe(event.target)) {
|
|
|
|
|
+ if (event.type !== HPCHANGE.NORMAL) {
|
|
|
|
|
+ event.type = HPCHANGE.NORMAL;
|
|
|
|
|
+ return true;
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
- const blockMpPopups = (event) => {
|
|
|
|
|
- if (data.activeMode.blockMpPopups && isMe(event.target)) {
|
|
|
|
|
- event.type = 0;
|
|
|
|
|
- return true;
|
|
|
|
|
|
|
+ const creatureChangeMpHandler = (event) => {
|
|
|
|
|
+ if (data.activeMode.blockNumbersPopups && data.activeMode.blockNumbersPopupsOptions.mp && isMe(event.target)) {
|
|
|
|
|
+ if (event.type !== MPCHANGE.DEFAULT) {
|
|
|
|
|
+ event.type = MPCHANGE.DEFAULT;
|
|
|
|
|
+ return true;
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
|
|
|
|
@@ -269,7 +273,7 @@ class unitFps {
|
|
|
|
|
|
|
|
res = true;
|
|
res = true;
|
|
|
}
|
|
}
|
|
|
- if (data.activeMode.blockDamageNumbers) {
|
|
|
|
|
|
|
+ if (data.activeMode.blockNumbersPopups && data.activeMode.blockNumbersPopupsOptions.damage) {
|
|
|
// eslint-disable-next-line no-magic-numbers
|
|
// eslint-disable-next-line no-magic-numbers
|
|
|
event.value = BigInt(0);
|
|
event.value = BigInt(0);
|
|
|
res = true;
|
|
res = true;
|
|
@@ -296,7 +300,7 @@ class unitFps {
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
- const fontSwapHandler = () => (data.activeMode.blockDamageNumbers ? false : undefined);
|
|
|
|
|
|
|
+ const fontSwapHandler = () => (data.activeMode.blockNumbersPopups && data.activeMode.blockNumbersPopupsOptions.damage ? false : undefined);
|
|
|
|
|
|
|
|
const dropIfBlockedHandler = (event) => {
|
|
const dropIfBlockedHandler = (event) => {
|
|
|
let id = event.target || event.gameId;
|
|
let id = event.target || event.gameId;
|
|
@@ -375,8 +379,8 @@ 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"), RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, blockAdditionalSkillEffectsHandler);
|
|
|
- mod.hook(...proto.getData("S_CREATURE_CHANGE_HP"), HOOK_SETTINGS.LAST, blockHpPopups);
|
|
|
|
|
- mod.hook(...proto.getData("S_PLAYER_CHANGE_MP"), HOOK_SETTINGS.LAST, blockMpPopups);
|
|
|
|
|
|
|
+ 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_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("S_FONT_SWAP_INFO", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, fontSwapHandler);
|
|
@@ -407,7 +411,7 @@ class unitFps {
|
|
|
switch (data.activeMode.blockCollections) {
|
|
switch (data.activeMode.blockCollections) {
|
|
|
case (true):
|
|
case (true):
|
|
|
for (const value of tracker.spawnedCollections.values()) {
|
|
for (const value of tracker.spawnedCollections.values()) {
|
|
|
- mod.send(...proto.getData("S_DESPAWN_COLLECTION"), value);
|
|
|
|
|
|
|
+ mod.send(...proto.getData("S_DESPAWN_COLLECTION"), { "gameId": value.gameId, "collected": false });
|
|
|
}
|
|
}
|
|
|
break;
|
|
break;
|
|
|
case (false):
|
|
case (false):
|
|
@@ -420,7 +424,7 @@ class unitFps {
|
|
|
for (const [key, value] of tracker.spawnedDrop.entries()) {
|
|
for (const [key, value] of tracker.spawnedDrop.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"), { "gameId": value.gameId });
|
|
|
blockedDrop.add(key);
|
|
blockedDrop.add(key);
|
|
|
}
|
|
}
|
|
|
else if (!needBlock && blockedDrop.has(key)) {
|
|
else if (!needBlock && blockedDrop.has(key)) {
|
|
@@ -432,7 +436,7 @@ class unitFps {
|
|
|
for (const [key, value] of tracker.spawnedPlayers.entries()) {
|
|
for (const [key, value] of tracker.spawnedPlayers.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"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW });
|
|
|
blockedPlayers.add(key);
|
|
blockedPlayers.add(key);
|
|
|
}
|
|
}
|
|
|
else if (!needBlock && blockedPlayers.has(key)) {
|
|
else if (!needBlock && blockedPlayers.has(key)) {
|
|
@@ -444,7 +448,7 @@ class unitFps {
|
|
|
for (const [key, value] of tracker.spawnedServants.entries()) {
|
|
for (const [key, value] of tracker.spawnedServants.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"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW });
|
|
|
blockedServants.add(key);
|
|
blockedServants.add(key);
|
|
|
}
|
|
}
|
|
|
else if (!needBlock && blockedServants.has(key)) {
|
|
else if (!needBlock && blockedServants.has(key)) {
|
|
@@ -456,7 +460,7 @@ class unitFps {
|
|
|
for (const [key, value] of tracker.spawnedSummons.entries()) {
|
|
for (const [key, value] of tracker.spawnedSummons.entries()) {
|
|
|
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"), value);
|
|
|
|
|
|
|
+ mod.send(...proto.getData("S_DESPAWN_NPC"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW, "loc": value.loc });
|
|
|
blockedSummons.add(key);
|
|
blockedSummons.add(key);
|
|
|
}
|
|
}
|
|
|
else if (!needBlock && blockedSummons.has(key)) {
|
|
else if (!needBlock && blockedSummons.has(key)) {
|
|
@@ -468,7 +472,7 @@ class unitFps {
|
|
|
for (const [key, value] of tracker.spawnedNPCS.entries()) {
|
|
for (const [key, value] of tracker.spawnedNPCS.entries()) {
|
|
|
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"), value);
|
|
|
|
|
|
|
+ mod.send(...proto.getData("S_DESPAWN_NPC"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW, "loc": value.loc });
|
|
|
blockedNpcs.add(key);
|
|
blockedNpcs.add(key);
|
|
|
}
|
|
}
|
|
|
else if (!needBlock && blockedNpcs.has(key)) {
|
|
else if (!needBlock && blockedNpcs.has(key)) {
|