SaltyMonkey лет назад: 6
Родитель
Сommit
0244de43ce
4 измененных файлов с 26 добавлено и 2 удалено
  1. 2 1
      data/staticData.json
  2. 3 1
      lib/helpers/utils.js
  3. 14 0
      lib/unitFps.js
  4. 7 0
      settings/presets/common.json

+ 2 - 1
data/staticData.json

@@ -27,13 +27,14 @@
 		"SMT_GQUEST_FAIL_ACCEPT"
 		"SMT_GQUEST_FAIL_ACCEPT"
 	],
 	],
 	"blockedProto": [
 	"blockedProto": [
+		"S_PARTY_MARKER",
 		"S_ITEM_CUSTOM_STRING",
 		"S_ITEM_CUSTOM_STRING",
 		"S_PARTY_MEMBER_QUEST_DATA",
 		"S_PARTY_MEMBER_QUEST_DATA",
 		"S_UNICAST_FLOATING_CASTLE_INFO",
 		"S_UNICAST_FLOATING_CASTLE_INFO",
 		"S_UNICAST_FLOATING_CASTLE_NAMEPLATE"
 		"S_UNICAST_FLOATING_CASTLE_NAMEPLATE"
 	],
 	],
 	"throttledProto": [
 	"throttledProto": [
-		"S_ITEM_CUSTOM_STRING",
+		"S_PARTY_MATCH_LINK",
 		"S_VIEW_PARTY_INVITE",
 		"S_VIEW_PARTY_INVITE",
 		"S_PLAYER_CHANGE_ALL_PROF",
 		"S_PLAYER_CHANGE_ALL_PROF",
 		"S_F2P_PremiumUser_Permission",
 		"S_F2P_PremiumUser_Permission",

+ 3 - 1
lib/helpers/utils.js

@@ -91,4 +91,6 @@ exports.saveJson = (obj, filepath) => {
 	} catch (err) {
 	} catch (err) {
 		return false;
 		return false;
 	}
 	}
-};
+};
+
+exports.getSkillBase = (skill) => Math.floor(skill / 10000);

+ 14 - 0
lib/unitFps.js

@@ -110,6 +110,19 @@ class unitFps {
 			return false;
 			return false;
 		};
 		};
 
 
+		const isSkillBlockable = (event) => {
+			if (data.activeMode.blockSkills) {
+				if (data.activeMode.blockSkills.class && utils.arraysHasIntersect(data.userTemplateToClassMap[event.templateId], data.activeMode.blockSkills.class))
+					return true;
+				else if (data.activeMode.blockPlayers.rawId && utils.arraysHasIntersect(event.skill.id, data.activeMode.blockSkills.rawId))
+					return true;
+				else if (data.activeMode.blockPlayers.extended && data.activeMode.blockPlayers.extended[data.userTemplateToClassMap[event.templateId]])
+					if (data.activeMode.blockPlayers.extended[data.userTemplateToClassMap[event.templateId]][utils.getSkillBase(event.skill.id)]) //TODO: refactor it
+						return true;
+			}
+			return false;
+		};
+
 		//-------------------------------------
 		//-------------------------------------
 		// Handlers for hooks
 		// Handlers for hooks
 		//-------------------------------------
 		//-------------------------------------
@@ -303,6 +316,7 @@ class unitFps {
 
 
 		const actionHandler = (event) => {
 		const actionHandler = (event) => {
 			if (isEntityBlocked(event.gameId)) return false;
 			if (isEntityBlocked(event.gameId)) return false;
+			if (isSkillBlockable(event)) return false;
 		};
 		};
 
 
 		const appearanceChangeHandler = (event) => {
 		const appearanceChangeHandler = (event) => {

+ 7 - 0
settings/presets/common.json

@@ -54,6 +54,13 @@
 				"me": false,
 				"me": false,
 				"area": false
 				"area": false
 			},
 			},
+			"blockSkills": {
+				"class": [],
+				"rawId": [],
+				"extended": {
+
+				}
+			},
 			"blockNpcs": {
 			"blockNpcs": {
 				"templateId": [],
 				"templateId": [],
 				"huntingZoneId": []
 				"huntingZoneId": []