Browse Source

some smol fixes

SaltyMonkey 6 years ago
parent
commit
613bec2f00
3 changed files with 16 additions and 0 deletions
  1. 6 0
      lib/unitFps.js
  2. 7 0
      lib/unitTracker.js
  3. 3 0
      settings/presets/common.json

+ 6 - 0
lib/unitFps.js

@@ -326,6 +326,10 @@ class unitFps {
 			if (data.activeMode.blockAchievementsInCombat && meInCombat()) return false;
 		};
 
+		const baloonsHandler = (event) => {
+			if (data.activeMode.blockPetBaloons && tracker.spawnedServants.has(event.source)) return false;
+		};
+
 		const cleanup = () => {
 			console.log("DEBUG: unitFps -> cleanup");
 			blockedPlayers.clear();
@@ -351,6 +355,8 @@ class unitFps {
 		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));

+ 7 - 0
lib/unitTracker.js

@@ -162,10 +162,17 @@ class unitTracker {
 			this.spawnedDrop.clear();
 		};
 
+		const bullrushHandler = (event) => {
+			userLocationHandler(event);
+			npcLocationHandler(event);
+		};
+
 		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_NPC_LOCATION"), HOOK_SETTINGS.FIRST, npcLocationHandler);
 		mod.hook(...proto.getData("S_USER_LOCATION"), HOOK_SETTINGS.FIRST, userLocationHandler);
+		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_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));

+ 3 - 0
settings/presets/common.json

@@ -20,6 +20,7 @@
 			"blockInventoryInCombat": false,
 			"blockShakeEffects": false,
 			"blockCollections": false,
+			"blockPetBaloons": false,
 			"blockHits": {
 				"area": false,
 				"me": false
@@ -82,6 +83,7 @@
 			"blockInventoryInCombat": false,
 			"blockShakeEffects": true,
 			"blockCollections": false,
+			"blockPetBaloons": true,
 			"blockHits": {
 				"area": true,
 				"me": false
@@ -144,6 +146,7 @@
 			"blockInventoryInCombat": true,
 			"blockShakeEffects": true,
 			"blockCollections": true,
+			"blockPetBaloons": true,
 			"blockHits": {
 				"area": true,
 				"me": true