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

Minor updates.

No more fishing option, The invisible npcs gets blocked by core script.
No system messages block.
Added achievement spam list block.
Added White list abnormalities so they don't get blocked as they're important to be seen.
Updated GUI appearance.
Split the HpMp hide to hp and mp options.
Settings version 11. :last_quarter_moon_with_face:
Risenio лет назад: 7
Родитель
Сommit
a4a874b678
5 измененных файлов с 146 добавлено и 141 удалено
  1. 128 128
      lib/index.js
  2. 10 3
      lib/setting_migration.js
  3. 5 7
      manifest.json
  4. 2 2
      module.json
  5. 1 1
      package.json

+ 128 - 128
lib/index.js

@@ -4,15 +4,41 @@
 module.exports = function FpsUtils(mod) {
 	const NotCP = typeof global.TeraProxy === 'undefined';
 	const NpcData = require("./data/npcData.json"), SkillData = require("./data/skillString.json");
-	const BnzC = '#BC8F8F', SlvC = '#9A9A9A', GldC = '#DAA520', PnkC = '#FFB7C5', HPkC = '#FF69B4', CPKC = '#ED5D92', RedC = '#FE6F5E', GrnC = '#4DE19C', LPrC = '#E0B0FF', PrpC = '#9966CC', LBlC = '#4DDCE1', BluC = '#436EEE', DBlC = '#00575e', HBlC = '#08B3E5', GryC = '#778899', YlwC = '#C0B94D', OngC = '#FFBE5E';
-	const FishingNpcs = { 8: [6011], 12: [1, 2], 23: [201, 202], 34: [8000], 61: [9901], 62: [1017, 1035, 1039, 1040, 1041, 1042, 1900, 1901, 1902, 1903, 9001, 9002, 9003, 9004, 9901], 83: [9901], 207: [9901], 212: [1034], 223: [9901, 9906, 9907, 9915, 9925], 230: [9901], 362: [1201, 1202, 1301, 1302] };
+	const BnzC = '#BC8F8F', SlvC = '#9A9A9A', GldC = '#DAA520', PnkC = '#FFB7C5', HPkC = '#FF69B4', CPKC = '#ED5D92', RedC = '#FE6F5E', GrnC = '#4DE19C', LPrC = '#E0B0FF', PrpC = '#9966CC', LBlC = '#4DDCE1', BluC = '#436EEE', DBlC = '#5BC0BE', HBlC = '#08B3E5', GryC = '#778899', YlwC = '#C0B94D', OngC = '#FFBE5E';
+	const InvisibleNpcs = { 8: [6011], 12: [1, 2], 23: [201, 202], 34: [8000], 61: [9901], 62: [1017, 1035, 1039, 1040, 1041, 1042, 1900, 1901, 1902, 1903, 9001, 9002, 9003, 9004, 9901], 83: [9901], 207: [9901], 212: [1034], 223: [9901, 9906, 9907, 9915, 9925], 230: [9901], 362: [1201, 1202, 1301, 1302] };
 	const PvPProjs = [30120, 30220, 30320, 90120, 90220, 90320, 90420, 90520, 90620, 90720, 90820, 90920, 100120, 100220, 100320, 100420, 100520, 120220, 120320, 120420, 120520, 120620, 120720, 120820, 120920, 150120, 150220, 150320, 150420, 150520, 150620, 150720, 170120, 170220, 170320, 170420, 170520, 170620, 170720, 170820, 170920, 230120, 230220, 230320, 250120, 250220, 250320, 250420, 250520, 250620, 250720, 250820, 250920, 251020];
-	const UserSumNPCs = [12345, 1100100, 1100101, 1023000, 1023001, 1023002, 1023003, 1023004, 1023005, 1023006, 1023007, 1023008, 1023009, 1023010, 1023011, 1023012, 1023013, 1023014, 1023200, 1023201, 1023202, 1023203, 1023204, 1023205, 1023206, 1023207, 1023208, 1023209, 1023210, 1023211, 1023300, 1023301, 1023302, 1023303, 1023304, 1023305, 1023306, 1023307, 1023308, 1023309, 1023310, 1023311, 1023312, 1023400, 1023401, 1023402, 1023403, 1023404, 1023405, 1024000, 1024001, 1024100, 1024200, 1024300, 2100100, 2100101, 10235001, 10235002, 10235003, 10235004, 10235005, 10235006, 10235007, 10235008, 10235009, 10235010, 10235011, 10235012, 10235013, 10235014, 10235015, 10235016, 10235017, 10235100, 10236001, 10236002, 10236003, 10236004, 10236005, 10236006, 10236007, 10236008, 10236009, 10236010, 10236011, 10236012, 10236013, 10236014, 10236015, 10236100, 10237001, 10237002, 10237003, 10237004, 10237005, 10237006, 10237007, 10237008, 10237009, 10237010, 10237011, 10237012, 10237013, 10237014, 10237015, 10237100, 10238001, 10238002, 10238003, 10238004, 10238005, 10238006, 10238007, 10238008, 10238100, 10239003, 30301001, 30301002, 30301003, 30301004, 30301005, 30302001, 30302002, 30302003, 30302004, 30302005, 30302006, 30302007, 30303001, 30303002, 30303003, 30303004, 30303005, 30303006, 30303007];
+	const UserNPCs = [12345, 1100100, 1100101, 1023000, 1023001, 1023002, 1023003, 1023004, 1023005, 1023006, 1023007, 1023008, 1023009, 1023010, 1023011, 1023012, 1023013, 1023014, 1023200, 1023201, 1023202, 1023203, 1023204, 1023205, 1023206, 1023207, 1023208, 1023209, 1023210, 1023211, 1023300, 1023301, 1023302, 1023303, 1023304, 1023305, 1023306, 1023307, 1023308, 1023309, 1023310, 1023311, 1023312, 1023400, 1023401, 1023402, 1023403, 1023404, 1023405, 1024000, 1024001, 1024100, 1024200, 1024300, 2100100, 2100101, 10235001, 10235002, 10235003, 10235004, 10235005, 10235006, 10235007, 10235008, 10235009, 10235010, 10235011, 10235012, 10235013, 10235014, 10235015, 10235016, 10235017, 10235100, 10236001, 10236002, 10236003, 10236004, 10236005, 10236006, 10236007, 10236008, 10236009, 10236010, 10236011, 10236012, 10236013, 10236014, 10236015, 10236100, 10237001, 10237002, 10237003, 10237004, 10237005, 10237006, 10237007, 10237008, 10237009, 10237010, 10237011, 10237012, 10237013, 10237014, 10237015, 10237100, 10238001, 10238002, 10238003, 10238004, 10238005, 10238006, 10238007, 10238008, 10238100, 10239003, 30301001, 30301002, 30301003, 30301004, 30301005, 30302001, 30302002, 30302003, 30302004, 30302005, 30302006, 30302007, 30303001, 30303002, 30303003, 30303004, 30303005, 30303006, 30303007];
+	const SpamAchievementIds = [51, 377, 391, 466, 467, 468, 469, 470, 471, 472, 473, 476, 611, 1408, 1744, 1745, 1769, 1770, 1771, 1942, 1943, 1952, 1992, 2032, 2033, 2036, 2037, 2038, 2057, 2062, 2071, 2078, 2081, 2082, 2083, 2084, 2088, 2089, 2095, 6005, 9817, 28723, 28724, 28725, 28726, 28727, 28728, 28729, 28730, 28731, 28732, 28733, 28734, 28735, 28736, 510005, 510012, 510019, 510026, 510027, 510033, 510034, 510035, 510036, 510037, 510038, 510039, 510040, 510041, 520029, 520030, 520032, 520033, 520034, 520035, 520048, 520049, 520050, 520051, 525000, 525001, 525002, 525003, 525004, 525005, 525006, 525007, 525008, 525009, 525010, 525011, 525012, 525013, 525014, 525015, 525016, 525017, 525018, 525019, 525020, 525021, 525022, 525023, 525024, 525025, 5010000];
+	const ImportantAbns = [
+		// Bahaar
+		90440009,	// Hammer stun
+
+		90442106,	// Endurance debuff at placement(hit) of meteor
+
+		90442110,	// Circle before meteor #1 (Wrath bg0)
+		90442111,	// Circle before meteor #2 (Wrath bg17)
+		90442112,	// Circle before meteor #3 (Wrath bg79)
+		90442113,	// Circle before meteor #4 (Wrath bg52)
+		90442114,	// Circle before meteor #5 (Wrath bg12)
+
+		90442400,	// 0     degree arrow & circle
+		90442401,	// 45    degree arrow & circle
+		90442402,	// 90    degree arrow & circle
+		90442403,	// 135   degree arrow & circle
+		90442404,	// 180   degree arrow & circle
+		90442405,	// 225   degree arrow & circle
+		90442406,	// 270   degree arrow & circle
+		90442407,	// 315   degree arrow & circle
+		90442408,	// 360   degree arrow & circle
+
+		90442502	// Laser mark
+	]
 
 	let MyGameId,
 		MyName,
 		MyPlayerId,
 		SwitchCd,
+		FirstAchUpdates,
 		LastState,
 		LastVrange,
 		ProjDebug,
@@ -22,8 +48,7 @@ module.exports = function FpsUtils(mod) {
 		SUsers = {},
 		HUsers = {},
 		SNpcs = {},
-		HNpcs = {},
-		OldChan = { z: 0, c: 0, t: 0 };
+		HNpcs = {};
 
 	// ~~~ * Gui Parser * ~~~ \\
 
@@ -35,7 +60,7 @@ module.exports = function FpsUtils(mod) {
 		mod.hook('C_CONFIRM_UPDATE_NOTIFICATION', 'raw', () => false)
 
 		mod.hook('C_ADMIN', 1, (event) => {
-			let Xd = event.command.split(";")
+			const Xd = event.command.split(";")
 			Xd.forEach(cmd => mod.command.exec(cmd))
 			return false
 		})
@@ -65,8 +90,7 @@ module.exports = function FpsUtils(mod) {
 
 	function GuiHandler(page, arg) {
 		switch (page) {
-			case "searchnpc":
-			case "npcsearch":
+			case "searchnpc": case "npcsearch":
 				NpcJsonSearch(arg, NpcData, "search", `<font color="${LBlC}" size="+16">Search results for '${arg}'</font>.`)
 				break;
 			case "npc":
@@ -205,8 +229,7 @@ module.exports = function FpsUtils(mod) {
 			case "help":
 				gui.parse([
 					{ text: `<font color="${PrpC}" size="+24"><p align="right">MAIN MENU</p></font><br>`, command: "fps gui" },
-					{ text: `<font size="20">` },
-					{ text: `<font color="${LBlC}">Command</font>            <font color="${SlvC}">Arg(s)</font>                 <font color="${CPKC}">Example</font><br>` },
+					{ text: `<font size="20"><font color="${LBlC}">Command</font>            <font color="${SlvC}">Arg(s)</font>                 <font color="${CPKC}">Example</font><br>` },
 					{ text: `<font color="${HBlC}">gui ^ g</font>                      <font color="${DBlC}">N/A</font>                    <font color="${HPkC}">!fps gui</font><br>` },
 					{ text: `<font color="${HBlC}">  N/A</font>                         <font color="${DBlC}">N/A</font>                    <font color="${HPkC}">!fps-util</font><br>` },
 					{ text: `<font color="${HBlC}">0 ^ 1 ^ 2 ^ 3</font>             <font color="${DBlC}">N/A</font>                    <font color="${HPkC}">!0 ^ !1 ^ !2 ^ !3</font><br>` },
@@ -229,68 +252,83 @@ module.exports = function FpsUtils(mod) {
 					{ text: `<font color="${HBlC}">dropitem</font>                 <font color="${DBlC}">N/A ^ hide</font>        <font color="${HPkC}">!fps dropitem</font><br>` },
 					{ text: `<font color="${HBlC}">monsterdeathani</font>   <font color="${DBlC}">N/A</font>                    <font color="${HPkC}">!fps monsterdeathani</font><br>` },
 					{ text: `<font color="${HBlC}">screenabns</font>             <font color="${DBlC}">N/A ^  hide</font>      <font color="${HPkC}">!fps screenabns</font><br>` },
-					{ text: `<font color="${HBlC}">fish ^ fishing</font>           <font color="${DBlC}">N/A</font>                    <font color="${HPkC}">!fps fishing</font>` },
-					{ text: `</font>` }
+					{ text: `<font color="${HBlC}">hpnumbers</font>                <font color="${DBlC}">N/A</font>                    <font color="${HPkC}">!fps hpnumbers</font><br>` },
+					{ text: `<font color="${HBlC}">mpnumbers</font>                <font color="${DBlC}">N/A</font>                    <font color="${HPkC}">!fps mpnumbers</font></font>` }
 				], `<font color="${LPrC}">[FPS] HELP</font>`)
 				break;
 			default:
 				gui.parse([
 					{ text: `<font color="${PrpC}" size="+24"><p align="right">REFRESH</p></font><br>`, command: "fps gui" },
 					{ text: `<font color="${YlwC}" size="+21">Modes:</font>` }, { text: "&#09;&#09;" },
-					{ text: `<font color="${mod.settings.Mode === 0 ? GrnC : RedC}" size="+18">[Mode 0]</font>`, command: "fps mode 0;fps gui" }, { text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.Mode === 1 ? GrnC : RedC}" size="+18">[Mode 1]</font>`, command: "fps mode 1;fps gui" }, { text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.Mode === 2 ? GrnC : RedC}" size="+18">[Mode 2]</font>`, command: "fps mode 2;fps gui" }, { text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.Mode === 3 ? GrnC : RedC}" size="+18">[Mode 3]</font>`, command: "fps mode 3;fps gui" }, { text: "&nbsp;&nbsp;&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.Fishing ? GrnC : RedC}" size="+18">[Fishing]</font><br><br>`, command: "fps fishing;fps gui" },
+					{ text: `<font color="${mod.settings.Mode === 0 ? GrnC : RedC}" size="+18">[Mode 0]</font>`, command: "fps mode 0;fps gui" }, { text: "&nbsp;&nbsp;&nbsp;" },
+					{ text: `<font color="${mod.settings.Mode === 1 ? GrnC : RedC}" size="+18">[Mode 1]</font>`, command: "fps mode 1;fps gui" }, { text: "&nbsp;&nbsp;&nbsp;" },
+					{ text: `<font color="${mod.settings.Mode === 2 ? GrnC : RedC}" size="+18">[Mode 2]</font>`, command: "fps mode 2;fps gui" }, { text: "&nbsp;&nbsp;&nbsp;" },
+					{ text: `<font color="${mod.settings.Mode === 3 ? GrnC : RedC}" size="+18">[Mode 3]</font><br><br>`, command: "fps mode 3;fps gui" },
+
 					{ text: `<font color="${YlwC}" size="+21">Hit:</font>` }, { text: "&#09;&#09;&#09;" },
 					{ text: `<font color="${mod.settings.Hit_Other ? GrnC : RedC}" size="+18">[Players]</font>`, command: "fps hit other;fps gui" }, { text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${mod.settings.Hit_Me ? GrnC : RedC}" size="+18">[Own]</font>`, command: "fps hit me;fps gui" }, { text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${mod.settings.Hit_Damage ? GrnC : RedC}" size="+18">[Dmg/heal numbers]</font>`, command: "fps hit damage;fps gui" }, { text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${mod.settings.Hit_All ? GrnC : RedC}" size="+18">[ALL]</font><br><br>`, command: "fps hit all;fps gui" },
+
 					{ text: `<font color="${YlwC}" size="+21">Hide:</font>` }, { text: "&#09;&#09;" },
-					{ text: `<font color="${mod.settings.HideOthersSummons ? GrnC : RedC}" size="+17">[Players summons]</font>`, command: "fps summons;fps gui" }, { text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.HideMySummons ? GrnC : RedC}" size="+17">[Own summons]</font>`, command: "fps summons me;fps gui" }, { text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.HideFireworks ? GrnC : RedC}" size="+17">[Fireworks]</font><br>`, command: "fps fireworks;fps gui" }, { text: "&#09;&#09;&#09;" },
-					{ text: `<font color="${mod.settings.ShowStyle ? GrnC : RedC}" size="+17">[Style]</font>`, command: "fps style;fps gui" }, { text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.Hideguildlogos ? GrnC : RedC}" size="+17">[Guild Logos]</font>`, command: "fps guildlogo;fps gui" }, { text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.HideBlacklistedDrop ? GrnC : RedC}" size="+17">[Drops]</font>`, command: "fps dropitem;fps gui" }, { text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.HideOwnBlacklistedAbns ? GrnC : RedC}" size="+17">[Dizziness]</font>`, command: "fps screenabns;fps gui" }, { text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.HideHpMpNumbers ? GrnC : RedC}" size="+17">[HpMp Nums]</font><br>`, command: "fps hpmpnumbers;fps gui" }, { text: "&#09;&#09;&#09;" },
-					{ text: `<font color="${mod.settings.HideAllAbnormalities ? GrnC : RedC}" size="+16">[All Abnormals]</font>`, command: "fps abn all;fps gui" }, { text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.HideBlacklistedAbnormalities ? GrnC : RedC}" size="+16">[Abnormals BList]</font>`, command: "fps abn blacklist;fps gui" }, { text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.HideAllProjectiles ? GrnC : RedC}" size="+16">[All Projs]</font>`, command: "fps proj all;fps gui" }, { text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.HideBlacklistedProjectiles ? GrnC : RedC}" size="+16">[Projs BList]</font><br>`, command: "fps proj blacklist;fps gui" }, { text: "&#09;&#09;&#09;" },
-					{ text: `<font color="${mod.settings.HideMonsterDeathAnimation ? GrnC : RedC}" size="+16">[NPCs Death Ani]</font>`, command: "fps monsterdeathani;fps gui" }, { text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.ActionScripts ? GrnC : RedC}" size="+16">[NPCs Zoom-in]</font>`, command: "fps npczoom;fps gui" }, { text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.HideBlacklistedNpcs ? GrnC : RedC}" size="+16">[NPCs BList]</font>`, command: "fps npc;fps gui" }, { text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.HideBlacklistedSkills ? GrnC : RedC}" size="+16">[Skills BList]</font><br><br>`, command: "fps skill blacklist;fps gui" },
+					{ text: `<font color="${LBlC}" size="+18">[Classes/Roles]</font>`, command: "fps gui role" }, { text: "&nbsp;&nbsp;&nbsp;" },
+					{ text: `<font color="${mod.settings.ShowStyle ? GrnC : RedC}" size="+18">[Style]</font>`, command: "fps style;fps gui" }, { text: "&nbsp;&nbsp;" },
+					{ text: `<font color="${mod.settings.Hideguildlogos ? GrnC : RedC}" size="+18">[Guild Logos]</font>`, command: "fps guildlogo;fps gui" }, { text: "&nbsp;&nbsp;" },
+					{ text: `<font color="${mod.settings.HideFireworks ? GrnC : RedC}" size="+18">[Fireworks]</font><br><br>`, command: "fps fireworks;fps gui" },
+
+					{ text: `<font color="${YlwC}" size="+21">Self(own):</font>` }, { text: "&#09;" },
+					{ text: `<font color="${mod.settings.HideHpNumbers ? GrnC : RedC}" size="+18">[HP Nums]</font>`, command: "fps hpnumbers;fps gui" }, { text: "&nbsp;&nbsp;&nbsp;" },
+					{ text: `<font color="${mod.settings.HideMpNumbers ? GrnC : RedC}" size="+18">[MP Nums]</font>`, command: "fps mpnumbers;fps gui" }, { text: "&nbsp;&nbsp;&nbsp;" },
+					{ text: `<font color="${mod.settings.HideMySummons ? GrnC : RedC}" size="+18">[Own summons]</font>`, command: "fps summons me;fps gui" }, { text: "&nbsp;&nbsp;&nbsp;" },
+					{ text: `<font color="${mod.settings.HideOwnBlacklistedAbns ? GrnC : RedC}" size="+18">[Blur/dizzy]</font><br>`, command: "fps screenabns;fps gui" },
+
 					{ text: `<font color="${YlwC}" size="+21">Players:</font>` }, { text: "&#09;" },
+					{ text: `<font color="${LBlC}" size="+18">[Spawned list]</font>`, command: "fps gui show" }, { text: "&nbsp;&nbsp;&nbsp;&nbsp;" },
 					{ text: `<font color="${LBlC}" size="+18">[Hidden list]</font>`, command: "fps gui hide" }, { text: "&nbsp;&nbsp;&nbsp;&nbsp;" },
-					{ text: `<font color="${LBlC}" size="+18">[Shown list]</font><br><br>`, command: "fps gui show" },
+					{ text: `<font color="${mod.settings.HideOthersSummons ? GrnC : RedC}" size="+18">[Players summons]</font><br>`, command: "fps summons;fps gui" },
+
+					{ text: `<font color="${YlwC}" size="+21">NPCs:</font>` }, { text: "&#09;&#09;" },
+					{ text: `<font color="${LBlC}" size="+18">[Menu]</font>`, command: "fps gui npcMain" }, { text: "&nbsp;&nbsp;" },
+					{ text: `<font color="${mod.settings.HideMonsterDeathAnimation ? GrnC : RedC}" size="+18">[Hide Death Ani]</font>`, command: "fps monsterdeathani;fps gui" }, { text: "&nbsp;&nbsp;" },
+					{ text: `<font color="${mod.settings.ActionScripts ? GrnC : RedC}" size="+18">[Zoom-ins]</font>`, command: "fps npczoom;fps gui" }, { text: "&nbsp;&nbsp;" },
+					{ text: `<font color="${mod.settings.HideBlacklistedNpcs ? GrnC : RedC}" size="+18">[Hide Blacklisted]</font><br><br>`, command: "fps npc;fps gui" },
+
+					{ text: `<font color="${YlwC}" size="+21">Skills:</font>` }, { text: "&#09;&#09;" },
+					{ text: `<font color="${LBlC}" size="+18">[Hide individually]</font>`, command: "fps gui skills" }, { text: "&nbsp;&nbsp;&nbsp;" },
+					{ text: `<font color="${mod.settings.HideBlacklistedSkills ? GrnC : RedC}" size="+18">[Hide Blacklisted]</font><br>`, command: "fps skill blacklist;fps gui" },
+
+					{ text: `<font color="${YlwC}" size="+21">Abnormal:</font>` }, { text: "&#09;" },
+					{ text: `<font color="${mod.settings.HideAllAbnormalities ? GrnC : RedC}" size="+18">[Hide ALL]</font>`, command: "fps abn all;fps gui" }, { text: "&nbsp;&nbsp;&nbsp;" },
+					{ text: `<font color="${mod.settings.HideBlacklistedAbnormalities ? GrnC : RedC}" size="+18">[Hide Blacklisted]</font>`, command: "fps abn blacklist;fps gui" }, { text: "&nbsp;&nbsp;&nbsp;" },
+					{ text: `<font color="${LBlC}" size="+18">[Black List]</font><br>`, command: "fps gui abn" },
+
+					{ text: `<font color="${YlwC}" size="+21">Projectile:</font>` }, { text: "&#09;" },
+					{ text: `<font color="${mod.settings.HideAllProjectiles ? GrnC : RedC}" size="+18">[Hide ALL]</font>`, command: "fps proj all;fps gui" }, { text: "&nbsp;&nbsp;&nbsp;" },
+					{ text: `<font color="${mod.settings.HideBlacklistedProjectiles ? GrnC : RedC}" size="+18">[Hide Blacklisted]</font>`, command: "fps proj blacklist;fps gui" }, { text: "&nbsp;&nbsp;&nbsp;" },
+					{ text: `<font color="${LBlC}" size="+18">[Black List]</font><br><br>`, command: "fps gui proj" },
+
 					{ text: `<font color="${YlwC}" size="+21">Misc.</font>` }, { text: "&#09;&#09;" },
-					{ text: `<font color="${LBlC}" size="+17">[Classes/Roles]</font>`, command: "fps gui role" }, { text: "&nbsp;&nbsp;&nbsp;" },
-					{ text: `<font color="${LBlC}" size="+17">[Skills]</font>`, command: "fps gui skills" }, { text: "&nbsp;&nbsp;&nbsp;" },
-					{ text: `<font color="${LBlC}" size="+17">[NPCs]</font>`, command: "fps gui npcMain" }, { text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${LBlC}" size="+17">[Abnormals]</font><br>`, command: "fps gui abn" }, { text: "&#09;&#09;&#09;" },
-					{ text: `<font color="${LBlC}" size="+17">[Projectiles]</font>`, command: "fps gui proj" }, { text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.RaidAutoChange ? GrnC : RedC}" size="+16">[Raid auto state]</font>`, command: "fps raid;fps gui" }, { text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.OnlyParty ? GrnC : RedC}" size="+16">[Only Party]</font>`, command: "fps party;fps gui" }, { text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.PvpTraps ? GrnC : RedC}" size="+16">[PvpTraps]</font><br><br><br><br>`, command: "fps pvptraps;fps gui" },
+					{ text: `<font color="${mod.settings.RaidAutoChange ? GrnC : RedC}" size="+18">[Raid auto state]</font>`, command: "fps raid;fps gui" }, { text: "&nbsp;&nbsp;" },
+					{ text: `<font color="${mod.settings.OnlyParty ? GrnC : RedC}" size="+18">[Only Party]</font>`, command: "fps party;fps gui" }, { text: "&nbsp;&nbsp;" },
+					{ text: `<font color="${mod.settings.HideBlacklistedDrop ? GrnC : RedC}" size="+18">[Drops BList]</font>`, command: "fps dropitem;fps gui" }, { text: "&nbsp;&nbsp;" },
+					{ text: `<font color="${mod.settings.PvpTraps ? GrnC : RedC}" size="+17">[Show Traps]</font><br><br><br><br>`, command: "fps pvptraps;fps gui" },
+
 					{ text: `<font color="${BluC}" size="+22">Quick Links:</font><br>` },
-					{ text: `<font color="${DBlC}" size="+21">UI:</font>` }, { text: "&#09;&#09;" },
+					{ text: `<font color="${YlwC}" size="+21">UI:</font>` }, { text: "&#09;&#09;" },
 					{ text: `<font color="${PrpC}" size="+17">[Mail]</font>`, command: "fps quicklink parcel" }, { text: "&nbsp;&nbsp;&nbsp;" },
 					{ text: `<font color="${PrpC}" size="+17">[Broker]</font>`, command: "fps quicklink broker" }, { text: "&nbsp;&nbsp;&nbsp;" },
 					{ text: `<font color="${PrpC}" size="+17">[Talent]</font>`, command: "fps quicklink talents" }, { text: "&nbsp;&nbsp;&nbsp;" },
 					{ text: `<font color="${PrpC}" size="+17">[Dress]</font>`, command: "fps quicklink dressingroom" }, { text: "&nbsp;&nbsp;&nbsp;" },
 					{ text: `<font color="${PrpC}" size="+17">[Hat Style]</font>`, command: "fps quicklink hatrestyle" }, { text: "&nbsp;&nbsp;&nbsp;" },
 					{ text: `<font color="${PrpC}" size="+17">[Search-Engine]</font><br>`, command: "fps quicklink searchengine" },
-					{ text: `<font color="${DBlC}" size="+21">Group:</font>` }, { text: "&#09;" },
-					{ text: `<font color="${OngC}" size="+17">[Reset]</font>`, command: "fps quicklink reset" }, { text: "&nbsp;&nbsp;&nbsp;&nbsp;" },
-					{ text: `<font color="${CPKC}" size="+17">[Leave]</font>`, command: "fps quicklink drop" }, { text: "&nbsp;&nbsp;&nbsp;" },
-					{ text: `<font color="${CPKC}" size="+17">[Disband]</font><br>`, command: "fps quicklink disband" },
-					{ text: `<font color="${DBlC}" size="+21">Extra:</font>` }, { text: "&#09;" },
-					{ text: `<font color="${CPKC}" size="+17">[Lobby]</font>`, command: "fps quicklink lobby" }, { text: "&#09;&#09;&#09;&#09;&#09;&#09;&nbsp;" },
-					{ text: `<font color="${HPkC}" size="+17">[!! Instant Exit]</font><br>`, command: "fps quicklink instantexit" }
+					{ text: `<font color="${YlwC}" size="+21">Group:</font>` }, { text: "&#09;" },
+					{ text: `<font color="${OngC}" size="+18">[Reset]</font>`, command: "fps quicklink reset" }, { text: "&nbsp;&nbsp;&nbsp;&nbsp;" },
+					{ text: `<font color="${CPKC}" size="+18">[Leave]</font>`, command: "fps quicklink drop" }, { text: "&nbsp;&nbsp;&nbsp;&nbsp;" },
+					{ text: `<font color="${CPKC}" size="+18">[Disband]</font><br>`, command: "fps quicklink disband" },
+					{ text: `<font color="${YlwC}" size="+21">Extra:</font>` }, { text: "&#09;" },
+					{ text: `<font color="${CPKC}" size="+18">[Lobby]</font>`, command: "fps quicklink lobby" }, { text: "&#09;&#09;&#09;&#09;&#09;&#09;&nbsp;" },
+					{ text: `<font color="${HPkC}" size="+18">[!! Instant Exit]</font><br>`, command: "fps quicklink instantexit" }
 				], `<font color="${LPrC}">[FPS] Options</font> | <font color="${RedC}" size="+16">Red</font><font color="${LPrC}" size="+16"> = disabled, <font color="${GrnC}" size="+16">Green</font><font color="${LPrC}" size="+16"> = enabled</font>`)
 		}
 	}
@@ -329,7 +367,7 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function ClassNameFromID(name) {
-		for (let Class_data of Object.keys(mod.settings.ClassesData)) {
+		for (const Class_data of Object.keys(mod.settings.ClassesData)) {
 			if (mod.settings.ClassesData[Class_data].name == name) return Class_data;
 		}
 	}
@@ -404,7 +442,7 @@ module.exports = function FpsUtils(mod) {
 		switch (type) {
 			case 'own':
 				for (let k in SNpcs) {
-					if (EqGid(SNpcs[k].owner) && UserSumNPCs.includes(SNpcs[k].templateId) && SNpcs[k].huntingZoneId === 1023) {
+					if (EqGid(SNpcs[k].owner) && UserNPCs.includes(SNpcs[k].templateId) && SNpcs[k].huntingZoneId === 1023) {
 						mod.toClient('S_DESPAWN_NPC', 3, { gameId: SNpcs[k].gameId, loc: SNpcs[k].loc, type: 1, unk: 0 })
 						HNpcs[SNpcs[k].gameId] = SNpcs[k];
 					}
@@ -412,7 +450,7 @@ module.exports = function FpsUtils(mod) {
 				break;
 			case 'others':
 				for (let k in SNpcs) {
-					if (!EqGid(SNpcs[k].owner) && UserSumNPCs.includes(SNpcs[k].templateId) && SNpcs[k].huntingZoneId === 1023) {
+					if (!EqGid(SNpcs[k].owner) && UserNPCs.includes(SNpcs[k].templateId) && SNpcs[k].huntingZoneId === 1023) {
 						mod.toClient('S_DESPAWN_NPC', 3, { gameId: SNpcs[k].gameId, loc: SNpcs[k].loc, type: 1, unk: 0 })
 						HNpcs[SNpcs[k].gameId] = SNpcs[k];
 					}
@@ -428,14 +466,6 @@ module.exports = function FpsUtils(mod) {
 					}
 				}
 				break;
-			case 'fish':
-				for (let k in SNpcs) {
-					if (FishingNpcs[SNpcs[k].huntingZoneId] && FishingNpcs[SNpcs[k].huntingZoneId].includes(SNpcs[k].templateId)) {
-						mod.toClient('S_DESPAWN_NPC', 3, { gameId: SNpcs[k].gameId, loc: SNpcs[k].loc, type: 1, unk: 0 })
-						HNpcs[SNpcs[k].gameId] = SNpcs[k];
-					}
-				}
-				break;
 			default: break;
 		}
 	}
@@ -444,7 +474,7 @@ module.exports = function FpsUtils(mod) {
 		switch (type) {
 			case 'own':
 				for (let v in HNpcs) {
-					if (EqGid(HNpcs[v].owner) && UserSumNPCs.includes(HNpcs[v].templateId) && HNpcs[v].huntingZoneId === 1023) {
+					if (EqGid(HNpcs[v].owner) && UserNPCs.includes(HNpcs[v].templateId) && HNpcs[v].huntingZoneId === 1023) {
 						mod.toClient('S_SPAWN_NPC', 11, HNpcs[v]);
 						delete HNpcs[v];
 					}
@@ -452,7 +482,7 @@ module.exports = function FpsUtils(mod) {
 				break;
 			case 'others':
 				for (let v in HNpcs) {
-					if (!EqGid(HNpcs[v].owner) && UserSumNPCs.includes(HNpcs[v].templateId) && HNpcs[v].huntingZoneId === 1023) {
+					if (!EqGid(HNpcs[v].owner) && UserNPCs.includes(HNpcs[v].templateId) && HNpcs[v].huntingZoneId === 1023) {
 						mod.toClient('S_SPAWN_NPC', 11, HNpcs[v]);
 						delete HNpcs[v];
 					}
@@ -468,14 +498,6 @@ module.exports = function FpsUtils(mod) {
 					}
 				}
 				break;
-			case 'fish':
-				for (let v in HNpcs) {
-					if (FishingNpcs[HNpcs[v].huntingZoneId] && FishingNpcs[HNpcs[v].huntingZoneId].includes(HNpcs[v].templateId)) {
-						mod.toClient('S_SPAWN_NPC', 11, HNpcs[v]);
-						delete HNpcs[v];
-					}
-				}
-				break;
 			default: break;
 		}
 	}
@@ -535,7 +557,7 @@ module.exports = function FpsUtils(mod) {
 			modified = true;
 		}
 
-		if (mod.settings.Hit_Damage && (EqGid(event.source) || EqGid(event.owner) || UserSumNPCs.includes(event.templateId) && event.skill.huntingZoneId === 1023)) {
+		if (mod.settings.Hit_Damage && (EqGid(event.source) || EqGid(event.owner) || UserNPCs.includes(event.templateId) && event.skill.huntingZoneId === 1023)) {
 			event.id = event.damage = event.type = event.noctEffect = event.reaction.id = 0;
 			event.crit = event.stackExplode = event.blocked = false;
 
@@ -570,10 +592,8 @@ module.exports = function FpsUtils(mod) {
 			}
 		}
 
-		if (mod.settings.Fishing && FishingNpcs[event.huntingZoneId] && FishingNpcs[event.huntingZoneId].includes(event.templateId)) {
+		if (InvisibleNpcs[event.huntingZoneId] && InvisibleNpcs[event.huntingZoneId].includes(event.templateId)) {
 			HNpcs[event.gameId] = event;
-			HNpcs[event.gameId].spawnType = 1;
-			HNpcs[event.gameId].spawnScript = 0;
 			blocked = true;
 		}
 
@@ -582,7 +602,7 @@ module.exports = function FpsUtils(mod) {
 			blocked = true;
 		}
 
-		if (UserSumNPCs.includes(event.templateId) && event.huntingZoneId === 1023) {
+		if (UserNPCs.includes(event.templateId) && event.huntingZoneId === 1023) {
 			if (EqGid(event.owner) && mod.settings.HideMySummons) {
 				HNpcs[event.gameId] = event;
 				HNpcs[event.gameId].spawnType = 1;
@@ -608,19 +628,20 @@ module.exports = function FpsUtils(mod) {
 		console.log(`[\x1b[37m${new Date().toJSON().slice(11)}\x1b[39m] \x1b[91m->\x1b[39m \x1b[36m${name}\x1b[39m \x1b[35m${type}\x1b[39m \x1b[97m${from}\x1b[39m \x1b[32m'${target}'\x1b[39m: \x1b[94m\ID\x1b[39m "\x1b[31m${id}\x1b[39m\x1b[49m\x1b[0m"`);
 	}
 
-	function UpdateLoc(event) {
+	function UpdateUserLoc(event) {
 		mod.toClient('S_USER_LOCATION', 5, { gameId: event.gameId, loc: event.loc, dest: event.loc, w: event.w, speed: 300, type: 7 });
 	}
 
 	// ~~~* Hook functions * ~~~ \\
 
 	function sLogin(event) {
-		LastState = event.name === MyName ? LastState : null
+		LastState = event.name === MyName ? LastState : null;
 		MyGameId = event.gameId;
 		MyName = event.name;
 		MyPlayerId = event.playerId;
 		ProjDebug = false;
 		AbnDebug = false;
+		FirstAchUpdates = 2;
 	}
 
 	function sLoadTopo() {
@@ -628,6 +649,7 @@ module.exports = function FpsUtils(mod) {
 		SNpcs = {};
 		HUsers = {};
 		HNpcs = {};
+		FirstAchUpdates = 1;
 		if (ProjDebug) {
 			ProjDebug = false
 			Msg(`<font color="${HPkC}">Auto Disabled</font> projectile debug, to reduce the unneeded spam.`)
@@ -677,9 +699,9 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function sPcBangInventory(event) {
-		for (let item of event.inventory)
-			if ([152898, 184659, 201005, 201006, 201007, 201008, 201022, 855604].includes(item.item)) {
-				item.cooldown = 0;
+		for (const Item of event.inventory)
+			if ([152898, 184659, 201005, 201006, 201007, 201008, 201022, 855604].includes(Item.item)) {
+				Item.cooldown = 0;
 				return true;
 			}
 	}
@@ -688,27 +710,9 @@ module.exports = function FpsUtils(mod) {
 		if (mod.settings.Mode >= 2) return false;
 	}
 
-	function sSystemMessage(event) {
-		if (!mod.settings.Fishing) return;
-		const msg = mod.parseSystemMessage(event.message)
-		if (msg.id === 'SMT_FIELD_EVENT_WORLD_ANNOUNCE') return false;			// Superior guardian spam.
-		if (msg.id === 'SMT_KOREAN_RATING_TEENAGER_PROHIBITED') return false;	// You've been playing for X hours spam.
-	}
-
-	/*function sQuestVillagerInfo() {
-		if (mod.settings.Fishing) return false;
-	}*/
-
-	function sUpdateAchievementProgress() {
-		if (mod.settings.Fishing) return false;
-	}
-
-	function sCurrentChannel(event) {
-		if (!mod.settings.Fishing) return;
-		if (event.zone === OldChan.z && event.channel === OldChan.c && event.type === OldChan.t) return false;
-		OldChan.z = event.zone;
-		OldChan.c = event.channel;
-		OldChan.t = event.type;
+	function sUpdateAchievementProgress(event) {
+		if (FirstAchUpdates) { FirstAchUpdates--; return; }
+		for (const Achieve of event.achievements) if (SpamAchievementIds.indexOf(Achieve.id) > -1) return false;
 	}
 
 	function sItemCustomString(event) {
@@ -865,11 +869,11 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function sFearMoveStage(event) {
-		if ((!EqGid(event.target) && mod.settings.Mode >= 2) || HUsers[event.target] || HNpcs[event.target]) return false;
+		if ((!EqGid(event.target) && mod.settings.Mode >= 1) || HUsers[event.target] || HNpcs[event.target]) return false;
 	}
 
 	function sFearMoveEnd(event) {
-		if ((!EqGid(event.target) && mod.settings.Mode >= 2) || HUsers[event.target] || HNpcs[event.target]) return false;
+		if ((!EqGid(event.target) && mod.settings.Mode >= 1) || HUsers[event.target] || HNpcs[event.target]) return false;
 	}
 
 	function sAbnormalityBegin(event) {
@@ -879,23 +883,25 @@ module.exports = function FpsUtils(mod) {
 			if (SUsers[event.target]) log('Abnormality', 'Applied', 'on', SUsers[event.target].name, event.id)
 			if (SUsers[event.source]) log('Abnormality', 'Started', 'from', SUsers[event.source].name, event.id)
 		}
+		if (ImportantAbns.includes(event.id)) return;
 		if (EqGid(event.target)) {
 			if (mod.settings.HideOwnBlacklistedAbns && mod.settings.OwnAbnormalsBlacklist.includes(event.id)) return false;
 			return;
 		}
 		if (HUsers[event.target] || HNpcs[event.target]) return false;
-		if (mod.settings.Fishing && event.id === 9943049) return false;
+		if (event.id === 9943049) return false;
 		if (mod.settings.HideBlacklistedAbnormalities && mod.settings.AbnormalitiesBlacklist.includes(event.id)) return false;
 		if (mod.settings.HideAllAbnormalities && (SUsers[event.target] || SUsers[event.source] || mod.settings.AbnormalitiesBlacklist.includes(event.id))) return false;
 	}
 
 	function sAbnormalityRefresh(event) {
+		if (ImportantAbns.includes(event.id)) return;
 		if (HUsers[event.target] || HNpcs[event.target]) return false;
 		if ((mod.settings.HideBlacklistedAbnormalities || mod.settings.HideAllAbnormalities) && (SUsers[[10306, 10316, 12001, 12003, 22040, 12120, 12130].includes(event.target)] || SUsers[[10306, 10316, 12001, 12003, 22040, 12120, 12130].includes(event.source)])) return false;
 	}
 
 	function sAbnormalityEnd(event) {
-		if (mod.settings.Fishing && event.id === 9943049) return false;
+		if (event.id === 9943049) return false;
 	}
 
 	function sAbnormalityFail(event) {
@@ -905,7 +911,7 @@ module.exports = function FpsUtils(mod) {
 	function sActionStage(event) {
 		if (EqGid(event.gameId) || !SUsers[event.gameId]) return;
 		if ((mod.settings.Mode >= 2) || HUsers[event.gameId] || (mod.settings.HideBlacklistedSkills && mod.settings.ClassesData[ClassID(event.templateId)].CD_SkillsBlacklist.includes(Math.floor(event.skill.id / 10000).toString())) || mod.settings.ClassesData[ClassID(event.templateId)].CD_HideBlacklistedSkills) {
-			UpdateLoc(event);
+			UpdateUserLoc(event);
 			return false;
 		}
 	}
@@ -917,7 +923,7 @@ module.exports = function FpsUtils(mod) {
 		}
 		if (mod.settings.PvpTraps && PvPProjs.includes(event.skill.id)) return;
 		if ((mod.settings.HideBlacklistedProjectiles || mod.settings.HideAllProjectiles) && mod.settings.ProjectilesBlacklist.includes(event.skill.id)) return false;
-		if (!EqGid(event.gameId) && SUsers[event.gameId] && (HUsers[event.gameId] || mod.settings.Mode > 0 || mod.settings.HideAllProjectiles)) return false;
+		if (!EqGid(event.gameId) && SUsers[event.gameId] && (HUsers[event.gameId] || mod.settings.Mode >= 2 || mod.settings.HideAllProjectiles)) return false;
 	}
 
 	function sSpawnProjectile(event) {
@@ -927,20 +933,20 @@ module.exports = function FpsUtils(mod) {
 		}
 		if (mod.settings.PvpTraps && PvPProjs.includes(event.skill.id)) return;
 		if ((mod.settings.HideBlacklistedProjectiles || mod.settings.HideAllProjectiles) && mod.settings.ProjectilesBlacklist.includes(event.skill.id)) return false;
-		if (!EqGid(event.gameId) && SUsers[event.gameId] && (HUsers[event.gameId] || mod.settings.Mode > 0 || mod.settings.HideAllProjectiles)) return false;
+		if (!EqGid(event.gameId) && SUsers[event.gameId] && (HUsers[event.gameId] || mod.settings.Mode >= 2 || mod.settings.HideAllProjectiles)) return false;
 	}
 
 	function sPlayerChangeMp(event) {
-		if (!mod.settings.HideHpMpNumbers || !EqGid(event.target)) return;
-		if (event.type != 0) {
+		if (!mod.settings.HideMpNumbers || !EqGid(event.target)) return;
+		if (event.type !== 0) {
 			event.type = 0;
 			return true;
 		}
 	}
 
 	function sCreatureChangeHp(event) {
-		if (!mod.settings.HideHpMpNumbers || !EqGid(event.target)) return;
-		if (event.type != 10) {
+		if (!mod.settings.HideHpNumbers || !EqGid(event.target)) return;
+		if (event.type !== 10) {
 			event.type = 10;
 			return true;
 		}
@@ -979,12 +985,9 @@ module.exports = function FpsUtils(mod) {
 	mod.hook('S_START_COOLTIME_ITEM', 1, sStartCooltimeItem)
 	mod.hook('S_START_ACTION_SCRIPT', 3, sStartActionScript)
 	mod.hook('S_PCBANGINVENTORY_DATALIST', 1, sPcBangInventory)
-	mod.hook('S_LOADING_SCREEN_CONTROL_INFO', 'raw', sLoadingScreenControlInfo)
 
-	mod.hook('S_SYSTEM_MESSAGE', 1, sSystemMessage)
-	//mod.hook('S_QUEST_VILLAGER_INFO', 'raw', sQuestVillagerInfo) Currently the opcode for this ain't public, Someday™.
-	mod.hook('S_UPDATE_ACHIEVEMENT_PROGRESS', 'raw', sUpdateAchievementProgress)
-	mod.hook('S_CURRENT_CHANNEL', 2, sCurrentChannel)
+	mod.hook('S_LOADING_SCREEN_CONTROL_INFO', 'raw', sLoadingScreenControlInfo)
+	mod.hook('S_UPDATE_ACHIEVEMENT_PROGRESS', 1, { order: 99999, filter: { fake: null } }, sUpdateAchievementProgress)
 	mod.hook('S_ITEM_CUSTOM_STRING', 2, sItemCustomString)
 
 	mod.hook('S_GUILD_NAME', 1, sGuildName)
@@ -997,7 +1000,7 @@ module.exports = function FpsUtils(mod) {
 	mod.hook('S_USER_LOCATION', 5, sUserLocation)
 	mod.hook('S_USER_STATUS', 3, sUserStatus)
 	mod.hook('S_DEAD_LOCATION', 2, sDeadLocation)
-	mod.hook('S_USER_MOVETYPE', 'raw', sUserMoveType)
+	mod.hook('S_USER_MOVETYPE', 'raw', { order: 110 }, sUserMoveType)	// I found that some public module were force reapplying this? so here's the order for that.
 	mod.hook('S_PARTY_MEMBER_LIST', 7, sPartyMemberList)
 	mod.hook('S_USER_APPEARANCE_CHANGE', 1, { order: 9999 }, sUserAppearanceChange)
 	mod.hook('S_USER_APPEARANCE_CHANGE', 1, { order: 99999, filter: { fake: null } }, sUserAppearanceChangefn)
@@ -1233,7 +1236,6 @@ module.exports = function FpsUtils(mod) {
 						Msg(`Blacklisted NPCs ${mod.settings.HideBlacklistedNpcs ? `<font color="${GrnC}">Hidden</font>` : `<font color="${RedC}">Shown</font>`}.`);
 						break;
 					}
-					if (FishingNpcs[Number(arg2)] && FishingNpcs[Number(arg2)].includes(Number(arg3))) return Msg(`<font color="${RedC}">You can't show or hide blocked fishing npcs by this option, use "<font color="${PnkC}">Fishing</font>" button instead!</font>`);
 					let found = mod.settings.NpcsBlacklist.some(s => s.zone === arg2 && s.templateId === arg3);
 					if (found) {
 						if (mod.settings.HideBlacklistedNpcs) ShowSpecificNpc(Number(arg2), Number(arg3));
@@ -1482,15 +1484,13 @@ module.exports = function FpsUtils(mod) {
 				} else mod.settings.HideOwnBlacklistedAbns = !mod.settings.HideOwnBlacklistedAbns;
 				Msg(`Blacklisted ScreenAbns ${mod.settings.HideOwnBlacklistedAbns ? `<font color="${GrnC}">Hidden</font>` : `<font color="${RedC}">Shown</font>`}.`);
 				break;
-			case "fish":
-			case "fishing":
-				mod.settings.Fishing = !mod.settings.Fishing;
-				Msg(`Fishing mode is ${mod.settings.Fishing ? `<font color="${GrnC}">Enabled</font>` : `<font color="${RedC}">Disabled</font>`}.`);
-				mod.settings.Fishing ? HideNpcs('fish') : ShowNpcs('fish');
+			case "hpnumbers":
+				mod.settings.HideHpNumbers = !mod.settings.HideHpNumbers;
+				Msg(`Own Hp numbers ${mod.settings.HideHpNumbers ? `<font color="${GrnC}">Hidden</font>` : `<font color="${RedC}">Shown</font>`}.`)
 				break;
-			case "hpmpnumbers":
-				mod.settings.HideHpMpNumbers = !mod.settings.HideHpMpNumbers;
-				Msg(`Own HpMp numbers ${mod.settings.HideHpMpNumbers ? `<font color="${GrnC}">Hidden</font>` : `<font color="${RedC}">Shown</font>`}.`)
+			case "mpnumbers":
+				mod.settings.HideMpNumbers = !mod.settings.HideMpNumbers;
+				Msg(`Own Mp numbers ${mod.settings.HideMpNumbers ? `<font color="${GrnC}">Hidden</font>` : `<font color="${RedC}">Shown</font>`}.`)
 				break;
 			case "help":
 				mod.command.exec("fps gui help");

+ 10 - 3
lib/setting_migration.js

@@ -1,9 +1,8 @@
 'use strict'
 
 const DefaultSettings = {
-	_version: 10,
+	_version: 11,
 	Mode: 0,
-	Fishing: false,
 	OnlyParty: false,
 	RaidAutoChange: false,
 	ShowStyle: false,
@@ -16,7 +15,8 @@ const DefaultSettings = {
 	HideFireworks: true,
 	Hideguildlogos: false,
 	HideMonsterDeathAnimation: true,
-	HideHpMpNumbers: false,
+	HideHpNumbers: false,
+	HideMpNumbers: false,
 	HideMySummons: false,
 	HideOthersSummons: false,
 	HideAllAbnormalities: false,
@@ -106,6 +106,13 @@ function MigrateSettings(from_ver, to_ver, settings) {
 				settings._version = 10;
 				settings.HideHpMpNumbers = DefaultSettings.HideHpMpNumbers;
 				break;
+			case 11:
+				settings._version = 11;
+				delete settings.Fishing;
+				settings.HideHpNumbers = DefaultSettings.HideHpNumbers;
+				settings.HideMpNumbers = settings.HideHpMpNumbers;
+				delete settings.HideHpMpNumbers;
+				break;
 			default:
 				console.log(`\x1b[94mINFO\x1b[34m [FPS-UTILS]\x1b[39m - Your \x1b[31m'config.json'(caali's proxy)/'settings/fps-utils.json'(pinkie's proxy)\x1b[39m seems to be mega outdated.\x1b[32m Re-created new one.\x1b[39m\x1b[0m`);
 				Object.keys(settings).forEach(key => delete settings[key]);

+ 5 - 7
manifest.json

@@ -3,10 +3,10 @@
         "README.md": "87158ad01812602aae6b490f754ae30a14765d5369d1fa31e0fac1e0d1be63e2",
         "lib/data/npcData.json": "d3e7b59617ef841447567d69b074aa2dd6958eabb1a231c5821ffa7165daeac6",
         "lib/data/skillString.json": "9d69876fea0be8e6ac5dd43b3fc74ea023f6b8a6145384f8f780dd977045d8ef",
-        "lib/index.js": "c0a3fbae2980db447ce6bf33ff8b11a666ba0d6e1ce7e5322591923ab65bcc4e",
-        "lib/setting_migration.js": "4d6163bcd97785739a1e7e9af800eb3f92dd7bca32824ae148c93fd4dbd16107",
-        "module.json": "58b10fc0f18f3452d3f044a82dc44a9e3809d9ad7840be312b53d7991c991d8b",
-        "package.json": "026fcecb19ecb5825e62a0409be84f5e207a24a1417de147d93d801f1e5758e4"
+        "lib/index.js": "4642a40caf7c226c09e25587f592916fee3ac4ad954fb02ff6e0dab40943773f",
+        "lib/setting_migration.js": "6f9169f0a607b77b4922dee0fdbaaae6dedcc181ccf2af234baf92530a50cf75",
+        "module.json": "53bbd3e486323e381ea9f89fe262c23b1389a54b954fe2fd91c368791cce1b7d",
+        "package.json": "b90a372cfaa137b9cf1835345248c5d6a600b4168faec199792e29d7491af7e1"
     },
     "defs": {
         "C_ADMIN": 1,
@@ -26,7 +26,6 @@
         "S_APPLY_TITLE": 2,
         "S_CREATURE_CHANGE_HP": 6,
         "S_CREATURE_ROTATE": 2,
-        "S_CURRENT_CHANNEL": 2,
         "S_DEAD_LOCATION": 2,
         "S_DESPAWN_NPC": 3,
         "S_DESPAWN_USER": 3,
@@ -56,10 +55,9 @@
         "S_START_ACTION_SCRIPT": 3,
         "S_START_COOLTIME_ITEM": 1,
         "S_START_USER_PROJECTILE": 9,
-        "S_SYSTEM_MESSAGE": 1,
         "S_UNICAST_TRANSFORM_DATA": 5,
         "S_UNMOUNT_VEHICLE": 2,
-        "S_UPDATE_ACHIEVEMENT_PROGRESS": "raw",
+        "S_UPDATE_ACHIEVEMENT_PROGRESS": 1,
         "S_USER_APPEARANCE_CHANGE": 1,
         "S_USER_EXTERNAL_CHANGE": 7,
         "S_USER_LOCATION": 5,

+ 2 - 2
module.json

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

+ 1 - 1
package.json

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