Browse Source

slight changes

SaltyMonkey 6 years ago
parent
commit
f746d61e33
1 changed files with 56 additions and 57 deletions
  1. 56 57
      lib/unitFps.js

+ 56 - 57
lib/unitFps.js

@@ -101,9 +101,9 @@ class unitFps {
 
 		const isPlayerBlockable = (event) => {
 			if (data.activeMode.blockPlayers) {
-				if (data.activeMode.blockPlayers.keepParty && partyMembers.has(event.gameId)) 
+				if (data.activeMode.blockPlayers.keepParty && partyMembers.has(event.gameId))
 					return false;
-				
+
 				if (data.activeMode.blockPlayers.all) {
 					return true;
 				}
@@ -120,7 +120,7 @@ class unitFps {
 		};
 
 		const isSkillBlockable = (event) => {
-			if(isMe(event.gameId) || event.skill.npc) return false;
+			if (isMe(event.gameId) || event.skill.npc) return false;
 			if (data.activeMode.blockSkills) {
 				if (data.activeMode.blockSkills.all)
 					return true;
@@ -135,6 +135,35 @@ class unitFps {
 			return false;
 		};
 
+		const isProjectileBlockable = (event) => {
+			if (data.activeMode.blockProjectiles) {
+				if (data.activeMode.blockProjectiles.players && tracker.spawnedPlayers.has(event.gameId)) return true;
+			}
+			return false;
+		};
+
+		const isEffectBlockable = (event) => {
+			if (data.activeMode.blockAdditionalSkillEffects) {
+				if (data.activeMode.blockAdditionalSkillEffects.players && tracker.spawnedPlayers.has(event.gameId)) return true;
+				if (data.activeMode.blockAdditionalSkillEffects.own && isMe(event.gameId)) return true;
+			}
+			return false;
+		};
+
+		const isAbnormalBlockable = (event) => {
+			if (data.activeMode.blockBuffs) {
+				if (isEntityBlocked(event.target) || (data.activeMode.blockBuffs.area && !isMe(event.target) && !tracker.spawnedNPCS.has(event.target))) return true;
+
+				if (data.activeMode.blockBuffs.huntRewards && data.huntingRewardsBuffs.has(event.id)) return true;
+				if (data.activeMode.blockBuffs.shapeChange && data.shapeChangersBuffs.has(event.id)) return true;
+				if (data.activeMode.blockBuffs.effects && data.onScreenEffectsBuffs.has(event.id)) return true;
+			}
+			return false;
+		};
+
+		//-------------------------------------
+		// Reconfigure area handlers
+		//-------------------------------------
 		const reconfigurePlayers = () => {
 			for (const [key, value] of tracker.spawnedPlayers.entries()) {
 				let needBlock = isPlayerBlockable(value);
@@ -223,7 +252,7 @@ class unitFps {
 		};
 
 		//-------------------------------------
-		// Handlers for hooks
+		// Hooks handlers
 		//-------------------------------------
 		const dropHandler = (type, event) => {
 			switch (type) {
@@ -301,17 +330,12 @@ class unitFps {
 
 		const projectileHandler = (event) => {
 			if (isEntityBlocked(event.gameId)) return false;
-			if (data.activeMode.blockProjectiles) {
-				if (data.activeMode.blockProjectiles.players && tracker.spawnedPlayers.has(event.gameId)) return false;
-			}
+			if (isProjectileBlockable(event)) return false;
 		};
 
 		const blockAdditionalSkillEffectsHandler = (event) => {
 			if (isEntityBlocked(event.gameId)) return false;
-			if (data.activeMode.blockAdditionalSkillEffects) {
-				if (data.activeMode.blockAdditionalSkillEffects.players && tracker.spawnedPlayers.has(event.gameId)) return false;
-				if (data.activeMode.blockAdditionalSkillEffects.own && isMe(event.gameId)) return false;
-			}
+			if (isEffectBlockable(event)) return false;
 		};
 
 		const smtHandler = (event) => {
@@ -334,13 +358,7 @@ class unitFps {
 		};
 
 		const abnormalsHandler = (event) => {
-			if (data.activeMode.blockBuffs) {
-				if (isEntityBlocked(event.target) || (data.activeMode.blockBuffs.area && !isMe(event.target) && !tracker.spawnedNPCS.has(event.target))) return false;
-
-				if (data.activeMode.blockBuffs.huntRewards && data.huntingRewardsBuffs.has(event.id)) return false;
-				if (data.activeMode.blockBuffs.shapeChange && data.shapeChangersBuffs.has(event.id)) return false;
-				if (data.activeMode.blockBuffs.effects && data.onScreenEffectsBuffs.has(event.id)) return false;
-			}
+			if (isAbnormalBlockable(event)) return false;
 		};
 
 		const creatureChangeHpHandler = (event) => {
@@ -413,16 +431,20 @@ class unitFps {
 			if (isEntityBlocked(id)) return false;
 		};
 
-		const actionHandler = (event) => {
+		const actionStageHandler = (event) => {
 			if (isEntityBlocked(event.gameId)) return false;
 			if (isSkillBlockable(event)) return false;
 		};
 
+		const actionEndHandler = (event) => {
+			if (isEntityBlocked(event.gameId)) return false;
+		};
+
 		const appearanceChangeHandler = (event) => {
 			if (isEntityBlocked(event.gameId) || data.activeMode.blockCustomAppearanceChanges) return false;
 		};
 
-		const achievementHandler = () => { 
+		const achievementHandler = () => {
 			if (data.activeMode.blockAchievementsInCombat && meInCombat()) return false;
 		};
 
@@ -431,31 +453,27 @@ class unitFps {
 			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 = partyMembers.get(key);
-				if(value["pid"] === event.playerId && value["sid"] === event.serverId)
-				{
+				if (value["pid"] === event.playerId && value["sid"] === event.serverId) {
 					partyMembers.delete(key);
 				}
 			});
-			
+			reconfigurePlayers();
+		};
+
+		const partyLeaveHandler = () => {
+			partyMembers.clear();
 			reconfigurePlayers();
 		};
 
@@ -469,49 +487,34 @@ class unitFps {
 		};
 
 		//-------------------------------------
-		// Simple hooks
+		// Hooks
 		//-------------------------------------
-
-		//Simple basic hooks
 		data.throttlePacketsData.forEach(packet => { mod.hook(packet, RAW_HOOK_MODE.PAYLOAD, HOOK_SETTINGS.LAST, throttlePacketsHandler.bind(null, packet)); });
 		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, smtHandler);
-
 		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);
-		
 		mod.hook(...proto.getData("S_QUEST_BALLOON"), HOOK_SETTINGS.LAST, baloonsHandler);
-
-		//Basic spawn handling
+		
 		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_REQUEST_SPAWN_SERVANT"), HOOK_SETTINGS.LAST, servantsHandler.bind(null, ENTITY_HOOK_TYPE.SPAWN));
 		mod.hook(...proto.getData("S_REQUEST_DESPAWN_SERVANT"), HOOK_SETTINGS.LAST, servantsHandler.bind(null, ENTITY_HOOK_TYPE.DESPAWN));
-
 		mod.hook(...proto.getData("S_SPAWN_NPC"), HOOK_SETTINGS.LAST, npcHandler.bind(null, ENTITY_HOOK_TYPE.SPAWN));
 		mod.hook(...proto.getData("S_DESPAWN_NPC"), HOOK_SETTINGS.LAST, npcHandler.bind(null, ENTITY_HOOK_TYPE.DESPAWN));
-
 		mod.hook(...proto.getData("S_SPAWN_USER"), HOOK_SETTINGS.LAST, userHandler.bind(null, ENTITY_HOOK_TYPE.SPAWN));
 		mod.hook(...proto.getData("S_DESPAWN_USER"), HOOK_SETTINGS.LAST, userHandler.bind(null, ENTITY_HOOK_TYPE.DESPAWN));
-
 		mod.hook(...proto.getData("S_SPAWN_DROPITEM"), HOOK_SETTINGS.LAST, dropHandler.bind(null, ENTITY_HOOK_TYPE.SPAWN));
 		mod.hook(...proto.getData("S_DESPAWN_DROPITEM"), HOOK_SETTINGS.LAST, dropHandler.bind(null, ENTITY_HOOK_TYPE.DESPAWN));
 
-		//-------------------------------------
-		// Cleanup hooks for hidden entities
-		//-------------------------------------
 		mod.hook(...proto.getData("S_SOCIAL"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
 		mod.hook(...proto.getData("S_USER_STATUS"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
 		mod.hook(...proto.getData("S_USER_MOVETYPE"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
 		mod.hook(...proto.getData("S_FEARMOVE_STAGE"), 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"), 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);
@@ -521,20 +524,16 @@ class unitFps {
 		mod.hook(...proto.getData("S_STICK_TO_USER_START"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
 		mod.hook(...proto.getData("S_STICK_TO_USER_END"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
 
-		//---------------------------------------
-		// Combined hooks with complicated logic
-		//---------------------------------------
 		mod.hook(...proto.getData("S_INSTANCE_ARROW"), HOOK_SETTINGS.LAST, blockAdditionalSkillEffectsHandler);
 		mod.hook(...proto.getData("S_INSTANCE_ARROW"), HOOK_SETTINGS.LASTFAKE, blockAdditionalSkillEffectsHandler);
 		mod.hook(...proto.getData("S_CREATURE_CHANGE_HP"), HOOK_SETTINGS.LAST, creatureChangeHpHandler);
 		mod.hook(...proto.getData("S_PLAYER_CHANGE_MP"), HOOK_SETTINGS.LAST, creatureChangeMpHandler);
-
 		mod.hook(...proto.getData("S_EACH_SKILL_RESULT"), HOOK_SETTINGS.LAST, eachSkillResultHandler);
 		mod.hook("S_FONT_SWAP_INFO", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, fontSwapHandler);
-
-		mod.hook(...proto.getData("S_ACTION_STAGE"), HOOK_SETTINGS.LAST, actionHandler);
-		mod.hook(...proto.getData("S_ACTION_END"), HOOK_SETTINGS.LAST, actionHandler);
-
+		
+		mod.hook(...proto.getData("S_ACTION_STAGE"), HOOK_SETTINGS.LAST, actionStageHandler);
+		mod.hook(...proto.getData("S_ACTION_END"), HOOK_SETTINGS.LAST, actionEndHandler);
+		
 		mod.hook(...proto.getData("S_ABNORMALITY_BEGIN"), HOOK_SETTINGS.LAST, abnormalsHandler);
 		mod.hook(...proto.getData("S_ABNORMALITY_END"), HOOK_SETTINGS.LAST, abnormalsHandler);
 		mod.hook(...proto.getData("S_ABNORMALITY_FAIL"), HOOK_SETTINGS.LAST, abnormalsHandler);
@@ -550,12 +549,12 @@ class unitFps {
 		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_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, () => {
 			console.log("DEBUG: unitFps -> constructor -> reconfigureEvent");
 			changeShakeState();