Просмотр исходного кода

proper projectile handler, fix npc replace id

SaltyMonkey лет назад: 6
Родитель
Сommit
87930b28d9
2 измененных файлов с 27 добавлено и 15 удалено
  1. 21 8
      lib/unitFps.js
  2. 6 7
      lib/unitTracker.js

+ 21 - 8
lib/unitFps.js

@@ -35,6 +35,8 @@ class unitFps {
 
 
 		const partyMembers = new Map();
 		const partyMembers = new Map();
 
 
+		const blockedProjectiles = new Set();
+
 		console.log("DEBUG: unitFps -> constructor");
 		console.log("DEBUG: unitFps -> constructor");
 
 
 		//-------------------------------------
 		//-------------------------------------
@@ -326,9 +328,18 @@ class unitFps {
 			}
 			}
 		};
 		};
 
 
-		const projectileHandler = (event) => {
-			if (isEntityBlocked(event.gameId)) return false;
-			if (isProjectileBlockable(event)) return false;
+		const projectileStartHandler = (event) => {
+			if (isEntityBlocked(event.gameId) || isProjectileBlockable(event)) {
+				blockedProjectiles.add(event.id);
+				return false;
+			}
+		};
+
+		const projectileEndHandler = (event) => {
+			if(blockedProjectiles.has(event.id)) {
+				blockedProjectiles.delete(event.id);
+				return false;
+			}
 		};
 		};
 
 
 		const blockAdditionalSkillEffectsHandler = (event) => {
 		const blockAdditionalSkillEffectsHandler = (event) => {
@@ -482,6 +493,7 @@ class unitFps {
 			blockedSummons.clear();
 			blockedSummons.clear();
 			blockedServants.clear();
 			blockedServants.clear();
 			blockedDrop.clear();
 			blockedDrop.clear();
+			blockedProjectiles.clear();
 		};
 		};
 
 
 		//-------------------------------------
 		//-------------------------------------
@@ -521,7 +533,8 @@ class unitFps {
 		mod.hook(...proto.getData("S_UNMOUNT_VEHICLE"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
 		mod.hook(...proto.getData("S_UNMOUNT_VEHICLE"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
 		mod.hook(...proto.getData("S_STICK_TO_USER_START"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
 		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);
 		mod.hook(...proto.getData("S_STICK_TO_USER_END"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
-
+		mod.hook(...proto.getData("S_DEFEND_SUCCESS"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
+		
 		mod.hook(...proto.getData("S_INSTANCE_ARROW"), HOOK_SETTINGS.LAST, blockAdditionalSkillEffectsHandler);
 		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_INSTANCE_ARROW"), HOOK_SETTINGS.LASTFAKE, blockAdditionalSkillEffectsHandler);
 		mod.hook(...proto.getData("S_CREATURE_CHANGE_HP"), HOOK_SETTINGS.LAST, creatureChangeHpHandler);
 		mod.hook(...proto.getData("S_CREATURE_CHANGE_HP"), HOOK_SETTINGS.LAST, creatureChangeHpHandler);
@@ -538,10 +551,10 @@ class unitFps {
 		mod.hook(...proto.getData("S_ABNORMALITY_DAMAGE_ABSORB"), HOOK_SETTINGS.LAST, abnormalsHandler);
 		mod.hook(...proto.getData("S_ABNORMALITY_DAMAGE_ABSORB"), HOOK_SETTINGS.LAST, abnormalsHandler);
 		//mod.hook(...proto.getData("S_ABNORMALITY_RESIST"), HOOK_SETTINGS.LAST, abnormalsHandler); //TODO: NEED MAP
 		//mod.hook(...proto.getData("S_ABNORMALITY_RESIST"), HOOK_SETTINGS.LAST, abnormalsHandler); //TODO: NEED MAP
 
 
-		mod.hook(...proto.getData("S_SPAWN_PROJECTILE"), HOOK_SETTINGS.LAST, projectileHandler);
-		mod.hook(...proto.getData("S_START_USER_PROJECTILE"), HOOK_SETTINGS.LAST, projectileHandler);
-		mod.hook(...proto.getData("S_END_USER_PROJECTILE"), HOOK_SETTINGS.LAST, projectileHandler);
-		mod.hook(...proto.getData("S_DESPAWN_PROJECTILE"), HOOK_SETTINGS.LAST, projectileHandler);
+		mod.hook(...proto.getData("S_SPAWN_PROJECTILE"), HOOK_SETTINGS.LAST, projectileStartHandler);
+		mod.hook(...proto.getData("S_START_USER_PROJECTILE"), HOOK_SETTINGS.LAST, projectileStartHandler);
+		mod.hook(...proto.getData("S_END_USER_PROJECTILE"), HOOK_SETTINGS.LAST, projectileEndHandler);
+		mod.hook(...proto.getData("S_DESPAWN_PROJECTILE"), HOOK_SETTINGS.LAST, projectileEndHandler);
 
 
 		mod.hook(...proto.getData("S_USER_APPEARANCE_CHANGE"), HOOK_SETTINGS.LAST, appearanceChangeHandler);
 		mod.hook(...proto.getData("S_USER_APPEARANCE_CHANGE"), HOOK_SETTINGS.LAST, appearanceChangeHandler);
 		mod.hook(...proto.getData("S_USER_EXTERNAL_CHANGE"), HOOK_SETTINGS.LAST, appearanceChangeHandler);
 		mod.hook(...proto.getData("S_USER_EXTERNAL_CHANGE"), HOOK_SETTINGS.LAST, appearanceChangeHandler);

+ 6 - 7
lib/unitTracker.js

@@ -82,8 +82,8 @@ class unitTracker {
 
 
 					// eslint-disable-next-line no-magic-numbers
 					// eslint-disable-next-line no-magic-numbers
 					if (event.replaceId !== BigInt(0)) {
 					if (event.replaceId !== BigInt(0)) {
-						this.spawnedNPCS.delete(event.gameId);
-						this.spawnedSummons.delete(event.gameId);
+						this.spawnedNPCS.delete(event.replaceId);
+						this.spawnedSummons.delete(event.replaceId);
 					}
 					}
 
 
 					break;
 					break;
@@ -125,8 +125,7 @@ class unitTracker {
 			else if (this.spawnedSummons.has(gameId)) this.spawnedSummons.set(gameId, updateAngle(this.spawnedSummons.get(gameId), event.w));
 			else if (this.spawnedSummons.has(gameId)) this.spawnedSummons.set(gameId, updateAngle(this.spawnedSummons.get(gameId), event.w));
 		};
 		};
 
 
-
-		const userLocationHandler = (event) => {
+		const playerLocationHandler = (event) => {
 			if (this.spawnedPlayers.has(event.gameId)) {
 			if (this.spawnedPlayers.has(event.gameId)) {
 				this.spawnedPlayers.set(event.gameId, updateLoc(this.spawnedPlayers.get(event.gameId), event.loc));
 				this.spawnedPlayers.set(event.gameId, updateLoc(this.spawnedPlayers.get(event.gameId), event.loc));
 			}
 			}
@@ -163,17 +162,17 @@ class unitTracker {
 		};
 		};
 
 
 		const bullrushHandler = (event) => {
 		const bullrushHandler = (event) => {
-			userLocationHandler(event);
+			playerLocationHandler(event);
 			npcLocationHandler(event);
 			npcLocationHandler(event);
 		};
 		};
 
 
 		mod.hook(...proto.getData("S_CREATURE_ROTATE"), HOOK_SETTINGS.FIRST, updateAngleHandler);
 		mod.hook(...proto.getData("S_CREATURE_ROTATE"), HOOK_SETTINGS.FIRST, updateAngleHandler);
 		mod.hook(...proto.getData("S_CREATURE_LIFE"), HOOK_SETTINGS.FIRST, creatureLifeHandler);
 		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_NPC_LOCATION"), HOOK_SETTINGS.FIRST, npcLocationHandler);
-		mod.hook(...proto.getData("S_USER_LOCATION"), HOOK_SETTINGS.FIRST, userLocationHandler);
+		mod.hook(...proto.getData("S_USER_LOCATION"), HOOK_SETTINGS.FIRST, playerLocationHandler);
 		mod.hook(...proto.getData("S_STICK_TO_USER_END"), HOOK_SETTINGS.LAST, bullrushHandler);
 		mod.hook(...proto.getData("S_STICK_TO_USER_END"), HOOK_SETTINGS.LAST, bullrushHandler);
 
 
-		mod.hook(...proto.getData("S_USER_LOCATION_IN_ACTION"), HOOK_SETTINGS.FIRST, userLocationHandler);
+		mod.hook(...proto.getData("S_USER_LOCATION_IN_ACTION"), HOOK_SETTINGS.FIRST, playerLocationHandler);
 		mod.hook(...proto.getData("S_MOUNT_VEHICLE"), HOOK_SETTINGS.FIRST, userMounted.bind(null, ENTITY_HOOK_TYPE.SPAWN));
 		mod.hook(...proto.getData("S_MOUNT_VEHICLE"), HOOK_SETTINGS.FIRST, userMounted.bind(null, ENTITY_HOOK_TYPE.SPAWN));
 		mod.hook(...proto.getData("S_UNMOUNT_VEHICLE"), HOOK_SETTINGS.FIRST, userMounted.bind(null, ENTITY_HOOK_TYPE.SPAWN));
 		mod.hook(...proto.getData("S_UNMOUNT_VEHICLE"), HOOK_SETTINGS.FIRST, userMounted.bind(null, ENTITY_HOOK_TYPE.SPAWN));