Browse Source

More fps & fixes.

• Added missing projectile types for some kind of Arrows.
• Block Actions & Results of blocked projectiles as well.
• Block more abnormalities from others when block abnormalities options are enabled.
• Block seed boxes when fps mode set to 2 or above.
• Fix stuck spawned seed boxes.
• Fix some command invalid messages.
Risenio 5 years ago
parent
commit
a6274bba45
3 changed files with 171 additions and 111 deletions
  1. 1 1
      README.md
  2. 161 108
      lib/index.js
  3. 9 2
      manifest.json

+ 1 - 1
README.md

@@ -30,5 +30,5 @@ In-direct Contributers:
   - [Kasea](https://github.com/Kaseaa)
   - [Caali](https://github.com/caali-hackerman)     - Original Tera-Toolbox (Tera-proxy's fork) developer.
   - [Bernkastel](https://github.com/Bernkastel-0)   - Original idea/ZFPS alternative script.
-  - [Pinkie Pie](https://github.com/pinkipi)        - Original idea/Current maintained fork of Tera-proxy developer.
+  - [Pinkie Pie](https://github.com/pinkipi)        - Original idea/~~Current maintained~~ fork of Tera-proxy developer (No longer maintained).
   - [Meishu](https://github.com/meishuu)            - Original developer of Tera-proxy (No longer maintained).

+ 161 - 108
lib/index.js

@@ -17,6 +17,7 @@ module.exports = function FpsUtils(mod) {
 	// ~~~ * Constants * ~~~ \\
 
 	const Cfg = mod.settings,
+		Cmd = mod.command,
 		NotCP = typeof mod.compileProto !== 'undefined';
 
 	// ~~~ * Variables * ~~~ \\
@@ -31,14 +32,15 @@ module.exports = function FpsUtils(mod) {
 		ProjDebug = false,
 		AbnDebug = false,
 		TmpData = [],
-		PMembers = [],
+		PMembers = new Set(),
+		BProjectiles = new Set(),
 		SUsers = {},
 		HUsers = {},
 		SNpcs = {},
 		HNpcs = {},
 		SPets = {},
 		HPets = {},
-		HSeedBoxes = {};
+		HSeedBoxes = new Set();
 
 	// ~~~ * Gui Parser * ~~~ \\
 
@@ -52,7 +54,7 @@ module.exports = function FpsUtils(mod) {
 		mod.hook('C_ADMIN', 1, LastHookfn, (event) => {
 			const commands = event.command.split(";");
 			for (const cmd of commands)
-				try { mod.command.exec(cmd); } catch (err) { continue; } // In case it errored out; prevent cAdmin from being sent to server.
+				try { Cmd.exec(cmd); } catch (err) { continue; }
 			return false;
 		});
 	}
@@ -338,7 +340,7 @@ module.exports = function FpsUtils(mod) {
 
 	function Msg(msg) {
 		if (Cfg.StreamMode) return;
-		mod.command.message(`<font color="${LPrC}">${NotCP ? '[FPS] ' : ''}${msg}</font>`);
+		Cmd.message(`<font color="${LPrC}">${NotCP ? '[FPS] ' : ''}${msg}</font>`);
 	}
 
 	function RemoveEntity(arr, elem) {
@@ -396,8 +398,8 @@ module.exports = function FpsUtils(mod) {
 			case 'pet':
 				for (const sPet in SPets) {
 					if (EqGid(SPets[sPet].ownerId) && whose === 'own') {
-						UpdateNpcLoc(SPets[sPet], -100);
-						ScaleUpEntity(SPets[sPet].gameId, 0.001);
+						UpdateNpcLoc(SPets[sPet], -1E2);
+						ScaleUpEntity(SPets[sPet].gameId, 1E-3);
 					}
 					if (!EqGid(SPets[sPet].ownerId) && whose === 'others')
 						mod.toClient('S_REQUEST_DESPAWN_SERVANT', 1, { gameId: SPets[sPet].gameId, despawnType: 1 });
@@ -484,7 +486,7 @@ module.exports = function FpsUtils(mod) {
 		let modified = undefined;
 
 		if (Cfg.ShowStyle) {
-			event.weapon = StarterWeaponIds[event.templateId % 100 - 1];
+			event.weapon = StarterWeaponIds[event.templateId % 1E2 - 1];
 			event.body = event.hand = event.feet = event.underwear = event.head = event.face = 0;
 			if (event.mount) event.mount = MountToReplaceId;
 			event.title = 0;
@@ -527,6 +529,8 @@ module.exports = function FpsUtils(mod) {
 		}
 
 		if (!end) {
+			if (typeof event.target === 'undefined') event.target = event.gameId
+
 			if (EqGid(event.target)) {
 				if (Cfg.HideOwnBlacklistedAbns && Cfg.OwnAbnormalsBlacklist.indexOf(event.id) !== -1) return false;
 
@@ -555,22 +559,27 @@ module.exports = function FpsUtils(mod) {
 			hidden = true;
 		}
 
+		if (BProjectiles.has(event.id) && (Cfg.Mode >= 2 || Cfg.HideAllProjectiles)) hidden = true;
+
 		return !end && hidden ? false : undefined;
 	}
 
 	function ProjectileBCheck(event) {
-		let blocked = false;
+		if (typeof event.id === 'undefined') event.id = event.actionId
 
-		if (event.skill.id === SmokeBombId || (Cfg.PvpTraps && TrapsIds.includes(event.skill.id))) return undefined;
+		if (typeof event.skill !== 'undefined') {
+			if (event.skill.id === SmokeBombId || (Cfg.PvpTraps && TrapsIds.includes(event.skill.id))) return undefined;
+			if ((Cfg.HideBlacklistedProjectiles || Cfg.HideAllProjectiles) && Cfg.ProjectilesBlacklist.includes(event.skill.id)) BProjectiles.add(event.id);
+		}
 
-		if ((Cfg.HideBlacklistedProjectiles || Cfg.HideAllProjectiles) && Cfg.ProjectilesBlacklist.includes(event.skill.id)) blocked = true;
-		if (!EqGid(event.gameId) && SUsers[event.gameId] && (HUsers[event.gameId] || Cfg.Mode >= 2 || Cfg.HideAllProjectiles)) blocked = true;
+		if (typeof event.gameId !== 'undefined')
+			if (!EqGid(event.gameId) && SUsers[event.gameId] && (HUsers[event.gameId] || Cfg.Mode >= 2 || Cfg.HideAllProjectiles)) BProjectiles.add(event.id);
 
-		return blocked ? false : undefined;
+		return BProjectiles.has(event.id) ? false : undefined;
 	}
 
 	function ModifySkillResult(event) {
-		let modified = undefined;
+		let returnValue = undefined;
 
 		if (Cfg.Hit_Me && (EqGid(event.source) || EqGid(event.owner))) {
 			event.templateId = 0;
@@ -579,7 +588,7 @@ module.exports = function FpsUtils(mod) {
 			event.crit = event.stackExplode = event.superArmor = false;
 			event.superArmorId = event.hitCylinderId = 0;
 
-			modified = true;
+			returnValue = true;
 		}
 
 		if (Cfg.Hit_Other && !EqGid(event.target) && !EqGid(event.source) && !EqGid(event.owner) && (SUsers[event.owner] || SUsers[event.source])) {
@@ -589,13 +598,13 @@ module.exports = function FpsUtils(mod) {
 			event.crit = event.stackExplode = event.superArmor = false;
 			event.superArmorId = event.hitCylinderId = 0;
 
-			modified = true;
+			returnValue = true;
 		}
 
 		if (Cfg.Hit_Damage && (EqGid(event.source) || EqGid(event.owner) || EqGid(event.target) || UserNpcs.includes(event.templateId) && event.skill.huntingZoneId === UserNpcsHzId)) {
 			event.value = 0n;
 
-			modified = true;
+			returnValue = true;
 		}
 
 		if (Cfg.Hit_All) {
@@ -606,10 +615,12 @@ module.exports = function FpsUtils(mod) {
 			event.crit = event.stackExplode = event.superArmor = false;
 			event.superArmorId = event.hitCylinderId = 0;
 
-			modified = true;
+			returnValue = true;
 		}
 
-		return modified;
+		if (BProjectiles.has(event.id) && (Cfg.Mode >= 2 || Cfg.HideAllProjectiles)) returnValue = false;
+
+		return returnValue;
 	}
 
 	const UserBCheck = user => { for (const plBlist of Cfg.PlayersBlacklist) if (plBlist.toLowerCase() === user.toLowerCase()) return true; };
@@ -662,7 +673,7 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function ClassID(m) {
-		return (m % 100);
+		return (m % 1E2);
 	}
 
 	function log(name, type, from, target, id) {
@@ -686,6 +697,9 @@ module.exports = function FpsUtils(mod) {
 		MyName = event.name;
 		ProjDebug = false;
 		AbnDebug = false;
+		PMembers.clear();
+		BProjectiles.clear();
+		HSeedBoxes.clear();
 		if (Cfg.StreamMode) console.log("\x1b[94mINFO\x1b[34m [FPS-UTILS]\x1b[39m - Steam Mode is enabled, No messages will be sent in-game messages until its disabled.");
 	}
 
@@ -705,21 +719,6 @@ module.exports = function FpsUtils(mod) {
 		}
 	}
 
-	function sLeaveParty() {
-		if (Cfg.OnlyParty)
-			for (const sUser in SUsers)
-				if (PMembers.includes(SUsers[sUser].name)) HideSpecificPlayerByName(SUsers[sUser].name);
-		PMembers = [];
-		if (Cfg.RaidAutoChange) {
-			if (LastFState === null || Cfg.Mode !== 2) {
-				LastFState = null;
-				return;
-			}
-			mod.command.exec(`fps mode ${LastFState}`);
-			LastFState = null;
-		}
-	}
-
 	function sMountVehicle(event) {
 		if (EqGid(event.gameId)) return;
 		SUsers[event.gameId].mount = event.id;
@@ -789,7 +788,7 @@ module.exports = function FpsUtils(mod) {
 	function sSpawnUser(event) {
 		SUsers[event.gameId] = event;
 		SUsers[event.gameId].spawnFx = 1;
-		if (Cfg.Mode === 3 || UserBCheck(event.name) || Cfg.ClassesData[ClassID(event.templateId)].isHidden || (Cfg.OnlyParty && !PMembers.includes(event.name))) {
+		if (Cfg.Mode === 3 || UserBCheck(event.name) || Cfg.ClassesData[ClassID(event.templateId)].isHidden || (Cfg.OnlyParty && !PMembers.has(event.name))) {
 			HUsers[event.gameId] = event;
 			HUsers[event.gameId].spawnFx = 1;
 			return false;
@@ -839,29 +838,6 @@ module.exports = function FpsUtils(mod) {
 		}
 	}
 
-	function sPartyMemberList(event) {
-		event.members.map(value => PMembers.push(value.name));
-		if (Cfg.OnlyParty)
-			for (const sUser in SUsers) {
-				if (!PMembers.includes(SUsers[sUser].name)) HideSpecificPlayerByName(SUsers[sUser].name);
-				else if (HUsers[SUsers[sUser].gameId]) ShowSpecificPlayerByName(SUsers[sUser].name);
-			}
-		if (Cfg.RaidAutoChange) {
-			if (event.raid) {
-				if (Cfg.Mode >= 2 || (LastFState === null && Cfg.Mode === 2)) return;
-				LastFState = Cfg.Mode;
-				mod.command.exec("fps state 2");
-			} else {
-				if (LastFState === null || Cfg.Mode !== 2) {
-					LastFState = null;
-					return;
-				}
-				mod.command.exec(`fps state ${LastFState}`);
-				LastFState = null;
-			}
-		}
-	}
-
 	function sUserAppearanceChange(event) {
 		if (EqGid(event.id)) return;
 		if (Cfg.ShowStyle) return false;
@@ -902,6 +878,48 @@ module.exports = function FpsUtils(mod) {
 		return modified;
 	}
 
+	function sPartyMemberList(event) {
+		event.members.map(value => { PMembers.add(value.name) });
+		if (Cfg.OnlyParty)
+			for (const sUser in SUsers) {
+				if (!PMembers.has(SUsers[sUser].name)) HideSpecificPlayerByName(SUsers[sUser].name);
+				else if (HUsers[SUsers[sUser].gameId]) ShowSpecificPlayerByName(SUsers[sUser].name);
+			}
+		if (Cfg.RaidAutoChange) {
+			if (event.raid) {
+				if (Cfg.Mode >= 2 || (LastFState === null && Cfg.Mode === 2)) return;
+				LastFState = Cfg.Mode;
+				Cmd.exec("fps state 2");
+			} else {
+				if (LastFState === null || Cfg.Mode !== 2) {
+					LastFState = null;
+					return;
+				}
+				Cmd.exec(`fps state ${LastFState}`);
+				LastFState = null;
+			}
+		}
+	}
+
+	function sLeavePartyMember(event) {
+		PMembers.delete(event.name)
+	}
+
+	function sLeaveParty() {
+		if (Cfg.OnlyParty)
+			for (const sUser in SUsers)
+				if (PMembers.has(SUsers[sUser].name)) HideSpecificPlayerByName(SUsers[sUser].name);
+		PMembers.clear();
+		if (Cfg.RaidAutoChange) {
+			if (LastFState === null || Cfg.Mode !== 2) {
+				LastFState = null;
+				return;
+			}
+			Cmd.exec(`fps mode ${LastFState}`);
+			LastFState = null;
+		}
+	}
+
 	function sSpawnNpc(event) {
 		SNpcs[event.gameId] = event;
 		SNpcs[event.gameId].spawnType = 1;
@@ -970,8 +988,8 @@ module.exports = function FpsUtils(mod) {
 		if (EqGid(event.ownerId) && Cfg.HideMyServants) {
 			HPets[event.gameId] = event;
 			process.nextTick(() => {
-				UpdateNpcLoc(event, -100);
-				ScaleUpEntity(event.gameId, 0.001);
+				UpdateNpcLoc(event, -1E2);
+				ScaleUpEntity(event.gameId, 1E-3);
 			});
 		} else if (!EqGid(event.ownerId) && Cfg.HideOthersServants) {
 			HPets[event.gameId] = event;
@@ -1003,6 +1021,18 @@ module.exports = function FpsUtils(mod) {
 		return ModifyAbnormalities(event);
 	}
 
+	function sAbnormalityResist(event) {
+		return ModifyAbnormalities(event);
+	}
+
+	function sAbnormalityDamageAbsorb(event) {
+		return ModifyAbnormalities(event);
+	}
+
+	function sAbnormalityFail(event) {
+		return ModifyAbnormalities(event);
+	}
+
 	function sAbnormalityEnd(event) {
 		return ModifyAbnormalities(event, true);
 	}
@@ -1015,11 +1045,7 @@ module.exports = function FpsUtils(mod) {
 		return ActionHCheck(event, true);
 	}
 
-	function sStartUserProjectile(event) {
-		if (ProjDebug) {
-			if (EqGid(event.gameId)) log('Projectile', 'Started', 'from', MyName, event.skill.id);
-			if (SUsers[event.gameId]) log('Projectile', 'Started', 'from', SUsers[event.gameId].name, event.skill.id);
-		}
+	function sInstanceArrow(event) {
 		return ProjectileBCheck(event);
 	}
 
@@ -1032,6 +1058,26 @@ module.exports = function FpsUtils(mod) {
 		return ProjectileBCheck(event);
 	}
 
+	function sStartUserProjectile(event) {
+		if (ProjDebug) {
+			if (EqGid(event.gameId)) log('Projectile', 'Started', 'from', MyName, event.skill.id);
+			if (SUsers[event.gameId]) log('Projectile', 'Started', 'from', SUsers[event.gameId].name, event.skill.id);
+		}
+		return ProjectileBCheck(event);
+	}
+
+	/*function sChangeDestposProjectile(event) {
+		return ProjectileBCheck(event);
+	}*/
+
+	function sEndUserProjectile(event) {
+		BProjectiles.delete(event.id);
+	}
+
+	function sDespawnProjectile(event) {
+		BProjectiles.delete(event.id);
+	}
+
 	function sPlayerChangeMp(event) {
 		if (!Cfg.HideMpNumbers || !EqGid(event.target)) return;
 		if (event.type !== 0) {
@@ -1076,32 +1122,29 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function sSpawnEventSeed(event) {
-		if (HUsers[event.owner]) {
-			HSeedBoxes[event.gameId] = event;
+		if (HUsers[event.owner] || Cfg.Mode >= 2) {
+			HSeedBoxes.add(event.gameId);
 			return false;
 		}
 	}
 
 	function sUpdateEventSeedState(event) {
-		if (HSeedBoxes[event.gameId]) return false;
+		if (HSeedBoxes.has(event.gameId)) return false;
 	}
 
 	function sResultEventSeed(event) {
-		if (HSeedBoxes[event.gameId]) return false;
+		if (HSeedBoxes.has(event.gameId)) return false;
 	}
 
 	function sDespawnEventSeed(event) {
-		if (HSeedBoxes[event.gameId]) {
-			delete HSeedBoxes[event.gameId];
-			return false;
-		}
+		HSeedBoxes.delete(event.gameId);
 	}
 
 	function sFieldEventOnEnter() {
 		if (Cfg.GuardianAutoChange) {
 			if ((LastGState !== null && Cfg.Mode === 2) || Cfg.Mode >= 2) return;
 			LastGState = Cfg.Mode;
-			mod.command.exec("fps state 2");
+			Cmd.exec("fps state 2");
 		}
 	}
 
@@ -1111,7 +1154,7 @@ module.exports = function FpsUtils(mod) {
 				LastGState = null;
 				return;
 			}
-			mod.command.exec(`fps state ${LastGState}`);
+			Cmd.exec(`fps state ${LastGState}`);
 			LastGState = null;
 		}
 	}
@@ -1120,7 +1163,6 @@ module.exports = function FpsUtils(mod) {
 
 	mod.hook('S_LOGIN', 14, sLogin)
 	mod.hook('S_LOAD_TOPO', 'raw', sLoadTopo)
-	mod.hook('S_LEAVE_PARTY', 'raw', sLeaveParty)
 	mod.hook('S_MOUNT_VEHICLE', 2, LastHook, sMountVehicle)
 	mod.hook('S_UNMOUNT_VEHICLE', 2, LastHook, sUnmountVehicle)
 	mod.hook('C_SET_VISIBLE_RANGE', 1, cSetVisibleRange)
@@ -1143,12 +1185,15 @@ module.exports = function FpsUtils(mod) {
 	mod.hook('S_USER_STATUS', 4, LastHook, sUserStatus)
 	mod.hook('S_DEAD_LOCATION', 2, sDeadLocation)
 	mod.hook('S_USER_MOVETYPE', 1, LastHook, sUserMovetype)
-	mod.hook('S_PARTY_MEMBER_LIST', 9, sPartyMemberList)
 	mod.hook('S_USER_APPEARANCE_CHANGE', 1, LastHook, sUserAppearanceChange)
 	mod.hook('S_USER_CHANGE_FACE_CUSTOM', 2, LastHook, sUserChangeFaceCustom)
 	mod.hook('S_USER_EXTERNAL_CHANGE', 7, LastHook, sUserExternalChange)
 	mod.hook('S_UNICAST_TRANSFORM_DATA', 6, LastHook, sUnicastTransformData)
 
+	mod.hook('S_PARTY_MEMBER_LIST', 9, sPartyMemberList)
+	mod.hook('S_LEAVE_PARTY_MEMBER', 2, sLeavePartyMember)
+	mod.hook('S_LEAVE_PARTY', 'raw', sLeaveParty)
+
 	mod.hook('S_SPAWN_NPC', 12, LastHook, sSpawnNpc)
 	mod.hook('S_DESPAWN_NPC', 3, LastHook, sDespawnNpc)
 	mod.hook('S_NPC_LOCATION', 3, LastHook, sNpcLocation)
@@ -1158,52 +1203,60 @@ module.exports = function FpsUtils(mod) {
 	mod.hook('S_FEARMOVE_END', 2, LastHook, sFearMoveEnd)
 
 	mod.hook('S_REQUEST_SPAWN_SERVANT', 4, LastHook, sRequestSpawnServant)
-	mod.hook('S_REQUEST_DESPAWN_SERVANT', 1, LastHook, sRequestDespawnServant)
+	mod.hook('S_REQUEST_DESPAWN_SERVANT', 1, sRequestDespawnServant)
 	mod.hook('S_QUEST_BALLOON', 1, LastHook, sQuestBalloon)
 
 	mod.hook('S_ABNORMALITY_BEGIN', 5, LastHookfn, sAbnormalityBegin)
 	mod.hook('S_ABNORMALITY_REFRESH', 2, LastHookfn, sAbnormalityRefresh)
+	mod.hook('S_ABNORMALITY_RESIST', 1, LastHookfn, sAbnormalityResist)
+	mod.hook('S_ABNORMALITY_DAMAGE_ABSORB', 1, LastHookfn, sAbnormalityDamageAbsorb)
+	mod.hook('S_ABNORMALITY_FAIL', 2, LastHookfn, sAbnormalityFail)
 	mod.hook('S_ABNORMALITY_END', 1, LastHookfn, sAbnormalityEnd)
 
 	mod.hook('S_ACTION_STAGE', 9, LastHook, sActionStage)
 	mod.hook('S_ACTION_END', 5, LastHook, sActionEnd)
+	mod.hook('S_INSTANCE_ARROW', 4, LastHook, sInstanceArrow)
 	mod.hook('S_SPAWN_PROJECTILE', 6, LastHook, sSpawnProjectile)
 	mod.hook('S_START_USER_PROJECTILE', 9, LastHook, sStartUserProjectile)
+	//mod.hook('S_CHANGE_DESTPOS_PROJECTILE', 1, LastHook, sChangeDestposProjectile) //! Awaiting public def !\\
+	mod.hook('S_END_USER_PROJECTILE', 4, sEndUserProjectile)
+	mod.hook('S_DESPAWN_PROJECTILE', 2, sDespawnProjectile)
+
 	mod.hook('S_PLAYER_CHANGE_MP', 1, LastHook, sPlayerChangeMp)
 	mod.hook('S_CREATURE_CHANGE_HP', 6, LastHook, sCreatureChangeHp)
-	mod.hook('S_ITEM_EXPLOSION_RESULT', 2, LastHook, sItemExplosionResult)
 	mod.hook('S_EACH_SKILL_RESULT', 14, LastHook, sEachSkillResult)
+	mod.hook('S_ITEM_EXPLOSION_RESULT', 2, LastHook, sItemExplosionResult)
 	mod.hook('S_SPAWN_DROPITEM', 9, LastHook, sSpawnDropItem)
 	mod.hook('S_FONT_SWAP_INFO', 'raw', LastHookfn, sFontSwapInfo)
 
-	mod.hook('S_SPAWN_EVENT_SEED', 2, LastHookfn, sSpawnEventSeed)
-	mod.hook('S_UPDATE_EVENT_SEED_STATE', 4, LastHookfn, sUpdateEventSeedState)
-	mod.hook('S_RESULT_EVENT_SEED', 2, LastHookfn, sResultEventSeed)
-	mod.hook('S_DESPAWN_EVENT_SEED', 1, LastHookfn, sDespawnEventSeed)
+	mod.hook('S_SPAWN_EVENT_SEED', 2, LastHook, sSpawnEventSeed)
+	mod.hook('S_UPDATE_EVENT_SEED_STATE', 4, LastHook, sUpdateEventSeedState)
+	mod.hook('S_RESULT_EVENT_SEED', 2, LastHook, sResultEventSeed)
+	mod.hook('S_DESPAWN_EVENT_SEED', 1, sDespawnEventSeed)
 
 	mod.hook('S_FIELD_EVENT_ON_ENTER', 'raw', sFieldEventOnEnter)
 	mod.hook('S_FIELD_EVENT_ON_LEAVE', 'raw', sFieldEventOnLeave)
 
 	// ~~~ * Commands * ~~~ \\
 
-	mod.command.add('0', () => mod.command.exec('fps mode 0'));
-	mod.command.add('1', () => mod.command.exec('fps mode 1'));
-	mod.command.add('2', () => mod.command.exec('fps mode 2'));
-	mod.command.add('3', () => mod.command.exec('fps mode 3'));
+	Cmd.add('0', () => Cmd.exec('fps mode 0'));
+	Cmd.add('1', () => Cmd.exec('fps mode 1'));
+	Cmd.add('2', () => Cmd.exec('fps mode 2'));
+	Cmd.add('3', () => Cmd.exec('fps mode 3'));
 
-	mod.command.add(['fps', '!fps', 'fps-utils', '!fps-utils'], (key, arg, arg2, arg3) => {
+	Cmd.add(['fps', '!fps', 'fps-utils', '!fps-utils'], (key, arg, arg2, arg3) => {
 		key = key ? key.toLowerCase() : key;
 		arg = arg ? arg.toLowerCase() : arg;
 		arg2 = arg2 ? arg2.toLowerCase() : arg2;
 		arg3 = arg3 ? arg3.toLowerCase() : arg3;
 		switch (key) {
-			case "b": mod.command.exec('fps skills blacklist'); break;
-			case "p": mod.command.exec('fps party'); break;
+			case "b": Cmd.exec('fps skills blacklist'); break;
+			case "p": Cmd.exec('fps party'); break;
 			case "g": case "gui": GuiHandler(arg, arg2); break;
-			case "0": mod.command.exec('fps mode 0'); break;
-			case "1": mod.command.exec('fps mode 1'); break;
-			case "2": mod.command.exec('fps mode 2'); break;
-			case "3": mod.command.exec('fps mode 3'); break;
+			case "0": Cmd.exec('fps mode 0'); break;
+			case "1": Cmd.exec('fps mode 1'); break;
+			case "2": Cmd.exec('fps mode 2'); break;
+			case "3": Cmd.exec('fps mode 3'); break;
 			case "m": case "mod": case "mode": case "state":
 				switch (arg) {
 					case "0": case "off": case "zero":
@@ -1240,7 +1293,7 @@ module.exports = function FpsUtils(mod) {
 						Msg(`<font color="${GldC}">Mode 3</font>.`);
 						break;
 					default:
-						Msg(`<font color="${GryC}">Invalid" ${arg}"</font>.`);
+						Msg(`<font color="${GryC}">Invalid arg: '${arg}'</font>.`);
 						Msg(`Modes: "<font color="${PnkC}">[0, 1, 2, 3]</font>.`);
 						break;
 				}
@@ -1266,7 +1319,7 @@ module.exports = function FpsUtils(mod) {
 					Msg(`Player '${arg}' <font color="${GrnC}">Hidden</font>.`);
 					Cfg.PlayersBlacklist.push(arg);
 					HideSpecificPlayerByName(arg);
-				} else Msg(`<font color="${GryC}">Invalid ${arg2}</font>.`);
+				} else Msg(`<font color="${GryC}">Invalid arg: '${arg2}'</font>.`);
 				break;
 			case "show":
 				if (typeof arg === "string" && arg !== null) {
@@ -1289,16 +1342,16 @@ module.exports = function FpsUtils(mod) {
 						Msg(`Class '${arg}' <font color="${RedC}">Shown</font>.`);
 					} else if (!Cfg.ClassesBlacklist.includes(arg) || !Cfg.RolesBlacklist.includes(arg)) Msg(`Class/Role '${arg}' <font color="${RedC}">Already shown</font>.`);
 					else if (!Cfg.PlayersBlacklist.includes(arg)) Msg(`Player '${arg}' <font color="${RedC}">Already shown</font>.`);
-					else Msg(`<font color="${GryC}">Invalid ${arg2}</font>.`);
+					else Msg(`<font color="${GryC}">Invalid arg: '${arg2}'</font>.`);
 				}
 				break;
 			case "party":
 				if (Cfg.Mode === 3) return Msg(`<font color="${RedC}">You've to disable mode 3 first</font>.`);
-				//if(!PMembers.length) return Msg(`<font color="${GryC}">You must be in party in-order to enable this</font>.`);
+				//if(!PMembers.size) return Msg(`<font color="${GryC}">You must be in party in-order to enable this</font>.`);
 				Cfg.OnlyParty = !Cfg.OnlyParty;
 				if (Cfg.OnlyParty) {
 					for (const sUser in SUsers) {
-						if (!PMembers.includes(SUsers[sUser].name)) HideSpecificPlayerByName(SUsers[sUser].name);
+						if (!PMembers.has(SUsers[sUser].name)) HideSpecificPlayerByName(SUsers[sUser].name);
 						else if (HUsers[SUsers[sUser].gameId]) ShowSpecificPlayerByName(SUsers[sUser].name);
 					}
 				} else ShowAllPlayers();
@@ -1418,7 +1471,7 @@ module.exports = function FpsUtils(mod) {
 						Msg(`Hit all ${Cfg.Hit_All ? `<font color="${GrnC}">Hidden</font>` : `<font color="${RedC}">Shown</font>`}.`);
 						break;
 					default:
-						Msg(`<font color="${GryC}">Invalid &#40;hit&#41; '${arg}'</font>.`);
+						Msg(`<font color="${GryC}">Invalid hit arg: '${arg}'</font>.`);
 						break;
 				}
 				break;
@@ -1456,7 +1509,7 @@ module.exports = function FpsUtils(mod) {
 										return;
 									}
 								}
-							} else return Msg(`<font color="${GryC}">Invalid &#40;abnormalities Blacklist&#41; '${arg}'</font>.`);
+							} else return Msg(`<font color="${GryC}">Invalid abnormalities Blacklist arg: '${arg}'</font>.`);
 						}
 						break;
 					case "log":
@@ -1466,7 +1519,7 @@ module.exports = function FpsUtils(mod) {
 						else Msg(`Abnormalities debug <font color="${RedC}">stopped</font>.`);
 						break;
 					default:
-						Msg(`<font color="${GryC}">Invalid &#40;abnormalities&#41; '${arg}'</font>.`);
+						Msg(`<font color="${GryC}">Invalid abnormalities arg: '${arg}'</font>.`);
 						break;
 				}
 				break;
@@ -1517,7 +1570,7 @@ module.exports = function FpsUtils(mod) {
 										return;
 									}
 								}
-							} else return Msg(`<font color="${GryC}">Invalid &#40;projectile Blacklist&#41; '${arg}'</font>.`);
+							} else return Msg(`<font color="${GryC}">Invalid projectile Blacklist arg: '${arg}'</font>.`);
 						}
 						break;
 					case "log": case "debug":
@@ -1526,7 +1579,7 @@ module.exports = function FpsUtils(mod) {
 						else Msg(`Projectile debug <font color="${RedC}">stopped</font>.`);
 						break;
 					default:
-						Msg(`<font color="${GryC}">Invalid &#40;projectile&#41; '${arg}'</font>.`);
+						Msg(`<font color="${GryC}">Invalid projectile arg: '${arg}'</font>.`);
 						break;
 				}
 				break;
@@ -1563,7 +1616,7 @@ module.exports = function FpsUtils(mod) {
 						mod.toServer('C_RESET_ALL_DUNGEON', 1);
 						break;
 					default:
-						Msg(`<font color="${GryC}">Invalid &#40;quicklink&#41; '${arg}'</font>.`);
+						Msg(`<font color="${GryC}">Invalid quicklink '${arg}'</font>.`);
 						break;
 				}
 				break;
@@ -1652,12 +1705,12 @@ module.exports = function FpsUtils(mod) {
 				else console.log("\x1b[94mINFO\x1b[34m [FPS-UTILS]\x1b[39m - Steam Mode has been disabled.");
 				break;
 			case "help": case "h":
-				mod.command.exec("fps gui help");
+				Cmd.exec("fps gui help");
 				break;
 			default:
 				//Msg(`<font color="${RedC}">Unknown command, check command list</font>.`);
-				//mod.command.exec("fps gui help");
-				mod.command.exec("fps gui");
+				//Cmd.exec("fps gui help");
+				Cmd.exec("fps gui");
 				break;
 		}
 		if (!NotCP && typeof Cfg.ClassesData["12"] === 'undefined') mod.saveSettings();

+ 9 - 2
manifest.json

@@ -1,12 +1,12 @@
 {
     "files": {
-        "README.md": "2d76c64d0955d36bac7d529543fd3d932cdee23f8c768b104d4c6544b1bf5a86",
+        "README.md": "0badc4f6743b12946865dcb1f5c2ef77839ab507ab29a273ee6d3087f2624996",
         "lib/data/abnormalities.json": "54727de2123584eb0ff38ffca5e86601e3faf05e8dc3379c9a0fd6e5ede1ca0c",
         "lib/data/miscData.json": "4f36b0f6c847ddde5a1a35acf944f700f3e47e39ca23e58cbf06233af67ad251",
         "lib/data/npcData.json": "bcd1876e4266f71299a298221b2594e45bf87f143f276a62c60dd8a35b75acd7",
         "lib/data/skillString.json": "90f7cf9e29f0c143ffe4650bebe85c097371507a23c9fd2a0ab6c877d5451e58",
         "lib/data/userSpawns.json": "50fa11179c14e3d5ff0f92d73f62f968331258e85e534102cde03dd6ad977463",
-        "lib/index.js": "03e56c9d3e0e8e66359cca7559f980d70599a1f79261d5d56e4c943c6096998a",
+        "lib/index.js": "26006a4d5c9efb940063082538993828a66a95156dfc5bad838ba89854730395",
         "lib/setting_migration.js": "1821fbb5ed37672bd9a8daa54f8ab392e35aa6c38b1602c560865b3bf6a7c6a2",
         "module.json": "c23d04a44a1ccdca2b8fc03f547a9b44fa08527f8ad73bc81c8dec042f9b4dcf",
         "package.json": "dd0e950e7b5b537ff09d5f7772373d2b1d7a13840868d4b5981e46d8ba25d1b9"
@@ -21,8 +21,11 @@
         "C_RETURN_TO_LOBBY": 1,
         "C_SET_VISIBLE_RANGE": 1,
         "S_ABNORMALITY_BEGIN": 5,
+        "S_ABNORMALITY_DAMAGE_ABSORB": 1,
         "S_ABNORMALITY_END": 1,
+        "S_ABNORMALITY_FAIL": 2,
         "S_ABNORMALITY_REFRESH": 2,
+        "S_ABNORMALITY_RESIST": 1,
         "S_ABNORMALITY_SCALE_UP": 2,
         "S_ACTION_END": 5,
         "S_ACTION_STAGE": 9,
@@ -35,8 +38,10 @@
         "S_DESPAWN_DROPITEM": 4,
         "S_DESPAWN_EVENT_SEED": 1,
         "S_DESPAWN_NPC": 3,
+        "S_DESPAWN_PROJECTILE": 2,
         "S_DESPAWN_USER": 3,
         "S_EACH_SKILL_RESULT": 14,
+        "S_END_USER_PROJECTILE": 4,
         "S_EXIT": 3,
         "S_FEARMOVE_END": 2,
         "S_FEARMOVE_STAGE": 2,
@@ -45,9 +50,11 @@
         "S_FONT_SWAP_INFO": "raw",
         "S_GUILD_NAME": 2,
         "S_IMAGE_DATA": "raw",
+        "S_INSTANCE_ARROW": 4,
         "S_ITEM_CUSTOM_STRING": 2,
         "S_ITEM_EXPLOSION_RESULT": 2,
         "S_LEAVE_PARTY": "raw",
+        "S_LEAVE_PARTY_MEMBER": 2,
         "S_LOADING_SCREEN_CONTROL_INFO": "raw",
         "S_LOAD_TOPO": "raw",
         "S_LOGIN": 14,