Browse Source

more changes

SaltyMonkey 6 years ago
parent
commit
3e152c2b38
3 changed files with 47 additions and 12 deletions
  1. 3 0
      fpsManager.js
  2. 7 0
      lib/helpers/utils.js
  3. 37 12
      lib/unitFps.js

+ 3 - 0
fpsManager.js

@@ -43,6 +43,9 @@ class FpsManager {
 			mod.error(msg.runtimeWarning);
 			mod.error(msg.runtimeWarning);
 		else if(mod.proxyAuthor === "caali" && !mod.clientInterface) 
 		else if(mod.proxyAuthor === "caali" && !mod.clientInterface) 
 			mod.error(msg.proxyWarning);
 			mod.error(msg.proxyWarning);
+		// eslint-disable-next-line node/no-missing-require
+		else if(!require("tera-data-parser").types)
+			mod.error(msg.proxyWarning);
 		
 		
 		mod.game.initialize("me");
 		mod.game.initialize("me");
 
 

+ 7 - 0
lib/helpers/utils.js

@@ -18,6 +18,13 @@ exports.arraysHasIntersect = (arr1, arr2) => {
 	return false;
 	return false;
 };
 };
 
 
+exports.arraysIntersect = (arr1, arr2) => {
+	let output = [];
+	for (const item of arr1)
+		if (arr2.indexOf(item) != -1) output.push(item);
+	return output;
+};
+
 /**
 /**
 * Check for intersection of array values against string
 * Check for intersection of array values against string
 * @param {string} string string to be checked for intersection
 * @param {string} string string to be checked for intersection

+ 37 - 12
lib/unitFps.js

@@ -81,7 +81,7 @@ class unitFps {
 
 
 		const servantsHandler = (type, event) => {
 		const servantsHandler = (type, event) => {
 			switch (type) {
 			switch (type) {
-				case (ENTITY_HOOK_TYPE.DESPAWN): 
+				case (ENTITY_HOOK_TYPE.DESPAWN):
 					blockedServants.delete(event.gameId);
 					blockedServants.delete(event.gameId);
 					break;
 					break;
 				case (ENTITY_HOOK_TYPE.SPAWN):
 				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_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_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_UPDATE_ACHIEVEMENT_PROGRESS", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, blockAchievementsInCombat);
-		
+
 		mod.hook("S_LOAD_TOPO", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.FIRST, cleanup);
 		mod.hook("S_LOAD_TOPO", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.FIRST, cleanup);
 
 
 		//Basic spawn handling
 		//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_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_IN_ACTION"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
 		mod.hook(...proto.getData("S_USER_LOCATION"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
 		mod.hook(...proto.getData("S_USER_LOCATION"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
-		
+
 		//---------------------------------------
 		//---------------------------------------
 		// Combined hooks with complicated logic
 		// Combined hooks with complicated logic
 		//---------------------------------------
 		//---------------------------------------
@@ -351,21 +351,46 @@ class unitFps {
 		mod.hook(...proto.getData("S_USER_CHANGE_FACE_CUSTOM"), 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, (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) {
 			if (oldMode.blockShakeEffects !== newMode.blockShakeEffects) {
 				changeShakeState(newMode.blockShakeEffects);
 				changeShakeState(newMode.blockShakeEffects);
 			}
 			}
 			//respawn collections back (nothing to analyze so we are just using original data )
 			//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);
+					}
+				});
 			}
 			}
+
 		});
 		});
 	}
 	}
 }
 }