Browse Source

done

50 readme commits later and we're done
Pentagon 8 years ago
parent
commit
be0e92466c
5 changed files with 927 additions and 770 deletions
  1. 36 35
      README.md
  2. 184 34
      config.json
  3. 0 26
      db.json
  4. 686 653
      index.js
  5. 21 22
      manifest.json

+ 36 - 35
README.md

@@ -1,63 +1,64 @@
-# fps-utils
+# FPS-UTILS
 
-  Written for tera-proxy, a free script filled with features dedicated to improve your fps, in the open world and in dungeons.
-  
-  ##
+  Written for TERA-Proxy, a free script filled with features dedicated to improving your FPS.
   
+  ****
+
   **To support development of this mod**:
   
   Throw money [here](https://www.patreon.com/saegusa) to show support for Saegusa, the original developer of this mod.
   
-  Buy me a [covfefe](https://ko-fi.com/codeagon) (I can't actually drink coffee)
+  Buy me a [covfefe](https://ko-fi.com/codeagon) (I can't actually drink coffee but I will eat your money)
   ****
+- [FPS-UTILS](#fps-utils)
+  - [Big Note](#big-note)
+  - [Installation](#installation)
+  - [Commands](#commands)
+    - [Additional command info](#additional-command-info)
+  - [Update Log](#update-log)
+  - [Work In Progress:](#work-in-progress)
+  - [Suggestions](#suggestions)
+  - [Credits](#credits)
 
-### Note:
-This **huge** update was 100% all done by [SerenTera](https://github.com/SerenTera) please go check their stuff out because it's way better than anything I've ever done.
+## Big Note
+FPS-Utils has received a facelift, several features have changed, fixed or removed entirely, so please read the readme!
 
-# How to use:
+## Installation 
 ***Note***: *If you're using [Caali's proxy](https://discord.gg/maqBmJV) fps-utils will be automatically updated and already installed so will not need to do the following.*
 * put the script folder "fps-utils" into bin/node_modules
 * Log the game using the proxy.
-* Now you have access to fps-utils commands
-* Default commands can be found in index.js
 
-## Commands:
+## Commands
 ***Note:*** *When inputting commands directly from the **proxy channel**  the prefix `!` should be ignored.*
 
 Command | Argument(s) | Example | Description
 ---|---|---|---
 **!fps mode** | 1, 2, 3, off | !fps mode 1| Sets the current fps-utils optimization state. 0 disables, 1 hides particles, 2 hides skill animations, 3 hides all players. All modes toggle`fps hit on`
 **!fps tc** | remove, party, on | !fps tc remove | Hides traverse cut spam.`Remove`stops the buff from being refreshed except for when it ends,`party`stops you from being spammed with party members getting the buff
-**!fps hit** | me, damage, on | !fps hit on | Enables/Disables hiding of hit effects for the player.`Damage`toggles damage numbers off.`Me` turns hit effects off for **you** (disables damage numbers also unfortunately).
-**!fps hide** | playername, dps, healers, tanks, ranged, class | !fps hide Spacecats, !fps hide valkyrie |hides dps, healers, tanks or ranged classes, any username or a class, class names can be found in`db.json`.
-**!fps show** | playername, dps, healers, tanks, ranged, class| !fps show Memeboy | Takes the same arguments as above and instead unhides them.
-**!fps list** |  | !fps list |  Prints a list of characters currently hidden by *hide* command to chat.
+**!fps hit** | me, damage, other | !fps hit other | Enables/Disables hiding of hit effects for the player.`Damage`toggles damage numbers off.`Me` turns hit effects off for **you** (disables damage numbers also unfortunately), other disables effects for other users (recommended).
+**!fps hide** | playername, dps, healers, tanks, ranged, classname | !fps hide Spacecats, !fps hide valkyrie |hides dps, healers, tanks or ranged classes, any username or a class, class names can be found in`config.json`.
+**!fps show** | playername, dps, healers, tanks, ranged, classname| !fps show Memeboy | Takes the same arguments as above and instead unhides them.
+**!fps list** |  | !fps list |  Prints a list of characters/classes/roles currently hidden by *hide* command to chat.
 **!fps fireworks** | None | !fps fireworks | Enables/Disables hiding of firework entities in open world.
-**!fps logo** | None | !fps logo | Enables/Disables hiding of guild logos, will require players to be reloaded (enter/exit the area)
-**!fps block**| skill, skilluser, summon, summonuser ,effect| !fps block skill| Toggle to hide specific skills, NPCs or abnormality effects as defined in`db.json`(see addition help). By default several things are included in the blocklist for ease of use.
-****
+**!fps summons** | None | !fps summons | Enables/Disables hiding of ALL summoned entities(gunner turrets, mystic thralls, etc);
+**!fps skill** | blacklist, class <classname>  | !fps skill class lancer | `black` toggles the skill blacklist feature, `class <classname>`toggles displaying of ALL skills for that class
+**!fps npc** | None | !fps npc | Enables/Disables hiding of ALL NPCs within the npc blacklist
+**!fps effects** | all, blacklist | !fps effects blacklist | Toggles showing of either blacklisted abnormality effects or all abnormality effects (your own ones still display normally in all mode, however not in blacklist mode).
+**!fps style** | None | !fps style | Enables/Disables showing of all spawned players as wearing the same outfit. Requires leaving and re-entering the area or re-logging to take effect.
 
-### Additional help:
- - `fps block`can be customized to hide specific skills, effects and NPCs. Simply edit`db.json` to include the ID of the skill, abnormality, or NPC you wish to hide. For example,`10155130`is the ID of the abnormality effect for`Ragnarok`, which may cause lag for some users, adding it to the`hiddenskill`section of`db.json`will cause it to be blocked when`fps block effect`is active.  A full list of IDs can be found [here.](https://github.com/neowutran/TeraDpsMeterData/tree/7194b31b111c48963618067d32ae7cfeab9675bb)
-## Update Log:
-- Reworked various commands, shortened some stuffs.
-- Added specific skill, summon and effect blacklist (db.json)
-- Added config saving (config.json)
-- Added automatic saving feature to config.json after every command use (set AUTO_SAVE to true)
-- Neaten code, combined various code fragments where possible
-- Correct Last state (Fixes respawning player bugs when going back to mode 1/2)
+### Additional command info
+*  A full list of skill IDs can be found [here.](https://github.com/pinkipi/skill-prediction/blob/master/config/skills.js)
+*  A full list of NPCs and Abnormalities will be posted later.
+  
+## Update Log
+* Rewrote the entire mod.
 ## Work In Progress:
-* Overall improvements.
-* Adding aliasing for commands
-* ~~Save configuration upon exit to remember last state.~~
-* ~~Revive !fps 2 to it's full glory and screw this "2 IS A MEME" gaem.~~
-* ~~Add support for hiding ranged dps and certain classes~~
-* ~~Rewrite and command support~~
 
-## Suggestions:
+
+## Suggestions
 * If you have suggestions, need help, or want to comment on my shitty coding, leave an issue report or message me (Hugedong69 on pinkies discord)
 
-## Credits: 
+## Credits
 The following people have helped in making FPS-Utils:
 - [Saegusae](https://github.com/Saegusae/) - Original developer
 - [Bernkastel](https://github.com/Bernkastel-0/) - Whos code I stole and then rewrote because it was also broken

+ 184 - 34
config.json

@@ -1,36 +1,186 @@
 {
-	"version": 1.01,
-	"state": 1,
-	"hide": {
-		"tanks": false,
-		"dps": false,
-		"healers": false,
-		"ranged": false,
-		"warrior": false,
-		"lancer": false,
-		"slayer": false,
-		"berserker": false,
-		"sorcerer": false,
-		"archer": false,
-		"priest": false,
-		"reaper": false,
-		"gunner": false,
-		"ninja": false,
-		"valkyrie": false
-	},
-	"fireworks": false,
-	"hitme": false,
-	"damage": false,
-	"heal": false,
-	"hit": false,
-	"logo": false,
-	"tcremove": false,
-	"tc": false,
-	"tcp": false,
-	"blockSkill": false,
-	"blockUserSkill": false,
-	"blockSummon": false,
-	"blockUserSummon": false,
-	"blockEffect": false,
-	"hiddenPeople": []
+    "version": 1,
+    "mode": "0",
+    "hideFirewworks": false,
+    "hideAllAbnormies": false,
+    "hideAllSummons": false,
+    "blacklistNpcs": false,
+    "blacklistSkills": false,
+    "blacklistAbnormies": false,
+    "hiddenAbnormies": [],
+    "hitMe": false,
+    "hitOther": false,
+    "hitDamage": false,
+    "showStyle": false,
+    "blacklistedNames": [
+        "hugedong"
+    ],
+    "hiddenNpcs": [
+        {
+            "zone": 1,
+            "templateId": 1
+        },
+        {
+            "zone": 1,
+            "tempalteId": 2
+        }
+    ],
+    "classNames": [
+        "warrior",
+        "lancer",
+        "slayer",
+        "berserker",
+        "sorcerer",
+        "archer",
+        "priest",
+        "mystic",
+        "reaper",
+        "gunner",
+        "brawler",
+        "ninja",
+        "valkyrie"
+    ],
+    "roleNames": [
+        "dps",
+        "healer",
+        "tank",
+        "ranged"
+    ],
+    "hiddenClasses": [],
+    "hiddenRoles": [],
+    "classes": {
+        "1": {
+            "name": "warrior",
+            "model": 1,
+            "blockedSkills": [],
+            "blockingSkills": false,
+            "role": [
+                "dps"
+            ],
+            "isHidden": false
+        },
+        "2": {
+            "name": "lancer",
+            "model": 2,
+            "blockedSkills": [],
+            "blockingSkills": false,
+            "role": [
+                "tank"
+            ],
+            "isHidden": false
+        },
+        "3": {
+            "name": "slayer",
+            "model": 3,
+            "blockedSkills": [],
+            "blockingSkills": false,
+            "role": [
+                "dps"
+            ],
+            "isHidden": false
+        },
+        "4": {
+            "name": "berserker",
+            "model": 4,
+            "blockedSkills": [],
+            "blockingSkills": false,
+            "role": [
+                "dps"
+            ],
+            "isHidden": false
+        },
+        "5": {
+            "name": "sorcerer",
+            "model": 5,
+            "blockedSkills": [],
+            "blockingSkills": false,
+            "role": [
+                "dps",
+                "ranged"
+            ],
+            "isHidden": false
+        },
+        "6": {
+            "name": "archer",
+            "model": 6,
+            "blockedSkills": [],
+            "blockingSkills": false,
+            "role": [
+                "dps",
+                "ranged"
+            ],
+            "isHidden": false
+        },
+        "7": {
+            "name": "priest",
+            "model": 7,
+            "blockedSkills": [],
+            "blockingSkills": false,
+            "role": [
+                "healer"
+            ],
+            "isHidden": false
+        },
+        "8": {
+            "name": "mystic",
+            "model": 8,
+            "blockedSkills": [],
+            "blockingSkills": false,
+            "role": [
+                "healer"
+            ],
+            "isHidden": false
+        },
+        "9": {
+            "name": "reaper",
+            "model": 9,
+            "blockedSkills": [],
+            "blockingSkills": false,
+            "role": [
+                "dps"
+            ],
+            "isHidden": false
+        },
+        "10": {
+            "name": "gunner",
+            "model": 10,
+            "blockedSkills": [],
+            "blockingSkills": false,
+            "role": [
+                "dps",
+                "ranged"
+            ],
+            "isHidden": false
+        },
+        "11": {
+            "name": "brawler",
+            "model": 11,
+            "blockedSkills": [],
+            "blockingSkills": false,
+            "role": [
+                "tank"
+            ],
+            "isHidden": false
+        },
+        "12": {
+            "name": "ninja",
+            "model": 12,
+            "blockedSkills": [],
+            "blockingSkills": false,
+            "role": [
+                "dps"
+            ],
+            "isHidden": false
+        },
+        "13": {
+            "name": "valkyrie",
+            "model": 13,
+            "blockedSkills": [],
+            "blockingSkills": false,
+            "role": [
+                "dps"
+            ],
+            "isHidden": false
+        }
+    }
 }

+ 0 - 26
db.json

@@ -1,26 +0,0 @@
-{
-	"version": 1,
-	"classes": {
-		"ranged": [5,6,10],
-		"dps": [1,3,4,5,6,9,10,12,13],
-		"healers": [7,8],
-		"tanks": [2,11],
-		"warrior": [1],
-		"lancer": [2],
-		"slayer": [3],
-		"berserker": [4],
-		"sorcerer": [5],
-		"archer": [6],
-		"priest": [7],
-		"mystic": [8],
-		"reaper": [9],
-		"gunner": [10],
-		"brawler": [11],
-		"ninja": [12],
-		"valkyrie": [13]
-	},
-	"hiddenskill": [270900,21400,40330,40320,40300],
-	"hiddensummon": [12345,1024001,1023405,10238007],
-	"hiddeneffect": [10153040,10155130,31100],
-	"hiddenheal": [10154031,700409,701606,701607]
-}

+ 686 - 653
index.js

@@ -1,737 +1,770 @@
-//FpsUtils revision 1.5.7- ALL HAIL SEREN
-//Credits to Seren, Xiphon, TeraProxy, Saegusa & Bernkastel for code and ideas
-/*
- Changelog:
- 1. Reworked various commands, shortened some stuffs.
- 2. Added specific skill, summon and effect blacklist (db.json)
- 3. Added config saving (config.json)
- 4. Added automatic saving feature to config.json after every command use (set AUTO_SAVE to true)
- 5. Neaten code, combined various code fragments where possible
- 6. Correct Last state (Fixes respawning player bugs when going back to mode 1/2)
- 
- TODO:
- Remove saving of hiddenPlayers/ add option to do so- This uses memory in populated regions...
- Add more hidden skills and summons when possible. Eg: gunner/brawler laggy skills, various skills when awakening comes, especially that king thrall
- Save config on logout too.
- 
- Custom Hidden Objects, with the type of id to input in db.json:
- Hidden Skills (skill id-0x4000000 or dbid): Hailstorm, Regeneration Circle, Sundering Strike
- Hidden Summons (template id): Thrall of wrath, Healing totem, Ninja 'Decoy Jutsu' totem
- Hidden Effect (abnormality id): Growing Fury, Ragnarok
- 
- 
- Options:
- Config.Json Options are listed below :
- state:1,				//Default Fps-Utils Mode to always start game with (0,1,2 or 3)
- hide: {					//True: Hides that class/role from spawning
- tanks: false,
- dps: false,
- healers: false,
- ranged: false,
- warrior: false,
- lancer: false,
- slayer: false,
- berserker: false,
- sorcerer: false,
- archer: false,
- priest: false,
- reaper: false,
- gunner: false,
- ninja: false,
- valkyrie: false
- },
- fireworks: false,		//True: Disable Dragon fireworks
- hitme: false,			//True: Disable hit effects on you
- damage: false, 			//True: Disable damage numbers
- heal: false, 			//True: Disable heal effects
- hit: true,				//True: Disable hit effects on others
- logo: false,			//True: Disable Guild logos
- tcremove: false, 		//True: Disable notifications of Traverse Cut (TC) buffs
- tc: true, 				//True: Shows TC refreshes at a reduced rate (once every 7 hits by default)
- tcp: true, 				//True: Party abnormality refresh spam
- blockSkill:true, 		//True: Blocks certain blacklisted skills
- blockUserSkill:false, 	//True: Blocks user skills as well
- blockSummon:true, 		//True: Blocks laggy summons (Thralls etc...)
- blockUserSummon:false, 	//True: Blocks user summon as well
- blockEffect:true		//True: Blocks Growing Fury and Ragnarok effects on other users
- hiddenPeople:[],		//Default Hidden Character names. Remember to use " " to enclose the ign, in lower case.
- */
-
-const AUTO_SAVE = true		//True: Always save applied settings when using commands.
-
-
-
-//================================================== DO NOT MAKE CHANGES BELOW THIS LINE ===========================================================================================================
-const Command = require('command'),
-        fs = require('fs'),
-        path = require('path')
-
-
-
-module.exports = function FpsUtils(dispatch) {
-
-
-    try {
-        db = require('./db.json')
+/* global __dirname */
+
+const path = require('path');
+const Command = require('command');
+const fs = require('fs');
+
+
+module.exports = function FpsUtils2(dispatch) {
+    //
+    let firstRun = false,
+            spawnedPlayers = {},
+            blacklisted = config.blacklistedNames,
+            mode = config.mode,
+            myId,
+            hiddenNpcs = {},
+            hiddenUsers = {};
+
+    const command = Command(dispatch);
+    try { //generate config
+        config = require('./config.json');
     } catch (e) {
-        console.log('(FPS Utils) - No DB file detected, creating...')
-        db = {
+        log("CONFIG FILE NOT FOUND, GENERATING ONE NOW");
+        config = {
             "version": 1,
+            "mode": "0",
+            "hideFirewworks": false,
+            "hideAllAbnormies": false,
+            "hideAllSummons": false,
+            "blacklistNpcs": false,
+            "blacklistSkills": false,
+            "blacklistAbnormies": false,
+            "hiddenAbnormies": [],
+            "hitMe": false,
+            "hitOther": false,
+            "hitDamage": false,
+            "showStyle": false,
+            "blacklistedNames": [
+                "hugedong"
+            ],
+            "hiddenNpcs": [
+                {
+                    "zone": 1,
+                    "templateId": 1
+                },
+                {
+                    "zone": 1,
+                    "tempalteId": 2
+                }
+            ],
+            "classNames": ["warrior", "lancer", "slayer", "berserker", "sorcerer", "archer", "priest", "mystic", "reaper", "gunner", "brawler", "ninja", "valkyrie"],
+            "roleNames": ["dps", "healer", "tank", "ranged"],
+            "hiddenClasses": [],
+            "hiddenRoles": [],
             "classes": {
-                "ranged": [5, 6, 10],
-                "dps": [1, 3, 4, 5, 6, 9, 10, 12, 13],
-                "healers": [7, 8],
-                "tanks": [2, 11],
-                "warrior": [1],
-                "lancer": [2],
-                "slayer": [3],
-                "berserker": [4],
-                "sorcerer": [5],
-                "archer": [6],
-                "priest": [7],
-                "mystic": [8],
-                "reaper": [9],
-                "gunner": [10],
-                "brawler": [11],
-                "ninja": [12],
-                "valkyrie": [13]
-            },
-            "hiddenskill": [270900, 21400, 40330, 40320, 40300],
-            "hiddensummon": [12345, 1024001, 1023405, 10238007],
-            "hiddeneffect": [10153040, 10155130, 31100],
-            "hiddenheal": [10154031, 700409, 701606, 701607]
-        }
-        saveDb()
-    }
-    if (db.version !== 1) { 		//Remember to change version number for updates
-        console.log('[FPS Utils] Outdated DB file detected, updating...')
-        Object.assign(db, {
-            "version": 1,
-            "hiddenskill": [270900, 21400, 40330, 40320, 40300],
-            "hiddensummon": [12345, 1024001, 1023405, 10238007],
-            "hiddeneffect": [10153040, 10155130, 31100],
-            "hiddenheal": [10154031, 700409, 701606, 701607]
-        })	//Replace {} with updating object.Eg {"version":1.1,"newKey":1,"newKey2":[1,2]}
-        //db.hiddenskill.push()	//To Prevent replacing user customized array, Use pushes for array based Object values. This is just an example.
-        saveDb()
-    }
-    //config
-    try {
-        flags = require('./config.json')
-    } catch (e) {
-        console.log('(FPS Utils) - No config file detected, creating...')
-        flags = {
-            "version": 1.02,
-            "state": 0,
-            "hide": {
-                "tanks": false,
-                "dps": false,
-                "healers": false,
-                "ranged": false,
-                "warrior": false,
-                "lancer": false,
-                "slayer": false,
-                "berserker": false,
-                "sorcerer": false,
-                "archer": false,
-                "priest": false,
-                "reaper": false,
-                "gunner": false,
-                "ninja": false,
-                "valkyrie": false
-            },
-            "fireworks": false,
-            "hitme": false,
-            "damage": false,
-            "heal": false,
-            "hit": false,
-            "logo": false,
-            "tcremove": false,
-            "tc": false,
-            "tcp": false,
-            "blockSkill": false,
-            "blockUserSkill": false,
-            "blockSummon": false,
-            "blockUserSummon": false,
-            "blockEffect": false,
-            "hiddenPeople": []
+                "1": {
+                    "name": "warrior",
+                    "model": 1,
+                    "blockedSkills": [],
+                    "blockingSkills": false,
+                    "role": ["dps"],
+                    "isHidden": false
+                },
+                "2": {
+                    "name": "lancer",
+                    "model": 2,
+                    "blockedSkills": [],
+                    "blockingSkills": false,
+                    "role": ["tank"],
+                    "isHidden": false
+                },
+                "3": {
+                    "name": "slayer",
+                    "model": 3,
+                    "blockedSkills": [],
+                    "blockingSkills": false,
+                    "role": ["dps"],
+                    "isHidden": false
+                },
+                "4": {
+                    "name": "berserker",
+                    "model": 4,
+                    "blockedSkills": [],
+                    "blockingSkills": false,
+                    "role": ["dps"],
+                    "isHidden": false
+                },
+                "5": {
+                    "name": "sorcerer",
+                    "model": 5,
+                    "blockedSkills": [],
+                    "blockingSkills": false,
+                    "role": ["dps", "ranged"],
+                    "isHidden": false
+                },
+                "6": {
+                    "name": "archer",
+                    "model": 6,
+                    "blockedSkills": [],
+                    "blockingSkills": false,
+                    "role": ["dps", "ranged"],
+                    "isHidden": false
+                },
+                "7": {
+                    "name": "priest",
+                    "model": 7,
+                    "blockedSkills": [],
+                    "blockingSkills": false,
+                    "role": ["healer"],
+                    "isHidden": false
+                },
+                "8": {
+                    "name": "mystic",
+                    "model": 8,
+                    "blockedSkills": [],
+                    "blockingSkills": false,
+                    "role": ["healer"],
+                    "isHidden": false
+                },
+                "9": {
+                    "name": "reaper",
+                    "model": 9,
+                    "blockedSkills": [],
+                    "blockingSkills": false,
+                    "role": ["dps"],
+                    "isHidden": false
+                },
+                "10": {
+                    "name": "gunner",
+                    "model": 10,
+                    "blockedSkills": [],
+                    "blockingSkills": false,
+                    "role": ["dps", "ranged"],
+                    "isHidden": false
+                },
+                "11": {
+                    "name": "brawler",
+                    "model": 11,
+                    "blockedSkills": [],
+                    "blockingSkills": false,
+                    "role": ["tank"],
+                    "isHidden": false
+                },
+                "12": {
+                    "name": "ninja",
+                    "model": 12,
+                    "blockedSkills": [],
+                    "blockingSkills": false,
+                    "role": ["dps"],
+                    "isHidden": false
+                },
+                "13": {
+                    "name": "valkyrie",
+                    "model": 13,
+                    "blockedSkills": [],
+                    "blockingSkills": false,
+                    "role": ["dps"],
+                    "isHidden": false
+                }
+            }
         };
         saveConfig();
     }
-    if (flags.version !== 1.02) {		//Remember to change version number for updates (if new version is 1.1, change to 1.1!)
-        console.log('[FPS Utils] Outdated config file detected, updating...');
-        Object.assign(flags, {
-            "version": 1.02,
-            "state": 0,
-            "hit": false,
-            "tc": false,
-            "tcp": false,
-            "blockSkill": false,
-            "blockSummon": false,
-            "blockEffect": false});	//Replace {} with updating object.Eg {"version":1.1,"newKey":true,"newKey2":false,"tcp":false}
+    //FORGIVE ME FATHER FOR I HAVE SINNED AND I KNOW NOT HOW TO DO THIS ANOTHER WAY
+    if (config.version !== 1) {
+        firstRun = true;
+        log('OUTDATED FPS UTILS CONFIG DETECTED, PLEASE SEE THE README FOR INFORMATION');// DO YOU SEE ME YET
+        log('OUTDATED FPS UTILS CONFIG DETECTED, PLEASE SEE THE README FOR INFORMATION');
+        log('OUTDATED FPS UTILS CONFIG DETECTED, PLEASE SEE THE README FOR INFORMATION');
+        log('OUTDATED FPS UTILS CONFIG DETECTED, PLEASE SEE THE README FOR INFORMATION');
+        log('OUTDATED FPS UTILS CONFIG DETECTED, PLEASE SEE THE README FOR INFORMATION');
+        log('OUTDATED FPS UTILS CONFIG DETECTED, PLEASE SEE THE README FOR INFORMATION');
+        log('OUTDATED FPS UTILS CONFIG DETECTED, PLEASE SEE THE README FOR INFORMATION');
+        log('OUTDATED FPS UTILS CONFIG DETECTED, PLEASE SEE THE README FOR INFORMATION');
+        config = {
+            "version": 1,
+            "mode": "0",
+            "hideFirewworks": false,
+            "hideAllAbnormies": false,
+            "hideAllSummons": false,
+            "blacklistNpcs": false,
+            "blacklistSkills": false,
+            "blacklistAbnormies": false,
+            "hiddenAbnormies": [],
+            "hitMe": false,
+            "hitOther": false,
+            "hitDamage": false,
+            "showStyle": false,
+            "blacklistedNames": [
+                "hugedong"
+            ],
+            "hiddenNpcs": [
+                {
+                    "zone": 1,
+                    "templateId": 1
+                },
+                {
+                    "zone": 1,
+                    "tempalteId": 2
+                }
+            ],
+            "classNames": ["warrior", "lancer", "slayer", "berserker", "sorcerer", "archer", "priest", "mystic", "reaper", "gunner", "brawler", "ninja", "valkyrie"],
+            "roleNames": ["dps", "healer", "tank", "ranged"],
+            "hiddenClasses": [],
+            "hiddenRoles": [],
+            "classes": {
+                "1": {
+                    "name": "warrior",
+                    "model": 1,
+                    "blockedSkills": [],
+                    "blockingSkills": false,
+                    "role": ["dps"],
+                    "isHidden": false
+                },
+                "2": {
+                    "name": "lancer",
+                    "model": 2,
+                    "blockedSkills": [],
+                    "blockingSkills": false,
+                    "role": ["tank"],
+                    "isHidden": false
+                },
+                "3": {
+                    "name": "slayer",
+                    "model": 3,
+                    "blockedSkills": [],
+                    "blockingSkills": false,
+                    "role": ["dps"],
+                    "isHidden": false
+                },
+                "4": {
+                    "name": "berserker",
+                    "model": 4,
+                    "blockedSkills": [],
+                    "blockingSkills": false,
+                    "role": ["dps"],
+                    "isHidden": false
+                },
+                "5": {
+                    "name": "sorcerer",
+                    "model": 5,
+                    "blockedSkills": [],
+                    "blockingSkills": false,
+                    "role": ["dps", "ranged"],
+                    "isHidden": false
+                },
+                "6": {
+                    "name": "archer",
+                    "model": 6,
+                    "blockedSkills": [],
+                    "blockingSkills": false,
+                    "role": ["dps", "ranged"],
+                    "isHidden": false
+                },
+                "7": {
+                    "name": "priest",
+                    "model": 7,
+                    "blockedSkills": [],
+                    "blockingSkills": false,
+                    "role": ["healer"],
+                    "isHidden": false
+                },
+                "8": {
+                    "name": "mystic",
+                    "model": 8,
+                    "blockedSkills": [],
+                    "blockingSkills": false,
+                    "role": ["healer"],
+                    "isHidden": false
+                },
+                "9": {
+                    "name": "reaper",
+                    "model": 9,
+                    "blockedSkills": [],
+                    "blockingSkills": false,
+                    "role": ["dps"],
+                    "isHidden": false
+                },
+                "10": {
+                    "name": "gunner",
+                    "model": 10,
+                    "blockedSkills": [],
+                    "blockingSkills": false,
+                    "role": ["dps", "ranged"],
+                    "isHidden": false
+                },
+                "11": {
+                    "name": "brawler",
+                    "model": 11,
+                    "blockedSkills": [],
+                    "blockingSkills": false,
+                    "role": ["tank"],
+                    "isHidden": false
+                },
+                "12": {
+                    "name": "ninja",
+                    "model": 12,
+                    "blockedSkills": [],
+                    "blockingSkills": false,
+                    "role": ["dps"],
+                    "isHidden": false
+                },
+                "13": {
+                    "name": "valkyrie",
+                    "model": 13,
+                    "blockedSkills": [],
+                    "blockingSkills": false,
+                    "role": ["dps"],
+                    "isHidden": false
+                }
+            }
+        };
         saveConfig();
     }
 
+// ~~~ * Commands * ~~~
 
-
-    let DEBUG = false,
-            player,
-            pcid,
-            clss,
-            tchits = 7, //Change this to fine tune TC spamage
-            counter = 0,
-            dur,
-            laststate,
-            summonid = [],
-            locx = [],
-            locy = [],
-            packetHooks = [],
-            state = flags.state,
-            hiddenPlayers = {},
-            peopleThatAreActuallyHidden = {}, // Store IDs for people hidden with `fps hide class/role`
-            hiddenIndividual = {};
-
-    const command = Command(dispatch),
-            classes = db.classes;
-
-
-//////Commands:
-    command.add('fps', (setting, value) => {
-        switch (setting) {
-
-            case "help":
-                command.message('Commands:\n' +
-                        ' |fps mode| [1, 2, 3, off]" (Sets the FPS mode, 1 = hides skill particles, 2 = hides animations, 3 = hides players. Also turns fps hit on. e.g. "fps mode 1"),\n' +
-                        ' |fps hit| [on, me, damage](Hides hit effects, on = hides other players hit effects, me = hides your own, damage = hides damage numbers e.g. "fps hit damage"),\n' +
-                        ' |fps tc| [remove, party, on](Defaults = on, party)(on = refreshes Traverse Cut every 7th hit- see db, party = hides party members TC buffs, remove = locks the duration to 0 e.g. "fps tc on" ),\n' +
-                        ' |fps hide| [playername, class, role] (Hides specific players. e.g. "fps hide dps"),\n' +
-                        ' |fps show| [playername, class, role] (Unhides specific players. e.g. "fps unhide Spacecats"),\n' +
-                        ' |fps list| (Displays a list of all hidden players. e.g. "fps list"),\n' +
-                        ' |fps logo| (Hides guild logos on players, requires the area to be re-entered e.g. "fps logo"),\n' +
-                        ' |fps fireworks| (Hides annoying fireworks e.g. "fps fireworks"),\n' +
-                        ' |fps block| [skill,skilluser,summon,summonuser,effect] (Hides specific skills/summons/abnormality)'
-                        )
-                break
-
+    command.add('fps', (cmd, arg, arg2) => {
+        switch (cmd) {
             case "mode":
-                switch (value) {
-                    // State 0: Turns off fps-utils
+            case "state":
+                switch (arg) {
                     case "0":
-                        state = 0
-                        log('Fps-utils optimization disabled by client.')
-                        command.message('Optimization disabled by user. [mode 0]')
-                        if (laststate === 3)
-                            redisplay()
-                        laststate = state
+                    case "off":
+                        if (mode === 3) {
+                            showAll();
+                        }
+                        mode = 0;
+                        message(`All FPS improvements disabled`);
                         break
-
-                        // State 1: Only hide projectiles.
                     case "1":
-                        state = 1
-                        flags.hit = true
-                        log('fps-utils optimization set to stage 1, disabling skill particles.')
-                        command.message('Optimization set to remove skill particles. [mode 1]')
-                        if (laststate === 3)
-                            redisplay()
-                        laststate = state
+                        mode = 1;
+                        config.hideAllAbnormies = true;
+                        message(`FPS mode set to 1, projectiles hidden and abnormalities disabled`);
                         break
-
-                        // State 2: Hide all skill animations.
                     case "2":
-                        state = 2
-                        flags.hit = true
-                        log('fps-utils optimization set to stage 2, disabling skill animations.')
-                        command.message('Optimization set to remove skill animations and hit effects. [mode 2]')
-                        if (laststate === 3)
-                            redisplay()
-                        laststate = state
+                        mode = 2;
+                        config.hideAllAbnormies = true;
+                        config.hitOther = true;
+                        message(`FPS mode set to 2, all skill effects disabled`);
                         break
-
-                        // State 3: Hide all other players.
                     case "3":
-                        state = 3
-                        flags.hit = true
-                        log('fps-utils optimization set to stage 3, disabling other player models.')
-                        command.message('Optimization set to remove other player models. [mode 3]')
-                        laststate = state
-                        for (let pl in hiddenPlayers)
-                            despawnUser(pl) //Despawn all players
+                        hideAll();
+                        mode = 3;
+                        config.hideAllAbnormies = true;
+                        config.hitOther = true;
+                        message(`FPS mode set to 3, hiding all players, their effects and their hit effects.`);
                         break
-
                     default:
-                        command.message('Missing command arguments, "fps mode [0, 1, 2, 3]"')
+                        message(`Invalid mode ${arg}, valid modes are : 0,1,2,3`);
                 }
-                flags.state = state
-                break
-
-            case "save":
-                saveConfig()
-                break
-
-            case "fireworks":	// Disable fireworks.
-                flags.fireworks = !flags.fireworks
-                log('fps-utils toggled fireworks: ' + flags.fireworks)
-                command.message(`Fireworks toggled off: ${flags.fireworks}`)
-                break
-
-            case "hit":	//disable players attack markers
-                switch (value) {
-                    case "me":
-                        flags.hitme = !flags.hitme
-                        log('fps-utils toggled users hit effects: ' + flags.hitme)
-                        command.message(`User hit effects turned off: ${flags.hitme}`)
-                        break
-
-                    case "on":
-                        flags.hit = !flags.hit
-                        log('fps-utils toggled hit effects on others: ' + flags.hit)
-                        command.message(`Player hit effects on others turned off: ${flags.hit}`)
-                        break
-
-                    case "damage":
-                        flags.damage = !flags.damage
-                        log('fps-utils toggled player damage numbers: ' + flags.damage)
-                        command.message(`Player damage numbers toggled off: ${flags.damage}`)
-                        break
-
-                    case "heal":
-                        flags.heal = !flags.heal
-                        log('fps-utils toggled player damage numbers: ' + flags.heal)
-                        command.message(`Player damage numbers toggled off: ${flags.heal}`)
-                        break
-
-                    default:
-                        command.message(`Missing command arguments, "fps hit [on, me, damage]"`)
-                }
-                break
-
-            case "logo":  // Disable guild logos
-                flags.logo = !flags.logo
-                log('fps-utils toggled guild logos: ' + flags.logo)
-                command.message(`toggled guild logos off: ${flags.logo}`)
                 break
-
-
-            case "tc":  // Hide TC abnormality spam
-                switch (value) {
-                    case "remove":
-                        flags.tcremove = !flags.tcremove
-                        command.message('TC buff will not refresh:' + flags.tcremove)
-                        log('fps-utils toggled showing TC refreshes: ' + flags.tcremove)
-                        break
-
-                    case "party":
-                        command.message('TC buff will not be shown on party members:' + flags.tcp)
-                        log('fps-utils toggled showing TC refreshes: ' + flags.tcp)
-                        break
-
-                    case "on":
-                        flags.tc = !flags.tc
-                        log('Smart TC fix enabled ' + flags.tc)
-                        command.message(`toggled toggled smart TC fix: ${flags.tc}`)
-                        break
-
-                    default:
-                        command.message(`Missing command arguments, "fps tc [remove,party,on]"`)
-                }
-                break
-
-            case "hide":  // Toggle individual classes on and off
-                if (value === null || value === undefined || value === "") {
-                    command.message(`Missing arguments for command "hide" [dps, healers, tanks], [username] or [class]`)
-                    break
-                } else
-                    for (let pl in hiddenPlayers) {
-                        if (hiddenPlayers[pl].name.toLowerCase() === value.toLowerCase()) {
-                            command.message(`Player ${hiddenPlayers[pl].name} is added to the hiding list.`)
-                            hiddenIndividual[hiddenPlayers[pl].gameId] = hiddenPlayers[pl]
-                            flags.hiddenPeople.push(hiddenPlayers[pl].name.toString())
-                            despawnUser(pl)
-                            return
+            case "hide":
+                if (typeof arg === "string" && arg !== null) {
+                    if (blacklisted.includes(arg)) {
+                        message(`Player "${arg}" already hidden!`);
+                        return;
+                    } else
+                    if ((config.classNames.includes(arg) && !config.hiddenClasses.includes(arg)) || (config.roleNames.includes(arg) && !config.hiddenRoles.includes(arg))) {
+                        for (let i in config.classes) {
+                            if ((config.classes[i].name === arg || config.classes[i].role.includes(arg)) && config.classes[i].isHidden !== true) { //loops are fun, right?
+                                config.classes[i].isHidden = true;
+                                if (config.classes[i].name === arg) {
+                                    config.hiddenClasses.push(arg);
+                                }
+                                if (config.classes[i].role.includes(arg)) {
+                                    config.hiddenRoles.push(arg);
+                                }
+                                let classtohide = config.classes[i].model;
+                                for (let i in spawnedPlayers) {
+                                    if (getClass(spawnedPlayers[i].templateId) === classtohide) {
+                                        hidePlayer(spawnedPlayers[i].name);
+                                    }
+                                }
+                            }
                         }
+                        saveConfig();
+                        message(`Class/Role ${arg} hidden`);
+                        return;
+                    } else if (config.hiddenClasses.includes(arg) || config.hiddenRoles.includes(arg)) {
+                        message(`Class/Role "${arg}" already hidden!`);
+                        return;
                     }
-
-                if (state < 3 && flags.hide[value.toLowerCase()] === false) { //Cannot use ! else outputs true.
-                    flags.hide[value.toLowerCase()] = true
-                    command.message(`All ${value}'s hidden`)
-
-                    for (let pl in hiddenPlayers) {
-                        if (!hiddenIndividual[hiddenPlayers[pl].gameId] && (classes[value].indexOf(getClass(hiddenPlayers[pl].templateId)) > -1)) {
-                            peopleThatAreActuallyHidden[hiddenPlayers[pl].gameId] = true
-                            despawnUser(pl)
-                        }
+                    if (!spawnedPlayers[arg]) {
+                        message(`Player ${arg} not spawned in, hiding anyway!`);
+                    } else {
+                        message(`Player "${arg}" hidden!`);
                     }
+                    blacklisted.push(arg);
+                    hidePlayer(arg);
+                    return;
                 } else
-                    command.message('Invalid argument for command "hide" [dps, healers, tanks], [username] or [class] ')
+                    message(`Invalid name "${arg}"`);
                 break
-
-
-            case "show":	// Try to respawn all hidden players included in show command.
-                if (value === null || value === undefined || value === "") {
-                    log('fps-utils missing arguments for command "show"')
-                    command.message(`Missing arguments for command "show" [dps, ranged, healers, tanks] or [username]`)
-                    break
-                } else
-                    for (let pl in hiddenIndividual) {
-                        if (hiddenIndividual[pl].name.toLowerCase() === value.toLowerCase()) {
-                            command.message(`Showing player ${hiddenIndividual[pl].name}.`)
-                            flags.hiddenPeople.splice(flags.hiddenPeople.indexOf(hiddenPlayers[pl].name), 1)
-                            dispatch.toClient('S_SPAWN_USER', 12, hiddenIndividual[pl])
-                            delete hiddenIndividual[pl]
+            case "show":
+                if (typeof arg === "string" && arg !== null) {
+                    if ((config.classNames.includes(arg) && config.hiddenClasses.includes(arg)) || (config.hiddenRoles.includes(arg) && config.roleNames.includes(arg))) {
+                        for (let i in config.classes) {
+                            if (config.classes[i].name === arg || config.classes[i].role.includes(arg)) {//loops are fun, right?
+                                if (config.classes[i].name === arg) {
+                                    removeName(config.hiddenClasses, arg);
+                                }
+                                if (config.classes[i].role.includes(arg)) {
+                                    removeName(config.hiddenRoles, arg);
+                                }
+                                config.classes[i].isHidden = false;
+                                let classToShow = config.classes[i].model;
+                                for (let i in hiddenUsers) {
+                                    if (getClass(hiddenUsers[i].templateId) === classToShow) {
+                                        showPlayer(hiddenUsers[i].name);
+                                    }
+                                }
+
+                            }
                         }
-                        return
+                        message(`Class "${arg}" redisplayed!`);
+                        saveConfig();
+                        return;
+                    } else if (!config.hiddenClasses.includes(arg) || !config.hiddenRoles.includes(arg)) {
+                        message(`Class/Role "${arg}" already displayed!!`);
+                        return;
                     }
-
-                if (state < 3 && flags.hide[value.toLowerCase()]) {
-                    flags.hide[value] = false
-                    log('fps-utils showing: ' + value)
-                    command.message(`Showing ${value}`)
-                    for (let pl in hiddenPlayers) {
-                        if (classes[value].indexOf(getClass(hiddenPlayers[pl].templateId)) > -1 && !hiddenIndividual[hiddenPlayers[pl].gameId]) {
-                            delete peopleThatAreActuallyHidden[hiddenPlayers[pl].gameId]
-                            dispatch.toClient('S_SPAWN_USER', 12, hiddenPlayers[pl])
-                        }
+                    if (!blacklisted.includes(arg)) {
+                        message(`Player "${arg}" is not hidden!`);
+                        return;
                     }
-                } else
-                    command.message('Invalid arguments for command "show" [dps, healers, tanks], [username] or [class] ')
+                    showPlayer(arg);
+                    removeName(blacklisted, arg);
+                    message(`Player "${arg}" shown!`);
+                    saveConfig();
+                }
                 break
-
-            case "list":  // List the players in individuals list.
-                let hiddenArray = []
-                for (let pl in hiddenIndividual)
-                    hiddenArray.push(hiddenIndividual[pl].name)
-                command.message(`Manually hidden players: ${hiddenArray}`)
+            case "list":
+                message(`Hidden players: ${blacklisted}`);
+                message(`Hidden classes: ${config.hiddenClasses}`);
+                message(`Hidden roles: ${config.hiddenRoles}`);
                 break
-
-            case "block":
-                switch (value) {
-                    case "skill":
-                        flags.blockSkill = !flags.blockSkill
-                        command.message(`Hiding blacklisted skills:${flags.blockSkill}`)
-                        break
-                    case "skilluser":
-                        flags.blockUserSkill = !flags.blockUserSkill
-                        command.message(`Hiding blacklisted skills for User:${flags.blockUserSkill}`)
+            case "summons":
+                config.hideAllSummons = !config.hideAllSummons;
+                message(`Hiding of summoned NPCs ${config.hideAllSummons ? 'en' : 'dis'}abled`);
+                break
+            case "skills":
+            case "skill":
+                switch (arg) {
+                    case "blacklist":
+                    case "black":
+                        config.blacklistSkills = !config.blacklistSkills;
+                        message(`Hiding of blacklisted skills ${config.blacklistSkills ? 'en' : 'dis'}abled`);
                         break
-                    case "summon":
-                        flags.blockSummon = !flags.blockSummon
-                        command.message(`Hiding blacklisted summons:${flags.blockSummon}`)
+                    case "class":
+                        if (config.classNames.includes(arg2)) {
+                            for (let i in config.classes) {
+                                if (config.classes[i].name === arg2) {
+                                    config.classes[i].blockingSkills = !config.classes[i].blockingSkills;
+                                    message(`Hidding ALL skills  for the class ${arg2} ${config.classes[i].blockingSkills ? 'en' : 'dis'}abled`);
+                                    saveConfig();
+                                    return;
+                                    break
+                                }
+                            }
+
+                        } else
+                            message(`Class ${arg2} not found!`);
+                }
+                break
+            case "npcs":
+            case "npc":
+                config.blacklistNpcs = !config.blacklistNpcs;
+                message(`Hiding of blacklisted NPCs ${config.blacklistSkills ? 'en' : 'dis'}abled`);
+                break
+            case "hit":
+                switch (arg) {
+                    case "me":
+                        config.hitMe = !config.hitMe;
+                        message(`Hiding of the players skill hits ${config.hitMe ? 'en' : 'dis'}abled`);
                         break
-                    case "summonuser":
-                        flags.blockUserSummon = !flags.blockUserSummon
-                        command.message(`Hiding blacklisted summons for User:${flags.blockUserSummon}`)
+                    case "other":
+                        config.hitOther = !config.hitOther;
+                        message(`Hiding of other players skill hits ${config.hitOther ? 'en' : 'dis'}abled`);
                         break
-                    case "effect":
-                        flags.blockEffect = !flags.blockEffect
-                        command.message(`Hiding blacklisted effects:${flags.blockEffect}`)
+                    case "damage":
+                        config.hitDamage = !config.hitDamage;
+                        message(`Hiding of the players skill damagen numbers ${config.hitDamage ? 'en' : 'dis'}abled`);
                         break
                     default:
-                        command.message('Command not recognised. Only use "fps block [skill,skilluser,summon,summonuser,effect]"')
+                        message(`Unrecognized sub-command "${arg}"!`);
+                        break
                 }
                 break
-
+            case "fireworks":
+            case "firework":
+                config.hideFirewworks = !config.hideFirewworks;
+                message(`Hiding of firework effects ${config.hideFirewworks ? 'en' : 'dis'}abled`);
+                break
+            case "fpsbooster9001":
+            case "effects":
+            case "abnormies":
+                switch (arg) {
+                    case "all":
+                        config.hideAllAbnormies = !config.hideAllAbnormies;
+                        message(`Hiding of ALL abnormality effects ${config.hideAllAbnormies ? 'en' : 'dis'}abled`);
+                        break
+                    case "blacklist":
+                    case "black":
+                        config.blacklistAbnormies = !config.blacklistAbnormies;
+                        message(`Hiding of blacklisted abnormality effects ${config.blacklistAbnormies ? 'en' : 'dis'}abled`);
+                        break
+                }
+                break
+            case "costume":
+            case "style":
+                config.showStyle = !config.showStyle;
+                message(`Displaying of all players as wearing default costumes ${config.showStyle ? 'en' : 'dis'}abled, you will have to leave and re-enter the zone for this to take effect`);
+                break
             default:
-                command.message('Command not recognized. Use [fps help] for a list of available commands')
+                message(`Unknown command! Please refer to the readme for more information`);
                 break
         }
-
-        if (AUTO_SAVE)
-            saveConfig()
-    })
-
-    /*command.add('fpsdebug', (string, add) => {  //DO NOT USE unless for debugging!
-     console.log(JSON.stringify(eval(string)))
-     })*/
-
-/////Dispatches
-    dispatch.hook('C_CHECK_VERSION', 1, (event) => {
-        enable()
-    })
-    function addHook(packetName, packetVersion, func) {
-        dispatch.hook(packetName, packetVersion, func)
+        saveConfig();
+    });
+// ~~~ * Functions * ~~~
+    function message(msg) {
+        command.message(`<font color="#ccb7ef">  [FPS-UTILS] - </font> <font color="#e0d3f5">${msg}`);
     }
 
-    dispatch.hook('S_LOAD_TOPO', 'raw', () => {
-        // Refresh the hide list upon teleport or zone change.
-        hiddenPlayers = {}
-        summonid = []
-        peopleThatAreActuallyHidden = {}
-    })
-
-    function enable() {
-        
-        addHook('S_LOGIN', (dispatch.base.majorPatchVersion >= 67) ? 10 : 9, (event) => {
-            pcid = event.gameId
-            player = event.name
-            clss = getClass(event.templateId)
-            job = (event.templateId - 10101) % 100
-            log(`[FPS UTILS] Mode:${state} Hitme:${flags.hitme} Damage:${flags.damage} Hit:${flags.hit}`)
-        })
-        
-        addHook('S_SPAWN_USER', 12, (event) => {
-            // Add players in proximity of user to possible hide list.
-            hiddenPlayers[event.gameId] = event
-
-            // Check the state or if the individual is hidden.
-            if (state === 3 || hiddenIndividual[event.gameId]) {
-                return false
-            }
-
-            // Hide dps enabled, remove dps characters;
-            if (flags.hide.dps && classes.dps.indexOf(getClass(event.templateId)) > -1) {
-                peopleThatAreActuallyHidden[event.gameId] = true
-                return false
-            }
+    function getClass(m) {
+        return (m % 100);
+    }
 
-            //hide ranged enabled, delet ranged characters;
-            if (flags.hide.ranged && classes.ranged.indexOf(getClass(event.templateId)) > -1) {
-                peopleThatAreActuallyHidden[event.gameId] = true
-                return false
-            }
+    function saveConfig() {
+        fs.writeFile(path.join(__dirname, 'config.json'), JSON.stringify(
+                config, null, 4), err => {
+        });
+    }
 
-            // Hide tanks enabled, remove tank characters;
-            if (flags.hide.tanks && classes.tanks.indexOf(getClass(event.templateId)) > -1) {
-                peopleThatAreActuallyHidden[event.gameId] = true
-                return false
+    function hidePlayer(name) {
+        for (let i in spawnedPlayers) {
+            if (spawnedPlayers[i].name.toString().toLowerCase() === name.toLowerCase()) {
+                dispatch.toClient('S_DESPAWN_USER', 3, {
+                    gameId: spawnedPlayers[i].gameId,
+                    type: 1
+                });
+                hiddenUsers[spawnedPlayers[i].gameId] = spawnedPlayers[i];
+                return;
             }
+        }
+    }
 
-            // Why would you want this on, seriously...
-            if (flags.hide.healers && classes.healers.indexOf(getClass(event.templateId)) > -1) {
-                peopleThatAreActuallyHidden[event.gameId] = true
-                return false
+    function removeName(name) {
+        var what, a = arguments, L = a.length, ax;
+        while (L > 1 && name.length) {
+            what = a[--L];
+            while ((ax = name.indexOf(what)) !== -1) {
+                name.splice(ax, 1);
             }
+        }
+        return name;
+    }
 
-            if (flags.logo) {
-                event.guildEmblem = ''
-                return true
+    function showPlayer(name) {
+        for (let i in hiddenUsers) {
+            if (hiddenUsers[i].name.toString().toLowerCase() === name.toLowerCase()) {
+                dispatch.toClient('S_SPAWN_USER', 13, hiddenUsers[i]);
+                delete hiddenUsers[i];
+                return;
             }
-        })
+        }
     }
-    dispatch.hook('S_DESPAWN_USER', 3, (event) => {
-        delete hiddenPlayers[event.gameId]
-        delete peopleThatAreActuallyHidden[event.gameId]
 
-        if (state === 3 || hiddenIndividual[event.gameId]) {
-            return false
+    function hideAll() {
+        for (let i in spawnedPlayers) {
+            dispatch.toClient('S_DESPAWN_USER', 3, {
+                gameId: spawnedPlayers[i].gameId,
+                type: 1
+            });
+            hiddenUsers[spawnedPlayers[i].gameId] = spawnedPlayers[i];
         }
-    })
-
-    dispatch.hook('S_SPAWN_NPC', 4, (event) => {
-        if (event.huntingZoneId !== 1023)
-            return		//huntingZoneId=1023 for all Players summons
+    }
 
-        if (flags.fireworks) {
-            if (event.templateId === 60016000 || event.templateId === 80037000)
-                return false
+    function showAll() {
+        for (let i in hiddenUsers) {
+            dispatch.toClient('S_SPAWN_USER', 13, hiddenUsers[i]);
+            delete hiddenUsers[i];
         }
+    }
 
-        if (db.hiddensummon.includes(event.templateId)) {
-            if (flags.blockSummon && (flags.blockUserSummon || !event.owner.equals(pcid))) {
-                summonid.push(event.id.low)
-                return false
-            }
-        }
+    function updateLoc(event) {
+        dispatch.toClient('S_USER_LOCATION', 3, {
+            gameId: event.gameId,
+            loc: event.loc,
+            dest: event.loc,
+            w: event.w,
+            speed: 300,
+            type: 7
+        });
+    }
 
-    })
+    function log(msg) {
+        console.log(`[FPS-UTILS] - ${msg}`);
+    }
 
-    dispatch.hook('S_DESPAWN_NPC', 1, event => {
-        if (summonid.includes(event.target.low)) {
-            summonid.splice(summonid.indexOf(event.target.low), 1)
+// ~~~* Hooks * ~~~
+// note: for skills, do if classes[event.templateId].blockedSkills !== 
+    dispatch.hook('S_LOGIN', 10, (event) => {
+        myId = event.gameId;
+    });
+    dispatch.hook('S_SPAWN_USER', 13, {order: 9999}, (event) => {
+        if (firstRun !== false) {
+            message(`FPS-UTILS has been updated! Please read the readme for more information!`);
+            firstRun = false;
         }
-    })
-
-    dispatch.hook('S_EACH_SKILL_RESULT', 5, {order: 999}, (event) => {
-        if (!event.target.equals(pcid)) {
-            if (flags.heal && event.type === 2) {
-                event.skill = ''
-                return true
-            }
-
-            if (event.source.equals(pcid) || event.owner.equals(pcid)) {
-                if (flags.damage) {
-                    event.damage = ''
-                    return true
-                }
-                if (flags.hitme) {
-                    event.skill = ''
-                    return true
-                }
-            }
-
-            if (flags.hit) {
-                if (hiddenPlayers[event.source] || hiddenPlayers[event.owner]) {
-                    event.skill = ''
-                    return true
-                }
-            }
+        spawnedPlayers[event.gameId] = event;
+        if (mode === 3 || config.blacklistedNames.includes(event.name.toString().toLowerCase()) || config.classes[getClass(event.templateId)].isHidden === true) { //includes should work!!
+            hiddenUsers[event.gameId] = event;
+            return false;
+        }
+        if (config.showStyle) {
+            event.weaponEnchant = 0;
+            event.body = 0;
+            event.hand = 0;
+            event.feet = 0;
+            event.underwear = 0;
+            event.head = 0;
+            event.face = 0;
+            event.weapon = 0;
+            event.showStyle = false;
+            return true;
         }
-    })
+    });
+
+    dispatch.hook('S_USER_EXTERNAL_CHANGE', 6, {order: 9999}, (event) => {
+        if (config.showStyle) {
+            event.weaponEnchant = 0;
+            event.body = 0;
+            event.hand = 0;
+            event.feet = 0;
+            event.underwear = 0;
+            event.head = 0;
+            event.face = 0;
+            event.weapon = 0;
+            event.showStyle = false;
+            return true;
+        }
+    });
+
+    dispatch.hook('S_SPAWN_USER', 13, {order: 99999, filter: {fake: null}}, (event) => {
+        if (config.showStyle) {
+            event.weaponEnchant = 0;
+            event.body = 0;
+            event.hand = 0;
+            event.feet = 0;
+            event.underwear = 0;
+            event.head = 0;
+            event.face = 0;
+            event.weapon = 0;
+            event.showStyle = false;
+            return true;
+        }
+    });
 
+    dispatch.hook('S_DESPAWN_USER', 3, {order: -901}, (event) => {
+        delete hiddenUsers[event.gameId];
+        delete spawnedPlayers[event.gameId];
+    });
 
-    dispatch.hook('S_ABNORMALITY_BEGIN', 2, {order: 999}, event => {
-        if (flags.heal) { //??
-            if (db.hiddenheal.includes(event.id))
-                return false
+    dispatch.hook('S_LOAD_TOPO', 'raw', () => {
+        spawnedPlayers = {};
+        hiddenUsers = {};
+        hiddenNpcs = {};
+    });
+
+    dispatch.hook('S_SPAWN_NPC', 6, (event) => {
+        if (config.hideAllSummons && event.huntingZoneId === 1023) {
+            hiddenNpcs[event.gameId] = event; // apparently NPCs get feared and crash the client too
+            return false;
         }
-        if (flags.tc) { //abnormality begin doesn't cause the lag but whatevs
-            if (event.id === 101300) {
-                event.duration = 0
-                return true
+        if (config.blacklistNpcs) {
+            for (var i = 0; i < config.hiddenNpcs.length; i++) {
+                if (event.huntingZoneId === config.hiddenNpcs[i].zone && event.templateId === config.hiddenNpcs[i].templateId) {
+                    hiddenNpcs[event.gameId] = event;
+                    return false;
+                }
             }
         }
-        if (flags.blockEffect) {
-            if (!event.source.equals(pcid) && db.hiddeneffect.includes(event.id))
-                return false
+        if (config.fireworks && event.huntingZoneId === 1023 && (event.templateId === 60016000 || event.templateId === 80037000)) {
+            return false;
         }
-    })
+    });
 
-    dispatch.hook('S_PARTY_MEMBER_ABNORMAL_ADD', 3, {order: 999}, (event) => {
-        if (event.id === 101300 && flags.tcp)
-            return false
-    })
+    dispatch.hook('S_DESPAWN_NPC', 3, (event) => {
+        delete hiddenNpcs[event.gameId];
+    });
 
-    dispatch.hook('S_ABNORMALITY_REFRESH', 1, {order: 999}, (event) => {
-        if (flags.heal) {
-            if (db.hiddenheal.includes(event.id))
-                return false
+    dispatch.hook('S_EACH_SKILL_RESULT', 6, (event) => {
+        if (event.target.equals(myId) || event.owner.equals(myId)) {
+            if (config.hitMe) {
+                event.skill = '';
+                return true;
+            }
+            if (config.hitDamage) {
+                event.damage = '';
+                return true;
+            }
         }
-
-        if (event.id === 101300 && flags.tc) {
-            dur = event.duration
-            counter = counter + 1
-            if (counter >= tchits) {
-                counter = 0
-                event.duration = dur
-                return true
-            } else
-                return false
+        if (config.hitOther && (spawnedPlayers[event.owner] || spawnedPlayers[event.source])) {
+            event.skill = '';
+            return true;
         }
+    });
 
-        if (event.id === 101300 && flags.tcremove)
-            return false
-
-    })
-
-    dispatch.hook('S_USER_LOCATION', 1, (event) => {
-        if (hiddenPlayers[event.target] === undefined)
-            return
-        // Update locations of every player in case we need to spawn them.
-        hiddenPlayers[event.target].loc.x = event.x2
-        hiddenPlayers[event.target].loc.y = event.y2
-
-        if (state > 2 || hiddenIndividual[event.target])
+    dispatch.hook('S_USER_LOCATION', 3, (event) => {
+        if (hiddenUsers[event.gameId] === undefined) {
+            return;
+        }
+        hiddenUsers[event.gameId].loc = event.dest;
+        if (hiddenUsers[event.gameId]) {
             return false;
+        }
+    });
 
-    })
-
-    dispatch.hook('S_ACTION_STAGE', 1, {order: 999}, (event) => {
-        if (state === 2 && (Math.abs(event.x - locx[event.source.low]) > 15 || Math.abs(event.y - locy[event.source.low]) > 15) && (hiddenPlayers[event.source] || hiddenIndividual[event.source])) {
-            dispatch.toClient('S_USER_LOCATION', 1, {
-                target: event.source,
-                x1: locx[event.source.low],
-                y1: locy[event.source.low],
-                z1: event.z,
-                w: event.w,
-                unk2: 0,
-                speed: 300,
-                x2: event.x,
-                y2: event.y,
-                z2: event.z,
-                type: 0,
-                unk: 0
-            })
-            locx[event.source.low] = event.x //.low should be enough
-            locy[event.source.low] = event.y
-            return false
+    dispatch.hook('S_ACTION_STAGE', 4, (event) => {
+        if (event.gameId.equals(myId) && spawnedPlayers[event.gameId]) {
+            if (!event.target.equals(myId) && (mode === 2 || hiddenUsers[event.gameId])) {
+                updateLoc(event);
+                return false;
+            }
+            if (config.blacklistSkills) {
+                if (typeof config.classes[getClass(event.templateId)].blockedSkills !== "undefined" && config.classes[getClass(event.templateId)].blockedSkills.includes(Math.floor((event.skill - 0x4000000) / 10000))) {
+                    updateLoc(event);
+                    return false;
+                }
+            }
+            if (config.classes[getClass(event.templateId)].blockingSkills) {
+                updateLoc(event);
+                return false;
+            }
         }
+    });
 
-        // If state is higher than state1 remove all skill animations.
-        else if (state > 1 && (hiddenPlayers[event.source] || hiddenIndividual[event.source]))
-            return false
+    dispatch.hook('S_START_USER_PROJECTILE', 5, (event) => {
+        if (!event.gameId.equals(myId) && (hiddenUsers[event.gameId] || mode > 0))
+            return false;
+    });
 
+    dispatch.hook('S_SPAWN_PROJECTILE', 3, (event) => {
+        if (!event.id.equals(myId) && (hiddenUsers[event.id] || mode > 0))
+            return false;
+    });
 
-        if (flags.blockSkill && db.hiddenskill.includes(event.skill - 0x4000000)) {  //Check skill first
-            if (flags.blockUserSkill || !event.source.equals(pcid))
-                return false
+    dispatch.hook('S_FEARMOVE_STAGE', 1, (event) => {
+        if (!event.target.equals(myId) && (mode === 3 || hiddenUsers[event.target] || hiddenNpcs[event.target])) {
+            return false;
         }
+    });
 
-        if (summonid.includes(event.source.low))
-            return false
-    })
-
-    /*dispatch.hook('S_ACTION_END', 1, (event) => {
-     // If we're removing skill animations we should ignore the end packet too. // wrong
-     if (state > 1 && (hiddenPlayers[event.source] || hiddenIndividual[event.source]))
-     return false;
-     })*/
-
-    dispatch.hook('S_START_USER_PROJECTILE', 1, (event) => {
-        // State 1 and higher ignores particles and projectiles so we're ignoring this.
-        if (state > 0 && (hiddenPlayers[event.source] || hiddenIndividual[event.source]))
-            return false
-    })
-    dispatch.hook('S_SPAWN_PROJECTILE', 1, (event) => {
-        // Ignore the projectile spawn if enabled in state.
-        if (state > 0 && (hiddenPlayers[event.source] || hiddenIndividual[event.source]))
-            return false
-    })
-    dispatch.hook('S_FEARMOVE_STAGE', 1, (event) => {
-        if (!event.target.equals(pcid) && (state > 2 || flags.state > 2 || peopleThatAreActuallyHidden[event.target] || hiddenIndividual[event.target]))
-            return false // Prevent crashing on other players getting feared because this is a good game with good coding
-    })
     dispatch.hook('S_FEARMOVE_END', 1, (event) => {
-        if (!event.target.equals(pcid) && (state > 2 || flags.state > 2 || peopleThatAreActuallyHidden[event.target] || hiddenIndividual[event.target]))
-            return false
-    })
-
-
-
-//////Functions
-    function log(msg) {
-        if (DEBUG)
-            console.log('[fps-utils] ' + msg)
-    }
-
-    function getClass(m) {
-        return (m % 100)
-    }
-
-    function saveConfig() {
-        fs.writeFile(path.join(__dirname, 'config.json'), JSON.stringify(flags, null, "\t"), err => {
-            if (err)
-                console.log('(FPS Utils) Config file failed to overwrite. Use "fps save" command to save again.')
-            else
-                log('(FPS Utils) Config file saved!') // I am too lazy to unfuck this at the present moment
-        })
-    }
-
-    function saveDb() { //Idk how else you can simplify this formatting method
-        fs.writeFile(path.join(__dirname, 'db.json'), JSON.stringify(db, (k, v) => {
-            if (v instanceof Array)
-                return JSON.stringify(v);
-            return v
-        }, "\t").replace(/\"\[/g, '[').replace(/\]\"/g, ']'), err => {
-            if (err)
-                console.log('(FPS Utils) DB file failed to overwrite. Use "fps save" command to save again.')
-            else
-                console.log('(FPS Utils) DB file saved!') // I am too lazy to unfuck this at the present moment
-        })
-    }
-
-
-    function redisplay() {
-        for (let pl in hiddenPlayers) {
-            if (!hiddenIndividual[hiddenPlayers[pl].gameId]) {
-                dispatch.toClient('S_SPAWN_USER', 12, hiddenPlayers[pl]);
-            }
+        if (!event.target.equals(myId) && (mode === 3 || hiddenUsers[event.target] || hiddenNpcs[event.target])) {
+            return false;
         }
+    });
 
-    }
+    dispatch.hook('S_ABNORMALITY_BEGIN', 2, {order: 999}, (event) => {
+        if (config.blacklistAbnormies && config.hiddenAbnormies.includes(event.id)) {
+            return false;
+        }
+        if (config.hideAllAbnormies && !event.target.equals(myId)) {
+            return false;
+        }
+    });
 
-    function despawnUser(pl) {
-        dispatch.toClient('S_DESPAWN_USER', 3, {
-            gameId: hiddenPlayers[pl].gameId,
-            type: 1
-        })
-    }
-}
+};

+ 21 - 22
manifest.json

@@ -1,24 +1,23 @@
 {
-  "files": {
-    "index.js": "A1C24F011560EF585377CCB57E01EDF883323979F508D496BB76E528B0EFADC0",
-    "module.json": "cfeb11cee659e5bdbbef0332226edc4761ebd62f6f8a4b870652fa4cfeff7669",
-    "package.json": "6d41e903c6db29adb13141a750e35991fcf8cef9831f47da6f3e7b25ce2e8be3"
-  },
-  "defs": {
-    "S_SPAWN_USER": 12,
-    "S_DESPAWN_USER": 3,
-    "S_LOGIN": [9, 10],
-    "S_LOAD_TOPO": 2,
-    "S_EACH_SKILL_RESULT": 5,
-    "S_ABNORMALITY_BEGIN": 2,
-    "S_PARTY_MEMBER_ABNORMAL_ADD": 3,
-    "S_ABNORMALITY_REFRESH": 1,
-    "S_USER_LOCATION": 1,
-    "S_ACTION_STAGE": 1,
-    "S_START_USER_PROJECTILE": 1,
-    "S_SPAWN_PROJECTILE": 1,
-    "S_FEARMOVE_STAGE": 1,
-    "S_FEARMOVE_END": 1,
-    "S_SPAWN_NPC": 4
-  }
+   "files":{
+      "index.js":"021EA5F917C6A7EDF6E951876C2F0DB42896AB217E70F14E6A72BD3B9E9BBD29",
+      "module.json":"7F69B7C7D353C673646FBFF5C570323E25318FEC42671B4C192A2723EDB0264C",
+	  "README.md":"ACA3C97951F9078967C50394379C2F0EF94111E118541410B9A97993E498FD73"
+   },
+   "defs":{
+      "S_SPAWN_USER":13,
+      "S_DESPAWN_USER":3,
+      "S_USER_EXTERNAL_CHANGE":6,
+      "S_LOGIN":10,
+      "S_EACH_SKILL_RESULT":6,
+      "S_ABNORMALITY_BEGIN":2,
+      "S_USER_LOCATION":3,
+      "S_ACTION_STAGE":4,
+      "S_START_USER_PROJECTILE":5,
+      "S_SPAWN_PROJECTILE":3,
+      "S_FEARMOVE_STAGE":1,
+      "S_FEARMOVE_END":1,
+      "S_SPAWN_NPC":4,
+      "S_DESPAWN_NPC":3
+   }
 }