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

excluded ninja smoke bomb and bahaar fix (thx Risenio)

SaltyMonkey лет назад: 6
Родитель
Сommit
2b0d6efcf1
3 измененных файлов с 31 добавлено и 3 удалено
  1. 22 0
      data/staticData.json
  2. 4 2
      lib/unitFps.js
  3. 5 1
      lib/unitState.js

+ 22 - 0
data/staticData.json

@@ -39,5 +39,27 @@
 		"S_PLAYER_CHANGE_ALL_PROF",
 		"S_F2P_PremiumUser_Permission",
 		"S_WEAK_POINT"
+	],
+	"excludedAbnormals": [
+		90440009,
+		90442106,
+		90442110,
+		90442111,
+		90442112,
+		90442113,
+		90442114,
+		90442400,
+		90442401,
+		90442402,
+		90442403,
+		90442404,
+		90442405,
+		90442406,
+		90442407,
+		90442408,
+		90442502
+	],
+	"excludedProjectiles": [ 
+		90120
 	]
 }

+ 4 - 2
lib/unitFps.js

@@ -182,9 +182,9 @@ class unitFps {
 		};
 
 		const isProjectileBlockable = (event) => {
-			if (event.skill.npc) return false;
-
 			if (data.activeMode.blockProjectiles && data.activeMode.blockProjectiles.players) {
+				if (event.skill.npc || 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))
 					return false;
@@ -212,6 +212,8 @@ class unitFps {
 
 		const isAbnormalBlockable = (event) => {
 			if (data.activeMode.blockBuffs) {
+				if (data.whitelistAbnormals.has(event.id)) return false;
+
 				if (data.activeMode.blockBuffs.area && !isMe(event.target) && tracker.spawnedPlayers.has(event.target)) return true;
 				if (data.activeMode.blockBuffs.shapeChange && data.shapeChangersBuffs.has(event.id)) return true;
 				if (data.activeMode.blockBuffs.effects && data.onScreenEffectsBuffs.has(event.id)) return true;

+ 5 - 1
lib/unitState.js

@@ -52,7 +52,9 @@ class unitState extends EventEmitter {
 			"shapeChangersBuffs": new Set(),
 			"onScreenEffectsBuffs": new Set(),
 			"smtData": new Set(),
-			"specialAs": new Set()
+			"specialAs": new Set(),
+			"whitelistAbnormals": new Set(),
+			"whitelistProjectiles": new Set()
 		});
 
 		deps.mod.game.data.abnormalities.forEach(abnormality => {
@@ -86,6 +88,8 @@ class unitState extends EventEmitter {
 		this.lockedPacketsData = staticData.blockedProto;
 		this.throttlePacketsData = staticData.throttledProto;
 		this.smtData = new Set(...staticData.blockedSmt);
+		this.whitelistAbnormals = new Set(...staticData.excludedAbnormals);
+		this.whitelistProjectiles = new Set(...staticData.excludedProjectiles);
 
 		this.__mod.hook("S_LOGIN", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.FIRST, () => {
 			this.lockedMode = false;