Просмотр исходного кода

added blockTabletsWithText features

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

+ 6 - 0
data/protoData.json

@@ -190,5 +190,11 @@
 	},
 	"S_DESPAWN_EVENT_SEED": {
 		"default": 1
+	},
+	"S_SPAWN_BUILD_OBJECT": {
+		"default": 2
+	},
+	"S_DESPAWN_BUILD_OBJECT": {
+		"default": 2
 	}
 }

+ 13 - 0
lib/helpers/enums.js

@@ -115,4 +115,17 @@ exports.MPCHANGE = Object.freeze(
 		"BYABNORMAL": 1,
 		"BYPASSIVE": 4
 	}
+);
+
+/**
+ * Enum chat type
+ * @readonly
+ * @enum {string}
+ */
+exports.CHAT_CHANNEL = Object.freeze(
+	{
+		"MEGAPHONE": 213,
+		"GREET": 9,
+		"EMOTE": 26
+	}
 );

+ 40 - 1
lib/unitFps.js

@@ -32,6 +32,7 @@ class unitFps {
 		const blockedSummons = new Set();
 		const blockedServants = new Set();
 		const blockedDrop = new Set();
+		const blockedBuildObjects = new Set();
 
 		const partyMembers = new Map();
 
@@ -183,7 +184,7 @@ class unitFps {
 
 		const isProjectileBlockable = (event) => {
 			if (data.activeMode.blockProjectiles && data.activeMode.blockProjectiles.players) {
-				if (event.skill.npc || data.whitelistProjectiles.has(event.skill.id)) return false;
+				if (data.whitelistProjectiles.has(event.skill.id)) return false;
 
 				if (data.activeMode.blockProjectiles.keepParty && partyMembers.has(event.gameId)) return false;
 				else if (data.activeMode.blockProjectiles.keepClass && utils.arraysHasIntersect(data.userTemplateToClassMap[event.templateId], data.activeMode.blockProjectiles.keepClass))
@@ -231,6 +232,11 @@ class unitFps {
 			return false;
 		};
 
+		const isBuildObjectBlockable = () => {
+			if (data.activeMode.blockTabletsWithText) return true;
+			return false;
+		};
+
 		const isSmtBlockable = (event) => {
 			if (data.activeMode.blockAnnoyingScreenMessages && data.smtData.has(mod.parseSystemMessage(event.message).id)) return true;
 			return false;
@@ -272,6 +278,20 @@ class unitFps {
 			}
 		};
 
+		const reconfigureBuildObjects = () => {
+			for (const [key, value] of tracker.spawnedBuildObjects.entries()) {
+				let needBlock = isBuildObjectBlockable();
+				if (needBlock && !blockedBuildObjects.has(key)) {
+					mod.send(...proto.getData("S_DESPAWN_BUILD_OBJECT"), { "gameId": value.gameId });
+					blockedBuildObjects.add(key);
+				}
+				else if (!needBlock && blockedBuildObjects.has(key)) {
+					mod.send(...proto.getData("S_SPAWN_BUILD_OBJECT"), value);
+					blockedBuildObjects.delete(key);
+				}
+			}
+		};
+
 		const reconfigureServants = () => {
 			for (const [key, value] of tracker.spawnedServants.entries()) {
 				let needBlock = isServantBlockable(value);
@@ -359,6 +379,20 @@ class unitFps {
 			}
 		};
 
+		
+		const buildObjectHandler = (type, event) => {
+			switch (type) {
+				case (ENTITY_HOOK_TYPE.DESPAWN):
+					blockedBuildObjects.delete(event.gameId);
+					break;
+				case (ENTITY_HOOK_TYPE.SPAWN):
+					if (isBuildObjectBlockable()) {
+						blockedBuildObjects.add(event.gameId);
+						return false;
+					}
+			}
+		};
+
 		const servantsHandler = (type, event) => {
 			switch (type) {
 				case (ENTITY_HOOK_TYPE.DESPAWN):
@@ -598,6 +632,7 @@ class unitFps {
 			blockedServants.clear();
 			blockedDrop.clear();
 			blockedProjectiles.clear();
+			blockedBuildObjects.clear();
 		};
 
 		//-------------------------------------
@@ -624,6 +659,9 @@ class unitFps {
 		mod.hook("S_RESULT_EVENT_SEED", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, eventBoxSeedHandler);
 		mod.hook("S_DESPAWN_EVENT_SEED", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, eventBoxSeedHandler);
 
+		mod.hook(...proto.getData("S_DESPAWN_BUILD_OBJECT"), HOOK_SETTINGS.LAST, buildObjectHandler.bind(null, ENTITY_HOOK_TYPE.DESPAWN));
+		mod.hook(...proto.getData("S_SPAWN_BUILD_OBJECT"), HOOK_SETTINGS.LAST, buildObjectHandler.bind(null, ENTITY_HOOK_TYPE.SPAWN));
+
 		mod.hook(...proto.getData("S_DESPAWN_COLLECTION"), HOOK_SETTINGS.LAST, collectionHandler.bind(null, ENTITY_HOOK_TYPE.DESPAWN));
 		mod.hook(...proto.getData("S_SPAWN_COLLECTION"), HOOK_SETTINGS.LAST, collectionHandler.bind(null, ENTITY_HOOK_TYPE.SPAWN));
 		mod.hook(...proto.getData("S_REQUEST_SPAWN_SERVANT"), HOOK_SETTINGS.LAST, servantsHandler.bind(null, ENTITY_HOOK_TYPE.SPAWN));
@@ -684,6 +722,7 @@ class unitFps {
 
 		deps.data.on(EVENTS.RECONFIGURE, () => {
 			changeShakeState();
+			reconfigureBuildObjects();
 			reconfigureCollections();
 			reconfigureDrop();
 			reconfigurePlayers();

+ 13 - 2
lib/unitTracker.js

@@ -32,7 +32,8 @@ class unitTracker {
 			"spawnedServants": new Map(),
 			"spawnedPlayers": new Map(),
 			"spawnedNPCS": new Map(),
-			"spawnedSummons": new Map()
+			"spawnedSummons": new Map(),
+			"spawnedBuildObjects": new Map()
 		});
 
 		const dropHandler = (type, event) => {
@@ -49,6 +50,13 @@ class unitTracker {
 			}
 		};
 
+		const buildObjectHandler = (type, event) => {
+			switch (type) {
+				case (ENTITY_HOOK_TYPE.DESPAWN): this.spawnedBuildObjects.delete(event.gameId); break;
+				case (ENTITY_HOOK_TYPE.SPAWN): this.spawnedBuildObjects.set(event.gameId, event); break;
+			}
+		};
+
 		const servantsHandler = (type, event) => {
 			switch (type) {
 				case (ENTITY_HOOK_TYPE.DESPAWN): this.spawnedServants.delete(event.gameId); break;
@@ -150,13 +158,13 @@ class unitTracker {
 		};
 
 		const cleanup = () => {
-			console.log("DEBUG: unitTracker -> cleanup");
 			this.spawnedNPCS.clear();
 			this.spawnedSummons.clear();
 			this.spawnedPlayers.clear();
 			this.spawnedServants.clear();
 			this.spawnedCollections.clear();
 			this.spawnedDrop.clear();
+			this.spawnedBuildObjects.clear();
 		};
 
 		const bullrushHandler = (event) => {
@@ -189,6 +197,9 @@ class unitTracker {
 		mod.hook(...proto.getData("S_SPAWN_DROPITEM"), HOOK_SETTINGS.FIRST, dropHandler.bind(null, ENTITY_HOOK_TYPE.SPAWN));
 		mod.hook(...proto.getData("S_DESPAWN_DROPITEM"), HOOK_SETTINGS.FIRST, dropHandler.bind(null, ENTITY_HOOK_TYPE.DESPAWN));
 
+		mod.hook(...proto.getData("S_SPAWN_BUILD_OBJECT"), HOOK_SETTINGS.FIRST, buildObjectHandler.bind(null, ENTITY_HOOK_TYPE.SPAWN));
+		mod.hook(...proto.getData("S_DESPAWN_BUILD_OBJECT"), HOOK_SETTINGS.FIRST, buildObjectHandler.bind(null, ENTITY_HOOK_TYPE.DESPAWN));
+
 		mod.hook("S_LOAD_TOPO", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.FIRST, cleanup);
 	}
 }

+ 3 - 0
settings/presets/common.json

@@ -23,6 +23,7 @@
 			"blockInventoryInCombat": false,
 			"blockShakeEffects": false,
 			"blockGatherNodes": false,
+			"blockTabletsWithText": false,
 			"blockPetBaloons": false,
 			"blockHits": {
 				"area": false,
@@ -101,6 +102,7 @@
 			"blockInventoryInCombat": false,
 			"blockShakeEffects": true,
 			"blockGatherNodes": true,
+			"blockTabletsWithText": false,
 			"blockPetBaloons": true,
 			"blockHits": {
 				"area": true,
@@ -179,6 +181,7 @@
 			"blockInventoryInCombat": true,
 			"blockShakeEffects": true,
 			"blockGatherNodes": true,
+			"blockTabletsWithText": false,
 			"blockPetBaloons": true,
 			"blockHits": {
 				"area": true,