Dmitry S лет назад: 4
Родитель
Сommit
e6447a6915
9 измененных файлов с 165 добавлено и 302 удалено
  1. 3 0
      .gitignore
  2. 8 8
      README.md
  3. 1 1
      lib/data/miscData.json
  4. 0 0
      lib/data/skillString.json
  5. 1 1
      lib/data/userSpawns.json
  6. 125 184
      lib/index.js
  7. 12 88
      manifest.json
  8. 15 18
      module.json
  9. 0 2
      package.json

+ 3 - 0
.gitignore

@@ -0,0 +1,3 @@
+.eslintrc.json
+manifest-generator.bat
+manifest-generator.js

+ 8 - 8
README.md

@@ -4,10 +4,10 @@
 ## How to use.
   * Put the script folder "fps-utils" into the `mods` folder.
   * Log the game using the proxy.
-  * Get access to the built-in GUI via typing `/!fps g` into the chat.
+  * To get access to the built-in GUI type `/!fps g` into the chat.
 
 ## Capability.
-  * Should work on any proxy. ([Tera-Proxy](https://github.com/tera-proxy/tera-proxy) & [Tera-Toolbox](https://github.com/tera-toolbox/tera-toolbox), *as long as its up-to-date*)
+  * Should work on any proxy. (Tera-Proxy & Tera-Toolbox, *as long as they're up-to-date*)
   * No dependencies.
 
 ## List of commands can be found in [this Wiki](https://github.com/Risenio/fps-utils/wiki/Commands).
@@ -18,17 +18,17 @@
 ## Credits
 Direct Contributers:
   - [Saegusae](https://github.com/Saegusae)         - [Original developer](https://github.com/Saegusae/fps-utils) (No longer maintained).
-  - [Pentagon](https://github.com/codeagon)         - [Fps-utils's fork](https://github.com/codeagon/fps-utils) (No longer maintained).
+  - [Pentagon](https://github.com/codeagon)         - ~~Most current maintained~~ [fork of Fps-utils](https://github.com/codeagon/fps-utils) (No longer maintained).
   - [SerenTera](https://github.com/SerenTera)
   - [Kyoukaya](https://github.com/kyoukaya)
-  - [SaltyMonkey](https://github.com/SaltyMonkey)   - Current [Tera-Toolbox (Tera-proxy's fork)](https://github.com/tera-toolbox/tera-toolbox) developer.
+  - [SaltyMonkey](https://github.com/SaltyMonkey)   - Current Tera-Toolbox (Tera-proxy's fork) developer.
   - [Leyki](https://github.com/Leyki)
 
 ---
 
 In-direct Contributers:
-  - [Kasea](https://github.com/Kasea)
-  - [Caali](https://github.com/caali-hackerman)     - Original [Tera-Toolbox (Tera-proxy's fork)](https://github.com/tera-toolbox/tera-toolbox) developer.
+  - [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~~ [Tera-proxy's fork](https://github.com/tera-proxy/tera-proxy) developer (No longer maintained).
-  - [Meishu](https://github.com/meishuu)            - Original developer of [Tera-proxy](https://github.com/meishuu/tera-proxy) (No longer maintained & DMCA'd by EME).
+  - [Pinkie Pie](https://github.com/pinkipi)        - Original idea/Current maintained fork of Tera-proxy developer.
+  - [Meishu](https://github.com/meishuu)            - Original developer of Tera-proxy (No longer maintained).

+ 1 - 1
lib/data/miscData.json

@@ -1 +1 @@
-{"Alphabet":"ABCDEFGHIJKLMNOPQRSTUVWXYZ","PClasses":["warrior","lancer","slayer","berserker","sorcerer","archer","priest","mystic","reaper","gunner","brawler","ninja","valkyrie"],"PRoles":["dps","healer","tank","ranged"],"InvalidVoiceId":249,"InvisibleNpcs":{"8":[6011],"12":[1],"23":[201,202],"34":[8000],"61":[9901],"62":[9001,9002,9003,9004,9901],"83":[9901],"207":[9901],"223":[9901],"230":[9901],"2010":[9901],"2011":[9901],"2012":[9901],"2013":[9901],"2014":[9901],"2015":[9901]},"ImportantActionScripts":[40000,40001,40002,426002],"MountToReplaceId":16,"SpamAchIds":[3,6,14,15,17,18,51,166,358,377,391,466,467,468,469,470,471,472,473,476,611,1002,1003,1004,1005,1308,1309,1310,1311,1312,1313,1314,1315,1408,1420,1744,1745,1769,1770,1771,1942,1943,1952,1992,2032,2033,2036,2037,2038,2057,2062,2071,2078,2081,2082,2083,2084,2088,2089,2095,6005,9817,20605,20607,20608,28723,28724,28725,28726,28727,28728,28729,28730,28731,28732,28733,28734,28735,28736,510005,510012,510019,510026,510027,510033,510034,510035,510036,510037,510038,510039,510040,510041,520029,520030,520032,520033,520034,520035,520048,520049,520050,520051,525000,525001,525002,525003,525004,525005,525006,525007,525008,525009,525010,525011,525012,525013,525014,525015,525016,525017,525018,525019,525020,525021,525022,525023,525024,525025,5010000],"StarterWeaponIds":[10001,10002,10003,10004,10005,10006,10007,10008,80396,55005,82005,58171,59053],"HexColors":{"BnzC":"#BC8F8F","SlvC":"#9A9A9A","GldC":"#DAA520","PnkC":"#FFB7C5","HPkC":"#FF69B4","CPkC":"#ED5D92","RedC":"#FE6F5E","GrnC":"#4DE19C","LPrC":"#E0B0FF","PrpC":"#9966CC","LBlC":"#4DDCE1","BluC":"#436EEE","DBlC":"#5BC0BE","HBlC":"#08B3E5","GryC":"#778899","YlwC":"#C0B94D"}}
+{"Alphabet":"ABCDEFGHIJKLMNOPQRSTUVWXYZ","PClasses":["warrior","lancer","slayer","berserker","sorcerer","archer","priest","mystic","reaper","gunner","brawler","ninja","valkyrie"],"PRoles":["dps","healer","tank","ranged"],"InvalidVoiceId":249,"InvisibleNpcs":{"8":[6011],"12":[1],"23":[201,202],"34":[8000],"61":[9901],"62":[9001,9002,9003,9004,9901],"83":[9901],"207":[9901],"223":[9901],"230":[9901],"2010":[9901],"2011":[9901],"2012":[9901],"2013":[9901],"2014":[9901],"2015":[9901]},"ImportantActionScripts":[40000,40001,40002,426002],"MountToReplaceId":16,"SpamAchIds":[6,14,15,17,18,51,377,391,466,467,468,469,470,471,472,473,476,611,1002,1003,1004,1005,1308,1309,1310,1311,1312,1313,1314,1315,1408,1420,1744,1745,1769,1770,1771,1942,1943,1952,1992,2032,2033,2036,2037,2038,2057,2062,2071,2078,2081,2082,2083,2084,2088,2089,2095,6005,9817,20605,20607,20608,28723,28724,28725,28726,28727,28728,28729,28730,28731,28732,28733,28734,28735,28736,510005,510012,510019,510026,510027,510033,510034,510035,510036,510037,510038,510039,510040,510041,520029,520030,520032,520033,520034,520035,520048,520049,520050,520051,525000,525001,525002,525003,525004,525005,525006,525007,525008,525009,525010,525011,525012,525013,525014,525015,525016,525017,525018,525019,525020,525021,525022,525023,525024,525025,5010000],"StarterWeaponIds":[10001,10002,10003,10004,10005,10006,10007,10008,80396,55005,82005,58171,59053],"HexColors":{"BnzC":"#BC8F8F","SlvC":"#9A9A9A","GldC":"#DAA520","PnkC":"#FFB7C5","HPkC":"#FF69B4","CPkC":"#ED5D92","RedC":"#FE6F5E","GrnC":"#4DE19C","LPrC":"#E0B0FF","PrpC":"#9966CC","LBlC":"#4DDCE1","BluC":"#436EEE","DBlC":"#5BC0BE","HBlC":"#08B3E5","GryC":"#778899","YlwC":"#C0B94D"}}

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
lib/data/skillString.json


+ 1 - 1
lib/data/userSpawns.json

@@ -1 +1 @@
-{"FireWorks":[60016000,80037000],"MoteIds":[8008,8009,8010,8011,8012,8013,8014,8015,8016,8017,8018,8019,8020,8021,8022,8023],"SmokeBombId":{"12":9},"DivineWrathId":{"11":3},"TrapsIds":[30120,30220,30320,90220,90320,90420,90520,90620,90720,90820,90920,100120,100220,100320,100420,100520,120220,120320,120420,120520,120620,120720,120820,120920,150120,150220,150320,150420,150520,150620,150720,170120,170220,170320,170420,170520,170620,170720,170820,170920,230120,230220,230320,250120,250220,250320,250420,250520,250620,250720,250820,250920,251020],"UserNpcsHzId":1023,"UserNpcs":[12345,1100100,1100101,1023000,1023001,1023002,1023003,1023004,1023005,1023006,1023007,1023008,1023009,1023010,1023011,1023012,1023013,1023014,1023200,1023201,1023202,1023203,1023204,1023205,1023206,1023207,1023208,1023209,1023210,1023211,1023300,1023301,1023302,1023303,1023304,1023305,1023306,1023307,1023308,1023309,1023310,1023311,1023312,1023400,1023401,1023402,1023403,1023404,1023405,1024000,1024001,1024100,1024200,1024300,2100100,2100101,10235001,10235002,10235003,10235004,10235005,10235006,10235007,10235008,10235009,10235010,10235011,10235012,10235013,10235014,10235015,10235016,10235017,10235100,10236001,10236002,10236003,10236004,10236005,10236006,10236007,10236008,10236009,10236010,10236011,10236012,10236013,10236014,10236015,10236100,10237001,10237002,10237003,10237004,10237005,10237006,10237007,10237008,10237009,10237010,10237011,10237012,10237013,10237014,10237015,10237100,10238001,10238002,10238003,10238004,10238005,10238006,10238007,10238008,10238100,10239003,30301001,30301002,30301003,30301004,30301005,30302001,30302002,30302003,30302004,30302005,30302006,30302007,30303001,30303002,30303003,30303004,30303005,30303006,30303007]}
+{"FireWorks":[60016000,80037000],"MoteIds":[8008,8009,8010,8011,8012,8013,8014,8015,8016,8017,8018,8019,8020,8021,8022,8023],"SmokeBombId":90120,"TrapsIds":[30120,30220,30320,90220,90320,90420,90520,90620,90720,90820,90920,100120,100220,100320,100420,100520,120220,120320,120420,120520,120620,120720,120820,120920,150120,150220,150320,150420,150520,150620,150720,170120,170220,170320,170420,170520,170620,170720,170820,170920,230120,230220,230320,250120,250220,250320,250420,250520,250620,250720,250820,250920,251020],"UserNpcsHzId":1023,"UserNpcs":[12345,1100100,1100101,1023000,1023001,1023002,1023003,1023004,1023005,1023006,1023007,1023008,1023009,1023010,1023011,1023012,1023013,1023014,1023200,1023201,1023202,1023203,1023204,1023205,1023206,1023207,1023208,1023209,1023210,1023211,1023300,1023301,1023302,1023303,1023304,1023305,1023306,1023307,1023308,1023309,1023310,1023311,1023312,1023400,1023401,1023402,1023403,1023404,1023405,1024000,1024001,1024100,1024200,1024300,2100100,2100101,10235001,10235002,10235003,10235004,10235005,10235006,10235007,10235008,10235009,10235010,10235011,10235012,10235013,10235014,10235015,10235016,10235017,10235100,10236001,10236002,10236003,10236004,10236005,10236006,10236007,10236008,10236009,10236010,10236011,10236012,10236013,10236014,10236015,10236100,10237001,10237002,10237003,10237004,10237005,10237006,10237007,10237008,10237009,10237010,10237011,10237012,10237013,10237014,10237015,10237100,10238001,10238002,10238003,10238004,10238005,10238006,10238007,10238008,10238100,10239003,30301001,30301002,30301003,30301004,30301005,30302001,30302002,30302003,30302004,30302005,30302006,30302007,30303001,30303002,30303003,30303004,30303005,30303006,30303007]}

+ 125 - 184
lib/index.js

@@ -5,8 +5,7 @@
 const NpcData = require('./data/npcData.json'),
 	SkillData = require('./data/skillString.json'),
 	{ ImportantAbns, BlockedAbns, ReplaceAbnIds, AbnNoEffectInvisibleNpcSpamId } = require('./data/abnormalities.json'),
-	{ UserNpcs, TrapsIds, FireWorks, UserNpcsHzId, SmokeBombId, DivineWrathId, MoteIds } = require('./data/userSpawns.json'),
-	ImportantProjectiles = { ...SmokeBombId, ...DivineWrathId },
+	{ UserNpcs, TrapsIds, FireWorks, UserNpcsHzId, SmokeBombId, MoteIds } = require('./data/userSpawns.json'),
 	{ InvisibleNpcs, SpamAchIds, PClasses, PRoles, HexColors, Alphabet, StarterWeaponIds, InvalidVoiceId, MountToReplaceId, ImportantActionScripts } = require('./data/miscData.json'),
 	{ BnzC, SlvC, GldC, PnkC, HPkC, CPkC, RedC, GrnC, LPrC, PrpC, LBlC, BluC, DBlC, HBlC, GryC, YlwC } = HexColors;
 
@@ -18,7 +17,6 @@ module.exports = function FpsUtils(mod) {
 	// ~~~ * Constants * ~~~ \\
 
 	const Cfg = mod.settings,
-		Cmd = mod.command,
 		NotCP = typeof mod.compileProto !== 'undefined';
 
 	// ~~~ * Variables * ~~~ \\
@@ -33,15 +31,14 @@ module.exports = function FpsUtils(mod) {
 		ProjDebug = false,
 		AbnDebug = false,
 		TmpData = [],
-		PMembers = new Set(),
-		BProjectiles = new Set(),
+		PMembers = [],
 		SUsers = {},
 		HUsers = {},
 		SNpcs = {},
 		HNpcs = {},
 		SPets = {},
 		HPets = {},
-		HSeedBoxes = new Set();
+		HSeedBoxes = {};
 
 	// ~~~ * Gui Parser * ~~~ \\
 
@@ -52,12 +49,12 @@ module.exports = function FpsUtils(mod) {
 
 		mod.hook('C_CONFIRM_UPDATE_NOTIFICATION', 'raw', LastHook, () => false);
 
-		mod.hook('C_ADMIN', 1, LastHookfn, (event) => {
+		/*mod.hook('C_ADMIN', 1, LastHookfn, (event) => {
 			const commands = event.command.split(";");
 			for (const cmd of commands)
-				try { Cmd.exec(cmd); } catch (err) { continue; }
+				try { mod.command.exec(cmd); } catch (err) { continue; } // In case it errored out; prevent cAdmin from being sent to server.
 			return false;
-		});
+		});*/
 	}
 
 	const gui = {
@@ -341,7 +338,7 @@ module.exports = function FpsUtils(mod) {
 
 	function Msg(msg) {
 		if (Cfg.StreamMode) return;
-		Cmd.message(`<font color="${LPrC}">${NotCP ? '[FPS] ' : ''}${msg}</font>`);
+		mod.command.message(`<font color="${LPrC}">${NotCP ? '[FPS] ' : ''}${msg}</font>`);
 	}
 
 	function RemoveEntity(arr, elem) {
@@ -399,8 +396,8 @@ module.exports = function FpsUtils(mod) {
 			case 'pet':
 				for (const sPet in SPets) {
 					if (EqGid(SPets[sPet].ownerId) && whose === 'own') {
-						UpdateNpcLoc(SPets[sPet], -1E2);
-						ScaleUpEntity(SPets[sPet].gameId, 1E-3);
+						UpdateNpcLoc(SPets[sPet], -100);
+						ScaleUpEntity(SPets[sPet].gameId, 0.001);
 					}
 					if (!EqGid(SPets[sPet].ownerId) && whose === 'others')
 						mod.toClient('S_REQUEST_DESPAWN_SERVANT', 1, { gameId: SPets[sPet].gameId, despawnType: 1 });
@@ -424,7 +421,7 @@ module.exports = function FpsUtils(mod) {
 		for (const hUser in HUsers) {
 			if (HUsers[hUser].name.toString().toLowerCase() === name.toLowerCase()) {
 				ModifyUserAppearance(HUsers[hUser]);
-				mod.toClient('S_SPAWN_USER', 17, HUsers[hUser]);
+				mod.toClient('S_SPAWN_USER', 15, HUsers[hUser]);
 				delete HUsers[hUser];
 				break;
 			}
@@ -434,7 +431,7 @@ module.exports = function FpsUtils(mod) {
 	function ShowSpecificNpcByHzTi(hz, ti) {
 		for (const hNpc in HNpcs) {
 			if (HNpcs[hNpc].huntingZoneId === hz && HNpcs[hNpc].templateId === ti) {
-				mod.toClient('S_SPAWN_NPC', 12, HNpcs[hNpc]);
+				mod.toClient('S_SPAWN_NPC', 11, HNpcs[hNpc]);
 				delete HNpcs[hNpc];
 				break;
 			}
@@ -442,7 +439,7 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function ShowSpecificNpcByGid(gameId) {
-		mod.toClient('S_SPAWN_NPC', 12, HNpcs[gameId]);
+		mod.toClient('S_SPAWN_NPC', 11, HNpcs[gameId]);
 		delete HNpcs[gameId];
 	}
 
@@ -476,7 +473,7 @@ module.exports = function FpsUtils(mod) {
 	function ShowAllPlayers() {
 		for (const hUser in HUsers) {
 			ModifyUserAppearance(HUsers[hUser]);
-			mod.toClient('S_SPAWN_USER', 17, HUsers[hUser]);
+			mod.toClient('S_SPAWN_USER', 15, HUsers[hUser]);
 			delete HUsers[hUser];
 		}
 	}
@@ -487,7 +484,7 @@ module.exports = function FpsUtils(mod) {
 		let modified = undefined;
 
 		if (Cfg.ShowStyle) {
-			event.weapon = StarterWeaponIds[event.templateId % 1E2 - 1];
+			event.weapon = StarterWeaponIds[event.templateId % 100 - 1];
 			event.body = event.hand = event.feet = event.underwear = event.head = event.face = 0;
 			if (event.mount) event.mount = MountToReplaceId;
 			event.title = 0;
@@ -530,8 +527,6 @@ 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;
 
@@ -545,7 +540,6 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function ActionHCheck(event, end) {
-		if (event.skill.npc) return;
 		let hidden = false;
 
 		if (EqGid(event.gameId) || !SUsers[event.gameId]) return undefined;
@@ -561,29 +555,22 @@ 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) {
-		if (event.skill.npc) return;
-		if (typeof event.id === 'undefined') event.id = event.actionId;
+		let blocked = false;
 
-		if (typeof event.skill !== 'undefined') {
-			if (ImportantProjectiles[ClassID(event.templateId)] && ImportantProjectiles[ClassID(event.templateId)] === Math.floor(event.skill.id / 1E4) || (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 (event.skill.id === SmokeBombId || (Cfg.PvpTraps && TrapsIds.includes(event.skill.id))) return undefined;
 
-		if (typeof event.gameId !== 'undefined')
-			if (!EqGid(event.gameId) && SUsers[event.gameId] && (HUsers[event.gameId] || Cfg.Mode >= 2 || Cfg.HideAllProjectiles)) 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;
 
-		return BProjectiles.has(event.id) ? false : undefined;
+		return blocked ? false : undefined;
 	}
 
 	function ModifySkillResult(event) {
-		if (event.skill.npc) return;
-		let returnValue = undefined;
+		let modified = undefined;
 
 		if (Cfg.Hit_Me && (EqGid(event.source) || EqGid(event.owner))) {
 			event.templateId = 0;
@@ -592,7 +579,7 @@ module.exports = function FpsUtils(mod) {
 			event.crit = event.stackExplode = event.superArmor = false;
 			event.superArmorId = event.hitCylinderId = 0;
 
-			returnValue = true;
+			modified = true;
 		}
 
 		if (Cfg.Hit_Other && !EqGid(event.target) && !EqGid(event.source) && !EqGid(event.owner) && (SUsers[event.owner] || SUsers[event.source])) {
@@ -602,13 +589,13 @@ module.exports = function FpsUtils(mod) {
 			event.crit = event.stackExplode = event.superArmor = false;
 			event.superArmorId = event.hitCylinderId = 0;
 
-			returnValue = true;
+			modified = 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;
 
-			returnValue = true;
+			modified = true;
 		}
 
 		if (Cfg.Hit_All) {
@@ -619,12 +606,10 @@ module.exports = function FpsUtils(mod) {
 			event.crit = event.stackExplode = event.superArmor = false;
 			event.superArmorId = event.hitCylinderId = 0;
 
-			returnValue = true;
+			modified = true;
 		}
 
-		if (BProjectiles.has(event.id) && (Cfg.Mode >= 2 || Cfg.HideAllProjectiles)) returnValue = false;
-
-		return returnValue;
+		return modified;
 	}
 
 	const UserBCheck = user => { for (const plBlist of Cfg.PlayersBlacklist) if (plBlist.toLowerCase() === user.toLowerCase()) return true; };
@@ -672,37 +657,12 @@ module.exports = function FpsUtils(mod) {
 		return blocked ? false : undefined;
 	}
 
-	function updatePartySpawns(raid) {
-		if (!Cfg.OnlyParty || !Cfg.RaidAutoChange) return
-
-		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 && typeof raid !== 'undefined') {
-			if (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 EqGid(xG) {
 		return (xG === MyGameId);
 	}
 
 	function ClassID(m) {
-		return (m % 1E2);
+		return (m % 100);
 	}
 
 	function log(name, type, from, target, id) {
@@ -710,7 +670,7 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function UpdateUserLoc(event) {
-		mod.toClient('S_USER_LOCATION', 6, { gameId: event.gameId, loc: event.loc, w: event.w, speed: 3E2, dest: event.loc, type: 7 });
+		mod.toClient('S_USER_LOCATION', 5, { gameId: event.gameId, loc: event.loc, w: event.w, speed: 3E2, dest: event.loc, type: 7 });
 	}
 
 	function UpdateNpcLoc(event, zMod = 0) {
@@ -726,9 +686,6 @@ 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.");
 	}
 
@@ -748,6 +705,21 @@ 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;
@@ -786,7 +758,6 @@ module.exports = function FpsUtils(mod) {
 			AllowedAchUps--;
 			return;
 		}
-		if (Cfg.Mode < 2) return;
 		for (const Achieve of event.achievements) if (SpamAchIds.indexOf(Achieve.id) !== -1 || !Achieve.requirements.length) return false;
 	}
 
@@ -818,7 +789,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.has(event.name))) {
+		if (Cfg.Mode === 3 || UserBCheck(event.name) || Cfg.ClassesData[ClassID(event.templateId)].isHidden || (Cfg.OnlyParty && !PMembers.includes(event.name))) {
 			HUsers[event.gameId] = event;
 			HUsers[event.gameId].spawnFx = 1;
 			return false;
@@ -868,6 +839,29 @@ 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;
@@ -908,21 +902,6 @@ module.exports = function FpsUtils(mod) {
 		return modified;
 	}
 
-	function sPartyMemberList(event) {
-		event.members.map(value => { PMembers.add(value.name) });
-		updatePartySpawns(event.raid);
-	}
-
-	function sLeavePartyMember(event) {
-		PMembers.delete(event.name);
-		updatePartySpawns();
-	}
-
-	function sLeaveParty() {
-		PMembers.clear();
-		updatePartySpawns(false);
-	}
-
 	function sSpawnNpc(event) {
 		SNpcs[event.gameId] = event;
 		SNpcs[event.gameId].spawnType = 1;
@@ -991,8 +970,8 @@ module.exports = function FpsUtils(mod) {
 		if (EqGid(event.ownerId) && Cfg.HideMyServants) {
 			HPets[event.gameId] = event;
 			process.nextTick(() => {
-				UpdateNpcLoc(event, -1E2);
-				ScaleUpEntity(event.gameId, 1E-3);
+				UpdateNpcLoc(event, -100);
+				ScaleUpEntity(event.gameId, 0.001);
 			});
 		} else if (!EqGid(event.ownerId) && Cfg.HideOthersServants) {
 			HPets[event.gameId] = event;
@@ -1024,18 +1003,6 @@ 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);
 	}
@@ -1048,15 +1015,16 @@ module.exports = function FpsUtils(mod) {
 		return ActionHCheck(event, true);
 	}
 
-	function sInstanceArrow(event) {
+	function sStartUserProjectile(event) {
 		if (ProjDebug) {
-			if (EqGid(event.gameId)) log('Projectile-Arrow', 'Spawned', 'from', MyName, event.skill.id);
-			if (SUsers[event.gameId]) log('Projectile-Arrow', 'Spawned', 'from', SUsers[event.gameId].name, event.skill.id);
+			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 sSpawnProjectile(event) {
+		if (event.skill.npc) return;
 		if (ProjDebug) {
 			if (EqGid(event.gameId)) log('Projectile', 'Spawned', 'from', MyName, event.skill.id);
 			if (SUsers[event.gameId]) log('Projectile', 'Spawned', 'from', SUsers[event.gameId].name, event.skill.id);
@@ -1064,26 +1032,6 @@ 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) {
@@ -1128,29 +1076,32 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function sSpawnEventSeed(event) {
-		if (HUsers[event.owner] || Cfg.Mode >= 2) {
-			HSeedBoxes.add(event.gameId);
+		if (HUsers[event.owner]) {
+			HSeedBoxes[event.gameId] = event;
 			return false;
 		}
 	}
 
 	function sUpdateEventSeedState(event) {
-		if (HSeedBoxes.has(event.gameId)) return false;
+		if (HSeedBoxes[event.gameId]) return false;
 	}
 
 	function sResultEventSeed(event) {
-		if (HSeedBoxes.has(event.gameId)) return false;
+		if (HSeedBoxes[event.gameId]) return false;
 	}
 
 	function sDespawnEventSeed(event) {
-		HSeedBoxes.delete(event.gameId);
+		if (HSeedBoxes[event.gameId]) {
+			delete HSeedBoxes[event.gameId];
+			return false;
+		}
 	}
 
 	function sFieldEventOnEnter() {
 		if (Cfg.GuardianAutoChange) {
 			if ((LastGState !== null && Cfg.Mode === 2) || Cfg.Mode >= 2) return;
 			LastGState = Cfg.Mode;
-			Cmd.exec("fps state 2");
+			mod.command.exec("fps state 2");
 		}
 	}
 
@@ -1160,15 +1111,16 @@ module.exports = function FpsUtils(mod) {
 				LastGState = null;
 				return;
 			}
-			Cmd.exec(`fps state ${LastGState}`);
+			mod.command.exec(`fps state ${LastGState}`);
 			LastGState = null;
 		}
 	}
 
 	// ~~~ * Packet Hooks * ~~~ \\
 
-	mod.hook('S_LOGIN', mod.majorPatchVersion < 114 ? 14 : 15, sLogin)
+	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)
@@ -1184,23 +1136,20 @@ module.exports = function FpsUtils(mod) {
 	mod.hook('S_APPLY_TITLE', 3, LastHook, sApplyTitle)
 	mod.hook('S_IMAGE_DATA', 'raw', LastHook, sImageData)
 
-	mod.hook('S_SPAWN_USER', 17, LastHook, sSpawnUser)
-	mod.hook('S_SPAWN_USER', 17, LastHookfn, sSpawnUserfn)
+	mod.hook('S_SPAWN_USER', 15, LastHook, sSpawnUser)
+	mod.hook('S_SPAWN_USER', 15, LastHookfn, sSpawnUserfn)
 	mod.hook('S_DESPAWN_USER', 3, sDespawnUser)
-	mod.hook('S_USER_LOCATION', 6, LastHook, sUserLocation)
-	mod.hook('S_USER_STATUS', 4, LastHook, sUserStatus)
+	mod.hook('S_USER_LOCATION', 5, LastHook, sUserLocation)
+	mod.hook('S_USER_STATUS', 3, LastHook, sUserStatus)
 	mod.hook('S_DEAD_LOCATION', 2, sDeadLocation)
 	mod.hook('S_USER_MOVETYPE', 1, LastHook, sUserMovetype)
+	mod.hook('S_PARTY_MEMBER_LIST', 7, 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_SPAWN_NPC', 11, LastHook, sSpawnNpc)
 	mod.hook('S_DESPAWN_NPC', 3, LastHook, sDespawnNpc)
 	mod.hook('S_NPC_LOCATION', 3, LastHook, sNpcLocation)
 	mod.hook('S_CREATURE_LIFE', 3, sCreatureLife)
@@ -1209,60 +1158,52 @@ 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, sRequestDespawnServant)
+	mod.hook('S_REQUEST_DESPAWN_SERVANT', 1, LastHook, 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_BEGIN', 3, LastHookfn, sAbnormalityBegin)
+	mod.hook('S_ABNORMALITY_REFRESH', 1, LastHookfn, sAbnormalityRefresh)
 	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_SPAWN_PROJECTILE', 5, 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_EACH_SKILL_RESULT', 15, LastHook, sEachSkillResult)
 	mod.hook('S_ITEM_EXPLOSION_RESULT', 2, LastHook, sItemExplosionResult)
-	mod.hook('S_SPAWN_DROPITEM', 9, LastHook, sSpawnDropItem)
+	mod.hook('S_EACH_SKILL_RESULT', 14, LastHook, sEachSkillResult)
+	mod.hook('S_SPAWN_DROPITEM', 8, LastHook, sSpawnDropItem)
 	mod.hook('S_FONT_SWAP_INFO', 'raw', LastHookfn, sFontSwapInfo)
 
-	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_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_FIELD_EVENT_ON_ENTER', 'raw', sFieldEventOnEnter)
 	mod.hook('S_FIELD_EVENT_ON_LEAVE', 'raw', sFieldEventOnLeave)
 
 	// ~~~ * Commands * ~~~ \\
 
-	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('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(['fps', '!fps', 'fps-utils', '!fps-utils'], (key, arg, arg2, arg3) => {
+	mod.command.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": Cmd.exec('fps skills blacklist'); break;
-			case "p": Cmd.exec('fps party'); break;
+			case "b": mod.command.exec('fps skills blacklist'); break;
+			case "p": mod.command.exec('fps party'); break;
 			case "g": case "gui": GuiHandler(arg, arg2); 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 "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 "m": case "mod": case "mode": case "state":
 				switch (arg) {
 					case "0": case "off": case "zero":
@@ -1299,7 +1240,7 @@ module.exports = function FpsUtils(mod) {
 						Msg(`<font color="${GldC}">Mode 3</font>.`);
 						break;
 					default:
-						Msg(`<font color="${GryC}">Invalid arg: '${arg}'</font>.`);
+						Msg(`<font color="${GryC}">Invalid" ${arg}"</font>.`);
 						Msg(`Modes: "<font color="${PnkC}">[0, 1, 2, 3]</font>.`);
 						break;
 				}
@@ -1325,7 +1266,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 arg: '${arg2}'</font>.`);
+				} else Msg(`<font color="${GryC}">Invalid ${arg2}</font>.`);
 				break;
 			case "show":
 				if (typeof arg === "string" && arg !== null) {
@@ -1348,16 +1289,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 arg: '${arg2}'</font>.`);
+					else Msg(`<font color="${GryC}">Invalid ${arg2}</font>.`);
 				}
 				break;
 			case "party":
 				if (Cfg.Mode === 3) return Msg(`<font color="${RedC}">You've to disable mode 3 first</font>.`);
-				//if(!PMembers.size) return Msg(`<font color="${GryC}">You must be in party in-order to enable this</font>.`);
+				//if(!PMembers.length) 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.has(SUsers[sUser].name)) HideSpecificPlayerByName(SUsers[sUser].name);
+						if (!PMembers.includes(SUsers[sUser].name)) HideSpecificPlayerByName(SUsers[sUser].name);
 						else if (HUsers[SUsers[sUser].gameId]) ShowSpecificPlayerByName(SUsers[sUser].name);
 					}
 				} else ShowAllPlayers();
@@ -1477,7 +1418,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 hit arg: '${arg}'</font>.`);
+						Msg(`<font color="${GryC}">Invalid &#40;hit&#41; '${arg}'</font>.`);
 						break;
 				}
 				break;
@@ -1515,7 +1456,7 @@ module.exports = function FpsUtils(mod) {
 										return;
 									}
 								}
-							} else return Msg(`<font color="${GryC}">Invalid abnormalities Blacklist arg: '${arg}'</font>.`);
+							} else return Msg(`<font color="${GryC}">Invalid &#40;abnormalities Blacklist&#41; '${arg}'</font>.`);
 						}
 						break;
 					case "log":
@@ -1525,7 +1466,7 @@ module.exports = function FpsUtils(mod) {
 						else Msg(`Abnormalities debug <font color="${RedC}">stopped</font>.`);
 						break;
 					default:
-						Msg(`<font color="${GryC}">Invalid abnormalities arg: '${arg}'</font>.`);
+						Msg(`<font color="${GryC}">Invalid &#40;abnormalities&#41; '${arg}'</font>.`);
 						break;
 				}
 				break;
@@ -1576,7 +1517,7 @@ module.exports = function FpsUtils(mod) {
 										return;
 									}
 								}
-							} else return Msg(`<font color="${GryC}">Invalid projectile Blacklist arg: '${arg}'</font>.`);
+							} else return Msg(`<font color="${GryC}">Invalid &#40;projectile Blacklist&#41; '${arg}'</font>.`);
 						}
 						break;
 					case "log": case "debug":
@@ -1585,7 +1526,7 @@ module.exports = function FpsUtils(mod) {
 						else Msg(`Projectile debug <font color="${RedC}">stopped</font>.`);
 						break;
 					default:
-						Msg(`<font color="${GryC}">Invalid projectile arg: '${arg}'</font>.`);
+						Msg(`<font color="${GryC}">Invalid &#40;projectile&#41; '${arg}'</font>.`);
 						break;
 				}
 				break;
@@ -1622,7 +1563,7 @@ module.exports = function FpsUtils(mod) {
 						mod.toServer('C_RESET_ALL_DUNGEON', 1);
 						break;
 					default:
-						Msg(`<font color="${GryC}">Invalid quicklink '${arg}'</font>.`);
+						Msg(`<font color="${GryC}">Invalid &#40;quicklink&#41; '${arg}'</font>.`);
 						break;
 				}
 				break;
@@ -1711,12 +1652,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":
-				Cmd.exec("fps gui help");
+				mod.command.exec("fps gui help");
 				break;
 			default:
 				//Msg(`<font color="${RedC}">Unknown command, check command list</font>.`);
-				//Cmd.exec("fps gui help");
-				Cmd.exec("fps gui");
+				//mod.command.exec("fps gui help");
+				mod.command.exec("fps gui");
 				break;
 		}
 		if (!NotCP && typeof Cfg.ClassesData["12"] === 'undefined') mod.saveSettings();

+ 12 - 88
manifest.json

@@ -1,90 +1,14 @@
 {
-	"files": {
-		"README.md": "f5c50ef82e8ba86477c3f97f92bf5e8b466b6742e84297b72d3f357f02ad26cb",
-		"lib/data/abnormalities.json": "54727de2123584eb0ff38ffca5e86601e3faf05e8dc3379c9a0fd6e5ede1ca0c",
-		"lib/data/miscData.json": "7d71d166aaa8bd39f40d9ddd8cbbccea6af7d8facae42b7d77046f2ea8cd143b",
-		"lib/data/npcData.json": "bcd1876e4266f71299a298221b2594e45bf87f143f276a62c60dd8a35b75acd7",
-		"lib/data/skillString.json": "8668b91e8165287eb43935cf9d2d85ffa6f1b6873d452857d8138a720d862fa9",
-		"lib/data/userSpawns.json": "e82a593b3e5aa970542d8330dfe690049abad98691e8b90210f46cdc281b17a3",
-		"lib/index.js": "ee36df541ecb128665494f122b80fde74e56535843645f74cbd33b366f3ee0b8",
-		"lib/setting_migration.js": "1821fbb5ed37672bd9a8daa54f8ab392e35aa6c38b1602c560865b3bf6a7c6a2",
-		"module.json": "f6c096f624a92587583d9b0f66a21bcbaefaf9d81c684f035a3ecada3712579c",
-		"package.json": "05c87cd1ccd2c23ba209b7a58d7fe10c5ed04e52c6fbecac8c3b0f368eeb7742"
-	},
-	"defs": {
-		"C_ADMIN": 1,
-		"C_CONFIRM_UPDATE_NOTIFICATION": "raw",
-		"C_DISMISS_PARTY": 1,
-		"C_LEAVE_PARTY": 1,
-		"C_REQUEST_CONTRACT": 1,
-		"C_RESET_ALL_DUNGEON": 1,
-		"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,
-		"S_ANNOUNCE_UPDATE_NOTIFICATION": 1,
-		"S_APPLY_TITLE": 3,
-		"S_CREATURE_CHANGE_HP": 6,
-		"S_CREATURE_LIFE": 3,
-		"S_CREATURE_ROTATE": 2,
-		"S_DEAD_LOCATION": 2,
-		"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": 15,
-		"S_END_USER_PROJECTILE": 4,
-		"S_EXIT": 3,
-		"S_FEARMOVE_END": 2,
-		"S_FEARMOVE_STAGE": 2,
-		"S_FIELD_EVENT_ON_ENTER": "raw",
-		"S_FIELD_EVENT_ON_LEAVE": "raw",
-		"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,
-		"S_MOUNT_VEHICLE": 2,
-		"S_NPC_LOCATION": 3,
-		"S_NPC_MENU_SELECT": 1,
-		"S_PARTY_MEMBER_LIST": 9,
-		"S_PLAYER_CHANGE_MP": 1,
-		"S_QUEST_BALLOON": 1,
-		"S_REQUEST_DESPAWN_SERVANT": 1,
-		"S_REQUEST_SPAWN_SERVANT": 4,
-		"S_RESULT_EVENT_SEED": 2,
-		"S_SOCIAL": 1,
-		"S_SPAWN_DROPITEM": 9,
-		"S_SPAWN_EVENT_SEED": 2,
-		"S_SPAWN_NPC": 12,
-		"S_SPAWN_PROJECTILE": 6,
-		"S_SPAWN_USER": 17,
-		"S_START_ACTION_SCRIPT": 3,
-		"S_START_COOLTIME_ITEM": 1,
-		"S_START_USER_PROJECTILE": 9,
-		"S_UNICAST_TRANSFORM_DATA": 6,
-		"S_UNMOUNT_VEHICLE": 2,
-		"S_UPDATE_ACHIEVEMENT_PROGRESS": 1,
-		"S_UPDATE_EVENT_SEED_STATE": 4,
-		"S_USER_APPEARANCE_CHANGE": 1,
-		"S_USER_CHANGE_FACE_CUSTOM": 2,
-		"S_USER_EXTERNAL_CHANGE": 7,
-		"S_USER_LOCATION": 6,
-		"S_USER_MOVETYPE": 1,
-		"S_USER_STATUS": 4
-	}
+    "files": {
+        "README.md": "2d76c64d0955d36bac7d529543fd3d932cdee23f8c768b104d4c6544b1bf5a86",
+        "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": "86350b18482cf367c06bf0464f27fcf4809be4983f3657555523b265fc17ea17",
+        "lib/setting_migration.js": "1821fbb5ed37672bd9a8daa54f8ab392e35aa6c38b1602c560865b3bf6a7c6a2",
+        "module.json": "d77096707e881b11c95c08ba76f87721e3650faefae911014992fdb3d2f8568b",
+        "package.json": "dd0e950e7b5b537ff09d5f7772373d2b1d7a13840868d4b5981e46d8ba25d1b9"
+    }
 }

+ 15 - 18
module.json

@@ -1,20 +1,17 @@
 {
-	"disableAutoUpdate": false,
-	"name": "fps-utils",
-	"author": "Risenio",
-	"homepage": "https://github.com/Risenio/fps-utils/wiki",
-	"supportUrl": "https://github.com/Risenio/fps-utils/issues",
-	"readmePath": "./README.md",
-	"description": "A free script filled with features dedicated to improve your fps.",
-	"contributors": ["Saegusae","codeagon","SerenTera","Kyoukaya","SaltyMonkey","Leyki"],
-	"conflicts": ["hide-players","fps-utils-lite","fps-manager"],
-	"version": "19",
-	"options": {
-		"cliName": "FPS",
-		"guiName": "Fps Utils",
-		"settingsVersion": 19,
-		"settingsFile": "config.json",
-		"settingsMigrator": "./lib/setting_migration.js"
-	},
-	"servers": ["https://raw.githubusercontent.com/Risenio/fps-utils/master/"]
+    "disableAutoUpdate": false,
+    "name": "fps-utils",
+    "author": "Risenio",
+    "readmePath": "./README.md",
+    "description": "A free script filled with features dedicated to improve your fps.",
+    "contributors": ["Saegusae","codeagon","SerenTera","Kyoukaya","SaltyMonkey","Leyki"],
+    "version": "19",
+    "options": {
+        "cliName": "FPS",
+        "guiName": "Fps Utils",
+        "settingsVersion": 19,
+        "settingsFile": "config.json",
+        "settingsMigrator": "./lib/setting_migration.js"
+    },
+    "servers": ["http://git.dev.hsdn.org/tera-v92/fps-utils/raw/master/"]
 }

+ 0 - 2
package.json

@@ -5,9 +5,7 @@
 	"description": "A free script filled with features dedicated to improve your fps.",
 	"version": "19",
 	"homepage": "https://github.com/Risenio/fps-utils/wiki",
-	"supportUrl": "https://github.com/Risenio/fps-utils/issues",
 	"keywords": ["tera", "fps", "tera-fps", "tera-proxy", "tera-toolbox", "tera-online", "fps-utils", "optimization"],
 	"contributors": ["Saegusae", "codeagon", "SerenTera", "Kyoukaya", "SaltyMonkey", "Leyki"],
-	"conflicts": ["hide-players","fps-utils-lite","fps-manager"],
 	"repository": { "type": "git", "url": "git+https://github.com/Risenio/fps-utils.git" }
 }

Некоторые файлы не были показаны из-за большого количества измененных файлов