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

slighty change linter, add CCB effects remove, fix throttle

SaltyMonkey лет назад: 6
Родитель
Сommit
64d234f587
4 измененных файлов с 18 добавлено и 11 удалено
  1. 11 6
      .eslintrc.json
  2. 1 0
      lib/helpers/enums.js
  3. 5 4
      lib/unitFps.js
  4. 1 1
      lib/unitState.js

+ 11 - 6
.eslintrc.json

@@ -13,8 +13,12 @@
         "ecmaVersion": 2020
         "ecmaVersion": 2020
     },
     },
     "rules": {
     "rules": {
+        "no-await-in-loop": ["error"],
+        "no-shadow": ["error"],
+        "no-redeclare": ["warn"],
         "arrow-spacing": ["warn"],
         "arrow-spacing": ["warn"],
         "init-declarations": ["error", "always"],
         "init-declarations": ["error", "always"],
+        "no-setter-return": ["warn"],
         "no-duplicate-imports": [
         "no-duplicate-imports": [
             "warn"
             "warn"
         ],
         ],
@@ -77,7 +81,7 @@
             "error"
             "error"
         ],
         ],
         "no-spaced-func": [
         "no-spaced-func": [
-            "error"
+            "warn"
         ],
         ],
         "no-confusing-arrow": [
         "no-confusing-arrow": [
             "error"
             "error"
@@ -108,13 +112,13 @@
             "error"
             "error"
         ],
         ],
         "no-floating-decimal": [
         "no-floating-decimal": [
-            "warn"
+            "error"
         ],
         ],
         "no-multi-spaces": [
         "no-multi-spaces": [
-            "error"
+            "warn"
         ],
         ],
         "guard-for-in": [
         "guard-for-in": [
-            "warn"
+            "error"
         ],
         ],
         "yoda" : [
         "yoda" : [
             "error"
             "error"
@@ -132,7 +136,8 @@
             "warn"
             "warn"
         ],
         ],
         "func-call-spacing": [
         "func-call-spacing": [
-            "error"
-        ]
+            "warn"
+        ],
+        "no-eval": ["error"]
     }
     }
 }
 }

+ 1 - 0
lib/helpers/enums.js

@@ -72,6 +72,7 @@ exports.ABN = Object.freeze(
 		"ShapeChanger": 192,
 		"ShapeChanger": 192,
 		"BigHead": 193,
 		"BigHead": 193,
 		"PostProcessingEffect": 244,
 		"PostProcessingEffect": 244,
+		"CCB": 249,
 		"EPExp": 289,
 		"EPExp": 289,
 		"FX": 322
 		"FX": 322
 	}
 	}

+ 5 - 4
lib/unitFps.js

@@ -224,11 +224,11 @@ class unitFps {
 			(data.activeMode.blockUselessPackets) ? false : undefined
 			(data.activeMode.blockUselessPackets) ? false : undefined
 		);
 		);
 
 
-		const throttlePacketsHandler = (name, code, data) => {
+		const throttlePacketsHandler = (name, code, payload) => {
 			// eslint-disable-next-line no-magic-numbers
 			// eslint-disable-next-line no-magic-numbers
-			let needBlock = (data.activeMode.throttleSomePackets && throttlePacketsData[name] && (Buffer.compare(throttlePacketsData[name], data) === 0));
-			throttlePacketsData[name] = data;
-			return needBlock ? true : undefined;
+			let needBlock = (data.activeMode.throttleSomePackets && throttlePacketsData[name] && (Buffer.compare(throttlePacketsData[name], payload) === 0));
+			throttlePacketsData[name] = payload;
+			return needBlock ? false : undefined;
 		};
 		};
 
 
 		const abnormalsHandler = (event) => {
 		const abnormalsHandler = (event) => {
@@ -363,6 +363,7 @@ class unitFps {
 		// Cleanup hooks for hidden entities
 		// Cleanup hooks for hidden entities
 		//-------------------------------------
 		//-------------------------------------
 		mod.hook(...proto.getData("S_SOCIAL"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
 		mod.hook(...proto.getData("S_SOCIAL"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
+		//mod.hook(...proto.getData("S_SOCIAL_CANCEL"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
 		mod.hook(...proto.getData("S_USER_STATUS"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
 		mod.hook(...proto.getData("S_USER_STATUS"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
 		mod.hook(...proto.getData("S_USER_MOVETYPE"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
 		mod.hook(...proto.getData("S_USER_MOVETYPE"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
 		mod.hook(...proto.getData("S_FEARMOVE_STAGE"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
 		mod.hook(...proto.getData("S_FEARMOVE_STAGE"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);

+ 1 - 1
lib/unitState.js

@@ -24,7 +24,7 @@ const { RAW_HOOK_MODE, HOOK_SETTINGS, ABN, EVENTS } = require("./helpers/enums")
 //types for abnormals to find in client data
 //types for abnormals to find in client data
 const huntingRewards = [ABN.HuntingGoldModifier, ABN.QuestingGoldModifier, ABN.ReputationBoostModifier, ABN.EPExp];
 const huntingRewards = [ABN.HuntingGoldModifier, ABN.QuestingGoldModifier, ABN.ReputationBoostModifier, ABN.EPExp];
 const shapeChangers = [ABN.BigHead, ABN.ShapeChanger];
 const shapeChangers = [ABN.BigHead, ABN.ShapeChanger];
-const onScreenEffects = [ABN.FX, ABN.PostProcessingEffect];
+const onScreenEffects = [ABN.FX, ABN.PostProcessingEffect, ABN.CCB];
 
 
 class unitState extends EventEmitter {
 class unitState extends EventEmitter {
 	/**
 	/**