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

P77

Patch 77.03 update.
Some fixes.
Merged badGui into main.
Updated some hooks, NPCs data, abnormalities ids.
Risenio лет назад: 8
Родитель
Сommit
9198e77c64
11 измененных файлов с 166 добавлено и 1049 удалено
  1. 6 72
      README.md
  2. 0 0
      lib/data/npcData.json
  3. 141 131
      lib/index.js
  4. 1 2
      lib/setting_migration.js
  5. 13 17
      manifest.json
  6. 0 10
      mod.cson
  7. 3 3
      module.json
  8. 0 674
      node_modules/Gui/LICENSE
  9. 0 32
      node_modules/Gui/README.md
  10. 0 107
      node_modules/Gui/index.js
  11. 2 1
      package.json

+ 6 - 72
README.md

@@ -2,83 +2,16 @@
 Written for tera-proxy, a free script filled with features dedicated to improve your fps, in the open world, in dungeons and in battlegrounds.
 Written for tera-proxy, a free script filled with features dedicated to improve your fps, in the open world, in dungeons and in battlegrounds.
 
 
 ## How to use
 ## How to use
-* Put the script folder "fps-utils" into bin/node_modules.
+* Put the script folder "fps-utils" into `mods`.
 * Log the game using the proxy.
 * Log the game using the proxy.
 
 
-## Commands
-***Note:*** *To start the command, you can either start it in any channel by adding `!` prefix, or `/!`, or just going to proxy channel `/8`.*
-
-
-|    Command(s)    |         Argument(s)        |      Example         |   Details   |
-|      :---        |            :---:           |        :---:         |---:         |
-|   `gui` \| `g`   |             N/A            |`!fps gui`            |Opens GUI.   |
-|       N/A        |             N/A            |`!fps-util`           |Opens Help.  |
-|`0`\|`1`\|`2`\|`3`|             N/A            |`!0`\|`!1`\|`!2`\|`!3`|Changes Mode.|
-| `mode` \| `state`| `0` \| `1` \| `2` \| `3`   |`!fps mode 2`         |Changes Mode.|
-| `hide` \| `show` |    Player\|Class\|Role     |`!fps hide mie`       | - |
-|     `party`      |             N/A            |`!fps party`          | - |
-|      `raid`      |             N/A            |`!fps raid`           | - |
-|      `list`      |             N/A            |`!fps list`           | - |
-|`summons` \|`sums`|      `other`\| `me`        |`!fps sums me`        | - |
-|`skill` \|`skills`|  `blacklist`\| Class `arg` |`!fps skill blacklist`| - |
-|  `npc` \|`npcs`  |      N/A \| `hide arg`     |`!fps npc`            | - |
-|      `hit`       | `me` \| `other` \| `damage`|`!fps hit me`         | - |
-|    `firework`    |             N/A            |`!fps firework`       | - |
-|`abn`\| `abnormal`|`all`\|`blacklist arg arg2` |`!fps abn blacklist`  | - |
-|       `proj`     |`all`\|`blacklist arg arg2` |`!fps proj all`       | - |
-|    `guildlogo`   |             N/A            |`!fps guildlogo`      | - |
-|`style`\|`costume`|             N/A            |`!fps style`          | - |
-|  `gui npcsearch` |             arg            |`!fps gui npcsearch E`| - |
-|    `npczoom`     |             N/A            |`!fps npczoom`        | - |
-|    `dropitem`    |       N/A \| `hide arg`    |`!fps dropitem`       | - |
-| `monsterdeathani`|             N/A            |`!fps monsterdeathani`| - |
-|   `screenabns`   |       N/A \| `hide arg`    |`!fps screenabns`     | - |
-
-#### Additional commands explaination
-- Modes: Sets the current presets optimization to \<num\>; \<num\> can be:
-  - `0`, `off`: Turns off preset optimization.
-  - `1`, `one`: Activates hiding all effects
-  - `2`, `two`: Activates hiding players' skills, their effects, projectiles, damage numbers
-  - `3`, `three`: Activates hiding all players & their skills, effects, projectiles, damage numbers.
-- Hit: Sets the current hit effect to \<hxa\>; \<hxa\> can be:
-  - `me`: Turns off showing own skill hit effect (and damage too... need to find workaround).
-  - `other`: Turns off showing other ppls skill hit effect (and damage too... need to find workaround, this cause issue with Shinra meter not showing other ppls dps).
-  - `damage`: Turns off showing damage numbers.
-- Fireworks: If enabled, Prevent dragon fireworks from showing in your client. (the barrel and the flying thingy).
-- Hide & Show: `hide`/`show`: if followed by Player\|Class\|Role hides/shows that Player\|Class\|Role.
-- GuildLogos: If enabled, Prevent Guild logos from loading in your client.
-- Party: if enabled, hides everyone but your party members.
-- Monsters Death Animation: if enabled, Prevent the death animations for monsters from appearing in your client.
-- Style: if enabled, Removes all costumes, titles & Removes the "shiny" icons above npcs heads, also make fixed mount shape for all other ppls mounts.
-- Npc zoom-ins: if enabled, Prevent the annoying auto camera zoom-in on npcs, in others words, it blocks the ActionScripts for all npcs except teleportal ones.
-- Raid auto state: if enabled, Automatically change mode to 2 as soon as your party gets 18 memebers or above, and auto revert back(if you didn't change it manually) to last mode when it drops below 18.
-- List: Prints out list of hidden players, classes, and roles.
-- Others Summons: if enabled, Prevent showing any summon for npcs(Thralls, Healbot, Turrets etc.) from other players.
-- 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 <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.
-- 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.
-- 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.
-- 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.
-- 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.
-- 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.
+## Commands can be found in [this Wiki](https://github.com/Risenio/fps-utils/wiki/Commands).
 
 
 ## Suggestions
 ## Suggestions
-* If you have suggestions, need help, or want to comment on my coding, leave an issue report or dm me on discord `@Risenio#1785`.
+* If you have suggestions, need help, or want to comment on my coding, dm me on discord `@Risenio#1785` or leave an issue report.
 
 
 ## Credits
 ## Credits
-Contributers in this module:
+Contributers:
 - [HugeDong69](https://github.com/codeagon) - Super-Cozy developer. [Donation link](https://ko-fi.com/codeagon)
 - [HugeDong69](https://github.com/codeagon) - Super-Cozy developer. [Donation link](https://ko-fi.com/codeagon)
 - [Saegusae](https://github.com/Saegusae) - Original developer. [Donation link](https://www.patreon.com/saegusa)
 - [Saegusae](https://github.com/Saegusae) - Original developer. [Donation link](https://www.patreon.com/saegusa)
 - [SerenTera](https://github.com/SerenTera)
 - [SerenTera](https://github.com/SerenTera)
@@ -88,9 +21,10 @@ Contributers in this module:
 
 
 ---
 ---
 
 
-Special thanks to these people:
+Thanks to the following people in maintaining this module.
 - [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)
 - [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) 
 - [Caali](https://github.com/hackerman-caali) 
 - [Bernkastel](https://github.com/Bernkastel-0)
 - [Bernkastel](https://github.com/Bernkastel-0)
 - [Kasea](https://github.com/Kaseaa)
 - [Kasea](https://github.com/Kaseaa)
 
 
+***

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


+ 141 - 131
lib/index.js

@@ -2,30 +2,14 @@
 /* global __dirname */
 /* global __dirname */
 
 
 String.prototype.clr = function (HexClr) { return `<font color='${HexClr}'>${this}</font>` }
 String.prototype.clr = function (HexClr) { return `<font color='${HexClr}'>${this}</font>` }
-const Gui = require('Gui')
-let 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 = '#DCE14D',
-	OrangeClr = '#FFBE5E';
 
 
 module.exports = function FpsUtils(mod) {
 module.exports = function FpsUtils(mod) {
 	var notcaaliproxy = mod.proxyAuthor !== 'caali';
 	var notcaaliproxy = mod.proxyAuthor !== 'caali';
 
 
-	const NpcData = require(`./data/npcData.json`),
-		SkillData = require(`./data/skillString.json`);
+	const NpcData = require(`./data/npcData.json`)
+	const SkillData = require(`./data/skillString.json`)
+	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 = '#DCE14D', 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']
 
 
 	let MyGameId,
 	let MyGameId,
 		MyName,
 		MyName,
@@ -37,13 +21,60 @@ module.exports = function FpsUtils(mod) {
 		PartyMembers = [],
 		PartyMembers = [],
 		HiddenNpcs = {},
 		HiddenNpcs = {},
 		HiddenUsers = {},
 		HiddenUsers = {},
-		SpawnedPlayers = {},
-		alphabet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''),
-		gui = new Gui(mod);
+		SpawnedPlayers = {}
 
 
-	if (notcaaliproxy) {
-		const settingsVersion = require('../module').options.settingsVersion
-		mod.settings = require('./setting_migration')(mod.settings._version > settingsVersion ? undefined : mod.settings._version, settingsVersion, mod.settings)
+	if (notcaaliproxy) mod.settings = require('./setting_migration')(mod.settings._version, require('../module').options.settingsVersion, mod.settings)
+
+	// ~~~ * Gui Parser * ~~~ \\
+
+	let Xd,
+		Xdata = '',
+		Xdone = false
+
+	const Xmap = new WeakMap();	//ok I know what you think...if you got a better way feel free to inform me, thank you.
+	if (!Xmap.has(mod)) {
+		Xmap.set(mod, {});
+
+		mod.hook('C_CONFIRM_UPDATE_NOTIFICATION', 'raw', () => false)
+
+		mod.hook('C_ADMIN', 1, (event) => {
+			Xd = event.command.split(";")
+			Xd.forEach(cmd => mod.command.exec(cmd))
+			return false
+		})
+	}
+
+	const gui = {
+		parse(Xarray, Xtitle) {
+			mod.send('S_ANNOUNCE_UPDATE_NOTIFICATION', 1, {
+				id: 0,
+				title: Xtitle,
+				body: X1(Xarray)
+			})
+			Xdata = ''
+		}
+	}
+
+	function X1(Xarray) {
+		Xdone = false
+		for (let i = 0; i < Xarray.length; i++) {
+			if (!Xdone) {
+				if (Xarray[i].command) Xshove(`<a href='admincommand:/@${Xarray[i].command}'>${Xarray[i].text}</a>`)
+				else if (!Xarray[i].command) Xshove(`${Xarray[i].text}`)
+				else console.log(`--v9-ERROR in Fps-Utils, pls report this as this ain't supposed to happen.`)
+			} else if (Xdone) break;
+			else console.log(`---ERROR in Fps-Utils, pls report this as this ain't supposed to happen.`)
+		}
+		return Xdata
+	}
+
+	function Xshove(stuff) {
+		if (Xdata.length >= 16000) {
+			Xdata += `Gui data limit exceeded, some values may be missing.`
+			Xdone = true
+			return
+		}
+		Xdata += stuff
 	}
 	}
 
 
 	// ~~~ * Gui Handler * ~~~ \\
 	// ~~~ * Gui Handler * ~~~ \\
@@ -79,12 +110,12 @@ module.exports = function FpsUtils(mod) {
 				TmpData.push(
 				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="${YellowClr}" size="+20"><p align="right">[Blacklisted NPCs list]</p></font><br>`, command: `fps gui npclist` },
 					{ text: `<font color="${YellowClr}" size="+20"><p align="right">[Blacklisted NPCs list]</p></font><br>`, command: `fps gui npclist` },
-					{ text: `<font color="${mod.settings.HideBlacklistedNpcs ? GreenClr : RedClr}" size="+20"><p align="right">[Blacklisted NPCs are ${mod.settings.HideBlacklistedNpcs ? 'Blocked' : 'Not-Blocked'}]</p></font><br><br>`, command: `fps npc;fps gui npcMain` },
+					{ text: `<font color="${mod.settings.HideBlacklistedNpcs ? GreenClr : RedClr}" size="+20"><p align="right">[Blacklisted NPCs are ${mod.settings.HideBlacklistedNpcs ? 'Hidden' : 'Shown'}]</p></font><br><br>`, command: `fps npc;fps gui npcMain` },
 					{ text: `<font color="${LBlueClr}" size="+19">Click a letter to view all NPCs starting with that letter:<br><br>` }
 					{ text: `<font color="${LBlueClr}" size="+19">Click a letter to view all NPCs starting with that letter:<br><br>` }
 				)
 				)
-				for (var i = 0; i < alphabet.length; i++) {
+				for (let i = 0; i < alphabet.length; i++) {
 					TmpData.push(
 					TmpData.push(
-						{ text: `<font color="${BronzeClr}" size="+18">${alphabet[i]}</font>`, command: `fps gui npc ${alphabet[i]}` },
+						{ text: `<font color="${BronzeClr}" size="+19">${alphabet[i]}</font>`, command: `fps gui npc ${alphabet[i]}` },
 						{ text: "&nbsp;" }
 						{ text: "&nbsp;" }
 					)
 					)
 				}
 				}
@@ -96,16 +127,14 @@ module.exports = function FpsUtils(mod) {
 				TmpData = []
 				TmpData = []
 				TmpData.push(
 				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>`, command: `fps gui` },
 					{ 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="${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>` }
+					{ text: `<font color="${LBlueClr}" size="+19">Click on <font color="${RedClr}">Red</font> to hide & add to blacklist. | on <font color="${GreenClr}">Green</font> to show & remove from 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>` }
-					)
+					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` })
 				}
 				}
-				gui.parse(TmpData, `<font color="${LPurpleClr}">[FPS] Options - Players </font><font color="${RedClr}">(Shown)</font>`)
+				gui.parse(TmpData, `<font color="${LPurpleClr}">[FPS] Options - Players </font><font color="${RedClr}">(In-distance)</font>`)
 				TmpData = []
 				TmpData = []
 				break;
 				break;
 			case "hide":
 			case "hide":
@@ -121,7 +150,7 @@ module.exports = function FpsUtils(mod) {
 			case "skills":
 			case "skills":
 				gui.parse([
 				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="${mod.settings.HideBlacklistedSkills ? GreenClr : RedClr}" size="+22"><p align="right">[Blacklisted skills are ${mod.settings.HideBlacklistedSkills ? 'Blocked' : 'Not-Blocked'}]</p></font><br><br>`, command: `fps skill blacklist;fps gui skills` },
+					{ text: `<font color="${mod.settings.HideBlacklistedSkills ? GreenClr : RedClr}" size="+22"><p align="right">[Blacklisted skills are ${mod.settings.HideBlacklistedSkills ? 'Hidden' : 'Shown'}]</p></font><br><br>`, command: `fps skill blacklist;fps gui skills` },
 					{ text: `<font color="${YellowClr}" size="+20">Tankers:</font>&#09;&#09;` },
 					{ 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: `<font color="${LBlueClr}" size="+18">&#40;Lancer&#41;</font>`, command: `fps gui class lancer` },
 					{ text: "&nbsp;&nbsp;" },
 					{ text: "&nbsp;&nbsp;" },
@@ -219,35 +248,34 @@ module.exports = function FpsUtils(mod) {
 				gui.parse(TmpData, `<font color="${LPurpleClr}">[FPS] Options - Projectiles</font>`)
 				gui.parse(TmpData, `<font color="${LPurpleClr}">[FPS] Options - Projectiles</font>`)
 				TmpData = []
 				TmpData = []
 				break;
 				break;
-			case "help": //TODO; Better formating. Attempt #3 (Noto Sans JP-KR-SC-TC) #wtb html support.
+			case "help": //(Noto Sans JP-KR-SC-TC_NL) *hopefully* now it will be read-able by all regions.
 				gui.parse([
 				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="${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 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>" }
+					{ 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;
 				break;
 			default:
 			default:
@@ -325,36 +353,28 @@ module.exports = function FpsUtils(mod) {
 					{ text: `<font color="${CPinkClr}" size="+17">[Disband]</font><br>`, command: `fps quicklink disband` },
 					{ 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="${DBlueClr}" size="+21">Extra:</font>&#09;` },
 					{ text: `<font color="${CPinkClr}" size="+17">[Lobby]</font>`, command: `fps quicklink lobby` },
 					{ text: `<font color="${CPinkClr}" size="+17">[Lobby]</font>`, command: `fps quicklink lobby` },
-					{ text: "&nbsp;&nbsp;&nbsp;" },
-					{ text: `<font color="${CPinkClr}" size="+17">[Exit]</font><br>`, command: `fps quicklink exit` }
+					{ text: "&#09;&#09;&nbsp;&nbsp;&nbsp;" },
+					{ text: `<font color="${CPinkClr}" 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>`)
 				], `<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>`)
 		}
 		}
 	}
 	}
 
 
 	// ~~~ * Gui Functions * ~~~ \\
 	// ~~~ * Gui Functions * ~~~ \\
 
 
-	function JustifySpaces(ToJustify) {
-		if (ToJustify <= 3) return '&#09;&#09;&#09;&#09;&#09;&#09;&#09;&#09;';
-		else if (ToJustify <= 7) return '&#09;&#09;&#09;&#09;&#09;&#09;&#09;';
-		else if (ToJustify <= 12) return '&#09;&#09;&#09;&#09;&#09;&#09;';
-		else if (ToJustify <= 15) return '&#09;&#09;&#09;&#09;&#09;';
-		else return '&#09;&#09;&#09;&#09;';
-	}
-
 	function SkillsList(value) {
 	function SkillsList(value) {
 		let keys = [],
 		let keys = [],
 			skilldata = [],
 			skilldata = [],
 			skillIds = []
 			skillIds = []
 		skilldata.push(
 		skilldata.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="${mod.settings.HideBlacklistedSkills ? GreenClr : RedClr}" size="+22"><p align="right">[Blacklisted skills are ${mod.settings.HideBlacklistedSkills ? 'Blocked' : 'Not-Blocked'}]</p></font><br>`, command: `fps skill blacklist;fps gui skills` },
+			{ 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>` }
 			{ text: `<font color="${LBlueClr}" size="+19">Click skill to blacklist it.</font><br>` }
 		)
 		)
 		for (let key in SkillData[value]) {
 		for (let key in SkillData[value]) {
 			keys.push(key);
 			keys.push(key);
 		}
 		}
 		skillIds.push(Object.values(SkillData[value]))
 		skillIds.push(Object.values(SkillData[value]))
-		for (var i = 0; i < keys.length; i++) {
+		for (let i = 0; i < keys.length; i++) {
 			skilldata.push({ command: `fps skill class ${value} ${skillIds[0][i]};fps gui class ${value}`, text: `<font color="${mod.settings.ClassesData[ClassNameFromID(value)].CD_SkillsBlacklist.includes(skillIds[0][i].toString()) ? GreenClr : RedClr}" size="+17">[${keys[i]}]</font><br>` })
 			skilldata.push({ command: `fps skill class ${value} ${skillIds[0][i]};fps gui class ${value}`, text: `<font color="${mod.settings.ClassesData[ClassNameFromID(value)].CD_SkillsBlacklist.includes(skillIds[0][i].toString()) ? GreenClr : RedClr}" size="+17">[${keys[i]}]</font><br>` })
 		}
 		}
 		return skilldata
 		return skilldata
@@ -410,7 +430,7 @@ module.exports = function FpsUtils(mod) {
 	}
 	}
 
 
 	function RemoveEntry(name) {
 	function RemoveEntry(name) {
-		var what, a = arguments, L = a.length, ax;
+		let what, a = arguments, L = a.length, ax;
 		while (L > 1 && name.length) {
 		while (L > 1 && name.length) {
 			what = a[--L];
 			what = a[--L];
 			while ((ax = name.indexOf(what)) !== -1) { name.splice(ax, 1); }
 			while ((ax = name.indexOf(what)) !== -1) { name.splice(ax, 1); }
@@ -422,7 +442,7 @@ module.exports = function FpsUtils(mod) {
 		for (let i in HiddenUsers) {
 		for (let i in HiddenUsers) {
 			if (HiddenUsers[i].name.toString().toLowerCase() === name.toLowerCase()) {
 			if (HiddenUsers[i].name.toString().toLowerCase() === name.toLowerCase()) {
 				ModifyAppearance(HiddenUsers[i]);
 				ModifyAppearance(HiddenUsers[i]);
-				mod.send('S_SPAWN_USER', 13, HiddenUsers[i]);
+				mod.send('S_SPAWN_USER', 14, HiddenUsers[i]);
 				delete HiddenUsers[i];
 				delete HiddenUsers[i];
 				return;
 				return;
 			}
 			}
@@ -441,7 +461,7 @@ module.exports = function FpsUtils(mod) {
 	function ShowAllPlayers() {
 	function ShowAllPlayers() {
 		for (let i in HiddenUsers) {
 		for (let i in HiddenUsers) {
 			ModifyAppearance(HiddenUsers[i]);
 			ModifyAppearance(HiddenUsers[i]);
-			mod.send('S_SPAWN_USER', 13, HiddenUsers[i]);
+			mod.send('S_SPAWN_USER', 14, HiddenUsers[i]);
 			delete HiddenUsers[i];
 			delete HiddenUsers[i];
 		}
 		}
 	}
 	}
@@ -456,16 +476,16 @@ module.exports = function FpsUtils(mod) {
 		let modified = false;
 		let modified = false;
 
 
 		if (mod.settings.ShowStyle) {
 		if (mod.settings.ShowStyle) {
-			event.ShowStyle = false;
-			event.weaponEnchant = event.body = event.hand = event.feet = event.underwear = event.head = event.face = event.weapon = 0;
-			event.title = event.underwearDye = event.styleBackDye = event.styleHeadDye = event.styleFaceDye = event.styleBodyDye = event.showFace = event.styleHead = event.styleFace = event.styleBack = event.styleWeapon = event.styleBody = event.styleFootprint = 0;
+			event.ShowStyle = event.showFace = false;
+			event.weaponEnchant = event.body = event.hand = event.feet = event.underwear = event.head = event.face = event.weapon = event.title = event.underwearDye = event.styleBackDye = event.styleHeadDye = event.styleFaceDye = event.styleBodyDye = event.weaponEnchant = event.styleHead = event.styleFace = event.styleBack = event.styleWeapon = event.styleBody = event.styleFootprint = 0;
 			event.icons = [];
 			event.icons = [];
 			if (event.mount) event.mount = 231;
 			if (event.mount) event.mount = 231;
 			modified = true;
 			modified = true;
 		}
 		}
 
 
 		if (mod.settings.Hideguildlogos) {
 		if (mod.settings.Hideguildlogos) {
-			event.guildEmblem = '';
+			event.guildLogo = '';
+			event.guildLogoId = 0;
 			modified = true;
 			modified = true;
 		}
 		}
 
 
@@ -595,7 +615,7 @@ module.exports = function FpsUtils(mod) {
 
 
 	function sSpawnUser(event) {
 	function sSpawnUser(event) {
 		SpawnedPlayers[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))) {
+		if (mod.settings.Mode === 3 || mod.settings.PlayersBlacklist.includes(event.name) || mod.settings.ClassesData[ClassID(event.templateId)].isHidden || (mod.settings.OnlyParty && !PartyMembers.includes(event.name))) {
 			HiddenUsers[event.gameId] = event;
 			HiddenUsers[event.gameId] = event;
 			return false;
 			return false;
 		}
 		}
@@ -638,16 +658,11 @@ module.exports = function FpsUtils(mod) {
 
 
 	function sUserExternalChange(event) {
 	function sUserExternalChange(event) {
 		if (EqGid(event.gameId)) return;
 		if (EqGid(event.gameId)) return;
-		if (mod.settings.ShowStyle) {
-			event.ShowStyle = false;
-			event.weaponEnchant = event.body = event.hand = event.feet = event.underwear = event.head = event.face = event.weapon = 0;
-			event.title = event.underwearDye = event.styleBackDye = event.styleHeadDye = event.styleFaceDye = event.styleBodyDye = event.showFace = event.styleHead = event.styleFace = event.styleBack = event.styleWeapon = event.styleBody = event.styleFootprint = 0;
-			return true;
-		}
+		if (mod.settings.ShowStyle) return false;
 	}
 	}
 
 
 	function sUnicastTransformData(event) {
 	function sUnicastTransformData(event) {
-		if (EqGid(event.gameId)) return;
+		if (EqGid(event.gameId) || event.gameId == 0) return;
 		if (mod.settings.ShowStyle) return false;
 		if (mod.settings.ShowStyle) return false;
 		if (mod.settings.Hideguildlogos) {
 		if (mod.settings.Hideguildlogos) {
 			event.guildLogo = '';
 			event.guildLogo = '';
@@ -655,9 +670,14 @@ module.exports = function FpsUtils(mod) {
 		}
 		}
 	}
 	}
 
 
+	/*function sUserChangeFaceCustom(event) {
+		if (EqGid(event.gameId) || event.gameId == 0) return;
+		if (mod.settings.ShowStyle) return false;
+	}*/
+
 	function sSpawnNpc(event) {
 	function sSpawnNpc(event) {
 		if (mod.settings.HideBlacklistedNpcs) {
 		if (mod.settings.HideBlacklistedNpcs) {
-			for (var i = 0; i < mod.settings.NpcsBlacklist.length; i++) {
+			for (let i = 0; i < mod.settings.NpcsBlacklist.length; i++) {
 				if (event.huntingZoneId == mod.settings.NpcsBlacklist[i].zone && event.templateId == mod.settings.NpcsBlacklist[i].templateId) {
 				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;
 					return false;
@@ -665,6 +685,7 @@ module.exports = function FpsUtils(mod) {
 			}
 			}
 		}
 		}
 		if (event.huntingZoneId === 1023) {
 		if (event.huntingZoneId === 1023) {
+			if (mod.settings.HideFireworks && (event.templateId == 60016000 || event.templateId == 80037000)) return false;
 			if (EqGid(event.owner)) {
 			if (EqGid(event.owner)) {
 				if (!mod.settings.HideMySummons) return;
 				if (!mod.settings.HideMySummons) return;
 				HiddenNpcs[event.gameId] = event;
 				HiddenNpcs[event.gameId] = event;
@@ -674,7 +695,6 @@ module.exports = function FpsUtils(mod) {
 			HiddenNpcs[event.gameId] = event;
 			HiddenNpcs[event.gameId] = event;
 			return false;
 			return false;
 		}
 		}
-		if (mod.settings.HideFireworks && event.huntingZoneId === 1023 && (event.templateId === 60016000 || event.templateId === 80037000)) return false;
 		if (mod.settings.ShowStyle) {
 		if (mod.settings.ShowStyle) {
 			event.repairable = false;
 			event.repairable = false;
 			return true;
 			return true;
@@ -718,7 +738,7 @@ module.exports = function FpsUtils(mod) {
 	}
 	}
 
 
 	function sAbnormalityFail(event) {
 	function sAbnormalityFail(event) {
-		if (event.id === 3000021) return false;
+		if (event.id == 3000021) return false;
 	}
 	}
 
 
 	function sActionStage(event) {
 	function sActionStage(event) {
@@ -734,7 +754,7 @@ module.exports = function FpsUtils(mod) {
 			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 (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 ((mod.settings.HideBlacklistedProjectiles || mod.settings.HideAllProjectiles) && 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;
 	}
 	}
 
 
@@ -743,7 +763,7 @@ module.exports = function FpsUtils(mod) {
 			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 (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 ((mod.settings.HideBlacklistedProjectiles || mod.settings.HideAllProjectiles) && 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;
 	}
 	}
 
 
@@ -753,8 +773,7 @@ module.exports = function FpsUtils(mod) {
 		}
 		}
 		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.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;
+			event.id = event.damage = event.type = event.noctEffect = event.crit = event.stackExplode = event.blocked = event.reaction.skill = 0;
 			return true;
 			return true;
 		}
 		}
 	}
 	}
@@ -779,7 +798,7 @@ module.exports = function FpsUtils(mod) {
 
 
 	// ~~~ * Packet Hooks * ~~~ \\
 	// ~~~ * Packet Hooks * ~~~ \\
 
 
-	mod.hook('S_LOGIN', 10, sLogin)
+	mod.hook('S_LOGIN', 12, sLogin)
 	mod.hook('S_LOAD_TOPO', 'raw', sLoadTopo)
 	mod.hook('S_LOAD_TOPO', 'raw', sLoadTopo)
 	mod.hook('S_LEAVE_PARTY', 'raw', sLeaveParty)
 	mod.hook('S_LEAVE_PARTY', 'raw', sLeaveParty)
 	mod.hook('S_MOUNT_VEHICLE', 2, sMountVehicle)
 	mod.hook('S_MOUNT_VEHICLE', 2, sMountVehicle)
@@ -794,14 +813,15 @@ module.exports = function FpsUtils(mod) {
 	mod.hook('S_APPLY_TITLE', 2, sApplyTitle)
 	mod.hook('S_APPLY_TITLE', 2, sApplyTitle)
 	mod.hook('S_IMAGE_DATA', 'raw', sImageData)
 	mod.hook('S_IMAGE_DATA', 'raw', sImageData)
 
 
-	mod.hook('S_SPAWN_USER', 13, { order: 9999 }, sSpawnUser)
-	mod.hook('S_SPAWN_USER', 13, { order: 99999, filter: { fake: null } }, sSpawnUserfn)
+	mod.hook('S_SPAWN_USER', 14, { order: 9999 }, sSpawnUser)
+	mod.hook('S_SPAWN_USER', 14, { order: 99999, filter: { fake: null } }, sSpawnUserfn)
 	mod.hook('S_DESPAWN_USER', 3, { order: 999 }, sDespawnUser)
 	mod.hook('S_DESPAWN_USER', 3, { order: 999 }, sDespawnUser)
 	mod.hook('S_USER_LOCATION', 5, sUserLocation)
 	mod.hook('S_USER_LOCATION', 5, sUserLocation)
 	mod.hook('S_USER_MOVETYPE', 'raw', sUserMoveType)
 	mod.hook('S_USER_MOVETYPE', 'raw', sUserMoveType)
 	mod.hook('S_PARTY_MEMBER_LIST', 7, sPartyMemberList)
 	mod.hook('S_PARTY_MEMBER_LIST', 7, sPartyMemberList)
-	mod.hook('S_USER_EXTERNAL_CHANGE', 6, { order: 9999 }, sUserExternalChange)
-	mod.hook('S_UNICAST_TRANSFORM_DATA', 3, { order: 99999 }, sUnicastTransformData)
+	mod.hook('S_USER_EXTERNAL_CHANGE', 7, { order: 9999 }, sUserExternalChange)
+	mod.hook('S_UNICAST_TRANSFORM_DATA', 5, { order: 99999 }, sUnicastTransformData)
+	//mod.hook('S_USER_CHANGE_FACE_CUSTOM', 2, { order: 9999 }, sUserChangeFaceCustom) opcode not public. :v
 
 
 	mod.hook('S_SPAWN_NPC', 10, sSpawnNpc)
 	mod.hook('S_SPAWN_NPC', 10, sSpawnNpc)
 	mod.hook('S_DESPAWN_NPC', 3, sDespawnNpc)
 	mod.hook('S_DESPAWN_NPC', 3, sDespawnNpc)
@@ -812,7 +832,7 @@ module.exports = function FpsUtils(mod) {
 	mod.hook('S_ABNORMALITY_REFRESH', 1, { order: 999 }, sAbnormalityRefresh)
 	mod.hook('S_ABNORMALITY_REFRESH', 1, { order: 999 }, sAbnormalityRefresh)
 	mod.hook('S_ABNORMALITY_FAIL', 1, sAbnormalityFail)
 	mod.hook('S_ABNORMALITY_FAIL', 1, sAbnormalityFail)
 
 
-	mod.hook('S_ACTION_STAGE', 8, { order: 999 }, sActionStage)
+	mod.hook('S_ACTION_STAGE', 9, { order: 999 }, sActionStage)
 	mod.hook('S_SPAWN_PROJECTILE', 5, { order: 999 }, sSpawnProjectile)
 	mod.hook('S_SPAWN_PROJECTILE', 5, { order: 999 }, sSpawnProjectile)
 	mod.hook('S_START_USER_PROJECTILE', 9, { order: 999 }, sStartUserProjectile)
 	mod.hook('S_START_USER_PROJECTILE', 9, { order: 999 }, sStartUserProjectile)
 	mod.hook('S_EACH_SKILL_RESULT', 12, { order: 999 }, sEachSkillResult)
 	mod.hook('S_EACH_SKILL_RESULT', 12, { order: 999 }, sEachSkillResult)
@@ -940,11 +960,9 @@ module.exports = function FpsUtils(mod) {
 							}
 							}
 						}
 						}
 						Msg(`Class "${arg}"` + ` Shown`.clr(RedClr) + '.');
 						Msg(`Class "${arg}"` + ` Shown`.clr(RedClr) + '.');
-					} else if (!mod.settings.ClassesBlacklist.includes(arg) || !mod.settings.RolesBlacklist.includes(arg)) {
-						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));
+					} else if (!mod.settings.ClassesBlacklist.includes(arg) || !mod.settings.RolesBlacklist.includes(arg)) 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;
 				break;
 			case "party":
 			case "party":
@@ -1013,8 +1031,7 @@ module.exports = function FpsUtils(mod) {
 									}
 									}
 								}
 								}
 							}
 							}
-						} else
-							Msg(`Class ${arg2} not found.`.clr(RedClr));
+						} else Msg(`Class ${arg2} not found.`.clr(RedClr));
 						break;
 						break;
 				}
 				}
 				break;
 				break;
@@ -1026,21 +1043,16 @@ module.exports = function FpsUtils(mod) {
 						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;
 						break;
 					}
 					}
-					let found = mod.settings.NpcsBlacklist.some(s => {
-						return s.zone === arg2 && s.templateId === arg3;
-					});
+					let found = mod.settings.NpcsBlacklist.some(s => s.zone === arg2 && s.templateId === arg3);
 					if (found) {
 					if (found) {
 						Msg(`NPC HntZone '${arg2}', TmpId '${arg3}'` + ` Removed from the blacklist`.clr(RedClr) + '.')
 						Msg(`NPC HntZone '${arg2}', TmpId '${arg3}'` + ` Removed from the blacklist`.clr(RedClr) + '.')
-						mod.settings.NpcsBlacklist = mod.settings.NpcsBlacklist.filter(obj => {
-							return obj.zone != arg2 || obj.templateId != arg3;
-						})
+						mod.settings.NpcsBlacklist = mod.settings.NpcsBlacklist.filter(obj => obj.zone != arg2 || obj.templateId != arg3);
 					} else {
 					} else {
 						Msg(`NPC HntZone '${arg2}', TmpId '${arg3}'` + ` Added to the blacklist`.clr(GreenClr) + '.')
 						Msg(`NPC HntZone '${arg2}', TmpId '${arg3}'` + ` Added to the blacklist`.clr(GreenClr) + '.')
 						mod.settings.NpcsBlacklist.push({ zone: arg2, templateId: arg3 })
 						mod.settings.NpcsBlacklist.push({ zone: arg2, templateId: arg3 })
 					}
 					}
 					return;
 					return;
-				} else
-					mod.settings.HideBlacklistedNpcs = !mod.settings.HideBlacklistedNpcs;
+				} 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;
 				break;
 			case "hit":
 			case "hit":
@@ -1118,22 +1130,22 @@ module.exports = function FpsUtils(mod) {
 				}
 				}
 				break;
 				break;
 			case "guildlogo":
 			case "guildlogo":
-				if (ChangeOnCd) return Msg(`Try again in 4 seconds.`.clr(PinkClr));
+				if (ChangeOnCd) return Msg(`Try again in 3 seconds.`.clr(PinkClr));
 				mod.settings.Hideguildlogos = !mod.settings.Hideguildlogos;
 				mod.settings.Hideguildlogos = !mod.settings.Hideguildlogos;
 				mod.send('C_SET_VISIBLE_RANGE', 1, { range: 0 });
 				mod.send('C_SET_VISIBLE_RANGE', 1, { range: 0 });
 				setTimeout(() => mod.send('C_SET_VISIBLE_RANGE', 1, { range: LastVrange }), 1500);
 				setTimeout(() => mod.send('C_SET_VISIBLE_RANGE', 1, { range: LastVrange }), 1500);
 				ChangeOnCd = true;
 				ChangeOnCd = true;
-				setTimeout(() => ChangeOnCd = false, 4000);
+				setTimeout(() => ChangeOnCd = false, 2800);
 				Msg(`Guild Logos ${mod.settings.Hideguildlogos ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
 				Msg(`Guild Logos ${mod.settings.Hideguildlogos ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
 				break;
 				break;
 			case "costume":
 			case "costume":
 			case "style":
 			case "style":
-				if (ChangeOnCd) return Msg(`Try again in 4 seconds.`.clr(PinkClr));
+				if (ChangeOnCd) return Msg(`Try again in 3 seconds.`.clr(PinkClr));
 				mod.settings.ShowStyle = !mod.settings.ShowStyle;
 				mod.settings.ShowStyle = !mod.settings.ShowStyle;
 				mod.send('C_SET_VISIBLE_RANGE', 1, { range: 0 })
 				mod.send('C_SET_VISIBLE_RANGE', 1, { range: 0 })
 				setTimeout(() => mod.send('C_SET_VISIBLE_RANGE', 1, { range: LastVrange }), 1500);
 				setTimeout(() => mod.send('C_SET_VISIBLE_RANGE', 1, { range: LastVrange }), 1500);
 				ChangeOnCd = true
 				ChangeOnCd = true
-				setTimeout(() => ChangeOnCd = false, 4000);
+				setTimeout(() => ChangeOnCd = false, 2800);
 				Msg(`Style of NPCs & others ${mod.settings.ShowStyle ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
 				Msg(`Style of NPCs & others ${mod.settings.ShowStyle ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
 				break;
 				break;
 			case "proj":
 			case "proj":
@@ -1204,8 +1216,8 @@ module.exports = function FpsUtils(mod) {
 					case "lobby":
 					case "lobby":
 						mod.send('C_RETURN_TO_LOBBY', 1, {});
 						mod.send('C_RETURN_TO_LOBBY', 1, {});
 						break;
 						break;
-					case "exit":
-						mod.send('C_EXIT', 1, {});
+					case "instantexit":
+						mod.send('S_EXIT', 3, { category: 0, code: 0 });
 						break;
 						break;
 					case "drop":
 					case "drop":
 						mod.send('C_LEAVE_PARTY', 1, {});
 						mod.send('C_LEAVE_PARTY', 1, {});
@@ -1236,17 +1248,16 @@ module.exports = function FpsUtils(mod) {
 						break;
 						break;
 					}
 					}
 					arg2 = Number(arg2);
 					arg2 = Number(arg2);
-					let found = mod.settings.DropBlacklist.some(s => { return s === arg2; });
+					let found = mod.settings.DropBlacklist.some(s => s === arg2);
 					if (found) {
 					if (found) {
 						Msg(`Drops id '${arg2}'` + ` Removed from the blacklist`.clr(RedClr) + '.')
 						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 => obj != arg2)
 					} else {
 					} else {
 						Msg(`Drops id '${arg2}'` + ` Added to the blacklist`.clr(GreenClr) + '.')
 						Msg(`Drops id '${arg2}'` + ` Added to the blacklist`.clr(GreenClr) + '.')
 						mod.settings.DropBlacklist.push(arg2)
 						mod.settings.DropBlacklist.push(arg2)
 					}
 					}
 					return;
 					return;
-				} else
-					mod.settings.HideBlacklistedDrop = !mod.settings.HideBlacklistedDrop;
+				} 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;
 				break;
 			case "monsterdeathani":
 			case "monsterdeathani":
@@ -1262,17 +1273,16 @@ module.exports = function FpsUtils(mod) {
 						break;
 						break;
 					}
 					}
 					arg2 = Number(arg2);
 					arg2 = Number(arg2);
-					let found = mod.settings.OwnAbnormalsBlacklist.some(m => { return m === arg2; });
+					let found = mod.settings.OwnAbnormalsBlacklist.some(m => m === arg2);
 					if (found) {
 					if (found) {
 						Msg(`Abnormal id '${arg2}'` + " Removed from the blacklist".clr(RedClr) + '.')
 						Msg(`Abnormal id '${arg2}'` + " Removed from the blacklist".clr(RedClr) + '.')
-						mod.settings.OwnAbnormalsBlacklist = mod.settings.OwnAbnormalsBlacklist.filter(obj => { return obj != arg2; })
+						mod.settings.OwnAbnormalsBlacklist = mod.settings.OwnAbnormalsBlacklist.filter(obj => obj != arg2);
 					} else {
 					} 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)
 						mod.settings.OwnAbnormalsBlacklist.push(arg2)
 					}
 					}
 					return;
 					return;
-				} else
-					mod.settings.HideOwnBlacklistedAbns = !mod.settings.HideOwnBlacklistedAbns;
+				} else mod.settings.HideOwnBlacklistedAbns = !mod.settings.HideOwnBlacklistedAbns;
 				Msg(`Blacklisted ScreenAbns ${mod.settings.HideOwnBlacklistedAbns ? 'Hidden'.clr(GreenClr) : 'Shown'.clr(RedClr)}.`);
 				Msg(`Blacklisted ScreenAbns ${mod.settings.HideOwnBlacklistedAbns ? 'Hidden'.clr(GreenClr) : 'Shown'.clr(RedClr)}.`);
 				break;
 				break;
 			case "help":
 			case "help":

Разница между файлами не показана из-за своего большого размера
+ 1 - 2
lib/setting_migration.js


+ 13 - 17
manifest.json

@@ -1,22 +1,17 @@
 {
 {
 	"files": {
 	"files": {
-		"README.md": "64e744609702579b229ff04683dc9827c9791e4f1491d2b531f98f2e680ca3ef",
-		"lib/data/npcData.json": "5d924897021af232e676e5ea56d9cdcbfca813edb0a23d8481a61b6eb7077a78",
+		"README.md": "b3bdcae6641fc741f65c11bc19788191d48b73a70b47f03cf15963dfe337a793",
+		"lib/data/npcData.json": "df6ea18642a274017e173d9bf34884a44202c72b3e030085aa5bb64f7b2d6337",
 		"lib/data/skillString.json": "9d69876fea0be8e6ac5dd43b3fc74ea023f6b8a6145384f8f780dd977045d8ef",
 		"lib/data/skillString.json": "9d69876fea0be8e6ac5dd43b3fc74ea023f6b8a6145384f8f780dd977045d8ef",
-		"lib/index.js": "4a97df9491d587544fd5c53d1e4aa33ea0cb212426b7e8a0554c524088fb8871",
-		"lib/setting_migration.js": "1c890dc0ea2c211b3d7cdda70d2ed9d6b1c80056eeff6a0dae0d30a9b9b28efe",
-		"mod.cson": "8512a3e497e8d16dea13de7b24de67aede93c28c5714f2e717bf8e44826ad54c",
-		"module.json": "7cc5851678163ba6f7d0d041694f9d9ea320e9afcb46d083547bf93d32872fbf",
-		"node_modules/Gui/LICENSE": "589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2",
-		"node_modules/Gui/README.md": "5ce236283acd2bf5c617866e714b53f15cf4b665dce51ae2418587f9c6bfc28b",
-		"node_modules/Gui/index.js": "7595b2d8617c00e1f4de976d14e96bbb0903783c93c746999f447b5eb9cfb7a3",
-		"package.json": "e4f97b0f2f8234a68ca2c9831eb50c8aabfe979f348700fd01ce8dab1c75242a"
+		"lib/index.js": "b35f51f72e704cb073587cde6d47466493ddd755c5309180188355a8c7b4cc3f",
+		"lib/setting_migration.js": "b31d10274986e26f09643ddbd3b34735e3528065186c7b1d0c9ce49e7bdd4669",
+		"module.json": "daad9efa0cb942c279a592e67d01d9d500c99176cbbd3254d27b62b3a6d2096d",
+		"package.json": "be83cd6f1b534497556ff64feb0d19766c03de3428b63ce11f08908afcc4eafe"
 	},
 	},
 	"defs": {
 	"defs": {
 		"C_ADMIN": 1,
 		"C_ADMIN": 1,
-		"C_CONFIRM_UPDATE_NOTIFICATION": 1,
+		"C_CONFIRM_UPDATE_NOTIFICATION": "raw",
 		"C_DISMISS_PARTY": 1,
 		"C_DISMISS_PARTY": 1,
-		"C_EXIT": 1,
 		"C_LEAVE_PARTY": 1,
 		"C_LEAVE_PARTY": 1,
 		"C_REQUEST_CONTRACT": 1,
 		"C_REQUEST_CONTRACT": 1,
 		"C_RESET_ALL_DUNGEON": 1,
 		"C_RESET_ALL_DUNGEON": 1,
@@ -25,12 +20,13 @@
 		"S_ABNORMALITY_BEGIN": 3,
 		"S_ABNORMALITY_BEGIN": 3,
 		"S_ABNORMALITY_FAIL": 1,
 		"S_ABNORMALITY_FAIL": 1,
 		"S_ABNORMALITY_REFRESH": 1,
 		"S_ABNORMALITY_REFRESH": 1,
-		"S_ACTION_STAGE": 8,
+		"S_ACTION_STAGE": 9,
 		"S_ANNOUNCE_UPDATE_NOTIFICATION": 1,
 		"S_ANNOUNCE_UPDATE_NOTIFICATION": 1,
 		"S_APPLY_TITLE": 2,
 		"S_APPLY_TITLE": 2,
 		"S_DESPAWN_NPC": 3,
 		"S_DESPAWN_NPC": 3,
 		"S_DESPAWN_USER": 3,
 		"S_DESPAWN_USER": 3,
 		"S_EACH_SKILL_RESULT": 12,
 		"S_EACH_SKILL_RESULT": 12,
+		"S_EXIT": 3,
 		"S_FEARMOVE_END": 1,
 		"S_FEARMOVE_END": 1,
 		"S_FEARMOVE_STAGE": 1,
 		"S_FEARMOVE_STAGE": 1,
 		"S_FONT_SWAP_INFO": "raw",
 		"S_FONT_SWAP_INFO": "raw",
@@ -39,7 +35,7 @@
 		"S_LEAVE_PARTY": "raw",
 		"S_LEAVE_PARTY": "raw",
 		"S_LOADING_SCREEN_CONTROL_INFO": "raw",
 		"S_LOADING_SCREEN_CONTROL_INFO": "raw",
 		"S_LOAD_TOPO": "raw",
 		"S_LOAD_TOPO": "raw",
-		"S_LOGIN": 10,
+		"S_LOGIN": 12,
 		"S_MOUNT_VEHICLE": 2,
 		"S_MOUNT_VEHICLE": 2,
 		"S_NPC_MENU_SELECT": 1,
 		"S_NPC_MENU_SELECT": 1,
 		"S_PARTY_MEMBER_LIST": 7,
 		"S_PARTY_MEMBER_LIST": 7,
@@ -48,13 +44,13 @@
 		"S_SPAWN_DROPITEM": 6,
 		"S_SPAWN_DROPITEM": 6,
 		"S_SPAWN_NPC": 10,
 		"S_SPAWN_NPC": 10,
 		"S_SPAWN_PROJECTILE": 5,
 		"S_SPAWN_PROJECTILE": 5,
-		"S_SPAWN_USER": 13,
+		"S_SPAWN_USER": 14,
 		"S_START_ACTION_SCRIPT": 3,
 		"S_START_ACTION_SCRIPT": 3,
 		"S_START_COOLTIME_ITEM": 1,
 		"S_START_COOLTIME_ITEM": 1,
 		"S_START_USER_PROJECTILE": 9,
 		"S_START_USER_PROJECTILE": 9,
-		"S_UNICAST_TRANSFORM_DATA": 3,
+		"S_UNICAST_TRANSFORM_DATA": 5,
 		"S_UNMOUNT_VEHICLE": 2,
 		"S_UNMOUNT_VEHICLE": 2,
-		"S_USER_EXTERNAL_CHANGE": 6,
+		"S_USER_EXTERNAL_CHANGE": 7,
 		"S_USER_LOCATION": 5,
 		"S_USER_LOCATION": 5,
 		"S_USER_MOVETYPE": "raw"
 		"S_USER_MOVETYPE": "raw"
 	}
 	}

+ 0 - 10
mod.cson

@@ -1,10 +0,0 @@
-{
-    "name": "Fps Utils",
-    "author": "Risenio",
-    "description": "A free script filled with features dedicated to improve your fps.",
-    "contributors": ["codeagon", "Saegusae", "SerenTera", "Kyoukaya", "SaltyMonkey", "Leyki"],
-    "version": "5",
-    "namespace": "fps_utils",
-    "main": "lib",
-    "update": "github:Risenio/fps-utils"
-}

+ 3 - 3
module.json

@@ -1,13 +1,13 @@
 {
 {
     "disableAutoUpdate": false,
     "disableAutoUpdate": false,
-    "name": "Fps Utils",
+    "name": "fps-utils",
     "author": "Risenio",
     "author": "Risenio",
     "description": "A free script filled with features dedicated to improve your fps.",
     "description": "A free script filled with features dedicated to improve your fps.",
     "contributors": ["codeagon", "Saegusae", "SerenTera", "Kyoukaya", "SaltyMonkey", "Leyki"],
     "contributors": ["codeagon", "Saegusae", "SerenTera", "Kyoukaya", "SaltyMonkey", "Leyki"],
-    "version": "5",
+    "version": "6",
     "options": {
     "options": {
         "niceName": "FPS",
         "niceName": "FPS",
-        "settingsVersion": 5,
+        "settingsVersion": 6,
         "settingsFile": "config.json",
         "settingsFile": "config.json",
         "settingsMigrator": "./lib/setting_migration.js"
         "settingsMigrator": "./lib/setting_migration.js"
     },
     },

+ 0 - 674
node_modules/Gui/LICENSE

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    {one line to give the program's name and a brief idea of what it does.}
-    Copyright (C) {year}  {name of author}
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    {project}  Copyright (C) {year}  {fullname}
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

+ 0 - 32
node_modules/Gui/README.md

@@ -1,32 +0,0 @@
-# Gui
-
-Allows you to have access to the welcome message window where you can click stuffs.
-
-## For Developers:
-
-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) {
-	const gui = new Gui(mod)
-	mod.command.add('guitest', () => {
-		gui.parse(
-			[
-				{
-					text: `Test text!`,                 //Text goes here.
-					command: `fps mode 3`,              //Command which will get send by 'command.exec()'.
-					img: `icon_items.homonculus1_tex`   //Image 'category.name' will appear infront of text.
-				}
-			],
-			'This is a test!'							//Title goes here.
-		)
-	})
-}
-```
-## Additional things to know
-- Multiple commands can now be split/chained together by using `command: "cmd1;cmd2"`
-
-## Credits
-- [HugeDong69](https://github.com/codeagon) - Original developer. [Donation link](https://ko-fi.com/codeagon)

+ 0 - 107
node_modules/Gui/index.js

@@ -1,107 +0,0 @@
-const map = new WeakMap();
-let blep;
-
-class Gui {
-	constructor(mod) {
-		this.mod = mod;
-		const base = mod.base || mod;
-
-		if (!map.has(base)) {
-			map.set(base, {});
-
-			mod.hook('C_CONFIRM_UPDATE_NOTIFICATION', 1, () => false)
-
-			mod.hook('C_ADMIN', 1, (event) => {
-				blep = event.command.split(";")
-				blep.forEach(cmd => mod.command.exec(cmd))
-				return false
-			})
-		}
-	}
-
-	parse(array, title, mode) {
-		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'/>`
-				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'/>`
-				body: thonk(array, mode)
-			})
-		Data = ''
-	}
-}
-
-let Data = '',
-	Count = 0,
-	IMGCount = 1,
-	FirstTXT = true,
-	ArrayTXT = [],
-	isFinished = 0
-
-function ShoveData(stuff, mode) {
-	if (Data.length >= 16000) {
-		Data += `GUI Data Limit Exceeded, some values may be missing.`
-		isFinished = true
-		return
-	}
-	if (Count >= 7 && mode == 1) {
-		Data += `<br>${stuff}`
-		Count = 1
-	} else Data += stuff
-}
-
-function thonk(array) {
-	isFinished = false
-	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}`);
-			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>`)
-	}
-	Count = 0
-	return Data
-}
-
-function squonk(array) {
-	for (var i = 0; i < array.length; i++) {
-		if (IMGCount <= 5) {
-			IMGCount++
-			ArrayTXT.push(array[i].text)
-			Data += `<a href='admincommand:/@${array[i].command}'><img src='img://__${array[i].img}'></img></a> &#09; `
-		} if (ArrayTXT.length == 5) {
-			console.log('else')
-			FirstTXT = true
-			for (var j = 0; j < ArrayTXT.length; j++) {
-				console.log(ArrayTXT[j])
-				if (j == 4) {
-					Data += `${ArrayTXT[j]}<br>`
-					IMGCount = 0
-					ArrayTXT = []
-					FirstTXT = true
-				}
-				if (FirstTXT == true && j != 4) {
-					Data += `<br> &#09;${ArrayTXT[j]} &#09;&#09;`
-					FirstTXT = false
-				} else if (j != 4) {
-					Data += `${ArrayTXT[j]} &#09;&#09;&#09;`
-				}
-			}
-			IMGCount = 0
-			ArrayTXT = []
-			FirstTXT = true
-		}
-	}
-	console.log(Data)
-	return Data
-}
-module.exports = Gui;

+ 2 - 1
package.json

@@ -2,5 +2,6 @@
 	"main": "lib",
 	"main": "lib",
 	"name": "fps-utils",
 	"name": "fps-utils",
 	"author": "Risenio",
 	"author": "Risenio",
-	"description": "A free script filled with features dedicated to improve your fps."
+	"description": "A free script filled with features dedicated to improve your fps.",
+    "contributors": ["codeagon", "Saegusae", "SerenTera", "Kyoukaya", "SaltyMonkey", "Leyki"]
 }
 }

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