SaltyMonkey лет назад: 6
Родитель
Сommit
4d0573e475
5 измененных файлов с 41 добавлено и 14 удалено
  1. 0 1
      data/staticData.json
  2. 9 8
      fpsManager.js
  3. 13 4
      lib/unitFps.js
  4. 4 0
      lib/unitProto.js
  5. 15 1
      lib/unitState.js

+ 0 - 1
data/staticData.json

@@ -29,7 +29,6 @@
 	"blockedProto": [
 		"S_ITEM_CUSTOM_STRING",
 		"S_PARTY_MEMBER_QUEST_DATA",
-		"S_HIT_COMBO",
 		"S_UNICAST_FLOATING_CASTLE_INFO",
 		"S_UNICAST_FLOATING_CASTLE_NAMEPLATE"
 	],

+ 9 - 8
fpsManager.js

@@ -37,20 +37,21 @@ class FpsManager {
 		/** 
 		* @type {deps}
 		*/
-		let deps = {};
-		
+		let deps = { "mod": mod };
+
 		console.log("DEBUG: FpsManager -> constructor");
-		
+
 		//check compatibility (only warning atm)
-		if (mod.proxyAuthor !== "caali") 
+		if (mod.proxyAuthor !== "caali")
 			mod.error(msg.runtimeWarning);
-		else if(mod.proxyAuthor === "caali" && !mod.clientInterface) 
+		else if (mod.proxyAuthor === "caali" && !mod.clientInterface)
 			mod.error(msg.proxyWarning);
 		// eslint-disable-next-line node/no-missing-require
-		else if(!require("tera-data-parser").types)
+		else if (!require("tera-data-parser").types)
 			mod.error(msg.runtimeOld);
-		
+
 		mod.game.initialize("me");
+
 		units.forEach(unit => {
 			// eslint-disable-next-line no-magic-numbers
 			deps[unit[0]] = new unit[1](deps);
@@ -59,7 +60,7 @@ class FpsManager {
 		//just in case units will need custom destructors, register them
 		this.destructor = () => {
 			Object.keys(deps).forEach(key => {
-				if (typeof deps[key].destructor === "function") { deps[key].destructor(); }
+				if (key !== "mod" && typeof deps[key].destructor === "function") { deps[key].destructor(); }
 			});
 		};
 	}

+ 13 - 4
lib/unitFps.js

@@ -9,7 +9,7 @@
 /**
  * @typedef {import("../fpsManager.js").deps} deps
 */
-
+const assert = require("assert").strict;
 const utils = require("./helpers/utils");
 const { ENTITY_HOOK_TYPE, RAW_HOOK_MODE, HOOK_SETTINGS, DESPAWN_TYPES, EVENTS, HPCHANGE, MPCHANGE } = require("./helpers/enums");
 
@@ -20,6 +20,7 @@ class unitFps {
 	* @memberof unitFps
 	*/
 	constructor(deps) {
+		assert.ok(Object.keys(deps), "unitState: empty deps");
 		const data = deps.data;
 		const mod = deps.mod;
 		const tracker = deps.tracker;
@@ -377,7 +378,7 @@ class unitFps {
 		//---------------------------------------
 		// Combined hooks with complicated logic
 		//---------------------------------------
-		mod.hook(...proto.getData("S_INSTANCE_ARROW"), RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, blockAdditionalSkillEffectsHandler);
+		mod.hook(...proto.getData("S_INSTANCE_ARROW"), HOOK_SETTINGS.LAST, blockAdditionalSkillEffectsHandler);
 		mod.hook(...proto.getData("S_CREATURE_CHANGE_HP"), HOOK_SETTINGS.LAST, creatureChangeHpHandler);
 		mod.hook(...proto.getData("S_PLAYER_CHANGE_MP"), HOOK_SETTINGS.LAST, creatureChangeMpHandler);
 
@@ -391,7 +392,7 @@ class unitFps {
 		mod.hook(...proto.getData("S_ABNORMALITY_END"), HOOK_SETTINGS.LAST, abnormalsHandler);
 		mod.hook(...proto.getData("S_ABNORMALITY_FAIL"), HOOK_SETTINGS.LAST, abnormalsHandler);
 		mod.hook(...proto.getData("S_ABNORMALITY_DAMAGE_ABSORB"), HOOK_SETTINGS.LAST, abnormalsHandler);
-		mod.hook(...proto.getData("S_ABNORMALITY_RESIST"), HOOK_SETTINGS.LAST, abnormalsHandler);
+		//mod.hook(...proto.getData("S_ABNORMALITY_RESIST"), HOOK_SETTINGS.LAST, abnormalsHandler); //TODO: NEED MAP
 
 		mod.hook(...proto.getData("S_SPAWN_PROJECTILE"), HOOK_SETTINGS.LAST, projectileHandler);
 		mod.hook(...proto.getData("S_START_USER_PROJECTILE"), HOOK_SETTINGS.LAST, projectileHandler);
@@ -401,7 +402,7 @@ class unitFps {
 		mod.hook(...proto.getData("S_USER_APPEARANCE_CHANGE"), HOOK_SETTINGS.LAST, appearanceChangeHandler);
 		mod.hook(...proto.getData("S_USER_EXTERNAL_CHANGE"), HOOK_SETTINGS.LAST, appearanceChangeHandler);
 		mod.hook(...proto.getData("S_UNICAST_TRANSFORM_DATA"), HOOK_SETTINGS.LAST, appearanceChangeHandler);
-		mod.hook(...proto.getData("S_USER_CHANGE_FACE_CUSTOM"), HOOK_SETTINGS.LAST, appearanceChangeHandler);
+		//mod.hook(...proto.getData("S_USER_CHANGE_FACE_CUSTOM"), HOOK_SETTINGS.LAST, appearanceChangeHandler); // TODO: NEED MAP
 
 		deps.data.on(EVENTS.RECONFIGURE, () => {
 			console.log("DEBUG: unitFps -> constructor -> reconfigureEvent");
@@ -421,6 +422,8 @@ class unitFps {
 				}
 			}
 			for (const [key, value] of tracker.spawnedDrop.entries()) {
+				assert.ok(Object.keys(value).length > 3, "reconfigure event: wrong object drop");
+
 				let needBlock = isDropBlockable(value);
 				if (needBlock && !blockedDrop.has(key)) {
 					mod.send(...proto.getData("S_DESPAWN_DROPITEM"), { "gameId": value.gameId });
@@ -433,6 +436,8 @@ class unitFps {
 			}
 
 			for (const [key, value] of tracker.spawnedPlayers.entries()) {
+				assert.ok(Object.keys(value).length > 3, "reconfigure event: wrong object players");
+
 				let needBlock = isUserBlockable(value);
 				if (needBlock && !blockedPlayers.has(key)) {
 					mod.send(...proto.getData("S_DESPAWN_USER"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW });
@@ -445,6 +450,8 @@ class unitFps {
 			}
 
 			for (const [key, value] of tracker.spawnedServants.entries()) {
+				assert.ok(Object.keys(value).length > 3, "reconfigure event: wrong object servants");
+
 				let needBlock = isServantBlockable(value);
 				if (needBlock && !blockedServants.has(key)) {
 					mod.send(...proto.getData("S_REQUEST_DESPAWN_SERVANT"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW });
@@ -457,6 +464,7 @@ class unitFps {
 			}
 
 			for (const [key, value] of tracker.spawnedSummons.entries()) {
+				assert.ok(Object.keys(value).length > 3, "reconfigure event: wrong object summons");
 				let needBlock = isSummonsBlockable(value);
 				if (needBlock && !blockedSummons.has(key)) {
 					mod.send(...proto.getData("S_DESPAWN_NPC"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW, "loc": value.loc });
@@ -469,6 +477,7 @@ class unitFps {
 			}
 
 			for (const [key, value] of tracker.spawnedNPCS.entries()) {
+				assert.ok(Object.keys(value).length > 3, "reconfigure event: wrong object NPCS");
 				let needBlock = isSummonsBlockable(value);
 				if (needBlock && !blockedNpcs.has(key)) {
 					mod.send(...proto.getData("S_DESPAWN_NPC"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW, "loc": value.loc });

+ 4 - 0
lib/unitProto.js

@@ -1,6 +1,7 @@
 "use strict";
 
 const proto = require("../data/protoData.json");
+const assert = require("assert").strict;
 /*
 * Unit for Fps Manager. Managing definitions versions for game protocol
 * Author: SaltyMonkey
@@ -21,6 +22,9 @@ class unitProto {
 		this.__mod = deps.mod;
 
 		console.log("DEBUG: unitProto -> constructor");
+		
+		assert.ok(Object.keys(deps), "unitProto: empty deps");
+		assert.ok(Object.keys(proto), "unitProto empty");
 	}
 
 	/**

+ 15 - 1
lib/unitState.js

@@ -9,7 +9,7 @@
 /**
  * @typedef {import("../fpsManager.js").deps} deps
 */
-
+const assert = require("assert").strict;
 //using es5 compatible mode because json not supports es6 types and es6 version is slow ->(require("fast-deep-equal/es6");)
 const equal = require("fast-deep-equal");
 const EventEmitter = require("events").EventEmitter;
@@ -35,6 +35,8 @@ class unitState extends EventEmitter {
 	constructor(deps) {
 		super();
 
+		assert.ok(Object.keys(deps), "unitState: empty deps");
+
 		console.log("DEBUG: unitState -> constructor");
 
 		this.__mod = deps.mod;
@@ -68,11 +70,18 @@ class unitState extends EventEmitter {
 				this.onScreenEffectsBuffs.add(abnormality.id);
 		});
 
+		assert.ok(Array.from(this.huntingRewardsBuffs).length > 0, "unitState: empty huntingRewardsBuffs");
+		assert.ok(Array.from(this.shapeChangersBuffs).length > 0, "unitState: empty shapeChangersBuffs");
+		assert.ok(Array.from(this.onScreenEffectsBuffs).length > 0, "unitState: empty onScreenEffectsBuffs");
+
 		deps.mod.game.data.users.forEach(template => {
 			this.availableClasses.push(template.class);
 			this.userTemplateToClassMap[template] = template.class;
 		});
 
+		assert.ok(this.availableClasses.length > 0, "unitState: empty availableClasses");
+		assert.ok(Object.keys(this.userTemplateToClassMap).length > 0, "unitState: empty userTemplateToClassMap");
+		
 		this.Init();
 	}
 
@@ -83,8 +92,12 @@ class unitState extends EventEmitter {
 			this.presets[x] = utils.loadJson(utils.getFullPath(__dirname, `../settings/presets/${x}.json`));
 		});
 
+		assert.ok(Object.keys(this.presets).length >= 1, "unitState: empty presets");
+
 		let staticData = utils.loadJson(utils.getFullPath(__dirname, "../data/staticData.json"));
 
+		assert.ok(Object.keys(staticData).length > 0, "unitState: empty staticData");
+
 		this.lockedPacketsData = staticData.blockedProto;
 		this.throttlePacketsData = staticData.throttledProto;
 		this.smtData = new Set(...staticData.blockedSmt);
@@ -97,6 +110,7 @@ class unitState extends EventEmitter {
 			if (!this.preset) { throw new Error("Preset can't be loaded! Critical error. "); }
 
 			this.activeMode = this.preset.modes[this.preset.directives["default"]];
+			assert.ok(Object.keys(this.activeMode).length > 0, "unitState: empty activeMode");
 		});
 
 		this.__mod.hook(...this.__proto.getData("S_LOAD_TOPO"), HOOK_SETTINGS.FIRST, (event) => {