SaltyMonkey лет назад: 6
Родитель
Сommit
53f6e1b879
7 измененных файлов с 117 добавлено и 42 удалено
  1. 0 0
      data/settingsData.js
  2. 1 1
      data/staticData.json
  3. 27 0
      lib/helpers/watchdog.js
  4. 2 2
      lib/unitControl.js
  5. 75 34
      lib/unitFps.js
  6. 8 2
      lib/unitState.js
  7. 4 3
      settings/settings.json

+ 0 - 0
data/settingsData.js


+ 1 - 1
data/staticData.json

@@ -16,7 +16,7 @@
 		"SMT_HUNTINGZONE_EVENT_ANNOUNCE",
 		"SMT_GOLDENBELL_MESSAGE"
 	],
-	"BlockedProto": [
+	"blockedProto": [
 		"S_ITEM_CUSTOM_STRING",
 		"S_PARTY_MEMBER_QUEST_DATA",
 		"S_HIT_COMBO",

+ 27 - 0
lib/helpers/watchdog.js

@@ -0,0 +1,27 @@
+const fs = require("fs");
+
+class Watchdog {
+	constructor(path, changeCallback, type = ["change"]) {
+		this.fsWatcher = null;
+		let fkYouNodeJs = false;
+		const debounce = 500;
+
+		if(!fs.existsSync(path) || typeof changeCallback !== "function")
+			throw new Error("All shit here fucked");
+
+		// eslint-disable-next-line no-unused-vars
+		const listener = (eventType, filename) => {
+			if(fkYouNodeJs || !type.includes(eventType)) return;
+			fkYouNodeJs = true;
+			setTimeout(() => { fkYouNodeJs = false;}, debounce);
+			setImmediate(() => {changeCallback();});
+		};
+
+		fs.watch(path, listener);
+	}
+
+	close() {
+		if(this.fsWatcher) this.fsWatcher.close();
+	}
+}
+module.exports = Watchdog;

+ 2 - 2
lib/unitControl.js

@@ -44,8 +44,8 @@ class unitControl {
 		};
 
 		const debugSettingsHandler = () => {
-			deps.data.settings.debug = !deps.data.settings.debug;
-			deps.mod.command.message(`Debug ${deps.data.settings.debug ? "a" : "dea"}ctivated.`);
+			deps.data.settings.debugMode = !deps.data.settings.debugMode;
+			deps.mod.command.message(`Debug ${deps.data.settings.debugMode ? "a" : "dea"}ctivated.`);
 		};
 
 		const activeModeHandler = (str) => {

+ 75 - 34
lib/unitFps.js

@@ -34,7 +34,7 @@ class unitFps {
 		const blockedDrop = new Set();
 
 		console.log("DEBUG: unitFps -> constructor");
-		
+
 		//-------------------------------------
 		// Basic internal functions 
 		//-------------------------------------
@@ -74,15 +74,17 @@ class unitFps {
 			return false;
 		};
 
-		const isNpcsBlockable = (event) => {
-			if (tracker.summons.has(event.gameId)) {
-				if (data.activeMode.blockOwnSummons && isMe(event.owner)) {
-					return true;
-				}
-				else if (data.activeMode.blockAreaSummons && !isMe(event.owner)) {
-					return true;
-				}
+		const isSummonsBlockable = (event) => {
+			if (data.activeMode.blockOwnSummons && isMe(event.owner)) {
+				return true;
+			}
+			else if (data.activeMode.blockAreaSummons && !isMe(event.owner)) {
+				return true;
 			}
+			return false;
+		};
+
+		const isNpcBlockable = (event) => {
 			if (data.activeMode.blockNpcs && data.activeMode.blockNpcsOptions) {
 				if (utils.arraysHasIntersect(event.templateId, data.activeMode.blockNpcsOptions.templateId)) {
 					return true;
@@ -90,7 +92,6 @@ class unitFps {
 				else if (utils.arraysHasIntersect(event.huntingZoneId, data.activeMode.blockNpcsOptions.huntingZoneId)) {
 					return true;
 				}
-
 			}
 			return false;
 		};
@@ -118,7 +119,7 @@ class unitFps {
 					blockedDrop.delete(event.gameId);
 					break;
 				case (ENTITY_HOOK_TYPE.SPAWN):
-					if(isDropBlockable(event)) {
+					if (isDropBlockable(event)) {
 						blockedDrop.add(event.gameId);
 						return false;
 					}
@@ -145,15 +146,14 @@ class unitFps {
 					blockedServants.delete(event.gameId);
 					break;
 				case (ENTITY_HOOK_TYPE.SPAWN):
-					if(isServantBlockable(event)) {
+					if (isServantBlockable(event)) {
 						blockedServants.add(event.gameId);
 						return false;
 					}
-				
 			}
 		};
 
-		const npcsHandler = (type, event) => {
+		const npcHandler = (type, event) => {
 			switch (type) {
 				case (ENTITY_HOOK_TYPE.DESPAWN):
 					if (!blockedNpcs.has(event.gameId) && data.activeMode.blockNpcsDeathAnimations && event.type === DESPAWN_TYPES.DEAD) {
@@ -163,7 +163,11 @@ class unitFps {
 					blockedNpcs.delete(event.gameId);
 					break;
 				case (ENTITY_HOOK_TYPE.SPAWN):
-					if(isNpcsBlockable(event)) {
+					if(tracker.summons.has(event.gameId) && isSummonsBlockable(event)) {
+						blockedSummons.add(event.gameId);
+						return false;
+					}
+					else if (isNpcBlockable(event)) {
 						blockedNpcs.add(event.gameId);
 						return false;
 					}
@@ -195,8 +199,8 @@ class unitFps {
 		const blockAdditionalSkillEffectsHandler = (event) => {
 			if (isEntityBlocked(event.gameId)) return false;
 			if (data.activeMode.blockAdditionalSkillEffects && data.activeMode.blockAdditionalSkillEffectsOptions) {
-				if (data.activeMode.blockProjectilesOptions.players && tracker.users.has(event.gameId)) return false;
-				if (data.activeMode.blockProjectilesOptions.own && isMe(event.gameId)) return false;
+				if (data.activeMode.blockAdditionalSkillEffectsOptions.players && tracker.users.has(event.gameId)) return false;
+				if (data.activeMode.blockAdditionalSkillEffectsOptions.own && isMe(event.gameId)) return false;
 			}
 		};
 
@@ -287,6 +291,8 @@ class unitFps {
 			}
 		};
 
+		const fontSwapHandler = () => (data.activeMode.blockDamageNumbers ? false : undefined);
+
 		const dropIfBlockedHandler = (event) => {
 			let id = event.target || event.gameId;
 			if (isEntityBlocked(id)) return false;
@@ -335,8 +341,8 @@ class unitFps {
 		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, npcsHandler.bind(null, ENTITY_HOOK_TYPE.SPAWN));
-		mod.hook(...proto.getData("S_DESPAWN_NPC"), HOOK_SETTINGS.LAST, npcsHandler.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.FIRST, userHandler.bind(null, ENTITY_HOOK_TYPE.SPAWN));
 		mod.hook(...proto.getData("S_DESPAWN_USER"), HOOK_SETTINGS.FIRST, userHandler.bind(null, ENTITY_HOOK_TYPE.DESPAWN));
@@ -357,9 +363,7 @@ class unitFps {
 		mod.hook(...proto.getData("S_CREATURE_ROTATE"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
 		mod.hook(...proto.getData("S_CREATURE_LIFE"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
 		mod.hook(...proto.getData("S_NPC_LOCATION"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
-		mod.hook(...proto.getData("S_USER_LOCATION"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
-		mod.hook(...proto.getData("S_USER_LOCATION_IN_ACTION"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
-		
+
 		//---------------------------------------
 		// Combined hooks with complicated logic
 		//---------------------------------------
@@ -368,6 +372,7 @@ class unitFps {
 		mod.hook(...proto.getData("S_PLAYER_CHANGE_MP"), HOOK_SETTINGS.LAST, blockMpPopups);
 
 		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);
@@ -391,17 +396,17 @@ class unitFps {
 		deps.data.on(EVENTS.RECONFIGURE, () => {
 			console.log("DEBUG: unitFps -> constructor -> reconfigureEvent");
 			changeShakeState();
-			if(data.prevMode.blockCollections !== data.activeMode.blockCollections) {
-				switch(data.activeMode.blockCollections) {
-					case(true) : 
+			if (data.prevMode.blockCollections !== data.activeMode.blockCollections) {
+				switch (data.activeMode.blockCollections) {
+					case (true):
 						// eslint-disable-next-line no-unused-vars
-						for (const [key, value] of tracker.collections.entries()) { 
+						for (const value of tracker.collections.values()) {
 							mod.send(...proto.getData("S_DESPAWN_COLLECTION"), value);
 						}
 						break;
-					case(false): 
+					case (false):
 						// eslint-disable-next-line no-unused-vars
-						for (const [key, value] of tracker.collections.entries()) { 
+						for (const value of tracker.collections.values()) {
 							mod.send(...proto.getData("S_SPAWN_COLLECTION"), value);
 						}
 						break;
@@ -409,26 +414,62 @@ class unitFps {
 			}
 			for (const [key, value] of tracker.drop.entries()) {
 				let needBlock = isDropBlockable(value);
-				if (needBlock && !blockedDrop.has(key))
+				if (needBlock && !blockedDrop.has(key)) {
 					mod.send(...proto.getData("S_DESPAWN_DROPITEM"), value);
-				else if (!needBlock && blockedDrop.has(key))
+					blockedDrop.add(key);
+				}
+				else if (!needBlock && blockedDrop.has(key)) {
 					mod.send(...proto.getData("S_SPAWN_DROPITEM"), value);
+					blockedDrop.delete(key);
+				}
 			}
 
 			for (const [key, value] of tracker.users.entries()) {
 				let needBlock = isUserBlockable(value);
-				if (needBlock && !blockedPlayers.has(key))
+				if (needBlock && !blockedPlayers.has(key)) {
 					mod.send(...proto.getData("S_DESPAWN_USER"), value);
-				else if (!needBlock && blockedPlayers.has(key))
+					blockedPlayers.add(key);
+				}
+				else if (!needBlock && blockedPlayers.has(key)) {
 					mod.send(...proto.getData("S_SPAWN_USER"), value);
+					blockedPlayers.delete(key);
+				}
 			}
 
 			for (const [key, value] of tracker.servants.entries()) {
 				let needBlock = isServantBlockable(value);
-				if (needBlock && !blockedServants.has(key))
+				if (needBlock && !blockedServants.has(key)) {
 					mod.send(...proto.getData("S_REQUEST_DESPAWN_SERVANT"), value);
-				else if (!needBlock && blockedServants.has(key))
+					blockedServants.add(key);
+				}
+				else if (!needBlock && blockedServants.has(key)) {
 					mod.send(...proto.getData("S_REQUEST_SPAWN_SERVANT"), value);
+					blockedServants.remove(key);
+				}
+			}
+
+			for (const [key, value] of tracker.summons.entries()) {
+				let needBlock = isSummonsBlockable(value);
+				if (needBlock && !blockedSummons.has(key)) {
+					mod.send(...proto.getData("S_DESPAWN_NPC"), value);
+					blockedSummons.add(key);
+				}
+				else if (!needBlock && blockedSummons.has(key)) {
+					mod.send(...proto.getData("S_SPAWN_NPC"), value);
+					blockedSummons.remove(key);
+				}
+			}
+
+			for (const [key, value] of tracker.npcs.entries()) {
+				let needBlock = isSummonsBlockable(value);
+				if (needBlock && !blockedNpcs.has(key)) {
+					mod.send(...proto.getData("S_DESPAWN_NPC"), value);
+					blockedNpcs.add(key);
+				}
+				else if (!needBlock && blockedNpcs.has(key)) {
+					mod.send(...proto.getData("S_SPAWN_NPC"), value);
+					blockedNpcs.remove(key);
+				}
 			}
 		});
 	}

+ 8 - 2
lib/unitState.js

@@ -88,7 +88,7 @@ class unitState extends EventEmitter {
 
 		let staticData = utils.loadJson(utils.getFullPath(__dirname, "../data/staticData.json"));
 
-		this.lockedPacketsData = staticData.BlockedProto;
+		this.lockedPacketsData = staticData.blockedProto;
 		this.throttlePacketsData = staticData.throttledProto;
 		this.smtsSet = new Set(...staticData.blockedSmt);
 
@@ -104,7 +104,9 @@ class unitState extends EventEmitter {
 
 		this.__mod.hook(...this.__proto.getData("S_LOAD_TOPO"), HOOK_SETTINGS.FIRST, (event) => {
 			if (!this.settings["applyTrigger"] || equal(this.prevMode, this.activeMode)) return;
+			
 			this.prevMode = rfdc(this.activeMode);
+		
 			if (this.__mod.game.me.inOpenWorld && this.preset.directives.triggerOW) {
 				this.activeMode = this.preset[this.preset.directives.triggerOW];
 			}
@@ -122,21 +124,25 @@ class unitState extends EventEmitter {
 
 		this.__mod.hook("S_FIELD_EVENT_ON_ENTER", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.FIRST, () => {
 			if (!this.settings["applyTrigger"] || equal(this.prevMode, this.activeMode)) return;
+			
 			this.prevMode = rfdc(this.activeMode);
+			
 			this.activeMode = this.preset[this.preset.directives.triggerGuardians];
 			this._eventTrigger();
 		});
 
 		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();
 		});
 	}
 
 	_eventTrigger() {
 		console.log("DEBUG: unitState -> _eventTrigger");
-		this.emit(EVENTS.RECONFIGURE, this.prevMode, this.activeMode);
+		this.emit(EVENTS.RECONFIGURE);
 	}
 }
 

+ 4 - 3
settings/settings.json

@@ -1,8 +1,9 @@
 {
 	"enableCommands": true,
 	"customCommandTag": "",
-	"enableModMessages": true,
-	"debug": false,
+	"interactiveMode": true,
+	"debugMode": false,
+	"applyTriggers": true,
 	"classBasedPresets": true,
-	"applyTriggers": true
+	"trackPresetsChanges": true
 }