Browse Source

Minor-update

Small fixes.
Added `mod.json`.
Risenio 8 years ago
parent
commit
d934c5b400
9 changed files with 232 additions and 334 deletions
  1. 13 12
      README.md
  2. 0 0
      lib/data/npcData.json
  3. 193 214
      lib/index.js
  4. 1 68
      lib/setting_migration.js
  5. 8 8
      manifest.json
  6. 7 0
      mod.json
  7. 1 1
      module.json
  8. 1 4
      node_modules/Gui/README.md
  9. 8 27
      node_modules/Gui/index.js

+ 13 - 12
README.md

@@ -57,25 +57,25 @@ Written for tera-proxy, a free script filled with features dedicated to improve
 - Own summons: if enabled, Prevent showing any summon for npcs from you.
 - Skill: if enabled, Prevent showing any blacklisted skills.
   - `blacklist`: triggers on/off for hiding backlisted skills.
-  - `class \<cls\>`: if \<cls\> is a valid class name, it turns on/off showing any skill for that class.
+  - `class <cla>`: if \<cla\> is a valid class name, it turns on/off showing any skill for that class.
 - Npc: if enabled, Prevent showing any blacklisted npc.
-  - `hide \<hz\> \<ti\>`: adds or removes to the npcs blacklist. \<hz\> is the hunting zone and \<ti\> is the template id.
+  - `hide <hz> <ti>`: adds or removes to the npcs blacklist. \<hz\> is the hunting zone and \<ti\> is the template id.
 - Abnormal: if `all` enabled, Prevent showing other peoples effects.
-  - `blacklist`: if you type `\!fps abn blacklist` it will trigger on/off blacklist hidden/shown.
-  - `blacklist \<x\> \<xx\>`: \<x\> can be 'add' to add or 'remv' to remove from the blacklist, \<xx\> is the abnomral id.
+  - `blacklist`: if you type `/!fps abn blacklist` it will trigger on/off blacklist hidden/shown.
+  - `blacklist <x> <xx>`: \<x\> can be 'add' to add or 'remv' to remove from the blacklist, \<xx\> is the abnomral id.
 - Proj: if `all` enabled, Prevent showing any projectiles.
-  - `blacklist`: if you type `\!fps proj blacklist` it will trigger on/off blacklist hidden/shown.
-  - `blacklist \<z\> \<zz\>`: \<z\> can be 'add' to add or 'remv' to remove from the blacklist, \<zz\> is the projectile id.
+  - `blacklist`: if you type `/!fps proj blacklist` it will trigger on/off blacklist hidden/shown.
+  - `blacklist <z> <zz>`: \<z\> can be 'add' to add or 'remv' to remove from the blacklist, \<zz\> is the projectile id.
 - Drops: if enabled, Prevent the blacklisted drops of other players from showing, the default list has mystic motes of all levels.
-  - `hide \<v\>`: adds or removes to the drops blacklist. \<v\> is the item id.
+  - `hide <v>`: adds or removes to the drops blacklist. \<v\> is the item id.
 - ScreenAbns: if enabled, Prevent the blacklisted annoying blur screen effects of your character from showing, the default list has couple of ids I picked 'em by hand, additional explaination about them can be found in `settings_migration`.
-  - `hide \<b\>`: adds or removes to the ScreenAbns blacklist. \<v\> is the item id.
+  - `hide <b>`: adds or removes to the ScreenAbns blacklist. \<v\> is the item id.
 - GUI: It has these & much more, not need to bother with details, these are important ones you should know:
-  - `gui npcsearch \<name\>`: if \<name\> exist, it will show a list of available npcs with that name, be aware, names are case-sensitive due to that huge amount of npcs.
-  - `gui npc \<letters\>`: if \<letters\> exist, it will show a list of available npcs with names that starts with that letters, letters are case-sensitive, you know why.
+  - `gui npcsearch <name>`: if \<name\> exist, it will show a list of available npcs with that name, be aware, names are case-sensitive due to that huge amount of npcs.
+  - `gui npc <letters>`: if \<letters\> exist, it will show a list of available npcs with names that starts with that letters, letters are case-sensitive, you know why.
 
 ## Suggestions
-* If you have suggestions, need help, or want to comment on my coding, leave an issue report.
+* If you have suggestions, need help, or want to comment on my coding, leave an issue report or dm me on discord `@Risenio#1785`.
 
 ## Credits
 Contributers in this module:
@@ -89,7 +89,8 @@ Contributers in this module:
 ---
 
 Special thanks to these people:
-- [Pinkie Pie](https://github.com/pinkipi) - Donation link: [![Donate](https://img.shields.io/badge/Donate-PayPal-ff69b4.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=5MTKARBK2CNG8&lc=US&item_name=Pinkie%27s%20TERA%20Mods&currency_code=USD)
+- [Pinkie Pie](https://github.com/pinkipi) - [Donation link](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=5MTKARBK2CNG8&lc=US&item_name=Pinkie%27s%20TERA%20Mods&currency_code=USD)
 - [Caali](https://github.com/hackerman-caali) 
 - [Bernkastel](https://github.com/Bernkastel-0)
 - [Kasea](https://github.com/Kaseaa)
+

File diff suppressed because it is too large
+ 0 - 0
lib/data/npcData.json


+ 193 - 214
lib/index.js

@@ -22,7 +22,7 @@ let BronzeClr = '#BC8F8F',
 	OrangeClr = '#FFBE5E';
 
 module.exports = function FpsUtils(mod) {
-	var notcaaliproxy = mod.proxyAuthor !== 'caali' || mod.base.proxyAuthor !== 'caali';
+	var notcaaliproxy = mod.proxyAuthor !== 'caali';
 
 	const NpcData = require(`./data/npcData.json`),
 		SkillData = require(`./data/skillString.json`);
@@ -31,24 +31,19 @@ module.exports = function FpsUtils(mod) {
 		MyName,
 		MyPlayerId,
 		ChangeOnCd,
-		laststate,
-		lastrange,
+		LastState,
+		LastVrange,
 		TmpData = [],
-		partyMembers = [],
-		hiddenNpcs = {},
-		hiddenUsers = {},
-		spawnedPlayers = {},
+		PartyMembers = [],
+		HiddenNpcs = {},
+		HiddenUsers = {},
+		SpawnedPlayers = {},
 		alphabet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''),
 		gui = new Gui(mod);
 
 	if (notcaaliproxy) {
-		const options = require('../module').options
-		if (options) {
-			const settingsVersion = options.settingsVersion
-			if (settingsVersion) {
-				mod.settings = require('./setting_migration')(mod.settings._version === settingsVersion ? settingsVersion : undefined, settingsVersion, mod.settings)
-			}
-		}
+		const settingsVersion = require('../module').options.settingsVersion
+		mod.settings = require('./setting_migration')(mod.settings._version > settingsVersion ? undefined : mod.settings._version, settingsVersion, mod.settings)
 	}
 
 	// ~~~ * Gui Handler * ~~~ \\
@@ -104,10 +99,10 @@ module.exports = function FpsUtils(mod) {
 					{ 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 to hide & add to blacklist.</font><br>` }
 				)
-				for (let i in spawnedPlayers) {
+				for (let i in SpawnedPlayers) {
 					TmpData.push(
-						{ text: `<font color="${mod.settings.PlayersBlacklist.includes(spawnedPlayers[i].name) ? GreenClr : RedClr}" size="+17">${spawnedPlayers[i].name}</font>`, command: mod.settings.PlayersBlacklist.includes(spawnedPlayers[i].name) ? `fps show ${spawnedPlayers[i].name};fps gui show` : `fps hide  ${spawnedPlayers[i].name};fps gui show` },
-						{ text: `${JustifySpaces(spawnedPlayers[i].name.length)}<font color="${mod.settings.PlayersBlacklist.includes(spawnedPlayers[i].name) ? GreenClr : RedClr}" size="+17">${mod.settings.PlayersBlacklist.includes(spawnedPlayers[i].name) ? 'is Hidden' : 'is Shown'}.</font><br>` }
+						{ text: `<font color="${mod.settings.PlayersBlacklist.includes(SpawnedPlayers[i].name) ? GreenClr : RedClr}" size="+17">${SpawnedPlayers[i].name}</font>`, command: mod.settings.PlayersBlacklist.includes(SpawnedPlayers[i].name) ? `fps show ${SpawnedPlayers[i].name};fps gui show` : `fps hide  ${SpawnedPlayers[i].name};fps gui show` },
+						{ text: `${JustifySpaces(SpawnedPlayers[i].name.length)}<font color="${mod.settings.PlayersBlacklist.includes(SpawnedPlayers[i].name) ? GreenClr : RedClr}" size="+17">${mod.settings.PlayersBlacklist.includes(SpawnedPlayers[i].name) ? 'is Hidden' : 'is Shown'}.</font><br>` }
 					)
 				}
 				gui.parse(TmpData, `<font color="${LPurpleClr}">[FPS] Options - Players </font><font color="${RedClr}">(Shown)</font>`)
@@ -119,7 +114,7 @@ module.exports = function FpsUtils(mod) {
 					{ 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` }) })
+				mod.settings.PlayersBlacklist.forEach(mem => TmpData.push({ text: `<font color="${BronzeClr}" size="+17">${mem}</font><br>`, command: `fps show ${mem};fps gui hide` }))
 				gui.parse(TmpData, `<font color="${LPurpleClr}">[FPS] Options - Players </font><font color="${GreenClr}">(Hidden)</font>`)
 				TmpData = []
 				break;
@@ -207,7 +202,7 @@ module.exports = function FpsUtils(mod) {
 					{ text: `<font color="${mod.settings.HideBlacklistedAbnormalities ? GreenClr : RedClr}" size="+22">[Blacklisted Abnormalities are ${mod.settings.HideBlacklistedAbnormalities ? 'Hidden' : 'Shown'}]</font><br><br>`, command: `fps abn blacklist;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` }) })
+				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` }))
 				gui.parse(TmpData, `<font color="${LPurpleClr}">[FPS] Options - Abnormalities</font>`)
 				TmpData = []
 				break;
@@ -220,40 +215,40 @@ module.exports = function FpsUtils(mod) {
 					{ text: `<font color="${mod.settings.HideBlacklistedProjectiles ? GreenClr : RedClr}" size="+22">[Blacklisted Projectiles are ${mod.settings.HideBlacklistedProjectiles ? 'Hidden' : 'Shown'}] </font><br><br>`, command: `fps proj blacklist;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` }) })
+				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` }))
 				gui.parse(TmpData, `<font color="${LPurpleClr}">[FPS] Options - Projectiles</font>`)
 				TmpData = []
 				break;
-			case "help":				//TO DO - Better formating, it looks messy. ##Attempt 2
+			case "help": //TODO; Better formating. Attempt #3 (Noto Sans JP-KR-SC-TC) #wtb html support.
 				gui.parse([
 					{ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br>`, command: `fps gui` },
-					{ text: `<font color="${PinkClr}" size="+17"><p align="right">Note: This page not completely developed yet, if you can't understand anything, just go check the README, Thank you.</p></font><br>` },
-					{ text: `<font color="${HBlueClr}" size="15">` }, //style="font-family:Consolas,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New, monospace;" doesn't work ._.
-					{ text: "  Command(s)  &#09;&#09;&#09;&#09;Argument(s)&#09; &#09; Example<br>" },
-					{ text: "  gui  ~  g&ensp;&#09;&#09;&#09;&#09;&#09;N/A&#09;&#09;&#09;&#09;!fps gui<br>" },
-					{ text: "&#09; N/A&#09;  &#09;&#09;&#09;&#09;&#09;N/A&#09;&#09;&#09;&#09;!fps-util<br>" },
-					{ text: "0 ~ 1 ~ 2 ~ 3 &#09;&#09;&#09;&#09;&#09;N/A&#09;&#09;&#09;&#09;!0 ~ !1 ~ !2 ~ !3<br>" },
-					{ text: "mode  ~  state&#09;&#09;&ensp;0  ~  1  ~  2  ~  3  &#09;!fps mode 2<br>" },
-					{ text: "hide  ~  show &#09;&#09;  Player ~ Class ~ Role &#09;!fps hide mie<br>" },
-					{ text: "&#09;party&#09; &#09;&#09;&#09;&#09;&#09;N/A&#09;&#09;&#09;&#09;!fps party<br>" },
-					{ text: "&#09; raid&#09; &#09;&#09;&#09;&#09;&#09;N/A&#09;&#09;&#09;&#09;!fps raid<br>" },
-					{ text: "&#09; list&#09; &#09;&#09;&#09;&#09;&#09;N/A&#09;&#09;&#09;&#09;!fps list<br>" },
-					{ text: "summons ~ sums&#09;&#09;&#09;  other ~  me&#09;&ensp;&#09;!fps sums me<br>" },
-					{ text: "skill ~ skills&#09;&#09;  blacklist ~ Class arg &#09;!fps skill blacklist<br>" },
-					{ text: "  npc  ~ npcs &#09;&#09;&#09; N/A ~  hide arg&#09;&#09;!fps npc<br>" },
-					{ text: "&#09;  hit&#09; &#09;&#09;&ensp;me ~ other ~ damage  &#09;!fps hit me<br>" },
-					{ text: "&#09;firework  &#09;&#09;&#09;&#09;&#09;N/A&#09;&#09;&#09;&#09;!fps firework<br>" },
-					{ text: "abn ~ abnormal&#09;&#09; all~blacklist arg arg2 &#09;!fps abn blacklist<br>" },
-					{ text: "&#09;  proj&#09;&#09;&#09; all~blacklist arg arg2 &#09;!fps proj all<br>" },
-					{ text: "&ensp;guildlogo  &#09;&#09;&#09;&#09;&#09;N/A&#09;&#09;&#09;&#09;!fps guildlogo<br>" },
-					{ text: "style~costume &#09;&#09;&#09;&#09;&#09;N/A&#09;&#09;&#09;&#09;!fps style<br>" },
-					{ text: "gui npcsearch &#09;&#09;&#09;  &#09;  arg&#09;&#09; &#09;!fps gui npcsearch E<br>" },
-					{ text: "&#09;npczoom&ensp;&#09;&#09;&#09;&#09;&#09;N/A&#09;&#09;&#09;&#09;!fps npczoom<br>" },
-					{ text: "&#09;dropitem  &#09;&#09;&#09;  N/A ~  hide arg&ensp;&#09;!fps dropitem<br>" },
-					{ text: "monsterdeathani&#09;&#09;&#09;&#09;&#09;N/A&#09;&#09;&#09;&#09;!fps monsterdeathani<br>" },
-					{ text: "  screenabns  &#09;&#09;&#09;  N/A ~  hide arg&ensp;&#09;!fps screenabns<br>" },
+					{ text: `<font color="${PinkClr}" size="+17"><p align="right">This page is under development. If you have messed up font check the ReadMe for list of commands, Thank you.</p></font><br>` },
+					{ text: `<font size="20">` },
+					{ text: (`<font color='${HBlueClr}'>  Command(s)</font>                  <font color='${DBlueClr}'>Argument(s)</font>                      <font color='${HPinkClr}'>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  ~  state</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}'>summons ~ sums</font>             <font color='${DBlueClr}'>other ~  me</font>                   <font color='${HPinkClr}'>!fps sums me</font><br>`) },
+					{ text: (`<font color='${HBlueClr}'>    skill ~ skills</font>               <font color='${DBlueClr}'>blacklist ~ Class arg</font>     <font color='${HPinkClr}'>!fps skill blacklist</font><br>`) },
+					{ text: (`<font color='${HBlueClr}'>   npc  ~ npcs</font>                    <font color='${DBlueClr}'>N/A ~  hide arg</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 ~ abnormal</font>          <font color='${DBlueClr}'>all~blacklist arg arg2</font>    <font color='${HPinkClr}'>!fps abn blacklist</font><br>`) },
+					{ text: (`<font color='${HBlueClr}'>         proj</font>                      <font color='${DBlueClr}'>all~blacklist arg arg2</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 ~ costume</font>                        <font color='${DBlueClr}'>N/A</font>                             <font color='${HPinkClr}'>!fps style</font><br>`) },
+					{ text: (`<font color='${HBlueClr}'> gui npcsearch</font>                          <font color='${DBlueClr}'>arg</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 arg</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 arg</font>             <font color='${HPinkClr}'>!fps screenabns</font><br>`) },
 					{ text: "</font>" }
-				], `<font color="${LPurpleClr}">[FPS] HELP </font>`)
+				], `<font color="${LPurpleClr}">[FPS] HELP</font>`)
 				break;
 			default:
 				gui.parse([
@@ -294,7 +289,7 @@ module.exports = function FpsUtils(mod) {
 					{ 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="${YellowClr}" size="+21">ETC:</font>&#09;&#09;` },
+					{ 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` },
@@ -370,9 +365,9 @@ module.exports = function FpsUtils(mod) {
 			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(() => {
-						return mod.settings.NpcsBlacklist.some((arrVal) => {
-							if (array[i].HuntingZoneId == arrVal.zone && array[i].TemplateId == arrVal.templateId) return true
-							return false
+						return mod.settings.NpcsBlacklist.some(arrVal => {
+							if (array[i].HuntingZoneId == arrVal.zone && array[i].TemplateId == arrVal.templateId) return true;
+							return false;
 						})
 					}) ? GreenClr : RedClr}" size="+17">${array[i].Name}</font><br>`
 				})
@@ -382,7 +377,7 @@ module.exports = function FpsUtils(mod) {
 			}
 			if (!isNaN(arg)) {
 				if (array[i].nameKey == arg) {
-					return true
+					return true;
 				}
 			}
 		}
@@ -393,7 +388,7 @@ module.exports = function FpsUtils(mod) {
 	function ClassNameFromID(name) {
 		for (let Class_data of Object.keys(mod.settings.ClassesData)) {
 			if (mod.settings.ClassesData[Class_data].name == name) {
-				return Class_data
+				return Class_data;
 			}
 		}
 	}
@@ -401,14 +396,14 @@ module.exports = function FpsUtils(mod) {
 	// ~~~ * Command Functions * ~~~ \\
 
 	function Msg(msg) {
-		mod.command.message(`[FPS] ${msg}`.clr(LPurpleClr))
+		mod.command.message(notcaaliproxy ? `[FPS] ${msg}`.clr(LPurpleClr) : `${msg}`.clr(LPurpleClr))
 	}
 
 	function HideSpecificPlayer(name) {
-		for (let i in spawnedPlayers) {
-			if (spawnedPlayers[i].name.toString().toLowerCase() === name.toLowerCase()) {
-				mod.send('S_DESPAWN_USER', 3, { gameId: spawnedPlayers[i].gameId, type: 1 });
-				hiddenUsers[spawnedPlayers[i].gameId] = spawnedPlayers[i];
+		for (let i in SpawnedPlayers) {
+			if (SpawnedPlayers[i].name.toString().toLowerCase() === name.toLowerCase()) {
+				mod.send('S_DESPAWN_USER', 3, { gameId: SpawnedPlayers[i].gameId, type: 1 });
+				HiddenUsers[SpawnedPlayers[i].gameId] = SpawnedPlayers[i];
 				return;
 			}
 		}
@@ -424,30 +419,30 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function ShowSpecificPlayer(name) {
-		for (let i in hiddenUsers) {
-			if (hiddenUsers[i].name.toString().toLowerCase() === name.toLowerCase()) {
-				ModifyAppearance(hiddenUsers[i]);
-				mod.send('S_SPAWN_USER', 13, hiddenUsers[i]);
-				delete hiddenUsers[i];
+		for (let i in HiddenUsers) {
+			if (HiddenUsers[i].name.toString().toLowerCase() === name.toLowerCase()) {
+				ModifyAppearance(HiddenUsers[i]);
+				mod.send('S_SPAWN_USER', 13, HiddenUsers[i]);
+				delete HiddenUsers[i];
 				return;
 			}
 		}
 	}
 
-	function HideAll() {
+	function HideAllPlayers() {
 		if (!mod.settings.OnlyParty) {
-			for (let i in spawnedPlayers) {
-				mod.send('S_DESPAWN_USER', 3, { gameId: spawnedPlayers[i].gameId, type: 1 });
-				hiddenUsers[spawnedPlayers[i].gameId] = spawnedPlayers[i];
+			for (let i in SpawnedPlayers) {
+				mod.send('S_DESPAWN_USER', 3, { gameId: SpawnedPlayers[i].gameId, type: 1 });
+				HiddenUsers[SpawnedPlayers[i].gameId] = SpawnedPlayers[i];
 			}
 		}
 	}
 
-	function ShowAll() {
-		for (let i in hiddenUsers) {
-			ModifyAppearance(hiddenUsers[i]);
-			mod.send('S_SPAWN_USER', 13, hiddenUsers[i]);
-			delete hiddenUsers[i];
+	function ShowAllPlayers() {
+		for (let i in HiddenUsers) {
+			ModifyAppearance(HiddenUsers[i]);
+			mod.send('S_SPAWN_USER', 13, HiddenUsers[i]);
+			delete HiddenUsers[i];
 		}
 	}
 
@@ -486,7 +481,7 @@ module.exports = function FpsUtils(mod) {
 		}
 
 		if (mod.settings.Hit_Damage) {
-			event.damage = event.type = 0;
+			event.damage = event.type = event.noctEffect = event.stackExplode = 0;
 			modified = true;
 		}
 
@@ -507,44 +502,44 @@ module.exports = function FpsUtils(mod) {
 		MyGameId = event.gameId;
 		MyName = event.name;
 		MyPlayerId = event.playerId;
-		laststate = undefined;
+		LastState = null;
 		if (mod.settings.ProjDebug) {
 			mod.settings.ProjDebug = false
-			Msg('Detected Projectile debug on, ' + 'Made off'.clr(HPinkClr) + '.')
+			Msg("Detected Projectile debug on, " + "turned off".clr(HPinkClr) + '.')
 		}
 		if (mod.settings.AbnDebug) {
 			mod.settings.AbnDebug = false
-			Msg('Detected Abnormalities debug on, ' + 'Made off'.clr(HPinkClr) + '.')
+			Msg("Detected Abnormalities debug on, " + "turned off".clr(HPinkClr) + '.')
 		}
 	}
 
 	function sLoadTopo() {
-		spawnedPlayers = {};
-		hiddenUsers = {};
-		hiddenNpcs = {};
+		SpawnedPlayers = {};
+		HiddenUsers = {};
+		HiddenNpcs = {};
 		if (mod.settings.ProjDebug) {
 			mod.settings.ProjDebug = false
-			Msg('Detected Projectile debug on, ' + 'Made off'.clr(HPinkClr) + '.')
+			Msg("Detected Projectile debug on, " + "turned off".clr(HPinkClr) + '.')
 		}
 		if (mod.settings.AbnDebug) {
 			mod.settings.AbnDebug = false
-			Msg('Detected Abnormalities debug on, ' + 'Made off'.clr(HPinkClr) + '.')
+			Msg("Detected Abnormalities debug on, " + "turned off".clr(HPinkClr) + '.')
 		}
 	}
 
 	function sLeaveParty() {
-		partyMembers = []
+		PartyMembers = []
 		if (mod.settings.RaidAutoChange) {
-			if (mod.settings.Mode !== 2 || laststate === undefined) return;
-			mod.command.exec(`fps mode ${laststate}`)
-			laststate = undefined;
+			if (mod.settings.Mode !== 2 || LastState === null) return;
+			mod.command.exec(`fps mode ${LastState}`)
+			LastState = null;
 		}
 	}
 
 	function sMountVehicle(event) {
 		if (EqGid(event.gameId)) return;
-		spawnedPlayers[event.gameId].mount = event.id
-		if (hiddenUsers[event.gameId]) hiddenUsers[event.gameId].mount = event.id;
+		SpawnedPlayers[event.gameId].mount = event.id
+		if (HiddenUsers[event.gameId]) HiddenUsers[event.gameId].mount = event.id;
 		if (mod.settings.ShowStyle) {
 			event.id = 231
 			return true;
@@ -553,21 +548,21 @@ module.exports = function FpsUtils(mod) {
 
 	function sUnmountVehicle(event) {
 		if (EqGid(event.gameId)) return;
-		spawnedPlayers[event.gameId].mount = 0
-		if (hiddenUsers[event.gameId]) hiddenUsers[event.gameId].mount = 0;
+		SpawnedPlayers[event.gameId].mount = 0
+		if (HiddenUsers[event.gameId]) HiddenUsers[event.gameId].mount = 0;
 	}
 
 	function cSetVisibleRange(event) {
-		lastrange = event.range
+		LastVrange = event.range
 	}
 
 	function sStartCooltimeItem(event) {
-		if (event.cooldown == 0) return false
+		if (event.cooldown == 0) return false;
 	}
 
 	function sStartActionScript(event) {
 		if ([40000, 40001, 40002].includes(event.script)) return;
-		if (mod.settings.ActionScripts) return false
+		if (mod.settings.ActionScripts) return false;
 	}
 
 	function sPcBangInventory(event) {
@@ -579,7 +574,7 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function sLoadingScreenControlInfo() {
-		if (mod.settings.Mode >= 2) return false
+		if (mod.settings.Mode >= 2) return false;
 	}
 
 	function sGuildName(event) {
@@ -591,28 +586,17 @@ module.exports = function FpsUtils(mod) {
 
 	function sApplyTitle(event) {
 		if (EqGid(event.gameId)) return;
-		if (mod.settings.ShowStyle) return false
+		if (mod.settings.ShowStyle) return false;
 	}
 
 	function sImageData() {
-		if (mod.settings.Hideguildlogos) return false
-	}
-
-	function sRequestCityWarMapInfoDetail(event) {
-		if (mod.settings.Hideguildlogos) {
-			for (let lgd in event.guilds) {
-				if (typeof event.guilds[lgd].id !== 'undefined') {
-					event.guilds[lgd].emblem = '';
-					return true;
-				}
-			}
-		}
+		if (mod.settings.Hideguildlogos) return false;
 	}
 
 	function sSpawnUser(event) {
-		spawnedPlayers[event.gameId] = event;
-		if (mod.settings.Mode === 3 || mod.settings.PlayersBlacklist.includes(event.name) || mod.settings.ClassesData[ClassID(event.templateId)].isHidden === true || (mod.settings.OnlyParty && !partyMembers.includes(event.name))) {
-			hiddenUsers[event.gameId] = event;
+		SpawnedPlayers[event.gameId] = event;
+		if (mod.settings.Mode === 3 || mod.settings.PlayersBlacklist.includes(event.name) || mod.settings.ClassesData[ClassID(event.templateId)].isHidden === true || (mod.settings.OnlyParty && !PartyMembers.includes(event.name))) {
+			HiddenUsers[event.gameId] = event;
 			return false;
 		}
 		if (ModifyAppearance(event)) return true;
@@ -623,14 +607,14 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function sDespawnUser(event) {
-		delete hiddenUsers[event.gameId];
-		delete spawnedPlayers[event.gameId];
+		delete HiddenUsers[event.gameId];
+		delete SpawnedPlayers[event.gameId];
 	}
 
 	function sUserLocation(event) {
-		if (spawnedPlayers[event.gameId]) spawnedPlayers[event.gameId].loc = event.dest;
-		if (hiddenUsers[event.gameId]) {
-			hiddenUsers[event.gameId].loc = event.dest;
+		if (SpawnedPlayers[event.gameId]) SpawnedPlayers[event.gameId].loc = event.dest;
+		if (HiddenUsers[event.gameId]) {
+			HiddenUsers[event.gameId].loc = event.dest;
 			return false;
 		}
 	}
@@ -638,17 +622,16 @@ module.exports = function FpsUtils(mod) {
 	function sUserMoveType() { return false; }
 
 	function sPartyMemberList(event) {
-		event.members.map((value) => { partyMembers.push(value.name) })
+		event.members.map(value => PartyMembers.push(value.name))
 		if (mod.settings.RaidAutoChange) {
 			if (event.members.length >= 18) {
-				if (mod.settings.Mode === 3) return;
-				if (mod.settings.Mode === 2 && laststate !== undefined) return;
-				laststate = mod.settings.Mode
+				if (mod.settings.Mode === 3 || (mod.settings.Mode === 2 && LastState !== null)) return;
+				LastState = mod.settings.Mode
 				mod.command.exec(`fps mode 2`)
 			} else {
-				if (mod.settings.Mode !== 2 || laststate === undefined) return;
-				mod.command.exec(`fps mode ${laststate}`)
-				laststate = undefined;
+				if (mod.settings.Mode !== 2 || LastState === null) return;
+				mod.command.exec(`fps mode ${LastState}`)
+				LastState = null;
 			}
 		}
 	}
@@ -676,7 +659,7 @@ module.exports = function FpsUtils(mod) {
 		if (mod.settings.HideBlacklistedNpcs) {
 			for (var i = 0; i < mod.settings.NpcsBlacklist.length; i++) {
 				if (event.huntingZoneId == mod.settings.NpcsBlacklist[i].zone && event.templateId == mod.settings.NpcsBlacklist[i].templateId) {
-					hiddenNpcs[event.gameId] = event;
+					HiddenNpcs[event.gameId] = event;
 					return false;
 				}
 			}
@@ -684,11 +667,11 @@ module.exports = function FpsUtils(mod) {
 		if (event.huntingZoneId === 1023) {
 			if (EqGid(event.owner)) {
 				if (!mod.settings.HideMySummons) return;
-				hiddenNpcs[event.gameId] = event;
+				HiddenNpcs[event.gameId] = event;
 				return false;
 			}
 			if (!mod.settings.HideOthersSummons) return;
-			hiddenNpcs[event.gameId] = event;
+			HiddenNpcs[event.gameId] = event;
 			return false;
 		}
 		if (mod.settings.HideFireworks && event.huntingZoneId === 1023 && (event.templateId === 60016000 || event.templateId === 80037000)) return false;
@@ -699,39 +682,39 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function sDespawnNpc(event) {
-		delete hiddenNpcs[event.gameId];
+		delete HiddenNpcs[event.gameId];
 		if (!mod.settings.HideMonsterDeathAnimation || event.type !== 5) return;
 		event.type = 1;
 		return true;
 	}
 
 	function sFearMoveStage(event) {
-		if ((!EqGid(event.target) && mod.settings.Mode === 3) || hiddenUsers[event.target] || hiddenNpcs[event.target]) return false;
+		if ((!EqGid(event.target) && mod.settings.Mode === 3) || HiddenUsers[event.target] || HiddenNpcs[event.target]) return false;
 	}
 
 	function sFearMoveEnd(event) {
-		if ((!EqGid(event.target) && mod.settings.Mode === 3) || hiddenUsers[event.target] || hiddenNpcs[event.target]) return false;
+		if ((!EqGid(event.target) && mod.settings.Mode === 3) || HiddenUsers[event.target] || HiddenNpcs[event.target]) return false;
 	}
 
 	function sAbnormalityBegin(event) {
 		if (mod.settings.AbnDebug) {
 			if (EqGid(event.target)) console.log(`\x1b[2m[${new Date().toTimeString().slice(0, 8)}]\x1b[0m \x1b[31m->\x1b[0m \x1b[36mAbnormality \x1b[4mStarted\x1b[0m \x1b[44mon\x1b[0m \x1b[37m'${MyName}'\x1b[0m:\x1b[33m \ID "\x1b[32m${event.id}\x1b[0m"`);
 			if (EqGid(event.source)) console.log(`\x1b[2m[${new Date().toTimeString().slice(0, 8)}]\x1b[0m \x1b[31m->\x1b[0m \x1b[36mAbnormality \x1b[4mStarted\x1b[0m \x1b[45mfrom\x1b[0m \x1b[37m'${MyName}'\x1b[0m:\x1b[33m \ID "\x1b[32m${event.id}\x1b[0m"`);
-			if (spawnedPlayers[event.target]) console.log(`\x1b[2m[${new Date().toTimeString().slice(0, 8)}]\x1b[0m \x1b[31m->\x1b[0m \x1b[36mAbnormality \x1b[4mStarted\x1b[0m \x1b[44mon\x1b[0m \x1b[37m'${spawnedPlayers[event.target].name}'\x1b[0m:\x1b[33m \ID "\x1b[32m${event.id}\x1b[0m"`);
-			if (spawnedPlayers[event.source]) console.log(`\x1b[2m[${new Date().toTimeString().slice(0, 8)}]\x1b[0m \x1b[31m->\x1b[0m \x1b[36mAbnormality \x1b[4mStarted\x1b[0m \x1b[45mfrom\x1b[0m \x1b[37m'${spawnedPlayers[event.source].name}'\x1b[0m:\x1b[33m \ID "\x1b[32m${event.id}\x1b[0m"`);
+			if (SpawnedPlayers[event.target]) console.log(`\x1b[2m[${new Date().toTimeString().slice(0, 8)}]\x1b[0m \x1b[31m->\x1b[0m \x1b[36mAbnormality \x1b[4mStarted\x1b[0m \x1b[44mon\x1b[0m \x1b[37m'${SpawnedPlayers[event.target].name}'\x1b[0m:\x1b[33m \ID "\x1b[32m${event.id}\x1b[0m"`);
+			if (SpawnedPlayers[event.source]) console.log(`\x1b[2m[${new Date().toTimeString().slice(0, 8)}]\x1b[0m \x1b[31m->\x1b[0m \x1b[36mAbnormality \x1b[4mStarted\x1b[0m \x1b[45mfrom\x1b[0m \x1b[37m'${SpawnedPlayers[event.source].name}'\x1b[0m:\x1b[33m \ID "\x1b[32m${event.id}\x1b[0m"`);
 		}
 		if (EqGid(event.target)) {
 			if (mod.settings.HideOwnBlacklistedAbns && mod.settings.OwnAbnormalsBlacklist.includes(event.id)) return false;
 			return;
 		}
-		if (hiddenUsers[event.target]) return false;
+		if (HiddenUsers[event.target]) return false;
 		if (mod.settings.HideBlacklistedAbnormalities && mod.settings.AbnormalitiesBlacklist.includes(event.id)) return false;
-		if (mod.settings.HideAllAbnormalities && (spawnedPlayers[event.target] || spawnedPlayers[event.source] || mod.settings.AbnormalitiesBlacklist.includes(event.id))) return false;
+		if (mod.settings.HideAllAbnormalities && (SpawnedPlayers[event.target] || SpawnedPlayers[event.source] || mod.settings.AbnormalitiesBlacklist.includes(event.id))) return false;
 	}
 
 	function sAbnormalityRefresh(event) {
-		if (hiddenUsers[event.target]) return false;
-		if ((mod.settings.HideBlacklistedAbnormalities || mod.settings.HideAllAbnormalities) && (spawnedPlayers[[10306, 10316, 12001, 12003, 12120, 12130].includes(event.target)] || spawnedPlayers[[10306, 10316, 12001, 12003, 12120, 12130].includes(event.source)])) return false;
+		if (HiddenUsers[event.target]) return false;
+		if ((mod.settings.HideBlacklistedAbnormalities || mod.settings.HideAllAbnormalities) && (SpawnedPlayers[[10306, 10316, 12001, 12003, 12120, 12130].includes(event.target)] || SpawnedPlayers[[10306, 10316, 12001, 12003, 12120, 12130].includes(event.source)])) return false;
 	}
 
 	function sAbnormalityFail(event) {
@@ -739,8 +722,8 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function sActionStage(event) {
-		if (EqGid(event.gameId) || !spawnedPlayers[event.gameId]) return;
-		if ((mod.settings.Mode >= 2) || hiddenUsers[event.gameId] || (mod.settings.HideBlacklistedSkills && mod.settings.ClassesData[ClassID(event.templateId)].CD_SkillsBlacklist.includes(Math.floor(event.skill.id / 10000).toString())) || mod.settings.ClassesData[ClassID(event.templateId)].CD_HideBlacklistedSkills) {
+		if (EqGid(event.gameId) || !SpawnedPlayers[event.gameId]) return;
+		if ((mod.settings.Mode >= 2) || HiddenUsers[event.gameId] || (mod.settings.HideBlacklistedSkills && mod.settings.ClassesData[ClassID(event.templateId)].CD_SkillsBlacklist.includes(Math.floor(event.skill.id / 10000).toString())) || mod.settings.ClassesData[ClassID(event.templateId)].CD_HideBlacklistedSkills) {
 			UpdateLoc(event);
 			return false;
 		}
@@ -749,26 +732,26 @@ module.exports = function FpsUtils(mod) {
 	function sStartUserProjectile(event) {
 		if (mod.settings.ProjDebug) {
 			if (EqGid(event.gameId)) console.log(`\x1b[2m[${new Date().toTimeString().slice(0, 8)}]\x1b[0m \x1b[31m->\x1b[0m \x1b[36mProjectile \x1b[4mStarted\x1b[0m \x1b[45mfrom\x1b[0m \x1b[37m'${MyName}'\x1b[0m:\x1b[33m \Skill_ID "\x1b[32m${event.skill.id}\x1b[0m"`);
-			if (spawnedPlayers[event.gameId]) console.log(`\x1b[2m[${new Date().toTimeString().slice(0, 8)}]\x1b[0m \x1b[31m->\x1b[0m \x1b[36mProjectile \x1b[4mStarted\x1b[0m \x1b[45mfrom\x1b[0m \x1b[37m'${spawnedPlayers[event.source].name}'\x1b[0m:\x1b[33m \Skill_ID "\x1b[32m${event.skill.id}\x1b[0m"`);
+			if (SpawnedPlayers[event.gameId]) console.log(`\x1b[2m[${new Date().toTimeString().slice(0, 8)}]\x1b[0m \x1b[31m->\x1b[0m \x1b[36mProjectile \x1b[4mStarted\x1b[0m \x1b[45mfrom\x1b[0m \x1b[37m'${SpawnedPlayers[event.source].name}'\x1b[0m:\x1b[33m \Skill_ID "\x1b[32m${event.skill.id}\x1b[0m"`);
 		}
 		if (mod.settings.HideBlacklistedProjectiles && mod.settings.ProjectilesBlacklist.includes(event.skill.id)) return false;
-		if (!EqGid(event.gameId) && spawnedPlayers[event.gameId] && (hiddenUsers[event.gameId] || mod.settings.Mode > 0 || mod.settings.HideAllProjectiles)) return false;
+		if (!EqGid(event.gameId) && SpawnedPlayers[event.gameId] && (HiddenUsers[event.gameId] || mod.settings.Mode > 0 || mod.settings.HideAllProjectiles)) return false;
 	}
 
 	function sSpawnProjectile(event) {
 		if (mod.settings.ProjDebug) {
 			if (EqGid(event.gameId)) console.log(`\x1b[2m[${new Date().toTimeString().slice(0, 8)}]\x1b[0m \x1b[31m->\x1b[0m \x1b[36mProjectile \x1b[4mSpawned\x1b[0m \x1b[45mfrom\x1b[0m \x1b[37m'${MyName}'\x1b[0m:\x1b[33m \Skill_ID "\x1b[32m${event.skill.id}\x1b[0m"`);
-			if (spawnedPlayers[event.gameId]) console.log(`\x1b[2m[${new Date().toTimeString().slice(0, 8)}]\x1b[0m \x1b[31m->\x1b[0m \x1b[36mProjectile \x1b[4mSpawned\x1b[0m \x1b[45mfrom\x1b[0m \x1b[37m'${spawnedPlayers[event.source].name}'\x1b[0m:\x1b[33m \Skill_ID "\x1b[32m${event.skill.id}\x1b[0m"`);
+			if (SpawnedPlayers[event.gameId]) console.log(`\x1b[2m[${new Date().toTimeString().slice(0, 8)}]\x1b[0m \x1b[31m->\x1b[0m \x1b[36mProjectile \x1b[4mSpawned\x1b[0m \x1b[45mfrom\x1b[0m \x1b[37m'${SpawnedPlayers[event.source].name}'\x1b[0m:\x1b[33m \Skill_ID "\x1b[32m${event.skill.id}\x1b[0m"`);
 		}
 		if (mod.settings.HideBlacklistedProjectiles && mod.settings.ProjectilesBlacklist.includes(event.skill.id)) return false;
-		if (!EqGid(event.gameId) && spawnedPlayers[event.gameId] && (hiddenUsers[event.gameId] || mod.settings.Mode > 0 || mod.settings.HideAllProjectiles)) return false;
+		if (!EqGid(event.gameId) && SpawnedPlayers[event.gameId] && (HiddenUsers[event.gameId] || mod.settings.Mode > 0 || mod.settings.HideAllProjectiles)) return false;
 	}
 
 	function sEachSkillResult(event) {
 		if (EqGid(event.source) || EqGid(event.owner)) {
 			if (ModifySkillResult(event)) return true;
 		}
-		if (!EqGid(event.target) && mod.settings.Hit_Other && (spawnedPlayers[event.owner] || spawnedPlayers[event.source])) {
+		if (!EqGid(event.target) && mod.settings.Hit_Other && (SpawnedPlayers[event.owner] || SpawnedPlayers[event.source])) {
 			event.skill = { npc: 0, type: 0, id: 0 };
 			event.id = event.damage = event.type = event.noctEffect = event.crit = event.stackExplode = event.blocked = 0;
 			event.reaction.skill = 0;
@@ -810,7 +793,6 @@ module.exports = function FpsUtils(mod) {
 	mod.hook('S_GUILD_NAME', 1, sGuildName)
 	mod.hook('S_APPLY_TITLE', 2, sApplyTitle)
 	mod.hook('S_IMAGE_DATA', 'raw', sImageData)
-	mod.hook('S_REQUEST_CITY_WAR_MAP_INFO_DETAIL', 1, sRequestCityWarMapInfoDetail)
 
 	mod.hook('S_SPAWN_USER', 13, { order: 9999 }, sSpawnUser)
 	mod.hook('S_SPAWN_USER', 13, { order: 99999, filter: { fake: null } }, sSpawnUserfn)
@@ -867,7 +849,7 @@ module.exports = function FpsUtils(mod) {
 				switch (arg) {
 					case "0":
 					case "off":
-						if (mod.settings.Mode === 3) ShowAll();
+						if (mod.settings.Mode === 3) ShowAllPlayers();
 						mod.settings.Mode = 0;
 						mod.settings.HideAllAbnormalities = false;
 						mod.settings.HideAllProjectiles = false;
@@ -876,7 +858,7 @@ module.exports = function FpsUtils(mod) {
 						break;
 					case "1":
 					case "one":
-						if (mod.settings.Mode === 3) ShowAll();
+						if (mod.settings.Mode === 3) ShowAllPlayers();
 						mod.settings.Mode = 1;
 						mod.settings.HideAllAbnormalities = false;
 						mod.settings.HideAllProjectiles = true;
@@ -885,7 +867,7 @@ module.exports = function FpsUtils(mod) {
 						break;
 					case "2":
 					case "two":
-						if (mod.settings.Mode === 3) ShowAll();
+						if (mod.settings.Mode === 3) ShowAllPlayers();
 						mod.settings.Mode = 2;
 						mod.settings.HideAllAbnormalities = true;
 						mod.settings.HideAllProjectiles = true;
@@ -894,7 +876,7 @@ module.exports = function FpsUtils(mod) {
 						break;
 					case "3":
 					case "three":
-						HideAll();
+						HideAllPlayers();
 						mod.settings.Mode = 3;
 						mod.settings.HideAllAbnormalities = true;
 						mod.settings.HideAllProjectiles = true;
@@ -921,8 +903,8 @@ module.exports = function FpsUtils(mod) {
 									if (mod.settings.ClassesData[i].name === arg) mod.settings.ClassesBlacklist.push(arg);
 									if (mod.settings.ClassesData[i].role.includes(arg)) mod.settings.RolesBlacklist.push(arg);
 									let classtohide = mod.settings.ClassesData[i].model;
-									for (let i in spawnedPlayers) {
-										if (ClassID(spawnedPlayers[i].templateId) === classtohide) HideSpecificPlayer(spawnedPlayers[i].name);
+									for (let i in SpawnedPlayers) {
+										if (ClassID(SpawnedPlayers[i].templateId) === classtohide) HideSpecificPlayer(SpawnedPlayers[i].name);
 									}
 								}
 							}
@@ -935,8 +917,7 @@ module.exports = function FpsUtils(mod) {
 					Msg(`Player "${arg}"` + ` Hidden`.clr(GreenClr) + '.');
 					mod.settings.PlayersBlacklist.push(arg);
 					HideSpecificPlayer(arg);
-				} else
-					Msg(`Invalid ${arg2}.`.clr(GrayClr));
+				} else Msg(`Invalid ${arg2}.`.clr(GrayClr));
 				break;
 			case "show":
 				if (typeof arg === "string" && arg !== null) {
@@ -953,8 +934,8 @@ module.exports = function FpsUtils(mod) {
 								if (mod.settings.ClassesData[i].role.includes(arg)) RemoveEntry(mod.settings.RolesBlacklist, arg);
 								mod.settings.ClassesData[i].isHidden = false;
 								let classToShow = mod.settings.ClassesData[i].model;
-								for (let i in hiddenUsers) {
-									if (ClassID(hiddenUsers[i].templateId) === classToShow) ShowSpecificPlayer(hiddenUsers[i].name);
+								for (let i in HiddenUsers) {
+									if (ClassID(HiddenUsers[i].templateId) === classToShow) ShowSpecificPlayer(HiddenUsers[i].name);
 								}
 							}
 						}
@@ -963,27 +944,25 @@ module.exports = function FpsUtils(mod) {
 						Msg(`Class/Role "${arg}"` + ` Already shown`.clr(RedClr) + '.');
 					} else if (!mod.settings.PlayersBlacklist.includes(arg)) {
 						Msg(`Player "${arg}"` + ` Already shown`.clr(RedClr) + '.');
-					}
+					} else Msg(`Invalid ${arg2}.`.clr(GrayClr));
 				}
 				break;
 			case "party":
 				if (mod.settings.Mode === 3) return Msg(`You've to disable mode 3 first.`.clr(RedClr));
 				mod.settings.OnlyParty = !mod.settings.OnlyParty
 				if (mod.settings.OnlyParty) {
-					for (let i in spawnedPlayers) {
-						if (!partyMembers.includes(spawnedPlayers[i].name)) {
-							mod.send('S_DESPAWN_USER', 3, { gameId: spawnedPlayers[i].gameId, type: 1 })
-							hiddenUsers[spawnedPlayers[i].gameId] = spawnedPlayers[i];
+					for (let i in SpawnedPlayers) {
+						if (!PartyMembers.includes(SpawnedPlayers[i].name)) {
+							mod.send('S_DESPAWN_USER', 3, { gameId: SpawnedPlayers[i].gameId, type: 1 })
+							HiddenUsers[SpawnedPlayers[i].gameId] = SpawnedPlayers[i];
 						}
 					}
-				} else {
-					ShowAll()
-				}
-				Msg(`Everyone but party ${mod.settings.OnlyParty ? 'Hidden'.clr(GreenClr) : 'Shown'.clr(RedClr)}.`);
+				} else ShowAllPlayers();
+				Msg(`Everyone but party ${mod.settings.OnlyParty ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
 				break;
 			case "raid":
 				mod.settings.RaidAutoChange = !mod.settings.RaidAutoChange
-				Msg(`Raid auto-state ${mod.settings.RaidAutoChange ? 'Enabled'.clr(GreenClr) : 'Disabled'.clr(RedClr)}.`);
+				Msg(`Raid auto-state ${mod.settings.RaidAutoChange ? "Enabled".clr(GreenClr) : "Disabled".clr(RedClr)}.`);
 				break;
 			case "list":
 				Msg(`Hidden players: ${mod.settings.PlayersBlacklist}.`.clr(PinkClr));
@@ -995,11 +974,11 @@ module.exports = function FpsUtils(mod) {
 				switch (arg) {
 					case "me":
 						mod.settings.HideMySummons = !mod.settings.HideMySummons;
-						Msg(`Own summoned NPCs ${mod.settings.HideMySummons ? 'Hidden'.clr(RedClr) : 'Shown'.clr(GreenClr)}.`);
+						Msg(`Own summoned NPCs ${mod.settings.HideMySummons ? "Hidden".clr(RedClr) : "Shown".clr(GreenClr)}.`);
 						break;
 					default:
 						mod.settings.HideOthersSummons = !mod.settings.HideOthersSummons;
-						Msg(`Others summoned NPCs ${mod.settings.HideOthersSummons ? 'Hidden'.clr(GreenClr) : 'Shown'.clr(RedClr)}.`);
+						Msg(`Others summoned NPCs ${mod.settings.HideOthersSummons ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
 						break;
 				}
 				break;
@@ -1008,7 +987,7 @@ module.exports = function FpsUtils(mod) {
 				switch (arg) {
 					case "blacklist":
 						mod.settings.HideBlacklistedSkills = !mod.settings.HideBlacklistedSkills;
-						Msg(`Blacklisted skills ${mod.settings.HideBlacklistedSkills ? 'Hidden'.clr(GreenClr) : 'Shown'.clr(RedClr)}.`);
+						Msg(`Blacklisted skills ${mod.settings.HideBlacklistedSkills ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
 						break;
 					case "class":
 						if (mod.settings.ClassesNames.includes(arg2)) {
@@ -1021,15 +1000,15 @@ module.exports = function FpsUtils(mod) {
 												mod.settings.ClassesData[i].CD_SkillsBlacklist.splice(index, 1)
 												Msg(`Skill ID '${arg3}'` + ` Shown`.clr(RedClr) + ` for class '${arg2}'.`)
 											}
-											return
+											return;
 										} else {
 											mod.settings.ClassesData[i].CD_SkillsBlacklist.push(arg3)
 											Msg(`Skill ID '${arg3}'` + ` Hidden`.clr(GreenClr) + ` for class '${arg2}'.`)
-											return
+											return;
 										}
 									} else {
 										mod.settings.ClassesData[i].CD_HideBlacklistedSkills = !mod.settings.ClassesData[i].CD_HideBlacklistedSkills;
-										Msg(`Skills for '${arg2}' class ${mod.settings.ClassesData[i].CD_HideBlacklistedSkills ? 'Hidden'.clr(GreenClr) : 'Shown'.clr(RedClr)}.`);
+										Msg(`Skills for '${arg2}' class ${mod.settings.ClassesData[i].CD_HideBlacklistedSkills ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
 										return;
 									}
 								}
@@ -1044,39 +1023,39 @@ module.exports = function FpsUtils(mod) {
 				if (arg == 'hide') {
 					if (!arg2 || !arg3) {
 						mod.settings.HideBlacklistedNpcs = !mod.settings.HideBlacklistedNpcs;
-						Msg(`Blacklisted NPCs ${mod.settings.HideBlacklistedNpcs ? 'Hidden'.clr(GreenClr) : 'Shown'.clr(RedClr)}.`);
+						Msg(`Blacklisted NPCs ${mod.settings.HideBlacklistedNpcs ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
 						break;
 					}
-					let found = mod.settings.NpcsBlacklist.some((s) => {
+					let found = mod.settings.NpcsBlacklist.some(s => {
 						return s.zone === arg2 && s.templateId === arg3;
 					});
 					if (found) {
 						Msg(`NPC HntZone '${arg2}', TmpId '${arg3}'` + ` Removed from the blacklist`.clr(RedClr) + '.')
-						mod.settings.NpcsBlacklist = mod.settings.NpcsBlacklist.filter((obj) => {
+						mod.settings.NpcsBlacklist = mod.settings.NpcsBlacklist.filter(obj => {
 							return obj.zone != arg2 || obj.templateId != arg3;
 						})
 					} else {
 						Msg(`NPC HntZone '${arg2}', TmpId '${arg3}'` + ` Added to the blacklist`.clr(GreenClr) + '.')
 						mod.settings.NpcsBlacklist.push({ zone: arg2, templateId: arg3 })
 					}
-					return
+					return;
 				} else
 					mod.settings.HideBlacklistedNpcs = !mod.settings.HideBlacklistedNpcs;
-				Msg(`Blacklisted NPCs ${mod.settings.HideBlacklistedNpcs ? 'Hidden'.clr(GreenClr) : 'Shown'.clr(RedClr)}.`);
+				Msg(`Blacklisted NPCs ${mod.settings.HideBlacklistedNpcs ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
 				break;
 			case "hit":
 				switch (arg) {
 					case "me":
 						mod.settings.Hit_Me = !mod.settings.Hit_Me;
-						Msg(`Own hits effect ${mod.settings.Hit_Me ? 'Hidden'.clr(GreenClr) : 'Shown'.clr(RedClr)}.`);
+						Msg(`Own hits effect ${mod.settings.Hit_Me ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
 						break;
 					case "other":
 						mod.settings.Hit_Other = !mod.settings.Hit_Other;
-						Msg(`Players hit effect ${mod.settings.Hit_Other ? 'Hidden'.clr(GreenClr) : 'Shown'.clr(RedClr)}.`);
+						Msg(`Players hit effect ${mod.settings.Hit_Other ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
 						break;
 					case "damage":
 						mod.settings.Hit_Damage = !mod.settings.Hit_Damage;
-						Msg(`Damage numbers ${mod.settings.Hit_Damage ? 'Hidden'.clr(GreenClr) : 'Shown'.clr(RedClr)}.`);
+						Msg(`Damage numbers ${mod.settings.Hit_Damage ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
 						break;
 					default:
 						Msg(`Invalid &#40;hit&#41; "${arg}".`.clr(GrayClr));
@@ -1086,7 +1065,7 @@ module.exports = function FpsUtils(mod) {
 			case "fireworks":
 			case "firework":
 				mod.settings.HideFireworks = !mod.settings.HideFireworks;
-				Msg(`Fireworks ${mod.settings.HideFireworks ? 'Hidden'.clr(GreenClr) : 'Shown'.clr(RedClr)}.`);
+				Msg(`Fireworks ${mod.settings.HideFireworks ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
 				break;
 			case "abn":
 			case "effects":
@@ -1095,12 +1074,12 @@ module.exports = function FpsUtils(mod) {
 				switch (arg) {
 					case "all":
 						mod.settings.HideAllAbnormalities = !mod.settings.HideAllAbnormalities;
-						Msg(`All Abnormalities ${mod.settings.HideAllAbnormalities ? 'Hidden'.clr(GreenClr) : 'Shown'.clr(RedClr)}.`);
+						Msg(`All Abnormalities ${mod.settings.HideAllAbnormalities ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
 						break;
 					case "blacklist":
 						if (!arg2 || !arg3) {
 							mod.settings.HideBlacklistedAbnormalities = !mod.settings.HideBlacklistedAbnormalities;
-							Msg(`Blacklisted Abnormalities ${mod.settings.HideBlacklistedAbnormalities ? 'Hidden'.clr(GreenClr) : 'Shown'.clr(RedClr)}.`);
+							Msg(`Blacklisted Abnormalities ${mod.settings.HideBlacklistedAbnormalities ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
 							break;
 						} else if (arg2 && arg3) {
 							arg3 = Number(arg3);
@@ -1108,21 +1087,21 @@ module.exports = function FpsUtils(mod) {
 								if (arg2 == 'add') {
 									mod.settings.AbnormalitiesBlacklist.push(arg3)
 									Msg(`Blacklisted Abnormalities` + ` added "${arg3}"`.clr(GreenClr) + '.')
-									return
+									return;
 								} else if (arg2 == 'remv') {
 									Msg(`Blacklisted Abnormalities` + ` can't remove "${arg3}" as it's not there`.clr(GrayClr) + '.')
-									return
+									return;
 								}
 							} else if (mod.settings.AbnormalitiesBlacklist.includes(arg3)) {
 								if (arg2 == 'add') {
 									Msg(`Blacklisted Abnormalities` + ` can't add "${arg3}" as it's already there`.clr(GrayClr) + '.')
-									return
+									return;
 								} else if (arg2 == 'remv') {
 									let index = mod.settings.AbnormalitiesBlacklist.indexOf(arg3)
 									if (index !== -1) {
 										mod.settings.AbnormalitiesBlacklist.splice(index, 1)
-										Msg(`Blacklisted Abnormalities` + ` removed "${arg3}"`.clr(RedClr) + '.')
-										return
+										Msg(`Blacklisted Abnormalities` + ` removed "${arg3}"`.clr(RedClr) + '.');
+										return;
 									}
 								}
 							} else return Msg(`Invalid &#40;abnormalities Blacklist&#41; "${arg}".`.clr(GrayClr));
@@ -1130,8 +1109,8 @@ module.exports = function FpsUtils(mod) {
 						break;
 					case "log":
 					case "debug":
-						mod.settings.AbnDebug = !mod.settings.AbnDebug
-						Msg(`Abnormalities debug ${mod.settings.AbnDebug ? 'started'.clr(GreenClr) : 'stopped'.clr(RedClr)}, check your console for details.`)
+						mod.settings.AbnDebug = !mod.settings.AbnDebug;
+						Msg(`Abnormalities debug ${mod.settings.AbnDebug ? "started".clr(GreenClr) : "stopped".clr(RedClr)}, check your console for details.`);
 						break;
 					default:
 						Msg(`Invalid &#40;abnormalities&#41; "${arg}".`.clr(GrayClr));
@@ -1141,33 +1120,33 @@ module.exports = function FpsUtils(mod) {
 			case "guildlogo":
 				if (ChangeOnCd) return Msg(`Try again in 4 seconds.`.clr(PinkClr));
 				mod.settings.Hideguildlogos = !mod.settings.Hideguildlogos;
-				mod.send('C_SET_VISIBLE_RANGE', 1, { range: 0 })
-				setTimeout(() => { mod.send('C_SET_VISIBLE_RANGE', 1, { range: lastrange }) }, 1500);
-				ChangeOnCd = true
-				setTimeout(() => { ChangeOnCd = false }, 4000);
-				Msg(`Guild Logos ${mod.settings.Hideguildlogos ? 'Hidden'.clr(GreenClr) : 'Shown'.clr(RedClr)}.`);
+				mod.send('C_SET_VISIBLE_RANGE', 1, { range: 0 });
+				setTimeout(() => mod.send('C_SET_VISIBLE_RANGE', 1, { range: LastVrange }), 1500);
+				ChangeOnCd = true;
+				setTimeout(() => ChangeOnCd = false, 4000);
+				Msg(`Guild Logos ${mod.settings.Hideguildlogos ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
 				break;
 			case "costume":
 			case "style":
 				if (ChangeOnCd) return Msg(`Try again in 4 seconds.`.clr(PinkClr));
 				mod.settings.ShowStyle = !mod.settings.ShowStyle;
 				mod.send('C_SET_VISIBLE_RANGE', 1, { range: 0 })
-				setTimeout(() => { mod.send('C_SET_VISIBLE_RANGE', 1, { range: lastrange }) }, 1500);
+				setTimeout(() => mod.send('C_SET_VISIBLE_RANGE', 1, { range: LastVrange }), 1500);
 				ChangeOnCd = true
-				setTimeout(() => { ChangeOnCd = false }, 4000);
-				Msg(`Style of NPCs & others ${mod.settings.ShowStyle ? 'Hidden'.clr(GreenClr) : 'Shown'.clr(RedClr)}.`);
+				setTimeout(() => ChangeOnCd = false, 4000);
+				Msg(`Style of NPCs & others ${mod.settings.ShowStyle ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
 				break;
 			case "proj":
 			case "projectile":
 				switch (arg) {
 					case "all":
 						mod.settings.HideAllProjectiles = !mod.settings.HideAllProjectiles;
-						Msg(`Projectiles ${mod.settings.HideAllProjectiles ? 'Hidden'.clr(GreenClr) : 'Shown'.clr(RedClr)}.`);
+						Msg(`Projectiles ${mod.settings.HideAllProjectiles ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
 						break;
 					case "blacklist":
 						if (!arg2 || !arg3) {
 							mod.settings.HideBlacklistedProjectiles = !mod.settings.HideBlacklistedProjectiles;
-							Msg(`Blacklisted projectile ${mod.settings.HideBlacklistedProjectiles ? 'Hidden'.clr(GreenClr) : 'Shown'.clr(RedClr)}.`);
+							Msg(`Blacklisted projectile ${mod.settings.HideBlacklistedProjectiles ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
 							break;
 						} else if (arg2 && arg3) {
 							arg3 = Number(arg3);
@@ -1175,21 +1154,21 @@ module.exports = function FpsUtils(mod) {
 								if (arg2 == 'add') {
 									mod.settings.ProjectilesBlacklist.push(arg3)
 									Msg(`Blacklisted projectile` + ` added "${arg3}"`.clr(GreenClr) + '.')
-									return
+									return;
 								} else if (arg2 == 'remv') {
 									Msg(`Blacklisted projectile` + ` can't remove "${arg3}" as it's not there`.clr(GrayClr) + '.')
-									return
+									return;
 								}
 							} else if (mod.settings.ProjectilesBlacklist.includes(arg3)) {
 								if (arg2 == 'add') {
 									Msg(`Blacklisted projectile` + ` can't add "${arg3}" as it's already there`.clr(GrayClr) + '.')
-									return
+									return;
 								} else if (arg2 == 'remv') {
 									let index = mod.settings.ProjectilesBlacklist.indexOf(arg3)
 									if (index !== -1) {
 										mod.settings.ProjectilesBlacklist.splice(index, 1)
 										Msg(`Blacklisted projectile` + ` removed "${arg3}"`.clr(RedClr) + '.')
-										return
+										return;
 									}
 								}
 							} else return Msg(`Invalid &#40;projectile Blacklist&#41; "${arg}".`.clr(GrayClr));
@@ -1198,7 +1177,7 @@ module.exports = function FpsUtils(mod) {
 					case "log":
 					case "debug":
 						mod.settings.ProjDebug = !mod.settings.ProjDebug
-						Msg(`Projectile debug ${mod.settings.ProjDebug ? 'started'.clr(GreenClr) : 'stopped'.clr(RedClr)}, check your console for details.`)
+						Msg(`Projectile debug ${mod.settings.ProjDebug ? "started".clr(GreenClr) : "stopped".clr(RedClr)}, check your console for details.`)
 						break;
 					default:
 						Msg(`Invalid &#40;projectile&#41; "${arg}".`.clr(GrayClr));
@@ -1247,51 +1226,51 @@ module.exports = function FpsUtils(mod) {
 				break;
 			case "npczoom":
 				mod.settings.ActionScripts = !mod.settings.ActionScripts;
-				Msg(`Npc zoom-ins ${mod.settings.ActionScripts ? 'Disabled'.clr(GreenClr) : 'Shown'.clr(RedClr)}.`);
+				Msg(`Npc zoom-ins ${mod.settings.ActionScripts ? "Disabled".clr(GreenClr) : "Shown".clr(RedClr)}.`);
 				break;
 			case "dropitem":
 				if (arg == 'hide') {
 					if (!arg2) {
 						mod.settings.HideBlacklistedDrop = !mod.settings.HideBlacklistedDrop;
-						Msg(`Blacklisted Drops ${mod.settings.HideBlacklistedDrop ? 'Hidden'.clr(GreenClr) : 'Shown'.clr(RedClr)}.`);
+						Msg(`Blacklisted Drops ${mod.settings.HideBlacklistedDrop ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
 						break;
 					}
 					arg2 = Number(arg2);
-					let found = mod.settings.DropBlacklist.some((s) => { return s === arg2; });
+					let found = mod.settings.DropBlacklist.some(s => { return s === arg2; });
 					if (found) {
 						Msg(`Drops id '${arg2}'` + ` Removed from the blacklist`.clr(RedClr) + '.')
-						mod.settings.DropBlacklist = mod.settings.DropBlacklist.filter((obj) => { return obj != arg2; })
+						mod.settings.DropBlacklist = mod.settings.DropBlacklist.filter(obj => { return obj != arg2; })
 					} else {
 						Msg(`Drops id '${arg2}'` + ` Added to the blacklist`.clr(GreenClr) + '.')
 						mod.settings.DropBlacklist.push(arg2)
 					}
-					return
+					return;
 				} else
 					mod.settings.HideBlacklistedDrop = !mod.settings.HideBlacklistedDrop;
-				Msg(`Blacklisted Drops ${mod.settings.HideBlacklistedDrop ? 'Hidden'.clr(GreenClr) : 'Shown'.clr(RedClr)}.`);
+				Msg(`Blacklisted Drops ${mod.settings.HideBlacklistedDrop ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
 				break;
 			case "monsterdeathani":
 			case "monstersdeathani":
 				mod.settings.HideMonsterDeathAnimation = !mod.settings.HideMonsterDeathAnimation;
-				Msg(`Monsters Death Animation is ${mod.settings.HideMonsterDeathAnimation ? 'Hidden'.clr(GreenClr) : 'Shown'.clr(RedClr)}.`);
+				Msg(`Monsters Death Animation is ${mod.settings.HideMonsterDeathAnimation ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
 				break;
 			case "screenabns":
 				if (arg == 'hide') {
 					if (!arg2) {
 						mod.settings.HideOwnBlacklistedAbns = !mod.settings.HideOwnBlacklistedAbns;
-						Msg(`Blacklisted ScreenAbns ${mod.settings.OwnAbnormalsBlacklist ? 'Hidden'.clr(GreenClr) : 'Shown'.clr(RedClr)}.`);
+						Msg(`Blacklisted ScreenAbns ${mod.settings.OwnAbnormalsBlacklist ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
 						break;
 					}
 					arg2 = Number(arg2);
-					let found = mod.settings.OwnAbnormalsBlacklist.some((m) => { return m === arg2; });
+					let found = mod.settings.OwnAbnormalsBlacklist.some(m => { return m === arg2; });
 					if (found) {
-						Msg(`Abnormal id '${arg2}'` + ` Removed from the blacklist`.clr(RedClr) + '.')
-						mod.settings.OwnAbnormalsBlacklist = mod.settings.OwnAbnormalsBlacklist.filter((obj) => { return obj != arg2; })
+						Msg(`Abnormal id '${arg2}'` + " Removed from the blacklist".clr(RedClr) + '.')
+						mod.settings.OwnAbnormalsBlacklist = mod.settings.OwnAbnormalsBlacklist.filter(obj => { return obj != arg2; })
 					} else {
-						Msg(`Abnormal id '${arg2}'` + ` Added to the blacklist`.clr(GreenClr) + '.')
+						Msg(`Abnormal id '${arg2}'` + " Added to the blacklist".clr(GreenClr) + ".")
 						mod.settings.OwnAbnormalsBlacklist.push(arg2)
 					}
-					return
+					return;
 				} else
 					mod.settings.HideOwnBlacklistedAbns = !mod.settings.HideOwnBlacklistedAbns;
 				Msg(`Blacklisted ScreenAbns ${mod.settings.HideOwnBlacklistedAbns ? 'Hidden'.clr(GreenClr) : 'Shown'.clr(RedClr)}.`);
@@ -1300,7 +1279,7 @@ module.exports = function FpsUtils(mod) {
 				mod.command.exec(`fps gui help`)
 				break;
 			default:
-				Msg('Unknown command, check command list.'.clr(RedClr));
+				Msg("Unknown command, check command list.".clr(RedClr));
 				mod.command.exec(`fps gui help`)
 				break;
 		}

File diff suppressed because it is too large
+ 1 - 68
lib/setting_migration.js


+ 8 - 8
manifest.json

@@ -1,14 +1,15 @@
 {
 	"files": {
-		"README.md": "af938aff5f1baf9ea7920e9e5b96b6e11b48e5b584dbb7561d19c533c7ac7397",
-		"lib/data/npcData.json": "9949d5b7d18e347c29c46adf44e4ad8a519fc2e87166b0c402860ebaa082fb35",
+		"README.md": "64e744609702579b229ff04683dc9827c9791e4f1491d2b531f98f2e680ca3ef",
+		"lib/data/npcData.json": "5d924897021af232e676e5ea56d9cdcbfca813edb0a23d8481a61b6eb7077a78",
 		"lib/data/skillString.json": "9d69876fea0be8e6ac5dd43b3fc74ea023f6b8a6145384f8f780dd977045d8ef",
-		"lib/index.js": "ad738b294ab712fb9bdb6077665454fa217492437eaf7383e7f3b2a2c13e99d9",
-		"lib/setting_migration.js": "b536ca71f44e065c61eb9816758c596d2ad81caabb7fe5bfcaa1191d6a79fe30",
-		"module.json": "00741bd3c50a9764e437f53028fcfc7dd53cda091dd9221718ef6f1b40a20d2f",
+		"lib/index.js": "37b4caad528317d443eb7269b6d10c89081d05767b85290ae1fce2d661b671f8",
+		"lib/setting_migration.js": "1c890dc0ea2c211b3d7cdda70d2ed9d6b1c80056eeff6a0dae0d30a9b9b28efe",
+		"mod.json": "ee2a821c9fc48b60933d3e17ca7819cddd7674b68d0e7a7d2e8e35eaedea9295",
+		"module.json": "deb3746661ed1e8e39feaf638a6f200ffb166143508d8dc86f45eb638b766a12",
 		"node_modules/Gui/LICENSE": "589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2",
-		"node_modules/Gui/README.md": "3f8afb8758597d32d5075a0664b3b9acdce7193ad43b54ee1d83daa9e0647db0",
-		"node_modules/Gui/index.js": "b13b4ebf8620c1e550965a39ac692063a59b5b2c628458cd160024e69b65474e",
+		"node_modules/Gui/README.md": "5ce236283acd2bf5c617866e714b53f15cf4b665dce51ae2418587f9c6bfc28b",
+		"node_modules/Gui/index.js": "7595b2d8617c00e1f4de976d14e96bbb0903783c93c746999f447b5eb9cfb7a3",
 		"package.json": "e4f97b0f2f8234a68ca2c9831eb50c8aabfe979f348700fd01ce8dab1c75242a"
 	},
 	"defs": {
@@ -43,7 +44,6 @@
 		"S_NPC_MENU_SELECT": 1,
 		"S_PARTY_MEMBER_LIST": 7,
 		"S_PCBANGINVENTORY_DATALIST": 1,
-		"S_REQUEST_CITY_WAR_MAP_INFO_DETAIL": 1,
 		"S_SHOW_AWESOMIUMWEB_SHOP": 1,
 		"S_SPAWN_DROPITEM": 6,
 		"S_SPAWN_NPC": 10,

+ 7 - 0
mod.json

@@ -0,0 +1,7 @@
+{
+    "name": "Fps Utils",
+    "author": "Risenio",
+    "namespace": "fps_utils",
+    "main": "lib",
+    "update": "github:Risenio/fps-utils"
+}

+ 1 - 1
module.json

@@ -1,7 +1,7 @@
 {
     "disableAutoUpdate": false,
     "options": {
-        "niceName": "fps-utils",
+        "niceName": "FPS",
         "settingsVersion": 5,
         "settingsFile": "config.json",
         "settingsMigrator": "./lib/setting_migration.js"

+ 1 - 4
node_modules/Gui/README.md

@@ -6,7 +6,7 @@ Allows you to have access to the welcome message window where you can click stuf
 
 You just require it like normal or just read the source it's like 5 lines if you wanna use it.
 Example :
-```
+```js
 const Gui = require('Gui')
 
 module.exports = function (mod) {
@@ -23,9 +23,6 @@ module.exports = function (mod) {
 			'This is a test!'							//Title goes here.
 		)
 	})
-	this.destructor = () => {
-		mod.command.remove('guitest')					//This just for reloading.
-	}
 }
 ```
 ## Additional things to know

+ 8 - 27
node_modules/Gui/index.js

@@ -13,10 +13,7 @@ class Gui {
 
 			mod.hook('C_ADMIN', 1, (event) => {
 				blep = event.command.split(";")
-				blep.forEach(
-					function (cmd) {
-						mod.command.exec(cmd);
-					})
+				blep.forEach(cmd => mod.command.exec(cmd))
 				return false
 			})
 		}
@@ -26,16 +23,15 @@ class Gui {
 		if (mode == 2) {
 			this.mod.send('S_ANNOUNCE_UPDATE_NOTIFICATION', 1, {
 				id: 0,
-				title: title, // <img src='icon_notice'/>`<img src='icon_notice'/>`<img src='icon_notice'/>`<img src='icon_notice'/>` USE THIS
+				title: title, // <img src='icon_notice'/>`<img src='icon_notice'/>`<img src='icon_notice'/>`<img src='icon_notice'/>`
 				body: squonk(array, mode)
-
 			})
 			Data = ''
 			ArrayTXT = ['cools']
 		} else
 			this.mod.send('S_ANNOUNCE_UPDATE_NOTIFICATION', 1, {
 				id: 0,
-				title: title, // <img src='icon_notice'/>`<img src='icon_notice'/>`<img src='icon_notice'/>`<img src='icon_notice'/>` USE THIS
+				title: title, // <img src='icon_notice'/>`<img src='icon_notice'/>`<img src='icon_notice'/>`<img src='icon_notice'/>`
 				body: thonk(array, mode)
 			})
 		Data = ''
@@ -45,7 +41,6 @@ class Gui {
 let Data = '',
 	Count = 0,
 	IMGCount = 1,
-	TXTCount = 0,
 	FirstTXT = true,
 	ArrayTXT = [],
 	isFinished = 0
@@ -59,9 +54,7 @@ function ShoveData(stuff, mode) {
 	if (Count >= 7 && mode == 1) {
 		Data += `<br>${stuff}`
 		Count = 1
-	} else {
-		Data += stuff
-	}
+	} else Data += stuff
 }
 
 function thonk(array) {
@@ -69,20 +62,12 @@ function thonk(array) {
 	for (var i = 0; i < array.length; i++) {
 		Count++
 		if (array[i].command == null && !isFinished) {
-			if (array[i].img != null) {
-				ShoveData(`<img src='img://__${array[i].img}'></img>${array[i].text}`)
-			}
+			if (array[i].img != null) ShoveData(`<img src='img://__${array[i].img}'></img>${array[i].text}`);
 			ShoveData(`${array[i].text}`)
-
-		} else
-			if (array[i].img != null && array[i].command !== null && !isFinished) {
-				ShoveData(`<a href='admincommand:/@${array[i].command}' ><img src='img://__${array[i].img}'></img></a>${array[i].text} `)
-			} else
-				if (array[i].img == null && array[i].command !== null && !isFinished) {
-					ShoveData(`<a href='admincommand:/@${array[i].command}'>${array[i].text}</a>`)
-				}
+		} else if (array[i].img != null && array[i].command !== null && !isFinished) {
+			ShoveData(`<a href='admincommand:/@${array[i].command}' ><img src='img://__${array[i].img}'></img></a>${array[i].text} `)
+		} else if (array[i].img == null && array[i].command !== null && !isFinished) ShoveData(`<a href='admincommand:/@${array[i].command}'>${array[i].text}</a>`)
 	}
-	//console.log(`Finished stuff ${Data}`) //mod here
 	Count = 0
 	return Data
 }
@@ -93,15 +78,12 @@ function squonk(array) {
 			IMGCount++
 			ArrayTXT.push(array[i].text)
 			Data += `<a href='admincommand:/@${array[i].command}'><img src='img://__${array[i].img}'></img></a> &#09; `
-			//console.log(IMGCount)
 		} if (ArrayTXT.length == 5) {
 			console.log('else')
 			FirstTXT = true
 			for (var j = 0; j < ArrayTXT.length; j++) {
 				console.log(ArrayTXT[j])
-				// console.log(ArrayTXT)
 				if (j == 4) {
-					// console.log('BEEEEEEEEEEEEEEP')
 					Data += `${ArrayTXT[j]}<br>`
 					IMGCount = 0
 					ArrayTXT = []
@@ -116,7 +98,6 @@ function squonk(array) {
 			}
 			IMGCount = 0
 			ArrayTXT = []
-			//console.log(ArrayTXT.length)
 			FirstTXT = true
 		}
 	}

Some files were not shown because too many files changed in this diff