Browse Source

keep rawId skill implementation

SaltyMonkey 6 years ago
parent
commit
39a8d0f876
2 changed files with 7 additions and 1 deletions
  1. 4 1
      lib/unitFps.js
  2. 3 0
      settings/presets/common.json

+ 4 - 1
lib/unitFps.js

@@ -122,9 +122,12 @@ class unitFps {
 			if (data.activeMode.blockSkills) {
 				if (data.activeMode.blockSkills.keepClass && utils.arraysHasIntersect(data.userTemplateToClassMap[event.templateId], data.activeMode.blockSkills.keepClass))
 					return false;
+				else if (data.activeMode.blockSkills.keepRawId && utils.arraysHasIntersect(event.skill.id, data.activeMode.blockSkills.keepRawId))
+					return false;
+
 				if (data.activeMode.blockSkills.all)
 					return true;
-				if (data.activeMode.blockSkills.class && utils.arraysHasIntersect(data.userTemplateToClassMap[event.templateId], data.activeMode.blockSkills.class))
+				else 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;

+ 3 - 0
settings/presets/common.json

@@ -61,6 +61,7 @@
 				"all": false,
 				"keepClass": [],
 				"class": [],
+				"keepRawId": [],
 				"rawId": [],
 				"extended": {
 
@@ -128,6 +129,7 @@
 				"all": false,
 				"keepClass": [],
 				"class": [],
+				"keepRawId": [],
 				"rawId": [],
 				"extended": {
 
@@ -195,6 +197,7 @@
 				"all": true,
 				"keepClass": [],
 				"class": [],
+				"keepRawId": [],
 				"rawId": [],
 				"extended": {
 				}