|
@@ -33,6 +33,8 @@ class unitFps {
|
|
|
const blockedServants = new Set();
|
|
const blockedServants = new Set();
|
|
|
const blockedDrop = new Set();
|
|
const blockedDrop = new Set();
|
|
|
|
|
|
|
|
|
|
+ const partyMembers = new Map();
|
|
|
|
|
+
|
|
|
console.log("DEBUG: unitFps -> constructor");
|
|
console.log("DEBUG: unitFps -> constructor");
|
|
|
|
|
|
|
|
//-------------------------------------
|
|
//-------------------------------------
|
|
@@ -59,7 +61,7 @@ class unitFps {
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
const isCollectionBlockable = () => {
|
|
const isCollectionBlockable = () => {
|
|
|
- if (data.activeMode.blockCollections)
|
|
|
|
|
|
|
+ if (data.activeMode.blockGatherNode)
|
|
|
return true;
|
|
return true;
|
|
|
return false;
|
|
return false;
|
|
|
};
|
|
};
|
|
@@ -96,6 +98,9 @@ class unitFps {
|
|
|
|
|
|
|
|
const isPlayerBlockable = (event) => {
|
|
const isPlayerBlockable = (event) => {
|
|
|
if (data.activeMode.blockPlayers) {
|
|
if (data.activeMode.blockPlayers) {
|
|
|
|
|
+ if (data.activeMode.blockPlayers.keepParty && partyMembers.has(event.gameId))
|
|
|
|
|
+ return false;
|
|
|
|
|
+
|
|
|
if (data.activeMode.blockPlayers.all) {
|
|
if (data.activeMode.blockPlayers.all) {
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
@@ -124,6 +129,93 @@ class unitFps {
|
|
|
return false;
|
|
return false;
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
|
|
+ const reconfigurePlayers = () => {
|
|
|
|
|
+ for (const [key, value] of tracker.spawnedPlayers.entries()) {
|
|
|
|
|
+ let needBlock = isPlayerBlockable(value);
|
|
|
|
|
+ if (needBlock && !blockedPlayers.has(key)) {
|
|
|
|
|
+ mod.send(...proto.getData("S_DESPAWN_USER"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW });
|
|
|
|
|
+ blockedPlayers.add(key);
|
|
|
|
|
+ }
|
|
|
|
|
+ else if (!needBlock && blockedPlayers.has(key)) {
|
|
|
|
|
+ mod.send(...proto.getData("S_SPAWN_USER"), value);
|
|
|
|
|
+ blockedPlayers.delete(key);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
|
|
+ const reconfigureDrop = () => {
|
|
|
|
|
+ for (const [key, value] of tracker.spawnedDrop.entries()) {
|
|
|
|
|
+ let needBlock = isDropBlockable(value);
|
|
|
|
|
+ if (needBlock && !blockedDrop.has(key)) {
|
|
|
|
|
+ mod.send(...proto.getData("S_DESPAWN_DROPITEM"), { "gameId": value.gameId });
|
|
|
|
|
+ blockedDrop.add(key);
|
|
|
|
|
+ }
|
|
|
|
|
+ else if (!needBlock && blockedDrop.has(key)) {
|
|
|
|
|
+ mod.send(...proto.getData("S_SPAWN_DROPITEM"), value);
|
|
|
|
|
+ blockedDrop.delete(key);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
|
|
+ const reconfigureServants = () => {
|
|
|
|
|
+ for (const [key, value] of tracker.spawnedServants.entries()) {
|
|
|
|
|
+ let needBlock = isServantBlockable(value);
|
|
|
|
|
+ if (needBlock && !blockedServants.has(key)) {
|
|
|
|
|
+ mod.send(...proto.getData("S_REQUEST_DESPAWN_SERVANT"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW });
|
|
|
|
|
+ blockedServants.add(key);
|
|
|
|
|
+ }
|
|
|
|
|
+ else if (!needBlock && blockedServants.has(key)) {
|
|
|
|
|
+ mod.send(...proto.getData("S_REQUEST_SPAWN_SERVANT"), value);
|
|
|
|
|
+ blockedServants.delete(key);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
|
|
+ const reconfigureSummons = () => {
|
|
|
|
|
+ for (const [key, value] of tracker.spawnedSummons.entries()) {
|
|
|
|
|
+ let needBlock = isSummonsBlockable(value);
|
|
|
|
|
+ if (needBlock && !blockedSummons.has(key)) {
|
|
|
|
|
+ mod.send(...proto.getData("S_DESPAWN_NPC"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW, "loc": value.loc });
|
|
|
|
|
+ blockedSummons.add(key);
|
|
|
|
|
+ }
|
|
|
|
|
+ else if (!needBlock && blockedSummons.has(key)) {
|
|
|
|
|
+ mod.send(...proto.getData("S_SPAWN_NPC"), value);
|
|
|
|
|
+ blockedSummons.delete(key);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
|
|
+ const reconfigureNpcs = () => {
|
|
|
|
|
+ for (const [key, value] of tracker.spawnedNPCS.entries()) {
|
|
|
|
|
+ let needBlock = isNpcBlockable(value);
|
|
|
|
|
+ if (needBlock && !blockedNpcs.has(key)) {
|
|
|
|
|
+ mod.send(...proto.getData("S_DESPAWN_NPC"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW, "loc": value.loc });
|
|
|
|
|
+ blockedNpcs.add(key);
|
|
|
|
|
+ }
|
|
|
|
|
+ else if (!needBlock && blockedNpcs.has(key)) {
|
|
|
|
|
+ mod.send(...proto.getData("S_SPAWN_NPC"), value);
|
|
|
|
|
+ blockedNpcs.delete(key);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
|
|
+ const reconfigureCollections = () => {
|
|
|
|
|
+ if (data.prevMode.blockGatherNode !== data.activeMode.blockGatherNode) {
|
|
|
|
|
+ switch (data.activeMode.blockGatherNode) {
|
|
|
|
|
+ case (true):
|
|
|
|
|
+ for (const value of tracker.spawnedCollections.values()) {
|
|
|
|
|
+ mod.send(...proto.getData("S_DESPAWN_COLLECTION"), { "gameId": value.gameId, "collected": false });
|
|
|
|
|
+ }
|
|
|
|
|
+ break;
|
|
|
|
|
+ case (false):
|
|
|
|
|
+ for (const value of tracker.spawnedCollections.values()) {
|
|
|
|
|
+ mod.send(...proto.getData("S_SPAWN_COLLECTION"), value);
|
|
|
|
|
+ }
|
|
|
|
|
+ break;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
//-------------------------------------
|
|
//-------------------------------------
|
|
|
// Handlers for hooks
|
|
// Handlers for hooks
|
|
|
//-------------------------------------
|
|
//-------------------------------------
|
|
@@ -332,6 +424,34 @@ class unitFps {
|
|
|
if (data.activeMode.blockPetBaloons && tracker.spawnedServants.has(event.source)) return false;
|
|
if (data.activeMode.blockPetBaloons && tracker.spawnedServants.has(event.source)) return false;
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
|
|
+ const partyLeaveHandler = () => {
|
|
|
|
|
+ partyMembers.clear();
|
|
|
|
|
+
|
|
|
|
|
+ reconfigurePlayers();
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
|
|
+ const partyMemberListHandler = (event) => {
|
|
|
|
|
+ partyMembers.clear();
|
|
|
|
|
+ event.members.forEach(member => {
|
|
|
|
|
+ if (!isMe(member.gameId))
|
|
|
|
|
+ partyMembers.set(member.gameId, { "pid": member.playerId, "sid": member.serverId });
|
|
|
|
|
+ });
|
|
|
|
|
+
|
|
|
|
|
+ reconfigurePlayers();
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
|
|
+ const partyMemberDeleteHandler = (event) => {
|
|
|
|
|
+ [...partyMembers.keys()].forEach(key => {
|
|
|
|
|
+ let value = this.partyMembers.get(key);
|
|
|
|
|
+ if(value["pid"] === event.playerId && value["sid"] === event.serverId)
|
|
|
|
|
+ {
|
|
|
|
|
+ this.partyMembers.delete(key);
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
|
|
+
|
|
|
|
|
+ reconfigurePlayers();
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
const cleanup = () => {
|
|
const cleanup = () => {
|
|
|
console.log("DEBUG: unitFps -> cleanup");
|
|
console.log("DEBUG: unitFps -> cleanup");
|
|
|
blockedPlayers.clear();
|
|
blockedPlayers.clear();
|
|
@@ -423,83 +543,21 @@ class unitFps {
|
|
|
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); // TODO: NEED MAP
|
|
//mod.hook(...proto.getData("S_USER_CHANGE_FACE_CUSTOM"), HOOK_SETTINGS.LAST, appearanceChangeHandler); // TODO: NEED MAP
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
+ mod.hook(...proto.getData("S_PARTY_MEMBER_LIST"), HOOK_SETTINGS.FIRSTA, partyMemberListHandler);
|
|
|
|
|
+ mod.hook(...proto.getData("S_LEAVE_PARTY_MEMBER"), HOOK_SETTINGS.FIRSTA, partyMemberDeleteHandler);
|
|
|
|
|
+ mod.hook(...proto.getData("S_BAN_PARTY_MEMBER"), HOOK_SETTINGS.FIRSTA, partyMemberDeleteHandler);
|
|
|
|
|
+ mod.hook("S_LEAVE_PARTY", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.FIRSTA, partyLeaveHandler);
|
|
|
|
|
+
|
|
|
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):
|
|
|
|
|
- for (const value of tracker.spawnedCollections.values()) {
|
|
|
|
|
- mod.send(...proto.getData("S_DESPAWN_COLLECTION"), { "gameId": value.gameId, "collected": false });
|
|
|
|
|
- }
|
|
|
|
|
- break;
|
|
|
|
|
- case (false):
|
|
|
|
|
- for (const value of tracker.spawnedCollections.values()) {
|
|
|
|
|
- mod.send(...proto.getData("S_SPAWN_COLLECTION"), value);
|
|
|
|
|
- }
|
|
|
|
|
- break;
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
- for (const [key, value] of tracker.spawnedDrop.entries()) {
|
|
|
|
|
- let needBlock = isDropBlockable(value);
|
|
|
|
|
- if (needBlock && !blockedDrop.has(key)) {
|
|
|
|
|
- mod.send(...proto.getData("S_DESPAWN_DROPITEM"), { "gameId": value.gameId });
|
|
|
|
|
- blockedDrop.add(key);
|
|
|
|
|
- }
|
|
|
|
|
- else if (!needBlock && blockedDrop.has(key)) {
|
|
|
|
|
- mod.send(...proto.getData("S_SPAWN_DROPITEM"), value);
|
|
|
|
|
- blockedDrop.delete(key);
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- for (const [key, value] of tracker.spawnedPlayers.entries()) {
|
|
|
|
|
- let needBlock = isPlayerBlockable(value);
|
|
|
|
|
- if (needBlock && !blockedPlayers.has(key)) {
|
|
|
|
|
- mod.send(...proto.getData("S_DESPAWN_USER"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW });
|
|
|
|
|
- blockedPlayers.add(key);
|
|
|
|
|
- }
|
|
|
|
|
- else if (!needBlock && blockedPlayers.has(key)) {
|
|
|
|
|
- mod.send(...proto.getData("S_SPAWN_USER"), value);
|
|
|
|
|
- blockedPlayers.delete(key);
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- for (const [key, value] of tracker.spawnedServants.entries()) {
|
|
|
|
|
- let needBlock = isServantBlockable(value);
|
|
|
|
|
- if (needBlock && !blockedServants.has(key)) {
|
|
|
|
|
- mod.send(...proto.getData("S_REQUEST_DESPAWN_SERVANT"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW });
|
|
|
|
|
- blockedServants.add(key);
|
|
|
|
|
- }
|
|
|
|
|
- else if (!needBlock && blockedServants.has(key)) {
|
|
|
|
|
- mod.send(...proto.getData("S_REQUEST_SPAWN_SERVANT"), value);
|
|
|
|
|
- blockedServants.delete(key);
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- for (const [key, value] of tracker.spawnedSummons.entries()) {
|
|
|
|
|
- let needBlock = isSummonsBlockable(value);
|
|
|
|
|
- if (needBlock && !blockedSummons.has(key)) {
|
|
|
|
|
- mod.send(...proto.getData("S_DESPAWN_NPC"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW, "loc": value.loc });
|
|
|
|
|
- blockedSummons.add(key);
|
|
|
|
|
- }
|
|
|
|
|
- else if (!needBlock && blockedSummons.has(key)) {
|
|
|
|
|
- mod.send(...proto.getData("S_SPAWN_NPC"), value);
|
|
|
|
|
- blockedSummons.delete(key);
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- for (const [key, value] of tracker.spawnedNPCS.entries()) {
|
|
|
|
|
- let needBlock = isNpcBlockable(value);
|
|
|
|
|
- if (needBlock && !blockedNpcs.has(key)) {
|
|
|
|
|
- mod.send(...proto.getData("S_DESPAWN_NPC"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW, "loc": value.loc });
|
|
|
|
|
- blockedNpcs.add(key);
|
|
|
|
|
- }
|
|
|
|
|
- else if (!needBlock && blockedNpcs.has(key)) {
|
|
|
|
|
- mod.send(...proto.getData("S_SPAWN_NPC"), value);
|
|
|
|
|
- blockedNpcs.delete(key);
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ reconfigureCollections();
|
|
|
|
|
+ reconfigureDrop();
|
|
|
|
|
+ reconfigurePlayers();
|
|
|
|
|
+ reconfigureServants();
|
|
|
|
|
+ reconfigureSummons();
|
|
|
|
|
+ reconfigureNpcs();
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|