SaltyMonkey лет назад: 6
Родитель
Сommit
9392ac6231
6 измененных файлов с 28 добавлено и 14 удалено
  1. 3 0
      data/protoData.json
  2. 2 2
      lib/helpers/enums.js
  3. 7 3
      lib/unitControl.js
  4. 13 7
      lib/unitFps.js
  5. 2 2
      lib/unitState.js
  6. 1 0
      lib/unitTracker.js

+ 3 - 0
data/protoData.json

@@ -130,5 +130,8 @@
 	},
 	"S_CREATURE_ROTATE": {
 		"default": 2
+	},
+	"S_USER_LOCATION_IN_ACTION": {
+		"default": 2
 	}
 }

+ 2 - 2
lib/helpers/enums.js

@@ -31,8 +31,8 @@ exports.RAW_HOOK_MODE = Object.freeze(
  */
 exports.HOOK_SETTINGS = Object.freeze(
 	{
-		"LAST": {"order": 9999999, "filter": {"fake": false, "modified": null}},
-		"FIRST": {"order": -9999999, "filter": {"fake": false}}
+		"LAST": {"order": 99999, "filter": {"fake": false, "modified": null}},
+		"FIRST": {"order": -10000, "filter": {"fake": false}}
 	}
 );
 

+ 7 - 3
lib/unitControl.js

@@ -20,6 +20,9 @@ class unitControl {
 	constructor(deps) {
 		let prefixes = ["fm", "fps"];
 
+		if(deps.data.settings.customCommandTag && deps.data.settings.customCommandTag.length)
+			prefixes.push(deps.data.settings.customCommandTag);
+
 		const infoHandler = () => {
 			deps.mod.command.message("FPS Manager information.");
 		};
@@ -47,11 +50,11 @@ class unitControl {
 			if(deps.data.preset[str]) {
 				deps.data.prevMode = rfdc(deps.data.activeMode);
 				deps.data.activeMode = deps.data.preset[str];
+				deps.mod.command.message(`Mode was changed to ${str}.`);
 				deps.data._eventTrigger();
-				deps.mod.command.message("Mode changed.");
 			}
 			else {
-				deps.mod.command.message("Incorrect mode.");
+				deps.mod.command.message(`Mode ${str} was not found.`);
 			}
 		};
 
@@ -70,7 +73,8 @@ class unitControl {
 			"debug": debugSettingsHandler
 		};
 
-		deps.mod.command.add(prefixes, commands);
+		if(deps.data.settings.enableCommands)
+			deps.mod.command.add(prefixes, commands);
 	}
 }
 module.exports = unitControl;

+ 13 - 7
lib/unitFps.js

@@ -27,7 +27,6 @@ class unitFps {
 
 		let throttledDAta = {};
 
-		const blockedCollections = new Set();
 		const blockedPlayers = new Set();
 		const blockedNpcs = new Set();
 		const blockedSummons = new Set();
@@ -68,14 +67,13 @@ class unitFps {
 			}
 		};
 
+		// eslint-disable-next-line no-unused-vars
 		const collectionHandler = (type, event) => {
 			switch (type) {
 				case (ENTITY_HOOK_TYPE.DESPAWN):
-					blockedCollections.delete(event.gameId);
 					break;
 				case (ENTITY_HOOK_TYPE.SPAWN):
 					if (data.activeMode.blockCollections) {
-						blockedCollections.add(event.gameId);
 						return false;
 					}
 			}
@@ -273,7 +271,6 @@ class unitFps {
 		const blockAchievementsInCombat = () => ((data.activeMode.blockAchievementSpamInCombat && meInCombat()) ? false : undefined);
 
 		const cleanup = () => {
-			blockedCollections.clear();
 			blockedPlayers.clear();
 			blockedNpcs.clear();
 			blockedSummons.clear();
@@ -290,7 +287,7 @@ class unitFps {
 		data.lockedPacketsData.forEach(packet => { mod.hook(packet, RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, blockUselessPackets); });
 
 		mod.hook(...proto.getData("S_SYSTEM_MESSAGE"), HOOK_SETTINGS.LAST, blockAnnoyingScreenMessages);
-		
+
 		mod.hook("C_SHOW_ITEMLIST", 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);
@@ -357,8 +354,17 @@ class unitFps {
 			if (oldMode.blockShakeEffects !== newMode.blockShakeEffects) {
 				changeShakeState(newMode.blockShakeEffects);
 			}
-			if (oldMode.blockCollections !== newMode.blockCollections && newMode.blockCollections === true) {
-				mod.send(...proto.getData("S_SPAWN_COLLECTION"), tracker);
+			//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);
+				}
+			}
+			//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);
+				}
 			}
 		});
 	}

+ 2 - 2
lib/unitState.js

@@ -88,7 +88,7 @@ class unitState extends EventEmitter {
 		this.throttlePacketsData = staticData.throttledProto;
 		this.smtsSet = new Set(...staticData.blockedSmt);
 
-		this.__mod.hook("S_LOGIN", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.FIRST,  () => {
+		this.__mod.hook("S_LOGIN", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.FIRST, () => {
 			this.preset = this.settings["classBasedPresets"]
 				? (this.presets[this.__mod.game.me.class] || this.presets["common"])
 				: this.presets["common"];
@@ -123,7 +123,7 @@ class unitState extends EventEmitter {
 			this._eventTrigger();
 		});
 
-		this.__mod.hook("S_FIELD_EVENT_ON_LEAVE", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.FIRST, ()=> {
+		this.__mod.hook("S_FIELD_EVENT_ON_LEAVE", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.FIRST, () => {
 			if (!this.settings["applyTrigger"] || equal(this.prevMode, this.activeMode)) return;
 			this.activeMode = rfdc(this.prevMode);
 			this._eventTrigger();

+ 1 - 0
lib/unitTracker.js

@@ -132,6 +132,7 @@ class unitState {
 		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_USER_LOCATION_IN_ACTION"), HOOK_SETTINGS.LAST, userLocationHandler);
 
 		//mod.hook("S_ACTION_STAGE", HOOK_SETTINGS.FIRST, locFromAction);
 		//mod.hook("S_ACTION_END", HOOK_SETTINGS.FIRST, locFromAction);