|
@@ -32,6 +32,7 @@ class unitFps {
|
|
|
const blockedSummons = new Set();
|
|
const blockedSummons = new Set();
|
|
|
const blockedServants = new Set();
|
|
const blockedServants = new Set();
|
|
|
const blockedDrop = new Set();
|
|
const blockedDrop = new Set();
|
|
|
|
|
+ const blockedBuildObjects = new Set();
|
|
|
|
|
|
|
|
const partyMembers = new Map();
|
|
const partyMembers = new Map();
|
|
|
|
|
|
|
@@ -183,7 +184,7 @@ class unitFps {
|
|
|
|
|
|
|
|
const isProjectileBlockable = (event) => {
|
|
const isProjectileBlockable = (event) => {
|
|
|
if (data.activeMode.blockProjectiles && data.activeMode.blockProjectiles.players) {
|
|
if (data.activeMode.blockProjectiles && data.activeMode.blockProjectiles.players) {
|
|
|
- if (event.skill.npc || data.whitelistProjectiles.has(event.skill.id)) return false;
|
|
|
|
|
|
|
+ if (data.whitelistProjectiles.has(event.skill.id)) return false;
|
|
|
|
|
|
|
|
if (data.activeMode.blockProjectiles.keepParty && partyMembers.has(event.gameId)) return false;
|
|
if (data.activeMode.blockProjectiles.keepParty && partyMembers.has(event.gameId)) return false;
|
|
|
else if (data.activeMode.blockProjectiles.keepClass && utils.arraysHasIntersect(data.userTemplateToClassMap[event.templateId], data.activeMode.blockProjectiles.keepClass))
|
|
else if (data.activeMode.blockProjectiles.keepClass && utils.arraysHasIntersect(data.userTemplateToClassMap[event.templateId], data.activeMode.blockProjectiles.keepClass))
|
|
@@ -231,6 +232,11 @@ class unitFps {
|
|
|
return false;
|
|
return false;
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
|
|
+ const isBuildObjectBlockable = () => {
|
|
|
|
|
+ if (data.activeMode.blockTabletsWithText) return true;
|
|
|
|
|
+ return false;
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
const isSmtBlockable = (event) => {
|
|
const isSmtBlockable = (event) => {
|
|
|
if (data.activeMode.blockAnnoyingScreenMessages && data.smtData.has(mod.parseSystemMessage(event.message).id)) return true;
|
|
if (data.activeMode.blockAnnoyingScreenMessages && data.smtData.has(mod.parseSystemMessage(event.message).id)) return true;
|
|
|
return false;
|
|
return false;
|
|
@@ -272,6 +278,20 @@ class unitFps {
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
|
|
+ const reconfigureBuildObjects = () => {
|
|
|
|
|
+ for (const [key, value] of tracker.spawnedBuildObjects.entries()) {
|
|
|
|
|
+ let needBlock = isBuildObjectBlockable();
|
|
|
|
|
+ if (needBlock && !blockedBuildObjects.has(key)) {
|
|
|
|
|
+ mod.send(...proto.getData("S_DESPAWN_BUILD_OBJECT"), { "gameId": value.gameId });
|
|
|
|
|
+ blockedBuildObjects.add(key);
|
|
|
|
|
+ }
|
|
|
|
|
+ else if (!needBlock && blockedBuildObjects.has(key)) {
|
|
|
|
|
+ mod.send(...proto.getData("S_SPAWN_BUILD_OBJECT"), value);
|
|
|
|
|
+ blockedBuildObjects.delete(key);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
const reconfigureServants = () => {
|
|
const reconfigureServants = () => {
|
|
|
for (const [key, value] of tracker.spawnedServants.entries()) {
|
|
for (const [key, value] of tracker.spawnedServants.entries()) {
|
|
|
let needBlock = isServantBlockable(value);
|
|
let needBlock = isServantBlockable(value);
|
|
@@ -359,6 +379,20 @@ class unitFps {
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+ const buildObjectHandler = (type, event) => {
|
|
|
|
|
+ switch (type) {
|
|
|
|
|
+ case (ENTITY_HOOK_TYPE.DESPAWN):
|
|
|
|
|
+ blockedBuildObjects.delete(event.gameId);
|
|
|
|
|
+ break;
|
|
|
|
|
+ case (ENTITY_HOOK_TYPE.SPAWN):
|
|
|
|
|
+ if (isBuildObjectBlockable()) {
|
|
|
|
|
+ blockedBuildObjects.add(event.gameId);
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
const servantsHandler = (type, event) => {
|
|
const servantsHandler = (type, event) => {
|
|
|
switch (type) {
|
|
switch (type) {
|
|
|
case (ENTITY_HOOK_TYPE.DESPAWN):
|
|
case (ENTITY_HOOK_TYPE.DESPAWN):
|
|
@@ -598,6 +632,7 @@ class unitFps {
|
|
|
blockedServants.clear();
|
|
blockedServants.clear();
|
|
|
blockedDrop.clear();
|
|
blockedDrop.clear();
|
|
|
blockedProjectiles.clear();
|
|
blockedProjectiles.clear();
|
|
|
|
|
+ blockedBuildObjects.clear();
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
//-------------------------------------
|
|
//-------------------------------------
|
|
@@ -624,6 +659,9 @@ class unitFps {
|
|
|
mod.hook("S_RESULT_EVENT_SEED", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, eventBoxSeedHandler);
|
|
mod.hook("S_RESULT_EVENT_SEED", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, eventBoxSeedHandler);
|
|
|
mod.hook("S_DESPAWN_EVENT_SEED", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, eventBoxSeedHandler);
|
|
mod.hook("S_DESPAWN_EVENT_SEED", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, eventBoxSeedHandler);
|
|
|
|
|
|
|
|
|
|
+ mod.hook(...proto.getData("S_DESPAWN_BUILD_OBJECT"), HOOK_SETTINGS.LAST, buildObjectHandler.bind(null, ENTITY_HOOK_TYPE.DESPAWN));
|
|
|
|
|
+ mod.hook(...proto.getData("S_SPAWN_BUILD_OBJECT"), HOOK_SETTINGS.LAST, buildObjectHandler.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_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_SPAWN_COLLECTION"), HOOK_SETTINGS.LAST, collectionHandler.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_SPAWN_SERVANT"), HOOK_SETTINGS.LAST, servantsHandler.bind(null, ENTITY_HOOK_TYPE.SPAWN));
|
|
@@ -684,6 +722,7 @@ class unitFps {
|
|
|
|
|
|
|
|
deps.data.on(EVENTS.RECONFIGURE, () => {
|
|
deps.data.on(EVENTS.RECONFIGURE, () => {
|
|
|
changeShakeState();
|
|
changeShakeState();
|
|
|
|
|
+ reconfigureBuildObjects();
|
|
|
reconfigureCollections();
|
|
reconfigureCollections();
|
|
|
reconfigureDrop();
|
|
reconfigureDrop();
|
|
|
reconfigurePlayers();
|
|
reconfigurePlayers();
|