|
|
@@ -27,12 +27,12 @@ class unitFps {
|
|
|
|
|
|
let throttledDAta = {};
|
|
|
|
|
|
- let blockedCollections = new Set();
|
|
|
- let blockedPlayers = new Set();
|
|
|
- let blockedNpcs = new Set();
|
|
|
- let blockedSummons = new Set();
|
|
|
- let blockedServants = new Set();
|
|
|
- let blockedDrop = new Set();
|
|
|
+ const blockedCollections = new Set();
|
|
|
+ const blockedPlayers = new Set();
|
|
|
+ const blockedNpcs = new Set();
|
|
|
+ const blockedSummons = new Set();
|
|
|
+ const blockedServants = new Set();
|
|
|
+ const blockedDrop = new Set();
|
|
|
|
|
|
//-------------------------------------
|
|
|
// Basic internal functions
|
|
|
@@ -41,6 +41,10 @@ class unitFps {
|
|
|
|
|
|
const changeShakeState = (state) => mod.clientInterface.configureCameraShake(state);
|
|
|
|
|
|
+ const isMe = (gameId) => mod.game.me.is(gameId);
|
|
|
+
|
|
|
+ const meInCombat = () => mod.game.me.inCombat;
|
|
|
+
|
|
|
//-------------------------------------
|
|
|
// Handlers for hooks
|
|
|
//-------------------------------------
|
|
|
@@ -55,7 +59,7 @@ class unitFps {
|
|
|
blockedDrop.add(event.gameId);
|
|
|
return false;
|
|
|
}
|
|
|
- else if (utils.arraysHasIntersect(event.templateId, data.activeMode.blockDropItemsOptions.templateId)) {
|
|
|
+ else if (data.activeMode.blockDropItemsOptions.templateId && utils.arraysHasIntersect(event.templateId, data.activeMode.blockDropItemsOptions.templateId)) {
|
|
|
blockedDrop.add(event.gameId);
|
|
|
return false;
|
|
|
}
|
|
|
@@ -64,7 +68,7 @@ class unitFps {
|
|
|
}
|
|
|
};
|
|
|
|
|
|
- const blockCollections = (type, event) => {
|
|
|
+ const collectionHandler = (type, event) => {
|
|
|
switch (type) {
|
|
|
case (ENTITY_HOOK_TYPE.DESPAWN):
|
|
|
blockedCollections.delete(event.gameId);
|
|
|
@@ -77,11 +81,13 @@ class unitFps {
|
|
|
}
|
|
|
};
|
|
|
|
|
|
- const blockServants = (type, event) => {
|
|
|
+ const servantsHandler = (type, event) => {
|
|
|
switch (type) {
|
|
|
- case (ENTITY_HOOK_TYPE.DESPAWN): blockedServants.delete(event.gameId); break;
|
|
|
+ case (ENTITY_HOOK_TYPE.DESPAWN):
|
|
|
+ blockedServants.delete(event.gameId);
|
|
|
+ break;
|
|
|
case (ENTITY_HOOK_TYPE.SPAWN):
|
|
|
- if (data.activeMode.blockOwnServants && mod.game.me.is(event.ownerId)) {
|
|
|
+ if (data.activeMode.blockOwnServants && isMe(event.ownerId)) {
|
|
|
blockedServants.add(event.gameId);
|
|
|
return false;
|
|
|
}
|
|
|
@@ -92,22 +98,22 @@ class unitFps {
|
|
|
}
|
|
|
};
|
|
|
|
|
|
- const npcHandler = (type, event) => {
|
|
|
+ const npcsHandler = (type, event) => {
|
|
|
switch (type) {
|
|
|
case (ENTITY_HOOK_TYPE.DESPAWN):
|
|
|
- blockedNpcs.delete(event.gameId);
|
|
|
if (!blockedNpcs.has(event.gameId) && data.activeMode.blockNpcsDeathAnimations && event.type === DESPAWN_TYPES.DEAD) {
|
|
|
event.type = DESPAWN_TYPES.OUTOFVIEW;
|
|
|
return true;
|
|
|
}
|
|
|
+ blockedNpcs.delete(event.gameId);
|
|
|
break;
|
|
|
case (ENTITY_HOOK_TYPE.SPAWN):
|
|
|
if (tracker.summons.has(event.gameId)) {
|
|
|
- if (data.activeMode.blockOwnSummons && mod.game.me.is(event.owner)) {
|
|
|
+ if (data.activeMode.blockOwnSummons && isMe(event.owner)) {
|
|
|
blockedSummons.add(event.gameId);
|
|
|
return false;
|
|
|
}
|
|
|
- else if (data.activeMode.blockAreaSummons && !mod.game.me.is(event.owner)) {
|
|
|
+ else if (data.activeMode.blockAreaSummons && !isMe(event.owner)) {
|
|
|
blockedSummons.add(event.gameId);
|
|
|
return false;
|
|
|
}
|
|
|
@@ -160,7 +166,7 @@ class unitFps {
|
|
|
if (isEntityBlocked(event.gameId)) return false;
|
|
|
if (data.activeMode.blockAdditionalSkillEffects && data.activeMode.blockAdditionalSkillEffectsOptions) {
|
|
|
if (data.activeMode.blockProjectilesOptions.players && tracker.users.has(event.gameId)) return false;
|
|
|
- if (data.activeMode.blockProjectilesOptions.own && mod.game.me.is(event.gameId)) return false;
|
|
|
+ if (data.activeMode.blockProjectilesOptions.own && isMe(event.gameId)) return false;
|
|
|
}
|
|
|
};
|
|
|
|
|
|
@@ -171,7 +177,7 @@ class unitFps {
|
|
|
);
|
|
|
|
|
|
const blockInventoryInCombat = () => (
|
|
|
- (data.activeMode.blockInventoryInCombat && mod.game.me.inCombat) ? false : undefined
|
|
|
+ (data.activeMode.blockInventoryInCombat && meInCombat()) ? false : undefined
|
|
|
);
|
|
|
|
|
|
const blockUselessPackets = () => (
|
|
|
@@ -185,32 +191,30 @@ class unitFps {
|
|
|
return needBlock ? true : undefined;
|
|
|
};
|
|
|
|
|
|
- const abnormieHandler = (event) => {
|
|
|
- if ((data.activeMode.blockAreaBuffs && !mod.game.me.is(event.target)) || isEntityBlocked(event.target)) return false;
|
|
|
+ const abnormalsHandler = (event) => {
|
|
|
+ if ((data.activeMode.blockAreaBuffs && !isMe(event.target)) || isEntityBlocked(event.target)) return false;
|
|
|
|
|
|
- //if (mod.game.me.is(event.target)) {
|
|
|
if (data.activeMode.blockHuntingRewardsBuffs && data.huntingRewardsBuffs.has(event.id)) return false;
|
|
|
if (data.activeMode.blockShapeChangeBuffs && data.shapeChangersBuffs.has(event.id)) return false;
|
|
|
if (data.activeMode.blockOnScreenEffectsBuffs && data.onScreenEffectsBuffs.has(event.id)) return false;
|
|
|
- //}
|
|
|
};
|
|
|
|
|
|
const blockHpPopups = (event) => {
|
|
|
- if (data.activeMode.blockHpPopups && mod.game.me.is(event.target)) {
|
|
|
+ if (data.activeMode.blockHpPopups && isMe(event.target)) {
|
|
|
event.type = 10;
|
|
|
return true;
|
|
|
}
|
|
|
};
|
|
|
|
|
|
const blockMpPopups = (event) => {
|
|
|
- if (data.activeMode.blockMpPopups && mod.game.me.is(event.target)) {
|
|
|
+ if (data.activeMode.blockMpPopups && isMe(event.target)) {
|
|
|
event.type = 0;
|
|
|
return true;
|
|
|
}
|
|
|
};
|
|
|
|
|
|
const eachSkillResultHandler = (event) => {
|
|
|
- if (mod.game.me.is(event.source) || mod.game.me.is(event.owner)) {
|
|
|
+ if (isMe(event.source) || isMe(event.owner)) {
|
|
|
let res = undefined;
|
|
|
if (data.activeMode.blockOwnHits) {
|
|
|
event.skill.id = 0;
|
|
|
@@ -235,7 +239,7 @@ class unitFps {
|
|
|
}
|
|
|
else if (
|
|
|
data.activeMode.blockAreaHits && (tracker.users.has(event.owner) || tracker.users.has(event.source))
|
|
|
- && !mod.game.me.is(event.target) && !mod.game.me.is(event.source) && !mod.game.me.is(event.owner)
|
|
|
+ && !isMe(event.target) && !isMe(event.source) && !isMe(event.owner)
|
|
|
) {
|
|
|
event.skill.id = 0;
|
|
|
event.templateId = 0;
|
|
|
@@ -266,7 +270,7 @@ class unitFps {
|
|
|
if (isEntityBlocked(event.gameId) || data.activeMode.blockCustomAppearanceChanges) return false;
|
|
|
};
|
|
|
|
|
|
- const blockAchievementsInCombat = () => ((data.activeMode.blockAchievementSpamInCombat && mod.game.me.inCombat) ? false : undefined);
|
|
|
+ const blockAchievementsInCombat = () => ((data.activeMode.blockAchievementSpamInCombat && meInCombat()) ? false : undefined);
|
|
|
|
|
|
const cleanup = () => {
|
|
|
blockedCollections.clear();
|
|
|
@@ -286,6 +290,7 @@ class unitFps {
|
|
|
data.lockedPacketsData.forEach(packet => { mod.hook(packet, RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, blockUselessPackets); });
|
|
|
|
|
|
mod.hook(...proto.getData("S_SYSTEM_MESSAGE"), HOOK_SETTINGS.LAST, blockAnnoyingScreenMessages);
|
|
|
+
|
|
|
mod.hook("C_SHOW_ITEMLIST", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, blockInventoryInCombat);
|
|
|
mod.hook("S_INVEN_USERDATA", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, blockInventoryInCombat);
|
|
|
mod.hook("S_ITEMLIST", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, blockInventoryInCombat);
|
|
|
@@ -294,14 +299,14 @@ class unitFps {
|
|
|
mod.hook("S_LOAD_TOPO", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.FIRST, cleanup);
|
|
|
|
|
|
//Basic spawn handling
|
|
|
- mod.hook(...proto.getData("S_DESPAWN_COLLECTION"), HOOK_SETTINGS.LAST, blockCollections.bind(null, ENTITY_HOOK_TYPE.DESPAWN));
|
|
|
- mod.hook(...proto.getData("S_SPAWN_COLLECTION"), HOOK_SETTINGS.LAST, blockCollections.bind(null, ENTITY_HOOK_TYPE.SPAWN));
|
|
|
+ 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_REQUEST_SPAWN_SERVANT"), HOOK_SETTINGS.LAST, blockServants.bind(null, ENTITY_HOOK_TYPE.SPAWN));
|
|
|
- mod.hook(...proto.getData("S_REQUEST_DESPAWN_SERVANT"), HOOK_SETTINGS.LAST, blockServants.bind(null, ENTITY_HOOK_TYPE.DESPAWN));
|
|
|
+ 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_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_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_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));
|
|
|
@@ -332,11 +337,11 @@ class unitFps {
|
|
|
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_ABNORMALITY_BEGIN"), HOOK_SETTINGS.LAST, abnormieHandler);
|
|
|
- mod.hook(...proto.getData("S_ABNORMALITY_END"), HOOK_SETTINGS.LAST, abnormieHandler);
|
|
|
- mod.hook(...proto.getData("S_ABNORMALITY_FAIL"), HOOK_SETTINGS.LAST, abnormieHandler);
|
|
|
- mod.hook(...proto.getData("S_ABNORMALITY_DAMAGE_ABSORB"), HOOK_SETTINGS.LAST, abnormieHandler);
|
|
|
- mod.hook(...proto.getData("S_ABNORMALITY_RESIST"), HOOK_SETTINGS.LAST, abnormieHandler);
|
|
|
+ mod.hook(...proto.getData("S_ABNORMALITY_BEGIN"), 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_DAMAGE_ABSORB"), HOOK_SETTINGS.LAST, abnormalsHandler);
|
|
|
+ mod.hook(...proto.getData("S_ABNORMALITY_RESIST"), HOOK_SETTINGS.LAST, abnormalsHandler);
|
|
|
|
|
|
mod.hook(...proto.getData("S_SPAWN_PROJECTILE"), HOOK_SETTINGS.LAST, projectileHandler);
|
|
|
mod.hook(...proto.getData("S_START_USER_PROJECTILE"), HOOK_SETTINGS.LAST, projectileHandler);
|