|
|
@@ -35,6 +35,8 @@ class unitFps {
|
|
|
|
|
|
const partyMembers = new Map();
|
|
|
|
|
|
+ const blockedProjectiles = new Set();
|
|
|
+
|
|
|
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) => {
|
|
|
@@ -482,6 +493,7 @@ class unitFps {
|
|
|
blockedSummons.clear();
|
|
|
blockedServants.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_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_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.LASTFAKE, blockAdditionalSkillEffectsHandler);
|
|
|
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_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_EXTERNAL_CHANGE"), HOOK_SETTINGS.LAST, appearanceChangeHandler);
|