|
|
@@ -81,7 +81,7 @@ class unitFps {
|
|
|
|
|
|
const servantsHandler = (type, event) => {
|
|
|
switch (type) {
|
|
|
- case (ENTITY_HOOK_TYPE.DESPAWN):
|
|
|
+ case (ENTITY_HOOK_TYPE.DESPAWN):
|
|
|
blockedServants.delete(event.gameId);
|
|
|
break;
|
|
|
case (ENTITY_HOOK_TYPE.SPAWN):
|
|
|
@@ -292,7 +292,7 @@ class unitFps {
|
|
|
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);
|
|
|
mod.hook("S_UPDATE_ACHIEVEMENT_PROGRESS", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, blockAchievementsInCombat);
|
|
|
-
|
|
|
+
|
|
|
mod.hook("S_LOAD_TOPO", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.FIRST, cleanup);
|
|
|
|
|
|
//Basic spawn handling
|
|
|
@@ -321,7 +321,7 @@ class unitFps {
|
|
|
mod.hook(...proto.getData("S_FEARMOVE_END"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
|
|
|
mod.hook(...proto.getData("S_USER_LOCATION_IN_ACTION"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
|
|
|
mod.hook(...proto.getData("S_USER_LOCATION"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
|
|
|
-
|
|
|
+
|
|
|
//---------------------------------------
|
|
|
// Combined hooks with complicated logic
|
|
|
//---------------------------------------
|
|
|
@@ -351,21 +351,46 @@ class unitFps {
|
|
|
mod.hook(...proto.getData("S_USER_CHANGE_FACE_CUSTOM"), HOOK_SETTINGS.LAST, appearanceChangeHandler);
|
|
|
|
|
|
deps.data.on(EVENTS.RECONFIGURE, (oldMode, newMode) => {
|
|
|
+ let spawnCollections = oldMode.blockCollections !== newMode.blockCollections && newMode.blockCollections === false;
|
|
|
+ let spawnOwnServants = oldMode.blockOwnServants !== newMode.blockOwnServants && newMode.blockOwnServants === false;
|
|
|
+ let spawnAreaServants = oldMode.blockAreaServants !== newMode.blockAreaServants && newMode.blockAreaServants === false;
|
|
|
+ let spawnOwnSummons = oldMode.blockOwnSummons !== newMode.blockOwnSummons && newMode.blockOwnSummons === false;
|
|
|
+ let spawnAreaSummons = oldMode.blockAreaSummons !== newMode.blockAreaSummons && newMode.blockAreaSummons === false;
|
|
|
+
|
|
|
if (oldMode.blockShakeEffects !== newMode.blockShakeEffects) {
|
|
|
changeShakeState(newMode.blockShakeEffects);
|
|
|
}
|
|
|
//respawn collections back (nothing to analyze so we are just using original data )
|
|
|
- if (oldMode.blockCollections !== newMode.blockCollections && newMode.blockCollections === false) {
|
|
|
- for (const val of tracker.collections.values()) {
|
|
|
- mod.send(...proto.getData("S_SPAWN_COLLECTION"), val);
|
|
|
- }
|
|
|
+ if(spawnCollections) {
|
|
|
+ [...tracker.collections.values()].forEach(event => {
|
|
|
+ mod.send(...proto.getData("S_SPAWN_COLLECTION"), event);
|
|
|
+ });
|
|
|
}
|
|
|
- //respawn servants back
|
|
|
- if (oldMode.blockOwnServants !== newMode.blockOwnServants && newMode.blockOwnServants === false) {
|
|
|
- for (const val of tracker.blockedServants.values()) {
|
|
|
- mod.send(...proto.getData("S_REQUEST_SPAWN_SERVANT"), val);
|
|
|
- }
|
|
|
+
|
|
|
+ if(spawnOwnServants || spawnAreaServants) {
|
|
|
+ let elems = utils.arraysIntersect([...blockedServants.keys()], [...tracker.servants.keys()]);
|
|
|
+
|
|
|
+ elems.forEach(id => {
|
|
|
+ let event = tracker.servants.get(id);
|
|
|
+ if((isMe(event.ownerId) && spawnOwnServants) || (!isMe(event.ownerId) && spawnAreaServants)) {
|
|
|
+ mod.send(...proto.getData("S_REQUEST_SPAWN_SERVANT"), event);
|
|
|
+ blockedServants.delete(id);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
+ if(spawnOwnSummons || spawnAreaSummons) {
|
|
|
+ let elems = utils.arraysIntersect([...blockedSummons.keys()], [...tracker.summons.keys()]);
|
|
|
+
|
|
|
+ elems.forEach(id => {
|
|
|
+ let event = tracker.summons.get(id);
|
|
|
+ if((isMe(event.owner) && spawnOwnSummons) || (!isMe(event.owner) && spawnAreaSummons)) {
|
|
|
+ mod.send(...proto.getData("S_SPAWN_NPC"), event);
|
|
|
+ blockedSummons.delete(id);
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
+
|
|
|
});
|
|
|
}
|
|
|
}
|