Browse Source

New option.

Added ScreenAbns.
Mie 8 years ago
parent
commit
0bc50907e2
5 changed files with 203 additions and 131 deletions
  1. 54 26
      README.md
  2. 111 97
      lib/index.js
  3. 32 2
      lib/setting_migration.js
  4. 4 4
      manifest.json
  5. 2 2
      module.json

+ 54 - 26
README.md

@@ -9,42 +9,70 @@ Written for tera-proxy, a free script filled with features dedicated to improve
 ***Note:*** *To start the command, you can either start it in any channel by adding `!` prefix, or `/!`, or just going to proxy channel **proxy channel** where it doesn't need any prefix.*
 
 
-|    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`       |  Hides/shows Player\|Class\|Role.  |
-|     `party`      |             N/A            |`!fps party`          |     Hides all but your party.    |
-|      `raid`      |             N/A            |`!fps raid`           |Auto `mode 2` when raid has 18 or more ppls.|
-|      `list`      |             N/A            |`!fps list`           | Prints list of hidden things.    |
-|`summons` \| `sums`|      `other`\| `me`        |`!fps sums me`        |`other` hide other sums; `me` yours.|
-|`skill` \| `skills`|`blacklist` \| Class \<arg3\>|`!fps skill blacklist`|Blacklist on/off; arg3 = classname|
-|  `npc` \| `npcs`  |   N/A \| `hide` \<num\>       |`!fps npc`            |N/A blacklist npcs on/off; `hide` to add \<num\> to blacklist. |
-|      `hit`       |   `me` \| `other` \| `damage`|`!fps hit me`         |Hides/shows skill results for each|
-|    `firework`    |             N/A            |`!fps firework`       |Hides/shows Dragon fireworks.     |
-|   `abn`\|`all`    |`blacklist` \<add\|remv num\>|`!fps abn blacklist`  |Hides/shows effects.              |
-|  `proj`\|`all`    |`blacklist` \<add\|remv num\>|`!fps proj all`       |Hides/shows projectiles.          |
-|   `guildlogo`    |             N/A            |`!fps guildlogo`      |Hides/shows guild logos           |
-| `style`\|`costume`|             N/A            |`!fps style`          |Hides/shows style for ppl\|npc     |
-|  `gui npcsearch` |           \<arg1\>         |`!fps gui npcsearch E`|Opens list of npcs matching arg1. |
-|    `npczoom`     |             N/A            |`!fps npczoom`        |If enabled, prevent zoom on npcs. |
-|    `dropitem`    |   N/A \| `hide` \<num\>       |`!fps dropitem hide 300`|N/A blacklist drops on/off; `hide` to add \<num\> to blacklist. |
-| `monsterdeathani`|             N/A            |`!fps monsterdeathani`|If enabled, prevent monsters death animation from appearing.|
+|    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` |           \<arg1\>         |`!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 explaination for some of the commands *in-case not clear*
+#### Additional explaination commands.*
 - 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.
-- Style: if enabled, Removes all costumes including gear shapes on players & Removes the icons above npcs heads.
-- 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.
+- Skill: if enabled, Prevent showing any blacklisted skills.
+  - `blacklist`: triggers on/off for hiding backlisted skills.
+  - `class \<cls\>`: if \<cls\> is a valid class name, it turns on/off showing any skill for that class.
+- 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.
 
 ## Suggestions
 * If you have suggestions, need help, or want to comment on my coding, leave an issue report.

+ 111 - 97
lib/index.js

@@ -13,7 +13,6 @@ let BronzeClr = '#BC8F8F',
 	GreenClr = '#4DE19C',
 	LPurpleClr = '#E0B0FF',
 	PurpleClr = '#9966CC',
-	DPurpleClr = '#957DAD',
 	LBlueClr = '#4DDCE1',
 	BlueClr = '#436EEE',
 	DBlueClr = '#00575e',
@@ -26,7 +25,7 @@ module.exports = function FpsUtils(mod) {
 	var notcaaliproxy = mod.proxyAuthor !== 'caali' || mod.base.proxyAuthor !== 'caali';
 
 	const NpcData = require(`./data/npcData.json`),
-		SkillData = require(`./data/skillString.json`)
+		SkillData = require(`./data/skillString.json`);
 
 	let MyGameId,
 		MyName,
@@ -56,18 +55,18 @@ module.exports = function FpsUtils(mod) {
 
 	function GuiHandler(page, arg) {
 		switch (page) {
-			case 'searchnpc':
-			case 'npcsearch':
+			case "searchnpc":
+			case "npcsearch":
 				TmpData = []
 				TmpData.push({ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br><br>`, command: `fps gui` })
 				JsonSearch(arg, NpcData, `search`, `<font color="${LBlueClr}" size="+16">Search results for "${arg}"</font>.`)
 				break;
-			case 'npc':
+			case "npc":
 				TmpData = []
 				TmpData.push({ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br><br>`, command: `fps gui` })
 				JsonSearch(arg, NpcData, `starts`, `<font color="${LBlueClr}" size="+16">Search results for "${arg}"</font>.`)
 				break;
-			case 'npclist':
+			case "npclist":
 				TmpData = []
 				TmpData.push(
 					{ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br><br>`, command: `fps gui` },
@@ -80,7 +79,7 @@ module.exports = function FpsUtils(mod) {
 				gui.parse(TmpData, `<font color="${LPurpleClr}">[FPS] Options - NPCs </font><font color="${GreenClr}">(Blacklist)</font>`)
 				TmpData = []
 				break;
-			case 'npcMain':
+			case "npcMain":
 				TmpData = []
 				TmpData.push(
 					{ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br><br>`, command: `fps gui` },
@@ -91,7 +90,7 @@ module.exports = function FpsUtils(mod) {
 				for (var i = 0; i < alphabet.length; i++) {
 					TmpData.push(
 						{ text: `<font color="${BronzeClr}" size="+18">${alphabet[i]}</font>`, command: `fps gui npc ${alphabet[i]}` },
-						{ text: `&nbsp;` }
+						{ text: "&nbsp;" }
 					)
 				}
 				TmpData.push({ text: `<br><br><font color="${PinkClr}" size="+16">(Command </font><font color="${HPinkClr}" size="+16">"fps gui searchnpc &#60;name&#62;"</font><font color="${PinkClr}" size="+16"> to search for a specific NPC's name, Case sensitive)</font>` })
@@ -130,29 +129,29 @@ module.exports = function FpsUtils(mod) {
 					{ 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="${YellowClr}" size="+20">Tankers:</font>&#09;&#09;` },
 					{ text: `<font color="${LBlueClr}" size="+18">&#40;Lancer&#41;</font>`, command: `fps gui class lancer` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${LBlueClr}" size="+18">&#40;Brawler&#41;</font><br><br>`, command: `fps gui class brawler` },
 					{ text: `<font color="${YellowClr}" size="+20">Healers:</font>&#09;&#09;` },
 					{ text: `<font color="${LBlueClr}" size="+18">&#40;Priest&#41;</font>`, command: `fps gui class priest` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${LBlueClr}" size="+18">&#40;Mystic&#41;</font><br><br>`, command: `fps gui class mystic` },
 					{ text: `<font color="${YellowClr}" size="+20">Dpsers(melee):</font>&#09;` },
 					{ text: `<font color="${LBlueClr}" size="+18">&#40;Warrior&#41;</font>`, command: `fps gui class warrior` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${LBlueClr}" size="+18">&#40;Slayer&#41;</font>`, command: `fps gui class slayer` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${LBlueClr}" size="+18">&#40;Berserker&#41;</font>`, command: `fps gui class berserker` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${LBlueClr}" size="+18">&#40;Ninja&#41;</font>`, command: `fps gui class ninja` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${LBlueClr}" size="+18">&#40;Valkyrie&#41;</font>`, command: `fps gui class valkyrie` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${LBlueClr}" size="+18">&#40;Reaper&#41;</font><br><br>`, command: `fps gui class reaper` },
 					{ text: `<font color="${YellowClr}" size="+20">Dpsers(ranged):</font>&#09;` },
 					{ text: `<font color="${LBlueClr}" size="+18">&#40;Sorcerer&#41;</font>`, command: `fps gui class sorcerer` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${LBlueClr}" size="+18">&#40;Archer&#41;</font>`, command: `fps gui class archer` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${LBlueClr}" size="+18">&#40;Gunner&#41;</font>`, command: `fps gui class gunner` }
 				], `<font color="${LPurpleClr}">[FPS] Options - Skills </font><font color="${YellowClr}">(Choose class)</font>`)
 				break;
@@ -164,38 +163,38 @@ module.exports = function FpsUtils(mod) {
 					{ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br><br>`, command: `fps gui` },
 					{ text: `<font color="${YellowClr}" size="+20">By Roles:</font>&#09;` },
 					{ text: `<font color="${mod.settings.RolesBlacklist.includes('tank') ? GreenClr : RedClr}" size="+18">[Tankers]</font>`, command: `fps ${mod.settings.RolesBlacklist.includes('tank') ? `show` : `hide`} tank;fps gui role` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${mod.settings.RolesBlacklist.includes('healer') ? GreenClr : RedClr}" size="+18">[Healers]</font>`, command: `fps ${mod.settings.RolesBlacklist.includes('healer') ? `show` : `hide`} healer;fps gui role` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${mod.settings.RolesBlacklist.includes('dps') ? GreenClr : RedClr}" size="+18" >[Dps-All]</font>`, command: `fps ${mod.settings.RolesBlacklist.includes('dps') ? `show` : `hide`} dps;fps gui role` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${mod.settings.RolesBlacklist.includes('ranged') ? GreenClr : RedClr}" size="+18">[Dps-Ranged]</font><br><br><br><br>`, command: `fps ${mod.settings.RolesBlacklist.includes('ranged') ? `show` : `hide`} ranged;fps gui role` },
 					{ text: `<font color="${DBlueClr}" size="+22">By Classes</font><br><br>` },
 					{ text: `<font color="${YellowClr}" size="+20">Tankers:</font>&#09;&#09;` },
 					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('lancer') ? GreenClr : RedClr}" size="+18">[Lancer]</font>`, command: `fps ${mod.settings.ClassesBlacklist.includes('lancer') ? `show` : `hide`} lancer;fps gui role` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('brawler') ? GreenClr : RedClr}" size="+18">[Brawler]</font><br><br>`, command: `fps ${mod.settings.ClassesBlacklist.includes('brawler') ? `show` : `hide`} brawler;fps gui role` },
 					{ text: `<font color="${YellowClr}" size="+20">Healers:</font>&#09;&#09;` },
 					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('priest') ? GreenClr : RedClr}" size="+18">[Priest]</font>`, command: `fps ${mod.settings.ClassesBlacklist.includes('priest') ? `show` : `hide`} priest;fps gui role` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('mystic') ? GreenClr : RedClr}" size="+18">[Mystic]</font><br><br>`, command: `fps ${mod.settings.ClassesBlacklist.includes('mystic') ? `show` : `hide`} mystic;fps gui role` },
 					{ text: `<font color="${YellowClr}" size="+20">Dpsers(melee):</font>&#09;` },
 					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('warrior') ? GreenClr : RedClr}" size="+18">[Warrior]</font>`, command: `fps ${mod.settings.ClassesBlacklist.includes('warrior') ? `show` : `hide`} warrior;fps gui role` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('slayer') ? GreenClr : RedClr}" size="+18">[Slayer]</font>`, command: `fps ${mod.settings.ClassesBlacklist.includes('slayer') ? `show` : `hide`} slayer;fps gui role` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('berserker') ? GreenClr : RedClr}" size="+18">[Berserker]</font>`, command: `fps ${mod.settings.ClassesBlacklist.includes('berserker') ? `show` : `hide`} berserker;fps gui role` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('ninja') ? GreenClr : RedClr}" size="+18">[Ninja]</font>`, command: `fps ${mod.settings.ClassesBlacklist.includes('ninja') ? `show` : `hide`} ninja;fps gui role` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('valkyrie') ? GreenClr : RedClr}" size="+18">[Valkyrie]</font>`, command: `fps ${mod.settings.ClassesBlacklist.includes('valkyrie') ? `show` : `hide`} valkyrie;fps gui role` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('reaper') ? GreenClr : RedClr}" size="+18">[Reaper]</font><br><br>`, command: `fps ${mod.settings.ClassesBlacklist.includes('reaper') ? `show` : `hide`} reaper;fps gui role` },
 					{ text: `<font color="${YellowClr}" size="+20">Dpsers(ranged):</font>&#09;` },
 					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('sorcerer') ? GreenClr : RedClr}" size="+18">[Sorcerer]</font>`, command: `fps ${mod.settings.ClassesBlacklist.includes('sorcerer') ? `show` : `hide`} sorcerer;fps gui role` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('archer') ? GreenClr : RedClr}" size="+18">[Archer]</font>`, command: `fps ${mod.settings.ClassesBlacklist.includes('archer') ? `show` : `hide`} archer;fps gui role` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${mod.settings.ClassesBlacklist.includes('gunner') ? GreenClr : RedClr}" size="+18">[Gunner]</font>`, command: `fps ${mod.settings.ClassesBlacklist.includes('gunner') ? `show` : `hide`} gunner;fps gui role` }
 				], `<font color="${LPurpleClr}">[FPS] Options - Roles/Classes</font>`)
 				break;
@@ -225,34 +224,35 @@ module.exports = function FpsUtils(mod) {
 				gui.parse(TmpData, `<font color="${LPurpleClr}">[FPS] Options - Projectiles</font>`)
 				TmpData = []
 				break;
-			case "help":				//TO DO - Better formating, it looks messy.
+			case "help":				//TO DO - Better formating, it looks messy. ##Attempt 2
 				gui.parse([
 					{ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br>`, command: `fps gui` },
 					{ text: `<font color="${PinkClr}" size="+17"><p align="right">Note: This page not completely developed yet, if you can't understand anything, just go check the README, Thank you.</p></font><br>` },
-					{ text: `<font color="${HBlueClr}" size="15" style="font-family:Consolas,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New, monospace;">` },
-					{ text: `|    Command(s)    |         Argument(s)        |      Example         |             Details              |<br>` },
-					{ text: `|   'gui' | 'g'    |             N/A            |'!fps gui'            |          Opens GUI.              |<br>` },
-					{ text: `|       N/A        |             N/A            |'!fps-util'           |          Opens Help.             |<br>` },
-					{ text: `|  '0'|'1'|'2'|'3' |             N/A            |'!0'|'!1'|'!2' |'!3'  |          Changes Mode.           |<br>` },
-					{ text: `| 'mode' | 'state' |    '0' | '1' | '2' | '3'   |'!fps mode 2'         |          Changes Mode.           |<br>` },
-					{ text: `| 'hide' | 'show'  |      Player|Class|Role     |'!fps hide mie'       |  Hides/shows Player|Class|Role.  |<br>` },
-					{ text: `|     'party'      |             N/A            |'!fps party'          |     Hides all but your party.    |<br>` },
-					{ text: `|      'raid'      |             N/A            |'!fps raid'           |Auto 'mode 2' when party 18+ ppls.|<br>` },
-					{ text: `|      'list'      |             N/A            |'!fps list'           | Prints list of hidden things.    |<br>` },
-					{ text: `|'summons' | 'sums'|        'other' | 'me'      |'!fps sums me'        |oth hide others sums; 'me' yours. |<br>` },
-					{ text: `|'skill' | 'skills'|'blacklist' | Class \<arg3\>  |'!fps skill blacklist'|Blacklist on/off; arg3 = classname|<br>` },
-					{ text: `|  'npc' | 'npcs'  |             N/A            |'!fps npc'            |Hides/shows blacklisted npcs.     |<br>` },
-					{ text: `|      'hit'       |   'me' | 'other' | 'damage'|'!fps hit me'         |Hides/shows skill results for each|<br>` },
-					{ text: `|    'firework'    |             N/A            |'!fps firework'       |Hides/shows Dragon fireworks.     |<br>` },
-					{ text: `|   'abn'|'all'    |'blacklist' \<add|remv num\>  |'!fps abn blacklist'  |Hides/shows effects.              |<br>` },
-					{ text: `|  'proj'|'all'    |'blacklist' \<add|remv num\>  |'!fps proj all'       |Hides/shows projectiles.          |<br>` },
-					{ text: `|   'guildlogo'    |             N/A            |'!fps guildlogo'      |Hides/shows guild logos           |<br>` },
-					{ text: `| 'style'|'costume'|             N/A            |'!fps style'          |Hides/shows style for ppl|npc     |<br>` },
-					{ text: `|  'gui npcsearch' |           \<arg1\>           |'!fps gui npcsearch E'|Opens list of npcs matching arg1. |<br>` },
-					{ text: `|    'npczoom'     |             N/A            |'!fps npczoom'        |If enabled, prevent zoom on npcs. |<br>` },
-					{ text: `|    'dropitem'    |    N/A \| 'hide' \<num\>   |'!fps dropitem'       |Hides/shows blacklisted drops.    |<br>` },
-					{ text: `| 'monsterdeathani'|             N/A            |'!fps monsterdeathani'|Hides/shows death animations.     |<br>` },
-					{ text: `</font>` }
+					{ text: `<font color="${HBlueClr}" size="15">` }, //style="font-family:Consolas,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New, monospace;" doesn't work ._.
+					{ text: "  Command(s)  &#09;&#09;&#09;&#09;Argument(s)&#09; &#09; Example<br>" },
+					{ text: "  gui  ~  g&ensp;&#09;&#09;&#09;&#09;&#09;N/A&#09;&#09;&#09;&#09;!fps gui<br>" },
+					{ text: "&#09; N/A&#09;  &#09;&#09;&#09;&#09;&#09;N/A&#09;&#09;&#09;&#09;!fps-util<br>" },
+					{ text: "0 ~ 1 ~ 2 ~ 3 &#09;&#09;&#09;&#09;&#09;N/A&#09;&#09;&#09;&#09;!0 ~ !1 ~ !2 ~ !3<br>" },
+					{ text: "mode  ~  state&#09;&#09;&ensp;0  ~  1  ~  2  ~  3  &#09;!fps mode 2<br>" },
+					{ text: "hide  ~  show &#09;&#09;  Player ~ Class ~ Role &#09;!fps hide mie<br>" },
+					{ text: "&#09;party&#09; &#09;&#09;&#09;&#09;&#09;N/A&#09;&#09;&#09;&#09;!fps party<br>" },
+					{ text: "&#09; raid&#09; &#09;&#09;&#09;&#09;&#09;N/A&#09;&#09;&#09;&#09;!fps raid<br>" },
+					{ text: "&#09; list&#09; &#09;&#09;&#09;&#09;&#09;N/A&#09;&#09;&#09;&#09;!fps list<br>" },
+					{ text: "summons ~ sums&#09;&#09;&#09;  other ~  me&#09;&ensp;&#09;!fps sums me<br>" },
+					{ text: "skill ~ skills&#09;&#09;  blacklist ~ Class arg &#09;!fps skill blacklist<br>" },
+					{ text: "  npc  ~ npcs &#09;&#09;&#09; N/A ~  hide arg&#09;&#09;!fps npc<br>" },
+					{ text: "&#09;  hit&#09; &#09;&#09;&ensp;me ~ other ~ damage  &#09;!fps hit me<br>" },
+					{ text: "&#09;firework  &#09;&#09;&#09;&#09;&#09;N/A&#09;&#09;&#09;&#09;!fps firework<br>" },
+					{ text: "abn ~ abnormal&#09;&#09; all~blacklist arg arg2 &#09;!fps abn blacklist<br>" },
+					{ text: "&#09;  proj&#09;&#09;&#09; all~blacklist arg arg2 &#09;!fps proj all<br>" },
+					{ text: "&ensp;guildlogo  &#09;&#09;&#09;&#09;&#09;N/A&#09;&#09;&#09;&#09;!fps guildlogo<br>" },
+					{ text: "style~costume &#09;&#09;&#09;&#09;&#09;N/A&#09;&#09;&#09;&#09;!fps style<br>" },
+					{ text: "gui npcsearch &#09;&#09;&#09;  &#09;  arg&#09;&#09; &#09;!fps gui npcsearch E<br>" },
+					{ text: "&#09;npczoom&ensp;&#09;&#09;&#09;&#09;&#09;N/A&#09;&#09;&#09;&#09;!fps npczoom<br>" },
+					{ text: "&#09;dropitem  &#09;&#09;&#09;  N/A ~  hide arg&ensp;&#09;!fps dropitem<br>" },
+					{ text: "monsterdeathani&#09;&#09;&#09;&#09;&#09;N/A&#09;&#09;&#09;&#09;!fps monsterdeathani<br>" },
+					{ text: "  screenabns  &#09;&#09;&#09;  N/A ~  hide arg&ensp;&#09;!fps screenabns<br>" },
+					{ text: "</font>" }
 				], `<font color="${LPurpleClr}">[FPS] HELP </font>`)
 				break;
 			default:
@@ -260,77 +260,78 @@ module.exports = function FpsUtils(mod) {
 					{ text: `<font color="${PurpleClr}" size="+24"><p align="right">REFRESH</p></font><br><br>`, command: `fps gui` },
 					{ text: `<font color="${YellowClr}" size="+21">Modes:</font>&#09;&#09;` },
 					{ text: `<font color="${mod.settings.Mode === 0 ? GreenClr : RedClr}" size="+18">[Mode 0]</font>`, command: `fps mode 0;fps gui` },
-					{ text: `&nbsp;&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;&nbsp;" },
 					{ text: `<font color="${mod.settings.Mode === 1 ? GreenClr : RedClr}" size="+18">[Mode 1]</font>`, command: `fps mode 1;fps gui` },
-					{ text: `&nbsp;&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;&nbsp;" },
 					{ text: `<font color="${mod.settings.Mode === 2 ? GreenClr : RedClr}" size="+18">[Mode 2]</font>`, command: `fps mode 2;fps gui` },
-					{ text: `&nbsp;&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;&nbsp;" },
 					{ text: `<font color="${mod.settings.Mode === 3 ? GreenClr : RedClr}" size="+18">[Mode 3]</font><br><br>`, command: `fps mode 3;fps gui` },
 					{ text: `<font color="${YellowClr}" size="+21">Hit:</font>&#09;&#09;&#09;` },
 					{ text: `<font color="${mod.settings.Hit_Me ? GreenClr : RedClr}" size="+18">[Own effect]</font>`, command: `fps hit me;fps gui` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${mod.settings.Hit_Other ? GreenClr : RedClr}" size="+18">[Players effect]</font>`, command: `fps hit other;fps gui` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${mod.settings.Hit_Damage ? GreenClr : RedClr}" size="+18">[Damage numbers]</font><br><br>`, command: `fps hit damage;fps gui` },
 					{ text: `<font color="${YellowClr}" size="+21">Hide:</font>&#09;&#09;` },
 					{ text: `<font color="${mod.settings.HideMySummons ? GreenClr : RedClr}" size="+17">[Own summons]</font>`, command: `fps summons me;fps gui` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${mod.settings.HideOthersSummons ? GreenClr : RedClr}" size="+17">[Players summons]</font>`, command: `fps summons;fps gui` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${mod.settings.HideFireworks ? GreenClr : RedClr}" size="+17">[Fireworks]</font><br>`, command: `fps fireworks;fps gui` },
 					{ text: `&#09;&#09;&#09;` },
 					{ text: `<font color="${mod.settings.OnlyParty ? GreenClr : RedClr}" size="+17">[Everyone but party]</font>`, command: `fps party;fps gui` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${mod.settings.Hideguildlogos ? GreenClr : RedClr}" size="+17">[Guild Logos]</font>`, command: `fps guildlogo;fps gui` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${mod.settings.ShowStyle ? GreenClr : RedClr}" size="+17">[Style]</font>`, command: `fps style;fps gui` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${mod.settings.HideBlacklistedDrop ? GreenClr : RedClr}" size="+17">[Drops]</font><br>`, command: `fps dropitem;fps gui` },
 					{ text: `&#09;&#09;&#09;` },
-					{ text: `<font color="${mod.settings.HideMonsterDeathAnimation ? GreenClr : RedClr}" size="+17">[Monsters Death Animation]</font><br><br>`, command: `fps monsterdeathani;fps gui` },
+					{ text: `<font color="${mod.settings.HideMonsterDeathAnimation ? GreenClr : RedClr}" size="+17">[Monsters Death Animation]</font>`, command: `fps monsterdeathani;fps gui` },
+					{ text: "&nbsp;&nbsp;" },
+					{ text: `<font color="${mod.settings.HideOwnBlacklistedAbns ? GreenClr : RedClr}" size="+17">[Screen Abns]</font><br><br>`, command: `fps screenabns;fps gui` },
 					{ text: `<font color="${YellowClr}" size="+21">Players:</font>&#09;` },
 					{ text: `<font color="${LBlueClr}" size="+18">[Hidden list]</font>`, command: `fps gui hide` },
-					{ text: `&nbsp;&nbsp;&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;&nbsp;&nbsp;" },
 					{ text: `<font color="${LBlueClr}" size="+18">[Shown list]</font><br><br>`, command: `fps gui show` },
 					{ text: `<font color="${YellowClr}" size="+21">ETC:</font>&#09;&#09;` },
 					{ text: `<font color="${LBlueClr}" size="+17">[Classes/Roles]</font>`, command: `fps gui role` },
-					{ text: `&nbsp;&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;&nbsp;" },
 					{ text: `<font color="${LBlueClr}" size="+17">[Skills]</font>`, command: `fps gui skills` },
-					{ text: `&nbsp;&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;&nbsp;" },
 					{ text: `<font color="${LBlueClr}" size="+17">[NPCs]</font>`, command: `fps gui npcMain` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${LBlueClr}" size="+17">[Abnormals]</font><br>`, command: `fps gui abn` },
 					{ text: `&#09;&#09;&#09;` },
 					{ text: `<font color="${LBlueClr}" size="+17">[Projectiles]</font>`, command: `fps gui proj` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${mod.settings.RaidAutoChange ? GreenClr : RedClr}" size="+17">[Raid auto state]</font>`, command: `fps raid;fps gui` },
-					{ text: `&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${mod.settings.ActionScripts ? GreenClr : RedClr}" size="+17">[Npc zoom-ins]</font>`, command: `fps npczoom;fps gui` },
 					{ text: `<br><br><br><br><br>` },
 					{ text: `<font color="${BlueClr}" size="+22">Quick Links:</font><br>` },
 					{ text: `<font color="${DBlueClr}" size="+21">UI:</font>&#09;&#09;` },
 					{ text: `<font color="${PurpleClr}" size="+17">[Mail]</font>`, command: `fps quicklink parcel` },
-					{ text: `&nbsp;&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;&nbsp;" },
 					{ text: `<font color="${PurpleClr}" size="+17">[Broker]</font>`, command: `fps quicklink broker` },
-					{ text: `&nbsp;&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;&nbsp;" },
 					{ text: `<font color="${PurpleClr}" size="+17">[Talent]</font>`, command: `fps quicklink talents` },
-					{ text: `&nbsp;&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;&nbsp;" },
 					{ text: `<font color="${PurpleClr}" size="+17">[Dress]</font>`, command: `fps quicklink dressingroom` },
-					{ text: `&nbsp;&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;&nbsp;" },
 					{ text: `<font color="${PurpleClr}" size="+17">[Hat Style]</font>`, command: `fps quicklink hatrestyle` },
-					{ text: `&nbsp;&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;&nbsp;" },
 					{ text: `<font color="${PurpleClr}" size="+17">[Search-Engine]</font><br>`, command: `fps quicklink searchengine` },
 					{ text: `<font color="${DBlueClr}" size="+21">Group:</font>&#09;` },
 					{ text: `<font color="${OrangeClr}" size="+17">[Reset]</font>`, command: `fps quicklink reset` },
-					{ text: `&nbsp;&nbsp;&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;&nbsp;&nbsp;" },
 					{ text: `<font color="${CPinkClr}" size="+17">[Leave]</font>`, command: `fps quicklink drop` },
-					{ text: `&nbsp;&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;&nbsp;" },
 					{ text: `<font color="${CPinkClr}" size="+17">[Disband]</font><br>`, command: `fps quicklink disband` },
 					{ text: `<font color="${DBlueClr}" size="+21">Extra:</font>&#09;` },
 					{ text: `<font color="${CPinkClr}" size="+17">[Lobby]</font>`, command: `fps quicklink lobby` },
-					{ text: `&nbsp;&nbsp;&nbsp;` },
+					{ text: "&nbsp;&nbsp;&nbsp;" },
 					{ text: `<font color="${CPinkClr}" size="+17">[Exit]</font><br>`, command: `fps quicklink exit` }
-
 				], `<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>`)
 		}
 	}
@@ -719,7 +720,10 @@ module.exports = function FpsUtils(mod) {
 			if (spawnedPlayers[event.target]) console.log(`\x1b[2m[${new Date().toTimeString().slice(0, 8)}]\x1b[0m \x1b[31m->\x1b[0m \x1b[36mAbnormality \x1b[4mStarted\x1b[0m \x1b[44mon\x1b[0m \x1b[37m'${spawnedPlayers[event.target].name}'\x1b[0m:\x1b[33m \ID "\x1b[32m${event.id}\x1b[0m"`);
 			if (spawnedPlayers[event.source]) console.log(`\x1b[2m[${new Date().toTimeString().slice(0, 8)}]\x1b[0m \x1b[31m->\x1b[0m \x1b[36mAbnormality \x1b[4mStarted\x1b[0m \x1b[45mfrom\x1b[0m \x1b[37m'${spawnedPlayers[event.source].name}'\x1b[0m:\x1b[33m \ID "\x1b[32m${event.id}\x1b[0m"`);
 		}
-		if (EqGid(event.target)) return;
+		if (EqGid(event.target)) {
+			if (mod.settings.HideOwnBlacklistedAbns && mod.settings.OwnAbnormalsBlacklist.includes(event.id)) return false;
+			return;
+		}
 		if (hiddenUsers[event.target]) return false;
 		if (mod.settings.HideBlacklistedAbnormalities && mod.settings.AbnormalitiesBlacklist.includes(event.id)) return false;
 		if (mod.settings.HideAllAbnormalities && (spawnedPlayers[event.target] || spawnedPlayers[event.source] || mod.settings.AbnormalitiesBlacklist.includes(event.id))) return false;
@@ -840,23 +844,23 @@ module.exports = function FpsUtils(mod) {
 	mod.command.add('2', () => mod.command.exec('fps mode 2'))
 	mod.command.add('3', () => mod.command.exec('fps mode 3'))
 
-	mod.command.add(['fps', 'fps-utils', 'fpsutil', 'fpsutils'], (key, arg, arg2, arg3) => {
+	mod.command.add(['fps', '!fps', 'fps-utils', '!fps-utils'], (key, arg, arg2, arg3) => {
 		switch (key) {
 			case "g":
 			case "gui":
 				GuiHandler(arg, arg2);
 				break;
 			case "0":
-				mod.command.exec(`fps mode 0`);
+				mod.command.exec('fps mode 0');
 				break;
 			case "1":
-				mod.command.exec(`fps mode 1`);
+				mod.command.exec('fps mode 1');
 				break;
 			case "2":
-				mod.command.exec(`fps mode 2`)
+				mod.command.exec('fps mode 2')
 				break;
 			case "3":
-				mod.command.exec(`fps mode 3`);
+				mod.command.exec('fps mode 3');
 				break;
 			case "mode":
 			case "state":
@@ -865,46 +869,37 @@ module.exports = function FpsUtils(mod) {
 					case "off":
 						if (mod.settings.Mode === 3) ShowAll();
 						mod.settings.Mode = 0;
-
 						mod.settings.HideAllAbnormalities = false;
 						mod.settings.HideAllProjectiles = false;
 						mod.settings.Hit_Other = false;
-
 						Msg(`Mode 0.`.clr(RedClr));
 						break;
 					case "1":
 					case "one":
 						if (mod.settings.Mode === 3) ShowAll();
 						mod.settings.Mode = 1;
-
 						mod.settings.HideAllAbnormalities = false;
 						mod.settings.HideAllProjectiles = true;
 						mod.settings.Hit_Other = true;
-
 						Msg(`Mode 1.`.clr(BronzeClr));
 						break;
 					case "2":
 					case "two":
 						if (mod.settings.Mode === 3) ShowAll();
 						mod.settings.Mode = 2;
-
 						mod.settings.HideAllAbnormalities = true;
 						mod.settings.HideAllProjectiles = true;
 						mod.settings.Hit_Other = true;
-
 						Msg(`Mode 2.`.clr(SilverClr));
 						break;
 					case "3":
 					case "three":
 						HideAll();
 						mod.settings.Mode = 3;
-
 						mod.settings.HideAllAbnormalities = true;
 						mod.settings.HideAllProjectiles = true;
 						mod.settings.Hit_Other = true;
-
 						mod.settings.OnlyParty = false;
-
 						Msg(`Mode 3.`.clr(GoldClr));
 						break;
 					default:
@@ -1032,7 +1027,6 @@ module.exports = function FpsUtils(mod) {
 											Msg(`Skill ID '${arg3}'` + ` Hidden`.clr(GreenClr) + ` for class '${arg2}'.`)
 											return
 										}
-
 									} else {
 										mod.settings.ClassesData[i].CD_HideBlacklistedSkills = !mod.settings.ClassesData[i].CD_HideBlacklistedSkills;
 										Msg(`Skills for '${arg2}' class ${mod.settings.ClassesData[i].CD_HideBlacklistedSkills ? 'Hidden'.clr(GreenClr) : 'Shown'.clr(RedClr)}.`);
@@ -1061,7 +1055,6 @@ module.exports = function FpsUtils(mod) {
 						mod.settings.NpcsBlacklist = mod.settings.NpcsBlacklist.filter((obj) => {
 							return obj.zone != arg2 || obj.templateId != arg3;
 						})
-
 					} else {
 						Msg(`NPC HntZone '${arg2}', TmpId '${arg3}'` + ` Added to the blacklist`.clr(GreenClr) + '.')
 						mod.settings.NpcsBlacklist.push({ zone: arg2, templateId: arg3 })
@@ -1282,6 +1275,27 @@ module.exports = function FpsUtils(mod) {
 				mod.settings.HideMonsterDeathAnimation = !mod.settings.HideMonsterDeathAnimation;
 				Msg(`Monsters Death Animation is ${mod.settings.HideMonsterDeathAnimation ? 'Hidden'.clr(GreenClr) : 'Shown'.clr(RedClr)}.`);
 				break;
+			case "screenabns":
+				if (arg == 'hide') {
+					if (!arg2) {
+						mod.settings.HideOwnBlacklistedAbns = !mod.settings.HideOwnBlacklistedAbns;
+						Msg(`Blacklisted ScreenAbns ${mod.settings.OwnAbnormalsBlacklist ? 'Hidden'.clr(GreenClr) : 'Shown'.clr(RedClr)}.`);
+						break;
+					}
+					arg2 = Number(arg2);
+					let found = mod.settings.OwnAbnormalsBlacklist.some((m) => { return m === arg2; });
+					if (found) {
+						Msg(`Abnormal id '${arg2}'` + ` Removed from the blacklist`.clr(RedClr) + '.')
+						mod.settings.OwnAbnormalsBlacklist = mod.settings.OwnAbnormalsBlacklist.filter((obj) => { return obj != arg2; })
+					} else {
+						Msg(`Abnormal id '${arg2}'` + ` Added to the blacklist`.clr(GreenClr) + '.')
+						mod.settings.OwnAbnormalsBlacklist.push(arg2)
+					}
+					return
+				} else
+					mod.settings.HideOwnBlacklistedAbns = !mod.settings.HideOwnBlacklistedAbns;
+				Msg(`Blacklisted ScreenAbns ${mod.settings.HideOwnBlacklistedAbns ? 'Hidden'.clr(GreenClr) : 'Shown'.clr(RedClr)}.`);
+				break;
 			case "help":
 				mod.command.exec(`fps gui help`)
 				break;

+ 32 - 2
lib/setting_migration.js

@@ -1,7 +1,7 @@
 "use strict"
 
 const DefaultSettings = {
-	_version: 4,
+	_version: 5,
 
 	Mode: 0,
 
@@ -28,12 +28,38 @@ const DefaultSettings = {
 	HideAllAbnormalities: false,
 	HideAllProjectiles: false,
 
+	HideOwnBlacklistedAbns: false,
 	HideBlacklistedAbnormalities: false,
 	HideBlacklistedProjectiles: false,
 	HideBlacklistedNpcs: false,
 	HideBlacklistedSkills: false,
 	HideBlacklistedDrop: false,
 
+	OwnAbnormalsBlacklist: [
+		4850, //Sneaky - "You've found a blind spot in their defenses. (makes your screen shadier)"
+		48732, //Brain freeze - "You ate ice-cold food too quickly. Your body is cold, and your Movement Speed decreases by 10%."
+		48733, //Summer Wine - "Ramsay's strong wine. The more of it consume, the tipsier you get."
+		48734, //Tipsy - "You're Tipsy. Your vision is blurry and your senses are dull. Increase Endurance by 1"
+		48735, //Intoxicated - "You're dizzy. Your vision is blurry and your senses are dull. Increase Endurance by 2."
+		48736, //Inebriated - "You're very dizzy. Your vision is blurry and your senses are dull. Increase Endurance by 3."
+		48737, //Drunk - "You're seriously dizzy. Increase Endurance by 3."
+		48738, //Wasted - "If you drink any more, you will hurt yourself. Increases Endurance by 3."
+		48739, //Passed Out - "You are beyond wasted and unable to move until you sober up."
+		70234, //Freeholds Root Beer - "Lightens your mood for 10 sec, but the kick might make you feel very woozy."
+		70235, //Shevranberry Wine - "Lightens your mood for 10 sec, but you might feel very woozy."
+		70236, //Sky Lotus - "Makes you 100% resistant to knowdown and stagger for 10 sec, but you might feel very woozy."
+		70237, //Lein's Dark Root Beer - "Increases Attack Speed by 20 for 10 sec, but the kick might make you feel very woozy."
+		70238, //Digory's Honey Moongourd Drink - "Increases Endurance by 10 for 10 sec, but you might feel very woozy."
+		776021, //Flash Blindness - "You can't see anything. (first boss SF, during the spawn of first boss, makes your screen full white)"
+		905434, //Noxious Plume - "Inhaled poisonous fumes. (first boss BR, blur screen debuff)"
+		47660800, //Darkness - "Makes it hard to see anything around you. (makes your screen briefly full black)"
+		47660900, //White Flash - "Makes it hard to see things around you. (makes your screen briefly full white)"
+		47661000, //Deep Darkness - "Makes it hard to see anything around you. (makes your screen shadier)"
+		47662300, //Darkness I - "You are gradually becoming blind."
+		99006000, //Flash Grenade - "A blinding flash makes it hard to see things around you!"
+		99007200, //Flash Grenade - "Makes it hard to see things around you. (makes your screen white for 0.5 second)"
+		999001011 //Blindfolded - "Your eyes are covered while you play the blind melon bash mini-game."
+	],
 	AbnormalitiesBlacklist: [
 		201, 202, 902, 903, 908, 910, 911, 912, 913, 916, 917, 920, 921, 922, 1130, 1131, 1133, 1461, 1462, 1490, 1491, 1495, 1510, 1511, 1512, 1610, 1630, 1800, 2040, 2041, 2042, 2057,
 		2058, 2059, 2060, 2066, 2067, 2068, 2081, 2755, 2756, 2757, 2758, 2759, 2760, 2761, 4401, 4600, 4610, 4611, 4612, 4613, 4614, 4615, 4616, 4950, 5060, 6005, 6006, 6007, 6009,
@@ -113,10 +139,14 @@ function MigrateSettings(from_ver, to_ver, settings) {
 				break;
 			case 4:
 				delete settings.NoZoomingToNpc;
-				settings._version = DefaultSettings._version;
+				settings._version = 4;
 				settings.ActionScripts = DefaultSettings.ActionScripts;
 				settings.HideMonsterDeathAnimation = DefaultSettings.HideMonsterDeathAnimation;
 				break;
+			case 5:
+				settings._version = DefaultSettings._version;
+				settings.HideOwnBlacklistedAbns = DefaultSettings.HideOwnBlacklistedAbns;
+				settings.OwnAbnormalsBlacklist = DefaultSettings.OwnAbnormalsBlacklist;
 			default:
 				console.log(`[FPS-UTILS] -\x1b[31m Your 'config.json' seems to be too old.\x1b[32m Re-created new one.\x1b[0m`);
 				Object.keys(settings).forEach(function (key) { delete settings[key]; });

+ 4 - 4
manifest.json

@@ -1,11 +1,11 @@
 {
 	"files": {
-		"README.md": "07c6a6bd7a34de9264fcf71e540f892c0f615a2fba0dd8c11810bcfaad99879a",
+		"README.md": "f14ba4bdf387bfeb80884158de8d6a09f536c46f8ea803750935fea10931ea55",
 		"lib/data/npcData.json": "9949d5b7d18e347c29c46adf44e4ad8a519fc2e87166b0c402860ebaa082fb35",
 		"lib/data/skillString.json": "9d69876fea0be8e6ac5dd43b3fc74ea023f6b8a6145384f8f780dd977045d8ef",
-		"lib/index.js": "8b2044182f16c3e23506d06ce031c1371bdf897bd69214c456839bcf609e24e2",
-		"lib/setting_migration.js": "0d47586bebc36a52d0402bdb04f871f9ae70fb4adce82f13ba6123daa5532a17",
-		"module.json": "1f294963a9862681497417daf8d7573b938064b7322603739d9a302a64d22502",
+		"lib/index.js": "f98f449190e19b044e06cfbada40f14d161f45027a5d986948ef93cc26c5a97f",
+		"lib/setting_migration.js": "9ed0101fe937b0e4a9169f88820b6b0fce28b3cbb4b0a61605fc6bf9fdf00578",
+		"module.json": "ebf8f0e58e4a0b681adbacf7922cdfd1f8a59780174894db6c8cec2126307968",
 		"node_modules/Gui/LICENSE": "589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2",
 		"node_modules/Gui/README.md": "3f8afb8758597d32d5075a0664b3b9acdce7193ad43b54ee1d83daa9e0647db0",
 		"node_modules/Gui/index.js": "b13b4ebf8620c1e550965a39ac692063a59b5b2c628458cd160024e69b65474e",

+ 2 - 2
module.json

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