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

安

Fixed the bug in auto-save & some minor things.
Added PvpTraps.
Settings v8 :new_moon_with_face:
Risenio лет назад: 8
Родитель
Сommit
a4f4ec4469
6 измененных файлов с 207 добавлено и 279 удалено
  1. 0 0
      lib/data/npcData.json
  2. 190 266
      lib/index.js
  3. 8 5
      lib/setting_migration.js
  4. 6 5
      manifest.json
  5. 2 2
      module.json
  6. 1 1
      package.json

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


+ 190 - 266
lib/index.js

@@ -1,50 +1,34 @@
-"use strict"
 /* global __dirname */
 
-const NotCP = typeof global.TeraProxy === 'undefined'; //For niceName forced thing and broken settings auto-save For Caalis Proxy users.
-
 module.exports = function FpsUtils(mod) {
-	const NpcData = require("./data/npcData.json")
-	const SkillData = require("./data/skillString.json")
-	const UsersSummonedNPCs = [12345, 1100100, 1100101, 2010100, 2010101, 10235004, 10235005, 10235006, 10235007, 10235008, 10235009, 10235010, 10235011, 10235012, 10235013, 10235014, 10235015, 10235016, 10235017, 10236001, 10236002, 10236003, 10236004, 10236005, 10236006, 10236007, 10236008, 10236009, 10236010, 10236011, 10236012, 10236013, 10236014, 10236015, 10237003, 10237004, 10237005, 10237006, 10237007, 10237008, 10237009, 10237010, 10237011, 10237012, 10237013, 10237014, 10237015, 10237015, 10238001, 10238002, 10238003, 10238004, 10238005, 10238006, 10238007, 10238008, 10238008, 10239003, 30301001, 30301002, 30301003, 30301004, 30302001, 30302002, 30302003, 30302004, 30302005, 30302006, 30302007, 30303001, 30303002, 30303003, 30303004, 30303005, 30303006, 30303007]
+	const NotCP = typeof global.TeraProxy === 'undefined'; //For niceName forced thing and broken settings auto-save For Caali's Proxy users.
+	const NpcData = require("./data/npcData.json"), SkillData = require("./data/skillString.json");
+	const Alphabet = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'];
 	const BronzeClr = '#BC8F8F', SilverClr = '#9A9A9A', GoldClr = '#DAA520', PinkClr = '#FFB7C5', HPinkClr = '#FF69B4', CPinkClr = '#ED5D92', RedClr = '#FE6F5E', GreenClr = '#4DE19C', LPurpleClr = '#E0B0FF', PurpleClr = '#9966CC', LBlueClr = '#4DDCE1', BlueClr = '#436EEE', DBlueClr = '#00575e', HBlueClr = '#08B3E5', GrayClr = '#778899', YellowClr = '#C0B94D', OrangeClr = '#FFBE5E';
-	const Alphabet = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z']
-	const FishingNpcs = {
-		8: [6011],                                  //frog
-		12: [1, 2],                                 //crab, bay kamara
-		23: [201, 202],                             //frog, bee
-		34: [8000],                                 //goat
-		61: [9901],                                 //Ostgarath - Vexatus Swamp
-		62: [1017, 1035, 1039, 1040, 1041, 1042, 1900, 1901, 1902, 1903, 9001, 9002, 9003, 9004, 9901], //Ostgarath - Cutthroat Harbor
-		83: [9901],                                 //Westonia - Celsian Lake
-		99: [1180, 1181, 1182, 1183, 1184, 1185],   //All invisible ?_? - unknown area.
-		207: [9901],                                //Arcadia - Muricai
-		212: [1034],                                //Cutthroat followup
-		223: [9901, 9906, 9907, 9915, 9925],        //Poporia - Lake of Tears
-		230: [9901],                                //Veritas District - Seren's Lake
-		362: [1201, 1202, 1301, 1302]               //Cutthroat followup
-	}
+	const FishingNpcs = { 8: [6011], 12: [1, 2], 23: [201, 202], 34: [8000], 61: [9901], 62: [1017, 1035, 1039, 1040, 1041, 1042, 1900, 1901, 1902, 1903, 9001, 9002, 9003, 9004, 9901], 83: [9901], 207: [9901], 212: [1034], 223: [9901, 9906, 9907, 9915, 9925], 230: [9901], 362: [1201, 1202, 1301, 1302] };
+	const PvPProjs = [30120, 30220, 30320, 90120, 90220, 90320, 90420, 90520, 90620, 90720, 90820, 90920, 100120, 100220, 100320, 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];
+	const UserSumNPCs = [12345, 1100100, 1100101, 2010100, 2010101, 10235004, 10235005, 10235006, 10235007, 10235008, 10235009, 10235010, 10235011, 10235012, 10235013, 10235014, 10235015, 10235016, 10235017, 10236001, 10236002, 10236003, 10236004, 10236005, 10236006, 10236007, 10236008, 10236009, 10236010, 10236011, 10236012, 10236013, 10236014, 10236015, 10237003, 10237004, 10237005, 10237006, 10237007, 10237008, 10237009, 10237010, 10237011, 10237012, 10237013, 10237014, 10237015, 10237015, 10238001, 10238002, 10238003, 10238004, 10238005, 10238006, 10238007, 10238008, 10238008, 10239003, 30301001, 30301002, 30301003, 30301004, 30302001, 30302002, 30302003, 30302004, 30302005, 30302006, 30302007, 30303001, 30303002, 30303003, 30303004, 30303005, 30303006, 30303007];
 
 	let MyGameId,
 		MyName,
 		MyPlayerId,
-		ChangeOnCd,
+		SwitchCd,
 		LastState,
 		LastVrange,
+		ProjDebug,
+		AbnDebug,
 		TmpData = [],
 		PartyMembers = [],
 		HiddenNpcs = {},
-		SFishingNpcs = {},
-		HFishingNpcs = {},
 		HiddenUsers = {},
+		HFishingNpcs = {},
 		SpawnedUsers = {},
-		oldCurChan = { oldCzone: 0, oldCchannel: 0, oldCtype: 0 }
-
-	if (NotCP) mod.settings = require('./setting_migration')(mod.settings._version, require('../module').options.settingsVersion, mod.settings) // Believe or not, this still needed for some cases. ._.
+		SFishingNpcs = {},
+		oldCurChan = { oldCzone: 0, oldCchannel: 0, oldCtype: 0 };
 
 	// ~~~ * Gui Parser * ~~~ \\
 
-	let Xd, Xdata = ''
+	let Xd, Xdata = '';
 	const Xmap = new WeakMap();
 
 	if (!Xmap.has(mod.dispatch || mod)) {
@@ -66,7 +50,7 @@ module.exports = function FpsUtils(mod) {
 				title: Xtitle,
 				body: X1(Xarray)
 			})
-			Xdata = ''
+			Xdata = '';
 		}
 	}
 
@@ -76,11 +60,11 @@ module.exports = function FpsUtils(mod) {
 				Xdata += `Gui data limit exceeded, some values may be missing.`;
 				break;
 			}
-			if (Xarray[i].command) Xdata += `<a href='admincommand:/@${Xarray[i].command}'>${Xarray[i].text}</a>`;
+			if (Xarray[i].command) Xdata += `<a href="admincommand:/@${Xarray[i].command}">${Xarray[i].text}</a>`;
 			else if (!Xarray[i].command) Xdata += `${Xarray[i].text}`;
 			else continue;
 		}
-		return Xdata
+		return Xdata;
 	}
 
 	// ~~~ * Gui Handler * ~~~ \\
@@ -89,20 +73,16 @@ module.exports = function FpsUtils(mod) {
 		switch (page) {
 			case "searchnpc":
 			case "npcsearch":
-				TmpData = []
-				TmpData.push({ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br><br>`, command: `fps gui` })
-				JsonSearch(arg, NpcData, `search`, `<font color="${LBlueClr}" size="+16">Search results for '${arg}'</font>.`)
+				NpcJsonSearch(arg, NpcData, "search", `<font color="${LBlueClr}" size="+16">Search results for '${arg}'</font>.`)
 				break;
 			case "npc":
-				TmpData = []
-				TmpData.push({ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br><br>`, command: `fps gui` })
-				JsonSearch(arg, NpcData, `starts`, `<font color="${LBlueClr}" size="+16">Search results for '${arg}'</font>.`)
+				NpcJsonSearch(arg, NpcData, "starts", `<font color="${LBlueClr}" size="+16">Search results for '${arg}'</font>.`)
 				break;
 			case "npclist":
 				TmpData = []
 				TmpData.push(
-					{ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br><br>`, command: `fps gui` },
-					{ text: `<font color="${YellowClr}" size="+20"><p align="right">[Main NPC page]</p></font><br>`, command: `fps gui npcMain` },
+					{ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br><br>`, command: "fps gui" },
+					{ text: `<font color="${YellowClr}" size="+20"><p align="right">[Main NPC page]</p></font><br>`, command: "fps gui npcMain" },
 					{ text: `<font color="${LBlueClr}" size="+19">Click a NPC ID to remove it from the blacklist:</font><br>` }
 				)
 				for (let i = 0; i < mod.settings.NpcsBlacklist.length; i++) {
@@ -114,14 +94,13 @@ module.exports = function FpsUtils(mod) {
 			case "npcMain":
 				TmpData = []
 				TmpData.push(
-					{ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br><br>`, command: `fps gui` },
-					{ text: `<font color="${YellowClr}" size="+20"><p align="right">[Blacklisted NPCs list]</p></font><br>`, command: `fps gui npclist` },
+					{ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br><br>`, command: "fps gui" },
+					{ text: `<font color="${YellowClr}" size="+20"><p align="right">[Blacklisted NPCs list]</p></font><br>`, command: "fps gui npclist" },
 					{ text: `<font color="${LBlueClr}" size="+19">Click a letter to view all NPCs starting with that letter:<br><br>` }
 				)
 				for (let i = 0; i < Alphabet.length; i++) {
 					TmpData.push(
-						{ text: `<font color="${BronzeClr}" size="+19">${Alphabet[i]}</font>`, command: `fps gui npc ${Alphabet[i]}` },
-						{ text: "&nbsp;&nbsp;" }
+						{ text: `<font color="${BronzeClr}" size="+19">${Alphabet[i]}</font>&nbsp;&nbsp;`, command: `fps gui npc ${Alphabet[i]}` }
 					)
 				}
 				TmpData.push(
@@ -135,7 +114,7 @@ module.exports = function FpsUtils(mod) {
 			case "show":
 				TmpData = []
 				TmpData.push(
-					{ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br>`, command: `fps gui` },
+					{ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br>`, command: "fps gui" },
 					{ text: `<font color="${RedClr}" size="+16">Red</font><font color="${LPurpleClr}" size="+16"> = Shown, <font color="${GreenClr}" size="+16">Green</font><font color="${LPurpleClr}" size="+16"> = Hidden</font></font><br>` },
 					{ text: `<font color="${PinkClr}" size="+16">(Command </font><font color="${HPinkClr}" size="+16">"fps hide &#60;name&#62;"</font><font color="${PinkClr}" size="+16"> to hide someone that does not appear here)</font><br><br>` },
 					{ text: `<font color="${LBlueClr}" size="+19">Click on <font color="${RedClr}">Red</font> to hide & add to blacklist.<br>Click on <font color="${GreenClr}">Green</font> to show & remove from blacklist</font><br>` }
@@ -149,7 +128,7 @@ module.exports = function FpsUtils(mod) {
 			case "hide":
 				TmpData = []
 				TmpData.push(
-					{ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br><br>`, command: `fps gui` },
+					{ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br><br>`, command: "fps gui" },
 					{ text: `<font color="${LBlueClr}" size="+19">Click to show & remove from blacklist.</font><br>` }
 				)
 				mod.settings.PlayersBlacklist.forEach(mem => TmpData.push({ text: `<font color="${BronzeClr}" size="+17">${mem}</font><br>`, command: `fps show ${mem};fps gui hide` }))
@@ -158,33 +137,24 @@ module.exports = function FpsUtils(mod) {
 				break;
 			case "skills":
 				gui.parse([
-					{ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br>`, command: `fps gui` },
+					{ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br>`, command: "fps gui" },
 					{ text: `<font color="${YellowClr}" size="+20">Tankers:</font>&#09;&#09;` },
-					{ text: `<font color="${LBlueClr}" size="+18">&#40;Lancer&#41;</font>`, command: `fps gui class lancer` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${LBlueClr}" size="+18">&#40;Brawler&#41;</font><br><br>`, command: `fps gui class brawler` },
+					{ text: `<font color="${LBlueClr}" size="+18">&#40;Lancer&#41;</font>&nbsp;&nbsp;`, command: "fps gui class lancer" },
+					{ text: `<font color="${LBlueClr}" size="+18">&#40;Brawler&#41;</font><br><br>`, command: "fps gui class brawler" },
 					{ text: `<font color="${YellowClr}" size="+20">Healers:</font>&#09;&#09;` },
-					{ text: `<font color="${LBlueClr}" size="+18">&#40;Priest&#41;</font>`, command: `fps gui class priest` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${LBlueClr}" size="+18">&#40;Mystic&#41;</font><br><br>`, command: `fps gui class mystic` },
+					{ text: `<font color="${LBlueClr}" size="+18">&#40;Priest&#41;</font>&nbsp;&nbsp;`, command: "fps gui class priest" },
+					{ text: `<font color="${LBlueClr}" size="+18">&#40;Mystic&#41;</font><br><br>`, command: "fps gui class mystic" },
 					{ text: `<font color="${YellowClr}" size="+20">Dpsers(melee):</font>&#09;` },
-					{ text: `<font color="${LBlueClr}" size="+18">&#40;Warrior&#41;</font>`, command: `fps gui class warrior` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${LBlueClr}" size="+18">&#40;Slayer&#41;</font>`, command: `fps gui class slayer` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${LBlueClr}" size="+18">&#40;Berserker&#41;</font>`, command: `fps gui class berserker` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${LBlueClr}" size="+18">&#40;Ninja&#41;</font>`, command: `fps gui class ninja` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${LBlueClr}" size="+18">&#40;Valkyrie&#41;</font>`, command: `fps gui class valkyrie` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${LBlueClr}" size="+18">&#40;Reaper&#41;</font><br><br>`, command: `fps gui class reaper` },
+					{ text: `<font color="${LBlueClr}" size="+18">&#40;Warrior&#41;</font>&nbsp;&nbsp;`, command: "fps gui class warrior" },
+					{ text: `<font color="${LBlueClr}" size="+18">&#40;Slayer&#41;</font>&nbsp;&nbsp;`, command: "fps gui class slayer" },
+					{ text: `<font color="${LBlueClr}" size="+18">&#40;Berserker&#41;</font>&nbsp;&nbsp;`, command: "fps gui class berserker" },
+					{ text: `<font color="${LBlueClr}" size="+18">&#40;Ninja&#41;</font>&nbsp;&nbsp;`, command: "fps gui class ninja" },
+					{ text: `<font color="${LBlueClr}" size="+18">&#40;Valkyrie&#41;</font>&nbsp;&nbsp;`, command: "fps gui class valkyrie" },
+					{ text: `<font color="${LBlueClr}" size="+18">&#40;Reaper&#41;</font><br><br>`, command: "fps gui class reaper" },
 					{ text: `<font color="${YellowClr}" size="+20">Dpsers(ranged):</font>&#09;` },
-					{ text: `<font color="${LBlueClr}" size="+18">&#40;Sorcerer&#41;</font>`, command: `fps gui class sorcerer` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${LBlueClr}" size="+18">&#40;Archer&#41;</font>`, command: `fps gui class archer` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${LBlueClr}" size="+18">&#40;Gunner&#41;</font>`, command: `fps gui class gunner` }
+					{ text: `<font color="${LBlueClr}" size="+18">&#40;Sorcerer&#41;</font>&nbsp;&nbsp;`, command: "fps gui class sorcerer" },
+					{ text: `<font color="${LBlueClr}" size="+18">&#40;Archer&#41;</font>&nbsp;&nbsp;`, command: "fps gui class archer" },
+					{ text: `<font color="${LBlueClr}" size="+18">&#40;Gunner&#41;</font>`, command: "fps gui class gunner" }
 				], `<font color="${LPurpleClr}">[FPS] Options - Skills </font><font color="${YellowClr}">(Choose class)</font>`)
 				break;
 			case "class":
@@ -192,49 +162,37 @@ module.exports = function FpsUtils(mod) {
 				break;
 			case "role":
 				gui.parse([
-					{ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br><br>`, command: `fps gui` },
+					{ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br><br>`, command: "fps gui" },
 					{ text: `<font color="${YellowClr}" size="+20">By Roles:</font>&#09;` },
-					{ text: `<font color="${mod.settings.RolesBlacklist.includes('tank') ? GreenClr : RedClr}" size="+18">[Tankers]</font>`, command: `fps ${mod.settings.RolesBlacklist.includes('tank') ? `show` : `hide`} tank;fps gui role` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.RolesBlacklist.includes('healer') ? GreenClr : RedClr}" size="+18">[Healers]</font>`, command: `fps ${mod.settings.RolesBlacklist.includes('healer') ? `show` : `hide`} healer;fps gui role` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.RolesBlacklist.includes('dps') ? GreenClr : RedClr}" size="+18" >[Dps-All]</font>`, command: `fps ${mod.settings.RolesBlacklist.includes('dps') ? `show` : `hide`} dps;fps gui role` },
-					{ text: "&nbsp;&nbsp;" },
+					{ text: `<font color="${mod.settings.RolesBlacklist.includes('tank') ? GreenClr : RedClr}" size="+18">[Tankers]</font>&nbsp;&nbsp;`, command: `fps ${mod.settings.RolesBlacklist.includes('tank') ? `show` : `hide`} tank;fps gui role` },
+					{ text: `<font color="${mod.settings.RolesBlacklist.includes('healer') ? GreenClr : RedClr}" size="+18">[Healers]</font>&nbsp;&nbsp;`, command: `fps ${mod.settings.RolesBlacklist.includes('healer') ? `show` : `hide`} healer;fps gui role` },
+					{ text: `<font color="${mod.settings.RolesBlacklist.includes('dps') ? GreenClr : RedClr}" size="+18" >[Dps-All]</font>&nbsp;&nbsp;`, command: `fps ${mod.settings.RolesBlacklist.includes('dps') ? `show` : `hide`} dps;fps gui role` },
 					{ text: `<font color="${mod.settings.RolesBlacklist.includes('ranged') ? GreenClr : RedClr}" size="+18">[Dps-Ranged]</font><br><br><br><br>`, command: `fps ${mod.settings.RolesBlacklist.includes('ranged') ? `show` : `hide`} ranged;fps gui role` },
 					{ text: `<font color="${DBlueClr}" size="+22">By Classes</font><br><br>` },
 					{ text: `<font color="${YellowClr}" size="+20">Tankers:</font>&#09;&#09;` },
-					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('lancer') ? GreenClr : RedClr}" size="+18">[Lancer]</font>`, command: `fps ${mod.settings.ClassesBlacklist.includes('lancer') ? `show` : `hide`} lancer;fps gui role` },
-					{ text: "&nbsp;&nbsp;" },
+					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('lancer') ? GreenClr : RedClr}" size="+18">[Lancer]</font>&nbsp;&nbsp;`, command: `fps ${mod.settings.ClassesBlacklist.includes('lancer') ? `show` : `hide`} lancer;fps gui role` },
 					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('brawler') ? GreenClr : RedClr}" size="+18">[Brawler]</font><br><br>`, command: `fps ${mod.settings.ClassesBlacklist.includes('brawler') ? `show` : `hide`} brawler;fps gui role` },
 					{ text: `<font color="${YellowClr}" size="+20">Healers:</font>&#09;&#09;` },
-					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('priest') ? GreenClr : RedClr}" size="+18">[Priest]</font>`, command: `fps ${mod.settings.ClassesBlacklist.includes('priest') ? `show` : `hide`} priest;fps gui role` },
-					{ text: "&nbsp;&nbsp;" },
+					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('priest') ? GreenClr : RedClr}" size="+18">[Priest]</font>&nbsp;&nbsp;`, command: `fps ${mod.settings.ClassesBlacklist.includes('priest') ? `show` : `hide`} priest;fps gui role` },
 					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('mystic') ? GreenClr : RedClr}" size="+18">[Mystic]</font><br><br>`, command: `fps ${mod.settings.ClassesBlacklist.includes('mystic') ? `show` : `hide`} mystic;fps gui role` },
 					{ text: `<font color="${YellowClr}" size="+20">Dpsers(melee):</font>&#09;` },
-					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('warrior') ? GreenClr : RedClr}" size="+18">[Warrior]</font>`, command: `fps ${mod.settings.ClassesBlacklist.includes('warrior') ? `show` : `hide`} warrior;fps gui role` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('slayer') ? GreenClr : RedClr}" size="+18">[Slayer]</font>`, command: `fps ${mod.settings.ClassesBlacklist.includes('slayer') ? `show` : `hide`} slayer;fps gui role` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('berserker') ? GreenClr : RedClr}" size="+18">[Berserker]</font>`, command: `fps ${mod.settings.ClassesBlacklist.includes('berserker') ? `show` : `hide`} berserker;fps gui role` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('ninja') ? GreenClr : RedClr}" size="+18">[Ninja]</font>`, command: `fps ${mod.settings.ClassesBlacklist.includes('ninja') ? `show` : `hide`} ninja;fps gui role` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('valkyrie') ? GreenClr : RedClr}" size="+18">[Valkyrie]</font>`, command: `fps ${mod.settings.ClassesBlacklist.includes('valkyrie') ? `show` : `hide`} valkyrie;fps gui role` },
-					{ text: "&nbsp;&nbsp;" },
+					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('warrior') ? GreenClr : RedClr}" size="+18">[Warrior]</font>&nbsp;&nbsp;`, command: `fps ${mod.settings.ClassesBlacklist.includes('warrior') ? `show` : `hide`} warrior;fps gui role` },
+					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('slayer') ? GreenClr : RedClr}" size="+18">[Slayer]</font>&nbsp;&nbsp;`, command: `fps ${mod.settings.ClassesBlacklist.includes('slayer') ? `show` : `hide`} slayer;fps gui role` },
+					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('berserker') ? GreenClr : RedClr}" size="+18">[Berserker]</font>&nbsp;&nbsp;`, command: `fps ${mod.settings.ClassesBlacklist.includes('berserker') ? `show` : `hide`} berserker;fps gui role` },
+					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('ninja') ? GreenClr : RedClr}" size="+18">[Ninja]</font>&nbsp;&nbsp;`, command: `fps ${mod.settings.ClassesBlacklist.includes('ninja') ? `show` : `hide`} ninja;fps gui role` },
+					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('valkyrie') ? GreenClr : RedClr}" size="+18">[Valkyrie]</font>&nbsp;&nbsp;`, command: `fps ${mod.settings.ClassesBlacklist.includes('valkyrie') ? `show` : `hide`} valkyrie;fps gui role` },
 					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('reaper') ? GreenClr : RedClr}" size="+18">[Reaper]</font><br><br>`, command: `fps ${mod.settings.ClassesBlacklist.includes('reaper') ? `show` : `hide`} reaper;fps gui role` },
 					{ text: `<font color="${YellowClr}" size="+20">Dpsers(ranged):</font>&#09;` },
-					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('sorcerer') ? GreenClr : RedClr}" size="+18">[Sorcerer]</font>`, command: `fps ${mod.settings.ClassesBlacklist.includes('sorcerer') ? `show` : `hide`} sorcerer;fps gui role` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('archer') ? GreenClr : RedClr}" size="+18">[Archer]</font>`, command: `fps ${mod.settings.ClassesBlacklist.includes('archer') ? `show` : `hide`} archer;fps gui role` },
-					{ text: "&nbsp;&nbsp;" },
+					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('sorcerer') ? GreenClr : RedClr}" size="+18">[Sorcerer]</font>&nbsp;&nbsp;`, command: `fps ${mod.settings.ClassesBlacklist.includes('sorcerer') ? `show` : `hide`} sorcerer;fps gui role` },
+					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('archer') ? GreenClr : RedClr}" size="+18">[Archer]</font>&nbsp;&nbsp;`, command: `fps ${mod.settings.ClassesBlacklist.includes('archer') ? `show` : `hide`} archer;fps gui role` },
 					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('gunner') ? GreenClr : RedClr}" size="+18">[Gunner]</font>`, command: `fps ${mod.settings.ClassesBlacklist.includes('gunner') ? `show` : `hide`} gunner;fps gui role` }
 				], `<font color="${LPurpleClr}">[FPS] Options - Roles/Classes</font>`)
 				break;
 			case "abn":
 				TmpData = []
 				TmpData.push(
-					{ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br>`, command: `fps gui` },
-					{ text: `<font color="${mod.settings.AbnDebug ? GreenClr : RedClr}" size="+19"><p align="right">Debug</p></font><br>`, command: `fps abn log;fps gui abn` },
+					{ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br>`, command: "fps gui" },
+					{ text: `<font color="${AbnDebug ? GreenClr : RedClr}" size="+19"><p align="right">Debug</p></font><br>`, command: "fps abn log;fps gui abn" },
 					{ text: `<font color="${LPurpleClr}" size="+19">Blacklist: </font><font color="${PinkClr}" size="17+">Click to remove from the blacklist.</font><br>` }
 				)
 				mod.settings.AbnormalitiesBlacklist.forEach(abnmem => TmpData.push({ text: `<font color="${BronzeClr}" size="+16">${abnmem}<br></font>`, command: `fps abn blacklist remv ${abnmem};fps gui abn` }))
@@ -244,8 +202,8 @@ module.exports = function FpsUtils(mod) {
 			case "proj":
 				TmpData = []
 				TmpData.push(
-					{ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br>`, command: `fps gui` },
-					{ text: `<font color="${mod.settings.ProjDebug ? GreenClr : RedClr}" size="+19"><p align="right">Debug</p></font><br>`, command: `fps proj log;fps gui proj` },
+					{ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br>`, command: "fps gui" },
+					{ text: `<font color="${ProjDebug ? GreenClr : RedClr}" size="+19"><p align="right">Debug</p></font><br>`, command: "fps proj log;fps gui proj" },
 					{ text: `<font color="${LPurpleClr}" size="+19">Blacklist: </font><font color="${PinkClr}" size="17+">Click to remove from the blacklist.</font><br>` }
 				)
 				mod.settings.ProjectilesBlacklist.forEach(projmem => TmpData.push({ text: `<font color="${BronzeClr}" size="+16">${projmem}<br></font>`, command: `fps proj blacklist remv ${projmem};fps gui proj` }))
@@ -254,126 +212,91 @@ module.exports = function FpsUtils(mod) {
 				break;
 			case "help":
 				gui.parse([
-					{ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br>`, command: `fps gui` },
+					{ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br>`, command: "fps gui" },
 					{ text: `<font size="20">` },
-					{ text: `<font color='${LBlueClr}'>Command</font>           <font color='${SilverClr}'>Arg(s)</font>                <font color='${CPinkClr}'>Example</font><br>` },
-					{ text: `<font color='${HBlueClr}'>gui ^ g</font>                      <font color='${DBlueClr}'>N/A</font>                    <font color='${HPinkClr}'>!fps gui</font><br>` },
-					{ text: `<font color='${HBlueClr}'>  N/A</font>                         <font color='${DBlueClr}'>N/A</font>                    <font color='${HPinkClr}'>!fps-util</font><br>` },
-					{ text: `<font color='${HBlueClr}'>0 ^ 1 ^ 2 ^ 3</font>               <font color='${DBlueClr}'>N/A</font>                    <font color='${HPinkClr}'>!0 ^ !1 ^ !2 ^ !3</font><br>` },
-					{ text: `<font color='${HBlueClr}'>mode</font>                  <font color='${DBlueClr}'>0 ^ 1 ^ 2 ^ 3</font>            <font color='${HPinkClr}'>!fps mode 2</font><br>` },
-					{ text: `<font color='${HBlueClr}'>hide^show</font>    <font color='${DBlueClr}'>Player^Class^Role</font>    <font color='${HPinkClr}'>!fps hide mie</font><br>` },
-					{ text: `<font color='${HBlueClr}'>party</font>                        <font color='${DBlueClr}'>N/A</font>                    <font color='${HPinkClr}'>!fps party</font><br>` },
-					{ text: `<font color='${HBlueClr}'>raid</font>                           <font color='${DBlueClr}'>N/A</font>                    <font color='${HPinkClr}'>!fps raid</font><br>` },
-					{ text: `<font color='${HBlueClr}'>list</font>                             <font color='${DBlueClr}'>N/A</font>                    <font color='${HPinkClr}'>!fps list</font><br>` },
-					{ text: `<font color='${HBlueClr}'>sums</font>                <font color='${DBlueClr}'>other ^ me</font>               <font color='${HPinkClr}'>!fps sums me</font><br>` },
-					{ text: `<font color='${HBlueClr}'>skill</font>                       <font color='${DBlueClr}'>blacklist</font>              <font color='${HPinkClr}'>!fps skill blacklist</font><br>` },
-					{ text: `<font color='${HBlueClr}'>npc</font>                      <font color='${DBlueClr}'>N/A ^ hide</font>             <font color='${HPinkClr}'>!fps npc</font><br>` },
-					{ text: `<font color='${HBlueClr}'>hit</font>                  <font color='${DBlueClr}'>me^other^damage</font>  <font color='${HPinkClr}'>!fps hit me</font><br>` },
-					{ text: `<font color='${HBlueClr}'>firework</font>                  <font color='${DBlueClr}'>N/A</font>                    <font color='${HPinkClr}'>!fps firework</font><br>` },
-					{ text: `<font color='${HBlueClr}'>abn</font>                   <font color='${DBlueClr}'>all ^ blacklist</font>          <font color='${HPinkClr}'>!fps abn blacklist</font><br>` },
-					{ text: `<font color='${HBlueClr}'>proj</font>                   <font color='${DBlueClr}'>all ^ blacklist</font>          <font color='${HPinkClr}'>!fps proj all</font><br>` },
-					{ text: `<font color='${HBlueClr}'>guildlogo</font>                <font color='${DBlueClr}'>N/A</font>                    <font color='${HPinkClr}'>!fps guildlogo</font><br>` },
-					{ text: `<font color='${HBlueClr}'>style</font>                          <font color='${DBlueClr}'>N/A</font>                    <font color='${HPinkClr}'>!fps style</font><br>` },
-					{ text: `<font color='${HBlueClr}'>gui npcsearch</font>    <font color='${DBlueClr}'>"target"</font>          <font color='${HPinkClr}'>!fps gui npcsearch E</font><br>` },
-					{ text: `<font color='${HBlueClr}'>npczoom</font>                 <font color='${DBlueClr}'>N/A</font>                    <font color='${HPinkClr}'>!fps npczoom</font><br>` },
-					{ text: `<font color='${HBlueClr}'>dropitem</font>                 <font color='${DBlueClr}'>N/A ^ hide</font>        <font color='${HPinkClr}'>!fps dropitem</font><br>` },
-					{ text: `<font color='${HBlueClr}'>monsterdeathani</font> <font color='${DBlueClr}'>N/A</font>                    <font color='${HPinkClr}'>!fps monsterdeathani</font><br>` },
-					{ text: `<font color='${HBlueClr}'>screenabns</font>             <font color='${DBlueClr}'>N/A ^  hide</font>      <font color='${HPinkClr}'>!fps screenabns</font><br>` },
-					{ text: `<font color='${HBlueClr}'>fish ^ fishing</font>            <font color='${DBlueClr}'>N/A</font>                    <font color='${HPinkClr}'>!fps fishing</font><br>` },
+					{ text: `<font color="${LBlueClr}">Command</font>           <font color="${SilverClr}">Arg(s)</font>                <font color="${CPinkClr}">Example</font><br>` },
+					{ text: `<font color="${HBlueClr}">gui ^ g</font>                      <font color="${DBlueClr}">N/A</font>                    <font color="${HPinkClr}">!fps gui</font><br>` },
+					{ text: `<font color="${HBlueClr}">  N/A</font>                         <font color="${DBlueClr}">N/A</font>                    <font color="${HPinkClr}">!fps-util</font><br>` },
+					{ text: `<font color="${HBlueClr}">0 ^ 1 ^ 2 ^ 3</font>             <font color="${DBlueClr}">N/A</font>                    <font color="${HPinkClr}">!0 ^ !1 ^ !2 ^ !3</font><br>` },
+					{ text: `<font color="${HBlueClr}">mode</font>                  <font color="${DBlueClr}">0 ^ 1 ^ 2 ^ 3</font>            <font color="${HPinkClr}">!fps mode 2</font><br>` },
+					{ text: `<font color="${HBlueClr}">hide^show</font>    <font color="${DBlueClr}">Player^Class^Role</font>    <font color="${HPinkClr}">!fps hide mie</font><br>` },
+					{ text: `<font color="${HBlueClr}">party</font>                        <font color="${DBlueClr}">N/A</font>                    <font color="${HPinkClr}">!fps party</font><br>` },
+					{ text: `<font color="${HBlueClr}">raid</font>                           <font color="${DBlueClr}">N/A</font>                    <font color="${HPinkClr}">!fps raid</font><br>` },
+					{ text: `<font color="${HBlueClr}">list</font>                             <font color="${DBlueClr}">N/A</font>                    <font color="${HPinkClr}">!fps list</font><br>` },
+					{ text: `<font color="${HBlueClr}">sums</font>                 <font color="${DBlueClr}">other ^ me</font>               <font color="${HPinkClr}">!fps sums me</font><br>` },
+					{ text: `<font color="${HBlueClr}">skill</font>                       <font color="${DBlueClr}">blacklist</font>               <font color="${HPinkClr}">!fps skill blacklist</font><br>` },
+					{ text: `<font color="${HBlueClr}">npc</font>                      <font color="${DBlueClr}">N/A ^ hide</font>             <font color="${HPinkClr}">!fps npc</font><br>` },
+					{ text: `<font color="${HBlueClr}">hit</font>                  <font color="${DBlueClr}">me^other^damage</font>  <font color="${HPinkClr}">!fps hit me</font><br>` },
+					{ text: `<font color="${HBlueClr}">firework</font>                  <font color="${DBlueClr}">N/A</font>                    <font color="${HPinkClr}">!fps firework</font><br>` },
+					{ text: `<font color="${HBlueClr}">abn</font>                   <font color="${DBlueClr}">all ^ blacklist</font>          <font color="${HPinkClr}">!fps abn blacklist</font><br>` },
+					{ text: `<font color="${HBlueClr}">proj</font>                   <font color="${DBlueClr}">all ^ blacklist</font>          <font color="${HPinkClr}">!fps proj all</font><br>` },
+					{ text: `<font color="${HBlueClr}">guildlogo</font>                <font color="${DBlueClr}">N/A</font>                    <font color="${HPinkClr}">!fps guildlogo</font><br>` },
+					{ text: `<font color="${HBlueClr}">style</font>                          <font color="${DBlueClr}">N/A</font>                    <font color="${HPinkClr}">!fps style</font><br>` },
+					{ text: `<font color="${HBlueClr}">gui npcsearch</font>      <font color="${DBlueClr}">"target"</font>             <font color="${HPinkClr}">!fps gui npcsearch E</font><br>` },
+					{ text: `<font color="${HBlueClr}">npczoom</font>                 <font color="${DBlueClr}">N/A</font>                    <font color="${HPinkClr}">!fps npczoom</font><br>` },
+					{ text: `<font color="${HBlueClr}">dropitem</font>                 <font color="${DBlueClr}">N/A ^ hide</font>        <font color="${HPinkClr}">!fps dropitem</font><br>` },
+					{ text: `<font color="${HBlueClr}">monsterdeathani</font>  <font color="${DBlueClr}">N/A</font>                    <font color="${HPinkClr}">!fps monsterdeathani</font><br>` },
+					{ text: `<font color="${HBlueClr}">screenabns</font>             <font color="${DBlueClr}">N/A ^  hide</font>      <font color="${HPinkClr}">!fps screenabns</font><br>` },
+					{ text: `<font color="${HBlueClr}">fish ^ fishing</font>           <font color="${DBlueClr}">N/A</font>                    <font color="${HPinkClr}">!fps fishing</font>` },
 					{ text: `</font>` }
 				], `<font color="${LPurpleClr}">[FPS] HELP</font>`)
 				break;
 			default:
 				gui.parse([
-					{ text: `<font color="${PurpleClr}" size="+24"><p align="right">REFRESH</p></font><br>`, command: `fps gui` },
+					{ text: `<font color="${PurpleClr}" size="+24"><p align="right">REFRESH</p></font><br>`, command: "fps gui" },
 					{ text: `<font color="${YellowClr}" size="+21">Modes:</font>&#09;&#09;` },
-					{ text: `<font color="${mod.settings.Mode === 0 ? GreenClr : RedClr}" size="+18">[Mode 0]</font>`, command: `fps mode 0;fps gui` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.Mode === 1 ? GreenClr : RedClr}" size="+18">[Mode 1]</font>`, command: `fps mode 1;fps gui` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.Mode === 2 ? GreenClr : RedClr}" size="+18">[Mode 2]</font>`, command: `fps mode 2;fps gui` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.Mode === 3 ? GreenClr : RedClr}" size="+18">[Mode 3]</font>`, command: `fps mode 3;fps gui` },
-					{ text: "&nbsp;&nbsp;&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.Fishing ? GreenClr : RedClr}" size="+18">[Fishing]</font><br><br>`, command: `fps fishing;fps gui` },
+					{ text: `<font color="${mod.settings.Mode === 0 ? GreenClr : RedClr}" size="+18">[Mode 0]</font>&nbsp;&nbsp;`, command: "fps mode 0;fps gui" },
+					{ text: `<font color="${mod.settings.Mode === 1 ? GreenClr : RedClr}" size="+18">[Mode 1]</font>&nbsp;&nbsp;`, command: "fps mode 1;fps gui" },
+					{ text: `<font color="${mod.settings.Mode === 2 ? GreenClr : RedClr}" size="+18">[Mode 2]</font>&nbsp;&nbsp;`, command: "fps mode 2;fps gui" },
+					{ text: `<font color="${mod.settings.Mode === 3 ? GreenClr : RedClr}" size="+18">[Mode 3]</font>&nbsp;&nbsp;&nbsp;&nbsp;`, command: "fps mode 3;fps gui" },
+					{ text: `<font color="${mod.settings.Fishing ? GreenClr : RedClr}" size="+18">[Fishing]</font><br><br>`, command: "fps fishing;fps gui" },
 					{ text: `<font color="${YellowClr}" size="+21">Hit:</font>&#09;&#09;&#09;` },
-					{ text: `<font color="${mod.settings.Hit_Other ? GreenClr : RedClr}" size="+18">[Players effect]</font>`, command: `fps hit other;fps gui` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.Hit_Me ? GreenClr : RedClr}" size="+18">[Own effect]</font>`, command: `fps hit me;fps gui` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.Hit_Damage ? GreenClr : RedClr}" size="+18">[Damage numbers]</font><br><br>`, command: `fps hit damage;fps gui` },
+					{ text: `<font color="${mod.settings.Hit_Other ? GreenClr : RedClr}" size="+18">[Players effect]</font>&nbsp;&nbsp;`, command: "fps hit other;fps gui" },
+					{ text: `<font color="${mod.settings.Hit_Me ? GreenClr : RedClr}" size="+18">[Own effect]</font>&nbsp;&nbsp;`, command: "fps hit me;fps gui" },
+					{ text: `<font color="${mod.settings.Hit_Damage ? GreenClr : RedClr}" size="+18">[Damage numbers]</font><br><br>`, command: "fps hit damage;fps gui" },
 					{ text: `<font color="${YellowClr}" size="+21">Hide:</font>&#09;&#09;` },
-					{ text: `<font color="${mod.settings.HideOthersSummons ? GreenClr : RedClr}" size="+17">[Players summons]</font>`, command: `fps summons;fps gui` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.HideMySummons ? GreenClr : RedClr}" size="+17">[Own summons]</font>`, command: `fps summons me;fps gui` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.HideFireworks ? GreenClr : RedClr}" size="+17">[Fireworks]</font><br>`, command: `fps fireworks;fps gui` },
-					{ text: `&#09;&#09;&#09;` },
-					{ text: `<font color="${mod.settings.ShowStyle ? GreenClr : RedClr}" size="+17">[Style]</font>`, command: `fps style;fps gui` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.Hideguildlogos ? GreenClr : RedClr}" size="+17">[Guild Logos]</font>`, command: `fps guildlogo;fps gui` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.HideBlacklistedDrop ? GreenClr : RedClr}" size="+17">[Drops]</font>`, command: `fps dropitem;fps gui` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.HideOwnBlacklistedAbns ? GreenClr : RedClr}" size="+17">[Dizziness]</font><br>`, command: `fps screenabns;fps gui` },
-					{ text: `&#09;&#09;&#09;` },
-					{ text: `<font color="${mod.settings.HideAllAbnormalities ? GreenClr : RedClr}" size="+16">[All Abnormals]</font>`, command: `fps abn all;fps gui` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.HideBlacklistedAbnormalities ? GreenClr : RedClr}" size="+16">[Abnormals BList]</font>`, command: `fps abn blacklist;fps gui` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.HideAllProjectiles ? GreenClr : RedClr}" size="+16">[All Projs]</font>`, command: `fps proj all;fps gui` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.HideBlacklistedProjectiles ? GreenClr : RedClr}" size="+16">[Projs BList]</font><br>`, command: `fps proj blacklist;fps gui` },
-					{ text: `&#09;&#09;&#09;` },
-					{ text: `<font color="${mod.settings.HideMonsterDeathAnimation ? GreenClr : RedClr}" size="+17">[NPCs Death Ani]</font>`, command: `fps monsterdeathani;fps gui` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.ActionScripts ? GreenClr : RedClr}" size="+17">[NPCs Zoom-in]</font>`, command: `fps npczoom;fps gui` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.HideBlacklistedNpcs ? GreenClr : RedClr}" size="+16">[NPCs BList]</font>`, command: `fps npc;fps gui` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.HideBlacklistedSkills ? GreenClr : RedClr}" size="+16">[Skills BList]</font><br><br>`, command: `fps skill blacklist;fps gui` },
+					{ text: `<font color="${mod.settings.HideOthersSummons ? GreenClr : RedClr}" size="+17">[Players summons]</font>&nbsp;&nbsp;`, command: "fps summons;fps gui" },
+					{ text: `<font color="${mod.settings.HideMySummons ? GreenClr : RedClr}" size="+17">[Own summons]</font>&nbsp;&nbsp;`, command: "fps summons me;fps gui" },
+					{ text: `<font color="${mod.settings.HideFireworks ? GreenClr : RedClr}" size="+17">[Fireworks]</font><br>&#09;&#09;&#09;`, command: "fps fireworks;fps gui" },
+					{ text: `<font color="${mod.settings.ShowStyle ? GreenClr : RedClr}" size="+17">[Style]</font>&nbsp;&nbsp;`, command: "fps style;fps gui" },
+					{ text: `<font color="${mod.settings.Hideguildlogos ? GreenClr : RedClr}" size="+17">[Guild Logos]</font>&nbsp;&nbsp;`, command: "fps guildlogo;fps gui" },
+					{ text: `<font color="${mod.settings.HideBlacklistedDrop ? GreenClr : RedClr}" size="+17">[Drops]</font>&nbsp;&nbsp;`, command: "fps dropitem;fps gui" },
+					{ text: `<font color="${mod.settings.HideOwnBlacklistedAbns ? GreenClr : RedClr}" size="+17">[Dizziness]</font><br>&#09;&#09;&#09;`, command: "fps screenabns;fps gui" },
+					{ text: `<font color="${mod.settings.HideAllAbnormalities ? GreenClr : RedClr}" size="+16">[All Abnormals]</font>&nbsp;&nbsp;`, command: "fps abn all;fps gui" },
+					{ text: `<font color="${mod.settings.HideBlacklistedAbnormalities ? GreenClr : RedClr}" size="+16">[Abnormals BList]</font>&nbsp;&nbsp;`, command: "fps abn blacklist;fps gui" },
+					{ text: `<font color="${mod.settings.HideAllProjectiles ? GreenClr : RedClr}" size="+16">[All Projs]</font>&nbsp;&nbsp;`, command: "fps proj all;fps gui" },
+					{ text: `<font color="${mod.settings.HideBlacklistedProjectiles ? GreenClr : RedClr}" size="+16">[Projs BList]</font><br>&#09;&#09;&#09;`, command: "fps proj blacklist;fps gui" },
+					{ text: `<font color="${mod.settings.HideMonsterDeathAnimation ? GreenClr : RedClr}" size="+16">[NPCs Death Ani]</font>&nbsp;&nbsp;`, command: "fps monsterdeathani;fps gui" },
+					{ text: `<font color="${mod.settings.ActionScripts ? GreenClr : RedClr}" size="+16">[NPCs Zoom-in]</font>&nbsp;&nbsp;`, command: "fps npczoom;fps gui" },
+					{ text: `<font color="${mod.settings.HideBlacklistedNpcs ? GreenClr : RedClr}" size="+16">[NPCs BList]</font>&nbsp;&nbsp;`, command: "fps npc;fps gui" },
+					{ text: `<font color="${mod.settings.HideBlacklistedSkills ? GreenClr : RedClr}" size="+16">[Skills BList]</font><br><br>`, command: "fps skill blacklist;fps gui" },
 					{ text: `<font color="${YellowClr}" size="+21">Players:</font>&#09;` },
-					{ text: `<font color="${LBlueClr}" size="+18">[Hidden list]</font>`, command: `fps gui hide` },
-					{ text: "&nbsp;&nbsp;&nbsp;&nbsp;" },
-					{ text: `<font color="${LBlueClr}" size="+18">[Shown list]</font><br><br>`, command: `fps gui show` },
+					{ text: `<font color="${LBlueClr}" size="+18">[Hidden list]</font>&nbsp;&nbsp;&nbsp;&nbsp;`, command: "fps gui hide" },
+					{ text: `<font color="${LBlueClr}" size="+18">[Shown list]</font><br><br>`, command: "fps gui show" },
 					{ text: `<font color="${YellowClr}" size="+21">Misc.</font>&#09;&#09;` },
-					{ text: `<font color="${LBlueClr}" size="+17">[Classes/Roles]</font>`, command: `fps gui role` },
-					{ text: "&nbsp;&nbsp;&nbsp;" },
-					{ text: `<font color="${LBlueClr}" size="+17">[Skills]</font>`, command: `fps gui skills` },
-					{ text: "&nbsp;&nbsp;&nbsp;" },
-					{ text: `<font color="${LBlueClr}" size="+17">[NPCs]</font>`, command: `fps gui npcMain` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${LBlueClr}" size="+17">[Abnormals]</font><br>`, command: `fps gui abn` },
-					{ text: `&#09;&#09;&#09;` },
-					{ text: `<font color="${LBlueClr}" size="+17">[Projectiles]</font>`, command: `fps gui proj` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.RaidAutoChange ? GreenClr : RedClr}" size="+17">[Raid auto state]</font>`, command: `fps raid;fps gui` },
-					{ text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.OnlyParty ? GreenClr : RedClr}" size="+17">[Only Party]</font>`, command: `fps party;fps gui` },
-					{ text: `<br><br><br><br>` },
+					{ text: `<font color="${LBlueClr}" size="+17">[Classes/Roles]</font>&nbsp;&nbsp;&nbsp;`, command: "fps gui role" },
+					{ text: `<font color="${LBlueClr}" size="+17">[Skills]</font>&nbsp;&nbsp;&nbsp;`, command: "fps gui skills" },
+					{ text: `<font color="${LBlueClr}" size="+17">[NPCs]</font>&nbsp;&nbsp;`, command: "fps gui npcMain" },
+					{ text: `<font color="${LBlueClr}" size="+17">[Abnormals]</font><br>&#09;&#09;&#09;`, command: "fps gui abn" },
+					{ text: `<font color="${LBlueClr}" size="+17">[Projectiles]</font>&nbsp;&nbsp;`, command: "fps gui proj" },
+					{ text: `<font color="${mod.settings.RaidAutoChange ? GreenClr : RedClr}" size="+16">[Raid auto state]</font>&nbsp;&nbsp;`, command: "fps raid;fps gui" },
+					{ text: `<font color="${mod.settings.OnlyParty ? GreenClr : RedClr}" size="+16">[Only Party]</font>&nbsp;&nbsp;`, command: "fps party;fps gui" },
+					{ text: `<font color="${mod.settings.PvpTraps ? GreenClr : RedClr}" size="+16">[PvpTraps]</font><br><br><br><br>`, command: "fps pvptraps;fps gui" },
 					{ text: `<font color="${BlueClr}" size="+22">Quick Links:</font><br>` },
 					{ text: `<font color="${DBlueClr}" size="+21">UI:</font>&#09;&#09;` },
-					{ text: `<font color="${PurpleClr}" size="+17">[Mail]</font>`, command: `fps quicklink parcel` },
-					{ text: "&nbsp;&nbsp;&nbsp;" },
-					{ text: `<font color="${PurpleClr}" size="+17">[Broker]</font>`, command: `fps quicklink broker` },
-					{ text: "&nbsp;&nbsp;&nbsp;" },
-					{ text: `<font color="${PurpleClr}" size="+17">[Talent]</font>`, command: `fps quicklink talents` },
-					{ text: "&nbsp;&nbsp;&nbsp;" },
-					{ text: `<font color="${PurpleClr}" size="+17">[Dress]</font>`, command: `fps quicklink dressingroom` },
-					{ text: "&nbsp;&nbsp;&nbsp;" },
-					{ text: `<font color="${PurpleClr}" size="+17">[Hat Style]</font>`, command: `fps quicklink hatrestyle` },
-					{ text: "&nbsp;&nbsp;&nbsp;" },
-					{ text: `<font color="${PurpleClr}" size="+17">[Search-Engine]</font><br>`, command: `fps quicklink searchengine` },
+					{ text: `<font color="${PurpleClr}" size="+17">[Mail]</font>&nbsp;&nbsp;&nbsp;`, command: "fps quicklink parcel" },
+					{ text: `<font color="${PurpleClr}" size="+17">[Broker]</font>&nbsp;&nbsp;&nbsp;`, command: "fps quicklink broker" },
+					{ text: `<font color="${PurpleClr}" size="+17">[Talent]</font>&nbsp;&nbsp;&nbsp;`, command: "fps quicklink talents" },
+					{ text: `<font color="${PurpleClr}" size="+17">[Dress]</font>&nbsp;&nbsp;&nbsp;`, command: "fps quicklink dressingroom" },
+					{ text: `<font color="${PurpleClr}" size="+17">[Hat Style]</font>&nbsp;&nbsp;&nbsp;`, command: "fps quicklink hatrestyle" },
+					{ text: `<font color="${PurpleClr}" size="+17">[Search-Engine]</font><br>`, command: "fps quicklink searchengine" },
 					{ text: `<font color="${DBlueClr}" size="+21">Group:</font>&#09;` },
-					{ text: `<font color="${OrangeClr}" size="+17">[Reset]</font>`, command: `fps quicklink reset` },
-					{ text: "&nbsp;&nbsp;&nbsp;&nbsp;" },
-					{ text: `<font color="${CPinkClr}" size="+17">[Leave]</font>`, command: `fps quicklink drop` },
-					{ text: "&nbsp;&nbsp;&nbsp;" },
-					{ text: `<font color="${CPinkClr}" size="+17">[Disband]</font><br>`, command: `fps quicklink disband` },
+					{ text: `<font color="${OrangeClr}" size="+17">[Reset]</font>&nbsp;&nbsp;&nbsp;&nbsp;`, command: "fps quicklink reset" },
+					{ text: `<font color="${CPinkClr}" size="+17">[Leave]</font>&nbsp;&nbsp;&nbsp;`, command: "fps quicklink drop" },
+					{ text: `<font color="${CPinkClr}" size="+17">[Disband]</font><br>`, command: "fps quicklink disband" },
 					{ text: `<font color="${DBlueClr}" size="+21">Extra:</font>&#09;` },
-					{ text: `<font color="${CPinkClr}" size="+17">[Lobby]</font>`, command: `fps quicklink lobby` },
-					{ text: "&#09;&#09;&#09;&#09;&#09;&#09;&nbsp;" },
-					{ text: `<font color="${HPinkClr}" size="+17">[!! Instant Exit]</font><br>`, command: `fps quicklink instantexit` }
+					{ text: `<font color="${CPinkClr}" size="+17">[Lobby]</font>&#09;&#09;&#09;&#09;&#09;&#09;&nbsp;`, command: "fps quicklink lobby" },
+					{ text: `<font color="${HPinkClr}" size="+17">[!! Instant Exit]</font><br>`, command: "fps quicklink instantexit" }
 				], `<font color="${LPurpleClr}">[FPS] Options</font> | <font color="${RedClr}" size="+16">Red</font><font color="${LPurpleClr}" size="+16"> = disabled, <font color="${GreenClr}" size="+16">Green</font><font color="${LPurpleClr}" size="+16"> = enabled</font>`)
 		}
 	}
@@ -386,8 +309,8 @@ module.exports = function FpsUtils(mod) {
 			skilldata = [],
 			skillIds = []
 		skilldata.push(
-			{ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br>`, command: `fps gui` },
-			{ text: `<font color="${mod.settings.HideBlacklistedSkills ? GreenClr : RedClr}" size="+22"><p align="right">[Blacklisted skills are ${mod.settings.HideBlacklistedSkills ? 'Hidden' : 'Shown'}]</p></font><br>`, command: `fps skill blacklist;fps gui skills` },
+			{ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br>`, command: "fps gui" },
+			{ text: `<font color="${mod.settings.HideBlacklistedSkills ? GreenClr : RedClr}" size="+22"><p align="right">[Blacklisted skills are ${mod.settings.HideBlacklistedSkills ? 'Hidden' : 'Shown'}]</p></font><br>`, command: "fps skill blacklist;fps gui skills" },
 			{ text: `<font color="${LBlueClr}" size="+19">Click skill to blacklist it.</font><br>` }
 		)
 		for (let key in SkillData[value]) {
@@ -400,11 +323,12 @@ module.exports = function FpsUtils(mod) {
 		return skilldata
 	}
 
-	function JsonSearch(nameKey, array, arg, title) {
+	function NpcJsonSearch(nameKey, array, arg, title) {
+		TmpData = []
+		TmpData.push({ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br><br>`, command: "fps gui" })
 		for (let i = 0; i < array.length; i++) {
-			if (array[i].Name.startsWith(nameKey) && arg == `starts`) TmpData.push({ command: `fps npc hide ${array[i].HuntingZoneId} ${array[i].TemplateId};fps gui npc ${nameKey}`, text: `<font color="${mod.settings.NpcsBlacklist.some(arrVal => array[i].HuntingZoneId == arrVal.zone && array[i].TemplateId == arrVal.templateId) ? GreenClr : RedClr}" size="+17">${array[i].Name} - ${array[i].HuntingZoneId}, ${array[i].TemplateId}</font><br>` })
-			if (array[i].Name.includes(nameKey) && arg == `search`) TmpData.push({ command: `fps npc hide ${array[i].HuntingZoneId} ${array[i].TemplateId};fps gui npcsearch ${nameKey}`, text: `<font color="${mod.settings.NpcsBlacklist.some(arrVal => array[i].HuntingZoneId == arrVal.zone && array[i].TemplateId == arrVal.templateId) ? GreenClr : RedClr}" size="+17">${array[i].Name} - ${array[i].HuntingZoneId}, ${array[i].TemplateId}</font><br>` })
-			if (!isNaN(arg) && array[i].nameKey == arg) return true;
+			if (array[i].Nm.startsWith(nameKey) && arg === "starts") TmpData.push({ command: `fps npc hide ${array[i].Hz} ${array[i].Ti};fps gui npc ${nameKey}`, text: `<font color="${mod.settings.NpcsBlacklist.some(arrVal => array[i].Hz == arrVal.zone && array[i].Ti == arrVal.templateId) ? GreenClr : RedClr}" size="+17">${array[i].Nm}</font><br>` });
+			if (array[i].Nm.includes(nameKey) && arg === "search") TmpData.push({ command: `fps npc hide ${array[i].Hz} ${array[i].Ti};fps gui npcsearch ${nameKey}`, text: `<font color="${mod.settings.NpcsBlacklist.some(arrVal => array[i].Hz == arrVal.zone && array[i].Ti == arrVal.templateId) ? GreenClr : RedClr}" size="+17">${array[i].Nm} </font><br>` });
 		}
 		gui.parse(TmpData, `<font color="${LPurpleClr}">[FPS] Options - NPCs</font> |  ${title}`)
 		TmpData = []
@@ -419,8 +343,8 @@ module.exports = function FpsUtils(mod) {
 	// ~~~ * Command Functions * ~~~ \\
 
 	function Msg(msg) {
-		if (NotCP) mod.command.message(`<font color="${LPurpleClr}">[FPS] ${msg}</font>`)
-		else mod.command.message(`<font color="${LPurpleClr}">${msg}</font>`)
+		if (NotCP) mod.command.message(`<font color="${LPurpleClr}">[FPS] ${msg}</font>`);
+		else mod.command.message(`<font color="${LPurpleClr}">${msg}</font>`);
 	}
 
 	function HideSpecificPlayer(name) {
@@ -545,14 +469,8 @@ module.exports = function FpsUtils(mod) {
 		MyGameId = event.gameId;
 		MyName = event.name;
 		MyPlayerId = event.playerId;
-		if (mod.settings.ProjDebug) {
-			mod.settings.ProjDebug = false
-			Msg(`<font color="${HPinkClr}">Auto Disabled</font> projectile debug, to reduce the unneeded spam.`)
-		}
-		if (mod.settings.AbnDebug) {
-			mod.settings.AbnDebug = false
-			Msg(`<font color="${HPinkClr}">Auto Disabled</font> abnormalities debug, to reduce the unneeded spam.`)
-		}
+		if (ProjDebug) ProjDebug = false;
+		if (AbnDebug) AbnDebug = false;
 	}
 
 	function sLoadTopo() {
@@ -561,12 +479,12 @@ module.exports = function FpsUtils(mod) {
 		HiddenUsers = {};
 		HiddenNpcs = {};
 		HFishingNpcs = {};
-		if (mod.settings.ProjDebug) {
-			mod.settings.ProjDebug = false
+		if (ProjDebug) {
+			ProjDebug = false
 			Msg(`<font color="${HPinkClr}">Auto Disabled</font> projectile debug, to reduce the unneeded spam.`)
 		}
-		if (mod.settings.AbnDebug) {
-			mod.settings.AbnDebug = false
+		if (AbnDebug) {
+			AbnDebug = false
 			Msg(`<font color="${HPinkClr}">Auto Disabled</font> abnormalities debug, to reduce the unneeded spam.`)
 		}
 	}
@@ -628,7 +546,7 @@ module.exports = function FpsUtils(mod) {
 
 	function sSystemMessage(event) {
 		if (!mod.settings.Fishing) return;
-		let SystemMessage = mod.parseSystemMessage(event.message)
+		const SystemMessage = mod.parseSystemMessage(event.message)
 		if (['SMT_KOREAN_RATING_TEENAGER_PROHIBITED', 'SMT_FIELD_EVENT_WORLD_ANNOUNCE'].includes(SystemMessage.id)) return false;
 		if (['SMT_GACHA_REWARD', 'SMT_FISHING_REWARD'].includes(SystemMessage.id) && SystemMessage.tokens.UserName !== MyName) return false;
 	}
@@ -711,7 +629,7 @@ module.exports = function FpsUtils(mod) {
 			if (event.members.length >= 18) {
 				if (mod.settings.Mode === 3 || (LastState && mod.settings.Mode === 2)) return;
 				LastState = mod.settings.Mode
-				mod.command.exec(`fps mode 2`)
+				mod.command.exec("fps mode 2")
 			} else {
 				if (!LastState || mod.settings.Mode !== 2) return;
 				mod.command.exec(`fps mode ${LastState}`)
@@ -720,10 +638,10 @@ module.exports = function FpsUtils(mod) {
 		}
 	}
 
-	/*function sUserAppearanceChange(event) {
+	function sUserAppearanceChange(event) {
 		if (EqGid(event.id)) return;
 		if (mod.settings.ShowStyle) return false;
-	}*/
+	}
 
 	function sUserExternalChange(event) {
 		if (EqGid(event.gameId)) return;
@@ -731,7 +649,7 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function sUnicastTransformData(event) {
-		if (event.gameId == 0 || EqGid(event.gameId)) return;
+		if (!event.gameId || EqGid(event.gameId)) return;
 		if (mod.settings.ShowStyle) return false;
 		if (mod.settings.Hideguildlogos) {
 			event.guildLogo = '';
@@ -750,7 +668,7 @@ module.exports = function FpsUtils(mod) {
 		}
 		if (event.huntingZoneId === 1023) {
 			if (mod.settings.HideFireworks && [60016000, 80037000].includes(event.templateId)) return false;
-			if (!UsersSummonedNPCs.includes(event.id)) return;
+			if (!UserSumNPCs.includes(event.id)) return;
 			if (EqGid(event.owner)) {
 				if (!mod.settings.HideMySummons) return;
 				HiddenNpcs[event.gameId] = event;
@@ -796,7 +714,7 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function sAbnormalityBegin(event) {
-		if (mod.settings.AbnDebug) {
+		if (AbnDebug) {
 			if (EqGid(event.target)) log('Abnormality', 'Applied', 'on', MyName, event.id)
 			if (EqGid(event.source)) log('Abnormality', 'Started', 'from', MyName, event.id)
 			if (SpawnedUsers[event.target]) log('Abnormality', 'Applied', 'on', SpawnedUsers[event.target].name, event.id)
@@ -834,19 +752,21 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function sStartUserProjectile(event) {
-		if (mod.settings.ProjDebug) {
+		if (ProjDebug) {
 			if (EqGid(event.gameId)) log('Projectile', 'Started', 'from', MyName, event.skill.id)
-			if (SpawnedUsers[event.gameId]) log('Projectile', 'Started', 'from', SpawnedUsers[event.source].name, event.skill.id)
+			if (SpawnedUsers[event.gameId]) log('Projectile', 'Started', 'from', SpawnedUsers[event.gameId].name, event.skill.id)
 		}
+		if (mod.settings.PvpTraps && PvPProjs.includes(event.skill.id)) return;
 		if ((mod.settings.HideBlacklistedProjectiles || mod.settings.HideAllProjectiles) && mod.settings.ProjectilesBlacklist.includes(event.skill.id)) return false;
 		if (!EqGid(event.gameId) && SpawnedUsers[event.gameId] && (HiddenUsers[event.gameId] || mod.settings.Mode > 0 || mod.settings.HideAllProjectiles)) return false;
 	}
 
 	function sSpawnProjectile(event) {
-		if (mod.settings.ProjDebug) {
+		if (ProjDebug) {
 			if (EqGid(event.gameId)) log('Projectile', 'Spawned', 'from', MyName, event.skill.id)
-			if (SpawnedUsers[event.gameId]) log('Projectile', 'Started', 'from', SpawnedUsers[event.source].name, event.skill.id)
+			if (SpawnedUsers[event.gameId]) log('Projectile', 'Spawned', 'from', SpawnedUsers[event.gameId].name, event.skill.id)
 		}
+		if (mod.settings.PvpTraps && PvPProjs.includes(event.skill.id)) return;
 		if ((mod.settings.HideBlacklistedProjectiles || mod.settings.HideAllProjectiles) && mod.settings.ProjectilesBlacklist.includes(event.skill.id)) return false;
 		if (!EqGid(event.gameId) && SpawnedUsers[event.gameId] && (HiddenUsers[event.gameId] || mod.settings.Mode > 0 || mod.settings.HideAllProjectiles)) return false;
 	}
@@ -864,7 +784,7 @@ module.exports = function FpsUtils(mod) {
 		if (EqGid(event.source)) return;
 		if (mod.settings.HideBlacklistedDrop) {
 			for (let i in event.owners) {
-				if (event.owners[i].playerId.toString() == MyPlayerId.toString()) return;
+				if (event.owners[i].playerId.toString() === MyPlayerId.toString()) return;
 			}
 			if (mod.settings.DropBlacklist.includes(event.item)) return false;
 		}
@@ -895,7 +815,7 @@ module.exports = function FpsUtils(mod) {
 	mod.hook('S_SYSTEM_MESSAGE', 1, sSystemMessage)
 	mod.hook('S_PARTY_MATCH_LINK', 'raw', sPartyMatchLink)
 	mod.hook('S_VIEW_PARTY_INVITE', 'raw', sViewPartyInvite)
-	//mod.hook('S_QUEST_VILLAGER_INFO', 'raw', sQuestVillagerInfo) opcode not public.
+	//mod.hook('S_QUEST_VILLAGER_INFO', 'raw', sQuestVillagerInfo) opcode currently not public, but soon it will be.
 	mod.hook('S_UPDATE_ACHIEVEMENT_PROGRESS', 'raw', sUpdateAchievementProgress)
 	mod.hook('S_CURRENT_CHANNEL', 2, sCurrentChannel)
 	mod.hook('S_ITEM_CUSTOM_STRING', 2, sItemCustomString)
@@ -910,7 +830,7 @@ module.exports = function FpsUtils(mod) {
 	mod.hook('S_USER_LOCATION', 5, sUserLocation)
 	mod.hook('S_USER_MOVETYPE', 'raw', sUserMoveType)
 	mod.hook('S_PARTY_MEMBER_LIST', 7, sPartyMemberList)
-	//mod.hook('S_USER_APPEARANCE_CHANGE', 1, { order: 9999 }, sUserAppearanceChange) missing opcode for pinkie proxy ._.
+	mod.hook('S_USER_APPEARANCE_CHANGE', 1, { order: 9999 }, sUserAppearanceChange)
 	mod.hook('S_USER_EXTERNAL_CHANGE', 7, { order: 9999 }, sUserExternalChange)
 	mod.hook('S_UNICAST_TRANSFORM_DATA', 5, { order: 99999 }, sUnicastTransformData)
 
@@ -1072,6 +992,10 @@ module.exports = function FpsUtils(mod) {
 				mod.settings.RaidAutoChange = !mod.settings.RaidAutoChange
 				Msg(`Raid auto-state ${mod.settings.RaidAutoChange ? `<font color="${GreenClr}">Enabled</font>` : `<font color="${RedClr}">Disabled</font>`}.`);
 				break;
+			case "pvptraps":
+				mod.settings.PvpTraps = !mod.settings.PvpTraps;
+				Msg(`Pvp Traps are ${mod.settings.PvpTraps ? `<font color="${GreenClr}">Shown<font color="${PinkClr}">(not affected by hide all projectiles)</font></font>` : `<font color="${RedClr}">Normal<font color="${PinkClr}">(affected by hide all projectiles)</font></font>`}.`);
+				break;
 			case "list":
 				Msg(`<font color="${PinkClr}">Hidden players: ${mod.settings.PlayersBlacklist}</font>.`);
 				Msg(`<font color="${PinkClr}">Hidden classes: ${mod.settings.ClassesBlacklist}</font>.`);
@@ -1127,7 +1051,7 @@ module.exports = function FpsUtils(mod) {
 				break;
 			case "npcs":
 			case "npc":
-				if (arg == 'hide') {
+				if (arg === 'hide') {
 					if (!arg2 || !arg3) {
 						mod.settings.HideBlacklistedNpcs = !mod.settings.HideBlacklistedNpcs;
 						Msg(`Blacklisted NPCs ${mod.settings.HideBlacklistedNpcs ? `<font color="${GreenClr}">Hidden</font>` : `<font color="${RedClr}">Shown</font>`}.`);
@@ -1186,15 +1110,15 @@ module.exports = function FpsUtils(mod) {
 						} else if (arg2 && arg3) {
 							arg3 = Number(arg3);
 							if (!mod.settings.AbnormalitiesBlacklist.includes(arg3)) {
-								if (arg2 == 'add') {
+								if (arg2 === 'add') {
 									mod.settings.AbnormalitiesBlacklist.push(arg3)
 									Msg(`Blacklisted Abnormalities <font color="${GreenClr}">added '${arg3}'</font>..`)
 									return;
-								} else if (arg2 == 'remv') return Msg(`Blacklisted Abnormalities <font color="${RedClr}">can't remove '${arg3}' as it's not there</font>.`);
+								} else if (arg2 === 'remv') return Msg(`Blacklisted Abnormalities <font color="${RedClr}">can't remove '${arg3}' as it's not there</font>.`);
 
 							} else if (mod.settings.AbnormalitiesBlacklist.includes(arg3)) {
-								if (arg2 == 'add') return Msg(`Blacklisted Abnormalities <font color="${RedClr}">can't add '${arg3}' as it's already there</font>.`);
-								else if (arg2 == 'remv') {
+								if (arg2 === 'add') return Msg(`Blacklisted Abnormalities <font color="${RedClr}">can't add '${arg3}' as it's already there</font>.`);
+								else if (arg2 === 'remv') {
 									let index = mod.settings.AbnormalitiesBlacklist.indexOf(arg3)
 									if (index !== -1) {
 										mod.settings.AbnormalitiesBlacklist.splice(index, 1)
@@ -1207,8 +1131,8 @@ module.exports = function FpsUtils(mod) {
 						break;
 					case "log":
 					case "debug":
-						mod.settings.AbnDebug = !mod.settings.AbnDebug;
-						if (mod.settings.AbnDebug) Msg(`Abnormalities debug <font color="${GreenClr}">started</font>, check your proxy console for details.`)
+						AbnDebug = !AbnDebug;
+						if (AbnDebug) Msg(`Abnormalities debug <font color="${GreenClr}">started</font>, check your proxy console for details.`)
 						else Msg(`Abnormalities debug <font color="${RedClr}">stopped</font>.`);
 						break;
 					default:
@@ -1217,22 +1141,22 @@ module.exports = function FpsUtils(mod) {
 				}
 				break;
 			case "guildlogo":
-				if (ChangeOnCd) return Msg(`<font color="${PinkClr}">Try again in 3 seconds</font>.`);
+				if (SwitchCd) return Msg(`<font color="${PinkClr}">Try again in 3 seconds</font>.`);
 				mod.settings.Hideguildlogos = !mod.settings.Hideguildlogos;
 				mod.toServer('C_SET_VISIBLE_RANGE', 1, { range: 0 });
 				setTimeout(() => mod.toServer('C_SET_VISIBLE_RANGE', 1, { range: LastVrange }), 1500);
-				ChangeOnCd = true;
-				setTimeout(() => ChangeOnCd = false, 2800);
+				SwitchCd = true;
+				setTimeout(() => SwitchCd = false, 2800);
 				Msg(`Guild Logos ${mod.settings.Hideguildlogos ? `<font color="${GreenClr}">Hidden</font>` : `<font color="${RedClr}">Shown</font>`}.`);
 				break;
 			case "costume":
 			case "style":
-				if (ChangeOnCd) return Msg(`<font color="${PinkClr}">Try again in 3 seconds</font>.`);
+				if (SwitchCd) return Msg(`<font color="${PinkClr}">Try again in 3 seconds</font>.`);
 				mod.settings.ShowStyle = !mod.settings.ShowStyle;
 				mod.toServer('C_SET_VISIBLE_RANGE', 1, { range: 0 })
 				setTimeout(() => mod.toServer('C_SET_VISIBLE_RANGE', 1, { range: LastVrange }), 1500);
-				ChangeOnCd = true
-				setTimeout(() => ChangeOnCd = false, 2800);
+				SwitchCd = true
+				setTimeout(() => SwitchCd = false, 2800);
 				Msg(`Style of NPCs & others ${mod.settings.ShowStyle ? `<font color="${GreenClr}">Hidden</font>` : `<font color="${RedClr}">Shown</font>`}.`);
 				break;
 			case "proj":
@@ -1250,14 +1174,14 @@ module.exports = function FpsUtils(mod) {
 						} else if (arg2 && arg3) {
 							arg3 = Number(arg3);
 							if (!mod.settings.ProjectilesBlacklist.includes(arg3)) {
-								if (arg2 == 'add') {
+								if (arg2 === 'add') {
 									mod.settings.ProjectilesBlacklist.push(arg3)
 									Msg(`Blacklisted projectile <font color="${GreenClr}">added '${arg3}'</font>.`)
 									return;
-								} else if (arg2 == 'remv') return Msg(`Blacklisted projectile <font color="${RedClr}">can't remove '${arg3}' as it's not there</font>.`);
+								} else if (arg2 === 'remv') return Msg(`Blacklisted projectile <font color="${RedClr}">can't remove '${arg3}' as it's not there</font>.`);
 							} else if (mod.settings.ProjectilesBlacklist.includes(arg3)) {
-								if (arg2 == 'add') return Msg(`Blacklisted projectile <font color="${RedClr}">can't add '${arg3}' as it's already there</font>.`);
-								else if (arg2 == 'remv') {
+								if (arg2 === 'add') return Msg(`Blacklisted projectile <font color="${RedClr}">can't add '${arg3}' as it's already there</font>.`);
+								else if (arg2 === 'remv') {
 									let index = mod.settings.ProjectilesBlacklist.indexOf(arg3)
 									if (index !== -1) {
 										mod.settings.ProjectilesBlacklist.splice(index, 1)
@@ -1270,8 +1194,8 @@ module.exports = function FpsUtils(mod) {
 						break;
 					case "log":
 					case "debug":
-						mod.settings.ProjDebug = !mod.settings.ProjDebug
-						if (mod.settings.ProjDebug) Msg(`Projectile debug <font color="${GreenClr}">started</font>, check your proxy console for details.`)
+						ProjDebug = !ProjDebug
+						if (ProjDebug) Msg(`Projectile debug <font color="${GreenClr}">started</font>, check your proxy console for details.`)
 						else Msg(`Projectile debug <font color="${RedClr}">stopped</font>.`);
 						break;
 					default:
@@ -1281,25 +1205,25 @@ module.exports = function FpsUtils(mod) {
 				break;
 			case "quicklink":
 				switch (arg) {
-					case "parcel":
+					case "mail": case "parcel":
 						mod.toServer('C_REQUEST_CONTRACT', 1, { type: 8 });
 						break;
-					case "talents":
+					case "talent": case "talents":
 						mod.toServer('C_REQUEST_CONTRACT', 1, { type: 77 });
 						break;
 					case "broker":
 						mod.toClient('S_NPC_MENU_SELECT', 1, { type: 28 });
 						break;
-					case "dressingroom":
+					case "dress": case "dressingroom":
 						mod.toServer('C_REQUEST_CONTRACT', 1, { type: 76 });
 						break;
-					case "hatrestyle":
+					case "hat": case "hatrestyle":
 						mod.toServer('C_REQUEST_CONTRACT', 1, { type: 90 });
 						break;
 					case "lobby":
 						mod.toServer('C_RETURN_TO_LOBBY', 1, {});
 						break;
-					case "instantexit":
+					case "exit": case "instantexit":
 						mod.toClient('S_EXIT', 3, { category: 0, code: 0 });
 						break;
 					case "drop":
@@ -1324,7 +1248,7 @@ module.exports = function FpsUtils(mod) {
 				Msg(`Npc zoom-ins ${mod.settings.ActionScripts ? `<font color="${GreenClr}">Hidden</font>` : `<font color="${RedClr}">Shown</font>`}.`);
 				break;
 			case "dropitem":
-				if (arg == 'hide') {
+				if (arg === 'hide') {
 					if (!arg2) {
 						mod.settings.HideBlacklistedDrop = !mod.settings.HideBlacklistedDrop;
 						Msg(`Blacklisted Drops ${mod.settings.HideBlacklistedDrop ? `<font color="${GreenClr}">Hidden</font>` : `<font color="${RedClr}">Shown</font>`}.`);
@@ -1349,7 +1273,7 @@ module.exports = function FpsUtils(mod) {
 				Msg(`Monsters Death Animation is ${mod.settings.HideMonsterDeathAnimation ? `<font color="${GreenClr}">Hidden</font>` : `<font color="${RedClr}">Shown</font>`}.`);
 				break;
 			case "screenabns":
-				if (arg == 'hide') {
+				if (arg === 'hide') {
 					if (!arg2) {
 						mod.settings.HideOwnBlacklistedAbns = !mod.settings.HideOwnBlacklistedAbns;
 						Msg(`Blacklisted ScreenAbns ${mod.settings.OwnAbnormalsBlacklist ? `<font color="${GreenClr}">Hidden</font>` : `<font color="${RedClr}">Shown</font>`}.`);
@@ -1376,13 +1300,13 @@ module.exports = function FpsUtils(mod) {
 				else ShowFishingNpcs();
 				break;
 			case "help":
-				mod.command.exec(`fps gui help`)
+				mod.command.exec("fps gui help");
 				break;
 			default:
 				Msg(`<font color="${RedClr}">Unknown command, check command list</font>.`);
-				mod.command.exec(`fps gui help`)
+				mod.command.exec("fps gui help");
 				break;
 		}
-		if (!NotCP) mod.saveSettings();
+		if (!NotCP) mod.saveSettings(); // for some reason settings still.... doesn't save properly on first run for caali's proxy so we have this here now as temp fix I guess. 🤷
 	})
 }

+ 8 - 5
lib/setting_migration.js

@@ -1,15 +1,12 @@
-"use strict"
-
 const DefaultSettings = {
-	_version: 7,
+	_version: 8,
 	Mode: 0,
 	Fishing: false,
 	OnlyParty: false,
 	RaidAutoChange: false,
 	ShowStyle: false,
 	ActionScripts: false,
-	ProjDebug: false,
-	AbnDebug: false,
+	PvpTraps: false,
 	Hit_Me: false,
 	Hit_Other: false,
 	Hit_Damage: false,
@@ -91,6 +88,12 @@ function MigrateSettings(from_ver, to_ver, settings) {
 				settings.AbnormalitiesBlacklist = DefaultSettings.AbnormalitiesBlacklist;
 				settings.Fishing = DefaultSettings.Fishing;
 				break;
+			case 8:
+				delete settings.ProjDebug;
+				delete settings.AbnDebug;
+				settings._version = 8;
+				settings.PvpTraps = DefaultSettings.PvpTraps;
+				break;
 			default:
 				console.log(`[FPS-UTILS] -\x1b[31m Your 'config.json' seems to be too old.\x1b[32m Re-created new one.\x1b[0m`);
 				Object.keys(settings).forEach(key => delete settings[key]);

+ 6 - 5
manifest.json

@@ -1,12 +1,12 @@
 {
     "files": {
         "README.md": "b9cbe53c8ea61dbb4b8cf889842f5344bf5b1fed0c12edc3c6004bede865ae00",
-        "lib/data/npcData.json": "df6ea18642a274017e173d9bf34884a44202c72b3e030085aa5bb64f7b2d6337",
+        "lib/data/npcData.json": "737fd1ff6b53121fc2fa716bc7f1c5688a4db2353dedf9c024bb879cd0cfa5a0",
         "lib/data/skillString.json": "9d69876fea0be8e6ac5dd43b3fc74ea023f6b8a6145384f8f780dd977045d8ef",
-        "lib/index.js": "20cebc445abb2ea17f6a73eefe3cb03543e655e1dc0e1e00828cb7b01de3f609",
-        "lib/setting_migration.js": "15e78141c9b59b9aa563ec107048a1212523942a4ed23bea38803cdb8abe9df6",
-        "module.json": "d4b5d23aecb16e1ae6ba64f6b71842b0b88dd5c686f54a7d9c328604a0f2570b",
-        "package.json": "64239e69d6e4b0568f1dd8456edeb8585e7ba2bcab1ae9cf4625d7027de95ff3"
+        "lib/index.js": "6c8239334d8c3ac1cb0018a24eff4a1a0e0f7a3d9b109e8142a516355736baba",
+        "lib/setting_migration.js": "df03f5c08e98f82275038b76b240f605d3a1ed29c831190e51f4e0cc4a9e1a4c",
+        "module.json": "817f90bb235687a40044b2875128ae848928efc62b3d3ecbde72d528e1fc033d",
+        "package.json": "c6c696814caec5c2994c9bf6c75f52ac65b6199e0f61b246da2ad73d406ce877"
     },
     "defs": {
         "C_ADMIN": 1,
@@ -58,6 +58,7 @@
         "S_UNICAST_TRANSFORM_DATA": 5,
         "S_UNMOUNT_VEHICLE": 2,
         "S_UPDATE_ACHIEVEMENT_PROGRESS": "raw",
+        "S_USER_APPEARANCE_CHANGE": 1,
         "S_USER_EXTERNAL_CHANGE": 7,
         "S_USER_LOCATION": 5,
         "S_USER_MOVETYPE": "raw",

+ 2 - 2
module.json

@@ -5,11 +5,11 @@
     "homepage": "https://github.com/Risenio/fps-utils/wiki",
     "description": "A free script filled with features dedicated to improve your fps.",
     "contributors": ["codeagon","Saegusae","SerenTera","Kyoukaya","SaltyMonkey","Leyki"],
-    "version": "7",
+    "version": "8",
     "options": {
         "niceName": "FPS",
         "guiName": "Fps Utils",
-        "settingsVersion": 7,
+        "settingsVersion": 8,
         "settingsFile": "config.json",
         "settingsMigrator": "./lib/setting_migration.js"
     },

+ 1 - 1
package.json

@@ -3,7 +3,7 @@
 	"name": "fps-utils",
 	"author": "Risenio",
 	"description": "A free script filled with features dedicated to improve your fps.",
-	"version": "7",
+	"version": "8",
 	"homepage": "https://github.com/Risenio/fps-utils/wiki",
 	"keywords": [ "fps", "tera", "tera-proxy", "tera-fps" ],
     "contributors": ["codeagon", "Saegusae", "SerenTera", "Kyoukaya", "SaltyMonkey", "Leyki"],

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