SaltyMonkey лет назад: 6
Родитель
Сommit
1d7eea1bf4
3 измененных файлов с 133 добавлено и 99 удалено
  1. 132 97
      lib/unitFps.js
  2. 1 1
      lib/unitTracker.js
  3. 0 1
      settings/presets/common.json

+ 132 - 97
lib/unitFps.js

@@ -38,14 +38,77 @@ class unitFps {
 		//-------------------------------------
 		// Basic internal functions 
 		//-------------------------------------
-		const isEntityBlocked = (gameId) => !!((blockedPlayers.has(gameId) || blockedNpcs.has(gameId) || blockedSummons.has(gameId)));
+		const isEntityBlocked = (gameId) => !!((blockedPlayers.has(gameId) || blockedNpcs.has(gameId) || blockedSummons.has(gameId) || blockedServants.has(gameId)));
 
-		const changeShakeState = (state) => mod.clientInterface.configureCameraShake(state);
+		const changeShakeState = () => mod.clientInterface.configureCameraShake(!!data.activeMode.blockShakeEffects);
 
 		const isMe = (gameId) => mod.game.me.is(gameId);
 
 		const meInCombat = () => mod.game.me.inCombat;
 
+		const isDropBlockable = (event) => {
+			if (data.activeMode.blockDropItems && data.activeMode.blockDropItemsOptions) {
+				if (data.activeMode.blockDropItemsOptions.all) {
+					return true;
+				}
+				else if (data.activeMode.blockDropItemsOptions.templateId && utils.arraysHasIntersect(event.templateId, data.activeMode.blockDropItemsOptions.templateId)) {
+					return true;
+				}
+			}
+			return false;
+		};
+
+		const isCollectionBlockable = () => {
+			if (data.activeMode.blockCollections)
+				return true;
+			return false;
+		};
+
+		const isServantBlockable = (event) => {
+			if (data.activeMode.blockOwnServants && isMe(event.ownerId)) {
+				return true;
+			}
+			else if (data.activeMode.blockAreaServants) {
+				return true;
+			}
+			return false;
+		};
+
+		const isNpcsBlockable = (event) => {
+			if (tracker.summons.has(event.gameId)) {
+				if (data.activeMode.blockOwnSummons && isMe(event.owner)) {
+					return true;
+				}
+				else if (data.activeMode.blockAreaSummons && !isMe(event.owner)) {
+					return true;
+				}
+			}
+			if (data.activeMode.blockNpcs && data.activeMode.blockNpcsOptions) {
+				if (utils.arraysHasIntersect(event.templateId, data.activeMode.blockNpcsOptions.templateId)) {
+					return true;
+				}
+				else if (utils.arraysHasIntersect(event.huntingZoneId, data.activeMode.blockNpcsOptions.huntingZoneId)) {
+					return true;
+				}
+
+			}
+			return false;
+		};
+
+		const isUserBlockable = (event) => {
+			if (data.activeMode.blockPlayers && data.activeMode.blockPlayersOptions) {
+				if (data.activeMode.blockPlayersOptions.all) {
+					return true;
+				}
+				else if (data.activeMode.blockPlayersOptions.class) {
+					if (utils.arraysHasIntersect(data.userTemplateToClassMap[event.templateId], data.activeMode.blockPlayersOptions.class)) {
+						return true;
+					}
+				}
+			}
+			return false;
+		};
+
 		//-------------------------------------
 		// Handlers for hooks
 		//-------------------------------------
@@ -55,15 +118,9 @@ class unitFps {
 					blockedDrop.delete(event.gameId);
 					break;
 				case (ENTITY_HOOK_TYPE.SPAWN):
-					if (data.activeMode.blockCollections && data.activeMode.blockDropItemsOptions) {
-						if (data.activeMode.blockDropItemsOptions.all) {
-							blockedDrop.add(event.gameId);
-							return false;
-						}
-						else if (data.activeMode.blockDropItemsOptions.templateId && utils.arraysHasIntersect(event.templateId, data.activeMode.blockDropItemsOptions.templateId)) {
-							blockedDrop.add(event.gameId);
-							return false;
-						}
+					if(isDropBlockable(event)) {
+						blockedDrop.add(event.gameId);
+						return false;
 					}
 					break;
 			}
@@ -75,9 +132,10 @@ class unitFps {
 				case (ENTITY_HOOK_TYPE.DESPAWN):
 					break;
 				case (ENTITY_HOOK_TYPE.SPAWN):
-					if (data.activeMode.blockCollections) {
+					if (isCollectionBlockable()) {
 						return false;
 					}
+					break;
 			}
 		};
 
@@ -87,14 +145,11 @@ class unitFps {
 					blockedServants.delete(event.gameId);
 					break;
 				case (ENTITY_HOOK_TYPE.SPAWN):
-					if (data.activeMode.blockOwnServants && isMe(event.ownerId)) {
-						blockedServants.add(event.gameId);
-						return false;
-					}
-					else if (data.activeMode.blockAreaServants) {
+					if(isServantBlockable(event)) {
 						blockedServants.add(event.gameId);
 						return false;
 					}
+				
 			}
 		};
 
@@ -108,26 +163,9 @@ class unitFps {
 					blockedNpcs.delete(event.gameId);
 					break;
 				case (ENTITY_HOOK_TYPE.SPAWN):
-					if (tracker.summons.has(event.gameId)) {
-						if (data.activeMode.blockOwnSummons && isMe(event.owner)) {
-							blockedSummons.add(event.gameId);
-							return false;
-						}
-						else if (data.activeMode.blockAreaSummons && !isMe(event.owner)) {
-							blockedSummons.add(event.gameId);
-							return false;
-						}
-					}
-					if (data.activeMode.blockNpcs && data.activeMode.blockNpcsOptions) {
-						if (utils.arraysHasIntersect(event.templateId, data.activeMode.blockNpcsOptions.templateId)) {
-							blockedNpcs.add(event.gameId);
-							return false;
-						}
-						else if (utils.arraysHasIntersect(event.huntingZoneId, data.activeMode.blockNpcsOptions.huntingZoneId)) {
-							blockedNpcs.add(event.gameId);
-							return false;
-						}
-
+					if(isNpcsBlockable(event)) {
+						blockedNpcs.add(event.gameId);
+						return false;
 					}
 					break;
 			}
@@ -139,17 +177,9 @@ class unitFps {
 					blockedPlayers.delete(event.gameId);
 					break;
 				case (ENTITY_HOOK_TYPE.SPAWN):
-					if (data.activeMode.blockPlayers && data.activeMode.blockPlayersOptions) {
-						if (data.activeMode.blockPlayersOptions.all) {
-							blockedPlayers.add(event.gameId);
-							return false;
-						}
-						else if (data.activeMode.blockPlayersOptions.class) {
-							if (utils.arraysHasIntersect(data.userTemplateToClassMap[event.templateId], data.activeMode.blockPlayersOptions.class)) {
-								blockedPlayers.add(event.gameId);
-								return false;
-							}
-						}
+					if (isUserBlockable(event)) {
+						blockedPlayers.add(event.gameId);
+						return false;
 					}
 					break;
 			}
@@ -170,21 +200,21 @@ class unitFps {
 			}
 		};
 
-		const blockAnnoyingScreenMessages = (event) => (
+		const smtHandler = (event) => (
 			(data.activeMode.blockAnnoyingScreenMessages && data.smtsSet.has(mod.parseSystemMessage(event.message).id))
 				? false
 				: undefined
 		);
 
-		const blockInventoryInCombat = () => (
+		const inventoryHandler = () => (
 			(data.activeMode.blockInventoryInCombat && meInCombat()) ? false : undefined
 		);
 
-		const blockUselessPackets = () => (
+		const blockUselessPacketsHandler = () => (
 			(data.activeMode.blockUselessPackets) ? false : undefined
 		);
 
-		const throttlePackets = (name, code, data) => {
+		const throttlePacketsHandler = (name, code, data) => {
 			// eslint-disable-next-line no-magic-numbers
 			let needBlock = (data.activeMode.throttleSomePackets && throttledDAta[name] && (Buffer.compare(throttledDAta[name], data) === 0));
 			throttledDAta[name] = data;
@@ -270,7 +300,7 @@ class unitFps {
 			if (isEntityBlocked(event.gameId) || data.activeMode.blockCustomAppearanceChanges) return false;
 		};
 
-		const blockAchievementsInCombat = () => ((data.activeMode.blockAchievementSpamInCombat && meInCombat()) ? false : undefined);
+		const achievementHandler = () => ((data.activeMode.blockAchievementSpamInCombat && meInCombat()) ? false : undefined);
 
 		const cleanup = () => {
 			console.log("DEBUG: unitFps -> cleanup");
@@ -286,15 +316,15 @@ class unitFps {
 		//-------------------------------------
 
 		//Simple basic hooks
-		data.throttlePacketsData.forEach(packet => { mod.hook(packet, RAW_HOOK_MODE.PAYLOAD, HOOK_SETTINGS.LAST, throttlePackets); });
-		data.lockedPacketsData.forEach(packet => { mod.hook(packet, RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, blockUselessPackets); });
+		data.throttlePacketsData.forEach(packet => { mod.hook(packet, RAW_HOOK_MODE.PAYLOAD, HOOK_SETTINGS.LAST, throttlePacketsHandler); });
+		data.lockedPacketsData.forEach(packet => { mod.hook(packet, RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, blockUselessPacketsHandler); });
 
-		mod.hook(...proto.getData("S_SYSTEM_MESSAGE"), HOOK_SETTINGS.LAST, blockAnnoyingScreenMessages);
+		mod.hook(...proto.getData("S_SYSTEM_MESSAGE"), HOOK_SETTINGS.LAST, smtHandler);
 
-		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);
-		mod.hook("S_UPDATE_ACHIEVEMENT_PROGRESS", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, blockAchievementsInCombat);
+		mod.hook("C_SHOW_ITEMLIST", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, inventoryHandler);
+		mod.hook("S_INVEN_USERDATA", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, inventoryHandler);
+		mod.hook("S_ITEMLIST", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, inventoryHandler);
+		mod.hook("S_UPDATE_ACHIEVEMENT_PROGRESS", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, achievementHandler);
 
 		mod.hook("S_LOAD_TOPO", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.FIRST, cleanup);
 
@@ -324,7 +354,12 @@ 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);
-
+		mod.hook(...proto.getData("S_CREATURE_ROTATE"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
+		mod.hook(...proto.getData("S_CREATURE_LIFE"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
+		mod.hook(...proto.getData("S_NPC_LOCATION"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
+		mod.hook(...proto.getData("S_USER_LOCATION"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
+		mod.hook(...proto.getData("S_USER_LOCATION_IN_ACTION"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
+		
 		//---------------------------------------
 		// Combined hooks with complicated logic
 		//---------------------------------------
@@ -353,48 +388,48 @@ class unitFps {
 		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);
 
-		deps.data.on(EVENTS.RECONFIGURE, (oldMode, newMode) => {
+		deps.data.on(EVENTS.RECONFIGURE, () => {
 			console.log("DEBUG: unitFps -> constructor -> reconfigureEvent");
-			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(spawnCollections) {
-				[...tracker.collections.values()].forEach(event => {
-					mod.send(...proto.getData("S_SPAWN_COLLECTION"), event);
-				});
+			changeShakeState();
+			if(data.prevMode.blockCollections !== data.activeMode.blockCollections) {
+				switch(data.activeMode.blockCollections) {
+					case(true) : 
+						// eslint-disable-next-line no-unused-vars
+						for (const [key, value] of tracker.collections.entries()) { 
+							mod.send(...proto.getData("S_DESPAWN_COLLECTION"), value);
+						}
+						break;
+					case(false): 
+						// eslint-disable-next-line no-unused-vars
+						for (const [key, value] of tracker.collections.entries()) { 
+							mod.send(...proto.getData("S_SPAWN_COLLECTION"), value);
+						}
+						break;
+				}
 			}
-			
-			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);
-					}
-				});
+			for (const [key, value] of tracker.drop.entries()) {
+				let needBlock = isDropBlockable(value);
+				if (needBlock && !blockedDrop.has(key))
+					mod.send(...proto.getData("S_DESPAWN_DROPITEM"), value);
+				else if (!needBlock && blockedDrop.has(key))
+					mod.send(...proto.getData("S_SPAWN_DROPITEM"), value);
 			}
 
-			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);
-					}
-				});
+			for (const [key, value] of tracker.users.entries()) {
+				let needBlock = isUserBlockable(value);
+				if (needBlock && !blockedPlayers.has(key))
+					mod.send(...proto.getData("S_DESPAWN_USER"), value);
+				else if (!needBlock && blockedPlayers.has(key))
+					mod.send(...proto.getData("S_SPAWN_USER"), value);
 			}
 
+			for (const [key, value] of tracker.servants.entries()) {
+				let needBlock = isServantBlockable(value);
+				if (needBlock && !blockedServants.has(key))
+					mod.send(...proto.getData("S_REQUEST_DESPAWN_SERVANT"), value);
+				else if (!needBlock && blockedServants.has(key))
+					mod.send(...proto.getData("S_REQUEST_SPAWN_SERVANT"), value);
+			}
 		});
 	}
 }

+ 1 - 1
lib/unitTracker.js

@@ -135,7 +135,7 @@ class unitTracker {
 		mod.hook(...proto.getData("S_CREATURE_LIFE"), HOOK_SETTINGS.FIRST, creatureLifeHandler);
 		mod.hook(...proto.getData("S_NPC_LOCATION"), HOOK_SETTINGS.FIRST, npcLocationHandler);
 		mod.hook(...proto.getData("S_USER_LOCATION"), HOOK_SETTINGS.FIRST, userLocationHandler);
-		mod.hook(...proto.getData("S_USER_LOCATION_IN_ACTION"), HOOK_SETTINGS.LAST, userLocationHandler);
+		mod.hook(...proto.getData("S_USER_LOCATION_IN_ACTION"), HOOK_SETTINGS.FIRST, userLocationHandler);
 
 		//mod.hook("S_ACTION_STAGE", HOOK_SETTINGS.FIRST, locFromAction);
 		//mod.hook("S_ACTION_END", HOOK_SETTINGS.FIRST, locFromAction);

+ 0 - 1
settings/presets/common.json

@@ -49,7 +49,6 @@
 		},
 		"blockNpcs": false,
 		"blockNpcsOptions": {
-			"aerial": false,
 			"templateId": [],
 			"huntingZoneId": []
 		},