Browse Source

added keepTemplateId into blockSummon option

SaltyMonkey 5 years ago
parent
commit
cef1a822a7
4 changed files with 45 additions and 21 deletions
  1. 3 0
      lib/unitFps.js
  2. 14 7
      settings/presets/common.json
  3. 14 7
      settings/presets/elementalist.json
  4. 14 7
      settings/presets/priest.json

+ 3 - 0
lib/unitFps.js

@@ -125,6 +125,9 @@ class unitFps {
 
 
 		const isSummonsBlockable = (event) => {
 		const isSummonsBlockable = (event) => {
 			if (data.activeMode.blockSummons) {
 			if (data.activeMode.blockSummons) {
+				if (data.activeMode.blockSummons.keepTemplateId && utils.arraysHasIntersect(event.templateId, data.activeMode.blockSummons.keepTemplateId))
+					return false;
+					
 				if (data.activeMode.blockSummons.me && isMe(event.owner))
 				if (data.activeMode.blockSummons.me && isMe(event.owner))
 					return true;
 					return true;
 				else if (data.activeMode.blockSummons.area && !isMe(event.owner))
 				else if (data.activeMode.blockSummons.area && !isMe(event.owner))

+ 14 - 7
settings/presets/common.json

@@ -60,7 +60,8 @@
 			},
 			},
 			"blockSummons": {
 			"blockSummons": {
 				"me": false,
 				"me": false,
-				"area": false
+				"area": false,
+				"keepTemplateId": []
 			},
 			},
 			"blockSkills": {
 			"blockSkills": {
 				"all": false,
 				"all": false,
@@ -140,7 +141,8 @@
 			},
 			},
 			"blockSummons": {
 			"blockSummons": {
 				"me": false,
 				"me": false,
-				"area": true
+				"area": true,
+				"keepTemplateId": []
 			},
 			},
 			"blockSkills": {
 			"blockSkills": {
 				"all": false,
 				"all": false,
@@ -220,7 +222,8 @@
 			},
 			},
 			"blockSummons": {
 			"blockSummons": {
 				"me": false,
 				"me": false,
-				"area": true
+				"area": true,
+				"keepTemplateId": []
 			},
 			},
 			"blockSkills": {
 			"blockSkills": {
 				"all": true,
 				"all": true,
@@ -300,7 +303,8 @@
 			},
 			},
 			"blockSummons": {
 			"blockSummons": {
 				"me": false,
 				"me": false,
-				"area": true
+				"area": true,
+				"keepTemplateId": []
 			},
 			},
 			"blockSkills": {
 			"blockSkills": {
 				"all": true,
 				"all": true,
@@ -380,7 +384,8 @@
 			},
 			},
 			"blockSummons": {
 			"blockSummons": {
 				"me": false,
 				"me": false,
-				"area": true
+				"area": true,
+				"keepTemplateId": []
 			},
 			},
 			"blockSkills": {
 			"blockSkills": {
 				"all": false,
 				"all": false,
@@ -460,7 +465,8 @@
 			},
 			},
 			"blockSummons": {
 			"blockSummons": {
 				"me": false,
 				"me": false,
-				"area": true
+				"area": true,
+				"keepTemplateId": []
 			},
 			},
 			"blockSkills": {
 			"blockSkills": {
 				"all": true,
 				"all": true,
@@ -540,7 +546,8 @@
 			},
 			},
 			"blockSummons": {
 			"blockSummons": {
 				"me": true,
 				"me": true,
-				"area": true
+				"area": true,
+				"keepTemplateId": []
 			},
 			},
 			"blockSkills": {
 			"blockSkills": {
 				"all": true,
 				"all": true,

+ 14 - 7
settings/presets/elementalist.json

@@ -59,7 +59,8 @@
 			},
 			},
 			"blockSummons": {
 			"blockSummons": {
 				"me": false,
 				"me": false,
-				"area": false
+				"area": false,
+				"keepTemplateId": []
 			},
 			},
 			"blockSkills": {
 			"blockSkills": {
 				"all": false,
 				"all": false,
@@ -138,7 +139,8 @@
 			},
 			},
 			"blockSummons": {
 			"blockSummons": {
 				"me": false,
 				"me": false,
-				"area": true
+				"area": true,
+				"keepTemplateId": []
 			},
 			},
 			"blockSkills": {
 			"blockSkills": {
 				"all": false,
 				"all": false,
@@ -217,7 +219,8 @@
 			},
 			},
 			"blockSummons": {
 			"blockSummons": {
 				"me": false,
 				"me": false,
-				"area": true
+				"area": true,
+				"keepTemplateId": []
 			},
 			},
 			"blockSkills": {
 			"blockSkills": {
 				"all": true,
 				"all": true,
@@ -296,7 +299,8 @@
 			},
 			},
 			"blockSummons": {
 			"blockSummons": {
 				"me": false,
 				"me": false,
-				"area": true
+				"area": true,
+				"keepTemplateId": []
 			},
 			},
 			"blockSkills": {
 			"blockSkills": {
 				"all": true,
 				"all": true,
@@ -375,7 +379,8 @@
 			},
 			},
 			"blockSummons": {
 			"blockSummons": {
 				"me": false,
 				"me": false,
-				"area": true
+				"area": true,
+				"keepTemplateId": []
 			},
 			},
 			"blockSkills": {
 			"blockSkills": {
 				"all": false,
 				"all": false,
@@ -454,7 +459,8 @@
 			},
 			},
 			"blockSummons": {
 			"blockSummons": {
 				"me": false,
 				"me": false,
-				"area": true
+				"area": true,
+				"keepTemplateId": []
 			},
 			},
 			"blockSkills": {
 			"blockSkills": {
 				"all": true,
 				"all": true,
@@ -533,7 +539,8 @@
 			},
 			},
 			"blockSummons": {
 			"blockSummons": {
 				"me": true,
 				"me": true,
-				"area": true
+				"area": true,
+				"keepTemplateId": []
 			},
 			},
 			"blockSkills": {
 			"blockSkills": {
 				"all": true,
 				"all": true,

+ 14 - 7
settings/presets/priest.json

@@ -59,7 +59,8 @@
 			},
 			},
 			"blockSummons": {
 			"blockSummons": {
 				"me": false,
 				"me": false,
-				"area": false
+				"area": false,
+				"keepTemplateId": []
 			},
 			},
 			"blockSkills": {
 			"blockSkills": {
 				"all": false,
 				"all": false,
@@ -138,7 +139,8 @@
 			},
 			},
 			"blockSummons": {
 			"blockSummons": {
 				"me": false,
 				"me": false,
-				"area": true
+				"area": true,
+				"keepTemplateId": []
 			},
 			},
 			"blockSkills": {
 			"blockSkills": {
 				"all": false,
 				"all": false,
@@ -217,7 +219,8 @@
 			},
 			},
 			"blockSummons": {
 			"blockSummons": {
 				"me": false,
 				"me": false,
-				"area": true
+				"area": true,
+				"keepTemplateId": []
 			},
 			},
 			"blockSkills": {
 			"blockSkills": {
 				"all": true,
 				"all": true,
@@ -296,7 +299,8 @@
 			},
 			},
 			"blockSummons": {
 			"blockSummons": {
 				"me": false,
 				"me": false,
-				"area": true
+				"area": true,
+				"keepTemplateId": []
 			},
 			},
 			"blockSkills": {
 			"blockSkills": {
 				"all": true,
 				"all": true,
@@ -375,7 +379,8 @@
 			},
 			},
 			"blockSummons": {
 			"blockSummons": {
 				"me": false,
 				"me": false,
-				"area": true
+				"area": true,
+				"keepTemplateId": []
 			},
 			},
 			"blockSkills": {
 			"blockSkills": {
 				"all": false,
 				"all": false,
@@ -454,7 +459,8 @@
 			},
 			},
 			"blockSummons": {
 			"blockSummons": {
 				"me": false,
 				"me": false,
-				"area": true
+				"area": true,
+				"keepTemplateId": []
 			},
 			},
 			"blockSkills": {
 			"blockSkills": {
 				"all": true,
 				"all": true,
@@ -533,7 +539,8 @@
 			},
 			},
 			"blockSummons": {
 			"blockSummons": {
 				"me": true,
 				"me": true,
-				"area": true
+				"area": true,
+				"keepTemplateId": []
 			},
 			},
 			"blockSkills": {
 			"blockSkills": {
 				"all": true,
 				"all": true,