SaltyMonkey лет назад: 6
Родитель
Сommit
40de63d1c1
5 измененных файлов с 166 добавлено и 94 удалено
  1. 12 0
      data/protoData.json
  2. 2 1
      lib/helpers/enums.js
  3. 133 75
      lib/unitFps.js
  4. 13 13
      lib/unitState.js
  5. 6 5
      settings/presets/common.json

+ 12 - 0
data/protoData.json

@@ -148,5 +148,17 @@
 	},
 	},
 	"S_QUEST_BALLOON": {
 	"S_QUEST_BALLOON": {
 		"default": 1
 		"default": 1
+	},
+	"S_LEAVE_PARTY": {
+		"default": 1
+	},
+	"S_BAN_PARTY_MEMBER": {
+		"default": 1
+	},
+	"S_LEAVE_PARTY_MEMBER": {
+		"default": 2
+	},
+	"S_PARTY_MEMBER_LIST": {
+		"default": 7
 	}
 	}
 }
 }

+ 2 - 1
lib/helpers/enums.js

@@ -33,7 +33,8 @@ exports.HOOK_SETTINGS = Object.freeze(
 	{
 	{
 		"LAST": { "order": 99999, "filter": { "fake": false, "modified": null } },
 		"LAST": { "order": 99999, "filter": { "fake": false, "modified": null } },
 		"LASTFAKE": { "order": 99999, "filter": { "fake": true, "modified": null } },
 		"LASTFAKE": { "order": 99999, "filter": { "fake": true, "modified": null } },
-		"FIRST": { "order": -10000, "filter": { "fake": false } }
+		"FIRST": { "order": -10000, "filter": { "fake": false } },
+		"FIRSTA": { "order": -99999, "filter": { "fake": false } }
 	}
 	}
 );
 );
 
 

+ 133 - 75
lib/unitFps.js

@@ -33,6 +33,8 @@ class unitFps {
 		const blockedServants = new Set();
 		const blockedServants = new Set();
 		const blockedDrop = new Set();
 		const blockedDrop = new Set();
 
 
+		const partyMembers = new Map();
+
 		console.log("DEBUG: unitFps -> constructor");
 		console.log("DEBUG: unitFps -> constructor");
 
 
 		//-------------------------------------
 		//-------------------------------------
@@ -59,7 +61,7 @@ class unitFps {
 		};
 		};
 
 
 		const isCollectionBlockable = () => {
 		const isCollectionBlockable = () => {
-			if (data.activeMode.blockCollections)
+			if (data.activeMode.blockGatherNode)
 				return true;
 				return true;
 			return false;
 			return false;
 		};
 		};
@@ -96,6 +98,9 @@ class unitFps {
 
 
 		const isPlayerBlockable = (event) => {
 		const isPlayerBlockable = (event) => {
 			if (data.activeMode.blockPlayers) {
 			if (data.activeMode.blockPlayers) {
+				if (data.activeMode.blockPlayers.keepParty && partyMembers.has(event.gameId)) 
+					return false;
+				
 				if (data.activeMode.blockPlayers.all) {
 				if (data.activeMode.blockPlayers.all) {
 					return true;
 					return true;
 				}
 				}
@@ -124,6 +129,93 @@ class unitFps {
 			return false;
 			return false;
 		};
 		};
 
 
+		const reconfigurePlayers = () => {
+			for (const [key, value] of tracker.spawnedPlayers.entries()) {
+				let needBlock = isPlayerBlockable(value);
+				if (needBlock && !blockedPlayers.has(key)) {
+					mod.send(...proto.getData("S_DESPAWN_USER"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW });
+					blockedPlayers.add(key);
+				}
+				else if (!needBlock && blockedPlayers.has(key)) {
+					mod.send(...proto.getData("S_SPAWN_USER"), value);
+					blockedPlayers.delete(key);
+				}
+			}
+		};
+
+		const reconfigureDrop = () => {
+			for (const [key, value] of tracker.spawnedDrop.entries()) {
+				let needBlock = isDropBlockable(value);
+				if (needBlock && !blockedDrop.has(key)) {
+					mod.send(...proto.getData("S_DESPAWN_DROPITEM"), { "gameId": value.gameId });
+					blockedDrop.add(key);
+				}
+				else if (!needBlock && blockedDrop.has(key)) {
+					mod.send(...proto.getData("S_SPAWN_DROPITEM"), value);
+					blockedDrop.delete(key);
+				}
+			}
+		};
+
+		const reconfigureServants = () => {
+			for (const [key, value] of tracker.spawnedServants.entries()) {
+				let needBlock = isServantBlockable(value);
+				if (needBlock && !blockedServants.has(key)) {
+					mod.send(...proto.getData("S_REQUEST_DESPAWN_SERVANT"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW });
+					blockedServants.add(key);
+				}
+				else if (!needBlock && blockedServants.has(key)) {
+					mod.send(...proto.getData("S_REQUEST_SPAWN_SERVANT"), value);
+					blockedServants.delete(key);
+				}
+			}
+		};
+
+		const reconfigureSummons = () => {
+			for (const [key, value] of tracker.spawnedSummons.entries()) {
+				let needBlock = isSummonsBlockable(value);
+				if (needBlock && !blockedSummons.has(key)) {
+					mod.send(...proto.getData("S_DESPAWN_NPC"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW, "loc": value.loc });
+					blockedSummons.add(key);
+				}
+				else if (!needBlock && blockedSummons.has(key)) {
+					mod.send(...proto.getData("S_SPAWN_NPC"), value);
+					blockedSummons.delete(key);
+				}
+			}
+		};
+
+		const reconfigureNpcs = () => {
+			for (const [key, value] of tracker.spawnedNPCS.entries()) {
+				let needBlock = isNpcBlockable(value);
+				if (needBlock && !blockedNpcs.has(key)) {
+					mod.send(...proto.getData("S_DESPAWN_NPC"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW, "loc": value.loc });
+					blockedNpcs.add(key);
+				}
+				else if (!needBlock && blockedNpcs.has(key)) {
+					mod.send(...proto.getData("S_SPAWN_NPC"), value);
+					blockedNpcs.delete(key);
+				}
+			}
+		};
+
+		const reconfigureCollections = () => {
+			if (data.prevMode.blockGatherNode !== data.activeMode.blockGatherNode) {
+				switch (data.activeMode.blockGatherNode) {
+					case (true):
+						for (const value of tracker.spawnedCollections.values()) {
+							mod.send(...proto.getData("S_DESPAWN_COLLECTION"), { "gameId": value.gameId, "collected": false });
+						}
+						break;
+					case (false):
+						for (const value of tracker.spawnedCollections.values()) {
+							mod.send(...proto.getData("S_SPAWN_COLLECTION"), value);
+						}
+						break;
+				}
+			}
+		};
+
 		//-------------------------------------
 		//-------------------------------------
 		// Handlers for hooks
 		// Handlers for hooks
 		//-------------------------------------
 		//-------------------------------------
@@ -332,6 +424,34 @@ class unitFps {
 			if (data.activeMode.blockPetBaloons && tracker.spawnedServants.has(event.source)) return false;
 			if (data.activeMode.blockPetBaloons && tracker.spawnedServants.has(event.source)) return false;
 		};
 		};
 
 
+		const partyLeaveHandler = () => {
+			partyMembers.clear();
+
+			reconfigurePlayers();
+		};
+
+		const partyMemberListHandler = (event) => {
+			partyMembers.clear();
+			event.members.forEach(member => {
+				if (!isMe(member.gameId))
+					partyMembers.set(member.gameId, { "pid": member.playerId, "sid": member.serverId });
+			});
+			
+			reconfigurePlayers();
+		};
+
+		const partyMemberDeleteHandler = (event) => {
+			[...partyMembers.keys()].forEach(key => {
+				let value = this.partyMembers.get(key);
+				if(value["pid"] === event.playerId && value["sid"] === event.serverId)
+				{
+					this.partyMembers.delete(key);
+				}
+			});
+			
+			reconfigurePlayers();
+		};
+
 		const cleanup = () => {
 		const cleanup = () => {
 			console.log("DEBUG: unitFps -> cleanup");
 			console.log("DEBUG: unitFps -> cleanup");
 			blockedPlayers.clear();
 			blockedPlayers.clear();
@@ -423,83 +543,21 @@ class unitFps {
 		mod.hook(...proto.getData("S_USER_EXTERNAL_CHANGE"), HOOK_SETTINGS.LAST, appearanceChangeHandler);
 		mod.hook(...proto.getData("S_USER_EXTERNAL_CHANGE"), HOOK_SETTINGS.LAST, appearanceChangeHandler);
 		mod.hook(...proto.getData("S_UNICAST_TRANSFORM_DATA"), HOOK_SETTINGS.LAST, appearanceChangeHandler);
 		mod.hook(...proto.getData("S_UNICAST_TRANSFORM_DATA"), HOOK_SETTINGS.LAST, appearanceChangeHandler);
 		//mod.hook(...proto.getData("S_USER_CHANGE_FACE_CUSTOM"), HOOK_SETTINGS.LAST, appearanceChangeHandler); // TODO: NEED MAP
 		//mod.hook(...proto.getData("S_USER_CHANGE_FACE_CUSTOM"), HOOK_SETTINGS.LAST, appearanceChangeHandler); // TODO: NEED MAP
-
+		
+		mod.hook(...proto.getData("S_PARTY_MEMBER_LIST"), HOOK_SETTINGS.FIRSTA, partyMemberListHandler);
+		mod.hook(...proto.getData("S_LEAVE_PARTY_MEMBER"), HOOK_SETTINGS.FIRSTA, partyMemberDeleteHandler);
+		mod.hook(...proto.getData("S_BAN_PARTY_MEMBER"), HOOK_SETTINGS.FIRSTA, partyMemberDeleteHandler);
+		mod.hook("S_LEAVE_PARTY", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.FIRSTA, partyLeaveHandler);
+		
 		deps.data.on(EVENTS.RECONFIGURE, () => {
 		deps.data.on(EVENTS.RECONFIGURE, () => {
 			console.log("DEBUG: unitFps -> constructor -> reconfigureEvent");
 			console.log("DEBUG: unitFps -> constructor -> reconfigureEvent");
 			changeShakeState();
 			changeShakeState();
-			if (data.prevMode.blockCollections !== data.activeMode.blockCollections) {
-				switch (data.activeMode.blockCollections) {
-					case (true):
-						for (const value of tracker.spawnedCollections.values()) {
-							mod.send(...proto.getData("S_DESPAWN_COLLECTION"), { "gameId": value.gameId, "collected": false });
-						}
-						break;
-					case (false):
-						for (const value of tracker.spawnedCollections.values()) {
-							mod.send(...proto.getData("S_SPAWN_COLLECTION"), value);
-						}
-						break;
-				}
-			}
-			for (const [key, value] of tracker.spawnedDrop.entries()) {
-				let needBlock = isDropBlockable(value);
-				if (needBlock && !blockedDrop.has(key)) {
-					mod.send(...proto.getData("S_DESPAWN_DROPITEM"), { "gameId": value.gameId });
-					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.spawnedPlayers.entries()) {
-				let needBlock = isPlayerBlockable(value);
-				if (needBlock && !blockedPlayers.has(key)) {
-					mod.send(...proto.getData("S_DESPAWN_USER"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW });
-					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.spawnedServants.entries()) {
-				let needBlock = isServantBlockable(value);
-				if (needBlock && !blockedServants.has(key)) {
-					mod.send(...proto.getData("S_REQUEST_DESPAWN_SERVANT"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW });
-					blockedServants.add(key);
-				}
-				else if (!needBlock && blockedServants.has(key)) {
-					mod.send(...proto.getData("S_REQUEST_SPAWN_SERVANT"), value);
-					blockedServants.delete(key);
-				}
-			}
-
-			for (const [key, value] of tracker.spawnedSummons.entries()) {
-				let needBlock = isSummonsBlockable(value);
-				if (needBlock && !blockedSummons.has(key)) {
-					mod.send(...proto.getData("S_DESPAWN_NPC"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW, "loc": value.loc });
-					blockedSummons.add(key);
-				}
-				else if (!needBlock && blockedSummons.has(key)) {
-					mod.send(...proto.getData("S_SPAWN_NPC"), value);
-					blockedSummons.delete(key);
-				}
-			}
-
-			for (const [key, value] of tracker.spawnedNPCS.entries()) {
-				let needBlock = isNpcBlockable(value);
-				if (needBlock && !blockedNpcs.has(key)) {
-					mod.send(...proto.getData("S_DESPAWN_NPC"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW, "loc": value.loc });
-					blockedNpcs.add(key);
-				}
-				else if (!needBlock && blockedNpcs.has(key)) {
-					mod.send(...proto.getData("S_SPAWN_NPC"), value);
-					blockedNpcs.delete(key);
-				}
-			}
+			reconfigureCollections();
+			reconfigureDrop();
+			reconfigurePlayers();
+			reconfigureServants();
+			reconfigureSummons();
+			reconfigureNpcs();
 		});
 		});
 	}
 	}
 }
 }

+ 13 - 13
lib/unitState.js

@@ -11,7 +11,7 @@
 */
 */
 
 
 //using es5 compatible mode because json not supports es6 types and es6 version is slow ->(require("fast-deep-equal/es6");)
 //using es5 compatible mode because json not supports es6 types and es6 version is slow ->(require("fast-deep-equal/es6");)
-const equal = require("fast-deep-equal");
+//const equal = require("fast-deep-equal");
 const EventEmitter = require("events").EventEmitter;
 const EventEmitter = require("events").EventEmitter;
 
 
 const rfdc = require("rfdc")({ "proto": true });
 const rfdc = require("rfdc")({ "proto": true });
@@ -89,7 +89,7 @@ class unitState extends EventEmitter {
 		this.smtData = new Set(...staticData.blockedSmt);
 		this.smtData = 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.__mod.settings["classBasedPresets"]
+			this.preset = this.__mod.settings.classBasedPresets
 				? (this.presets[this.__mod.game.me.class] || this.presets["common"])
 				? (this.presets[this.__mod.game.me.class] || this.presets["common"])
 				: this.presets["common"];
 				: this.presets["common"];
 
 
@@ -98,16 +98,12 @@ class unitState extends EventEmitter {
 			this.activeMode = this.preset.modes[this.preset.directives["default"]];
 			this.activeMode = this.preset.modes[this.preset.directives["default"]];
 		});
 		});
 
 
-		this.__mod.hook(...this.__proto.getData("S_LOAD_TOPO"), HOOK_SETTINGS.FIRST, (event) => {
-			if (!this.__mod.settings["enableEvents"] || equal(this.prevMode, this.activeMode)) return;
+		this.__mod.hook(...this.__proto.getData("S_LOAD_TOPO"), (event) => {
+			if (!this.__mod.settings.enableEvents) return;
 
 
 			this.prevMode = rfdc(this.activeMode);
 			this.prevMode = rfdc(this.activeMode);
 
 
-			if (this.__mod.game.me.inOpenWorld && this.preset.directives.triggerOW) {
-				this.activeMode = this.preset.modes[this.preset.directives.triggerOW];
-				this.__mod.command.message(`Mode was changed to "${this.preset.directives.triggerOW}".`);
-			}
-			else if (this.__mod.game.me.inBattleground && this.preset.directives.triggerBG) {
+			if (this.__mod.game.me.inBattleground && this.preset.directives.triggerBG) {
 				this.activeMode = this.preset.modes[this.preset.directives.triggerBG];
 				this.activeMode = this.preset.modes[this.preset.directives.triggerBG];
 				this.__mod.command.message(`Mode was changed to "${this.preset.directives.triggerBG}".`);
 				this.__mod.command.message(`Mode was changed to "${this.preset.directives.triggerBG}".`);
 			}
 			}
@@ -120,10 +116,14 @@ class unitState extends EventEmitter {
 				this.activeMode = this.preset.modes[this.preset.directives.triggerDungeons[event.zone]] ||
 				this.activeMode = this.preset.modes[this.preset.directives.triggerDungeons[event.zone]] ||
 					this.preset.modes[this.preset.directives.triggerDungeons["all"]];
 					this.preset.modes[this.preset.directives.triggerDungeons["all"]];
 			}
 			}
+			else if (this.__mod.game.me.inOpenWorld && this.preset.directives.triggerOW) {
+				this.activeMode = this.preset.modes[this.preset.directives.triggerOW];
+				this.__mod.command.message(`Mode was changed to "${this.preset.directives.triggerOW}".`);
+			}
 		});
 		});
 
 
-		this.__mod.hook("S_FIELD_EVENT_ON_ENTER", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.FIRST, () => {
-			if (!this.__mod.settings["enableEvents"] || equal(this.prevMode, this.activeMode)) return;
+		this.__mod.hook("S_FIELD_EVENT_ON_ENTER", RAW_HOOK_MODE.EVENT, () => {
+			if (!this.__mod.settings.enableEvents ) return;
 
 
 			this.prevMode = rfdc(this.activeMode);
 			this.prevMode = rfdc(this.activeMode);
 
 
@@ -133,8 +133,8 @@ class unitState extends EventEmitter {
 			this._eventTrigger();
 			this._eventTrigger();
 		});
 		});
 
 
-		this.__mod.hook("S_FIELD_EVENT_ON_LEAVE", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.FIRST, () => {
-			if (!this.__mod.settings["enableEvents"] || equal(this.prevMode, this.activeMode)) return;
+		this.__mod.hook("S_FIELD_EVENT_ON_LEAVE", RAW_HOOK_MODE.EVENT, () => {
+			if (!this.__mod.settings.enableEvents) return;
 
 
 			this.activeMode = rfdc(this.prevMode);
 			this.activeMode = rfdc(this.prevMode);
 			this.__mod.command.message("Mode was changed back");
 			this.__mod.command.message("Mode was changed back");

+ 6 - 5
settings/presets/common.json

@@ -19,7 +19,7 @@
 			"blockAchievementsInCombat": false,
 			"blockAchievementsInCombat": false,
 			"blockInventoryInCombat": false,
 			"blockInventoryInCombat": false,
 			"blockShakeEffects": false,
 			"blockShakeEffects": false,
-			"blockCollections": false,
+			"blockGatherNode": false,
 			"blockPetBaloons": false,
 			"blockPetBaloons": false,
 			"blockHits": {
 			"blockHits": {
 				"area": false,
 				"area": false,
@@ -68,7 +68,7 @@
 			},
 			},
 			"blockPlayers": {
 			"blockPlayers": {
 				"all": false,
 				"all": false,
-				"exceptParty": false,
+				"keepParty": true,
 				"class": [],
 				"class": [],
 				"name": []
 				"name": []
 			}
 			}
@@ -82,7 +82,7 @@
 			"blockAchievementsInCombat": false,
 			"blockAchievementsInCombat": false,
 			"blockInventoryInCombat": false,
 			"blockInventoryInCombat": false,
 			"blockShakeEffects": true,
 			"blockShakeEffects": true,
-			"blockCollections": false,
+			"blockGatherNode": false,
 			"blockPetBaloons": true,
 			"blockPetBaloons": true,
 			"blockHits": {
 			"blockHits": {
 				"area": true,
 				"area": true,
@@ -131,7 +131,7 @@
 			},
 			},
 			"blockPlayers": {
 			"blockPlayers": {
 				"all": false,
 				"all": false,
-				"exceptParty": false,
+				"keepParty": true,
 				"class": [],
 				"class": [],
 				"name": []
 				"name": []
 			}
 			}
@@ -145,7 +145,7 @@
 			"blockAchievementsInCombat": true,
 			"blockAchievementsInCombat": true,
 			"blockInventoryInCombat": true,
 			"blockInventoryInCombat": true,
 			"blockShakeEffects": true,
 			"blockShakeEffects": true,
-			"blockCollections": true,
+			"blockGatherNode": true,
 			"blockPetBaloons": true,
 			"blockPetBaloons": true,
 			"blockHits": {
 			"blockHits": {
 				"area": true,
 				"area": true,
@@ -194,6 +194,7 @@
 			},
 			},
 			"blockPlayers": {
 			"blockPlayers": {
 				"all": true,
 				"all": true,
+				"keepParty": true,
 				"class": [],
 				"class": [],
 				"name": []
 				"name": []
 			}
 			}