Browse Source

Minor update.

Fixed the coloring of text.
Added fishing mode.
Lets hope... Caali will add my opcode. :alien:
Risenio 8 years ago
parent
commit
91be58b769
6 changed files with 255 additions and 125 deletions
  1. 1 1
      README.md
  2. 232 114
      lib/index.js
  3. 2 1
      lib/setting_migration.js
  4. 15 6
      manifest.json
  5. 4 2
      module.json
  6. 1 1
      package.json

+ 1 - 1
README.md

@@ -1,5 +1,5 @@
 # Fps Utils
-Written for tera-proxy, a free script filled with features dedicated to improve your fps, in the open world, in dungeons and in battlegrounds.
+  Written for tera-proxy, a free script filled with features dedicated to improve your fps, in the open world, in dungeons and in battlegrounds.
 
 ## How to use
   * Put the script folder "fps-utils" into `mods`.

+ 232 - 114
lib/index.js

@@ -1,15 +1,29 @@
 "use strict"
 /* global __dirname */
 
-String.prototype.clr = function (HexClr) { return `<font color='${HexClr}'>${this}</font>` }
-
 module.exports = function FpsUtils(mod) {
 	var notcaaliproxy = mod.proxyAuthor !== 'caali';
 
 	const NpcData = require(`./data/npcData.json`)
 	const SkillData = require(`./data/skillString.json`)
+	const UsersSummonedNPCs = [12345, 1100100, 1100101, 2010100, 2010101, 10235004, 10235005, 10235006, 10235007, 10235008, 10235009, 10235010, 10235011, 10235012, 10235013, 10235014, 10235015, 10235016, 10235017, 10236001, 10236002, 10236003, 10236004, 10236005, 10236006, 10236007, 10236008, 10236009, 10236010, 10236011, 10236012, 10236013, 10236014, 10236015, 10237003, 10237004, 10237005, 10237006, 10237007, 10237008, 10237009, 10237010, 10237011, 10237012, 10237013, 10237014, 10237015, 10237015, 10238001, 10238002, 10238003, 10238004, 10238005, 10238006, 10238007, 10238008, 10238008, 10239003, 30301001, 30301002, 30301003, 30301004, 30302001, 30302002, 30302003, 30302004, 30302005, 30302006, 30302007, 30303001, 30303002, 30303003, 30303004, 30303005, 30303006, 30303007]
 	const BronzeClr = '#BC8F8F', SilverClr = '#9A9A9A', GoldClr = '#DAA520', PinkClr = '#FFB7C5', HPinkClr = '#FF69B4', CPinkClr = '#ED5D92', RedClr = '#FE6F5E', GreenClr = '#4DE19C', LPurpleClr = '#E0B0FF', PurpleClr = '#9966CC', LBlueClr = '#4DDCE1', BlueClr = '#436EEE', DBlueClr = '#00575e', HBlueClr = '#08B3E5', GrayClr = '#778899', YellowClr = '#C0B94D', OrangeClr = '#FFBE5E';
 	const alphabet = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z']
+	const FishingNpcs = {
+		8: [6011], //frog
+		12: [1, 2], //crab, bay kamara(not aggressive type)
+		23: [201, 202], //frog, bee
+		34: [8000], //goat
+		61: [9805, 9901, 9902, 9903, 9904, 9905, 9906, 9907, 9908], //Ostgarath - Vexatus Swamp
+		62: [1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 1020, 1024, 1025, 1026, 1031, 1032, 1033, 1034, 1035, 1038, 1039, 1040, 1041, 1042, 1043, 1501, 1900, 1901, 1902, 1903, 8100, 9001, 9002, 9003, 9004, 9805, 9901, 9902, 9903, 9904, 9905], //Ostgarath - Cutthroat Harbor
+		83: [9805, 9901, 9902, 9903, 9904, 9905], //Westonia - Celsian Lake
+		99: [1180, 1181, 1182, 1183, 1184, 1185], //All invisible ?_? - unknown area.
+		207: [9805, 9901, 9902, 9903, 9904, 9905], //Arcadia - Muricai
+		212: [1034], //Cutthroat followup
+		223: [9805, 9901, 9902, 9903, 9904, 9905, 9906, 9907, 9915, 9925], //Poporia - Lake of Tears
+		230: [1041, 1042, 1043, 1044, 1045, 1046, 1084, 9805, 9901, 9902, 9903, 9904, 9905, 9906], //Veritas District - Seren's Lake
+		362: [1201, 1202, 1301, 1302] //Cutthroat followup
+	}
 
 	let MyGameId,
 		MyName,
@@ -17,21 +31,23 @@ module.exports = function FpsUtils(mod) {
 		ChangeOnCd,
 		LastState,
 		LastVrange,
+		Alerted,
 		TmpData = [],
 		PartyMembers = [],
 		HiddenNpcs = {},
+		SFishingNpcs = {},
+		HFishingNpcs = {},
 		HiddenUsers = {},
-		SpawnedUsers = {}
+		SpawnedUsers = {},
+		oldCurChan = { oldCzone: 0, oldCchannel: 0, oldCtype: 0 }
 
 	if (notcaaliproxy) mod.settings = require('./setting_migration')(mod.settings._version, require('../module').options.settingsVersion, mod.settings)
 
 	// ~~~ * Gui Parser * ~~~ \\
 
-	let Xd,
-		Xdata = '',
-		Xdone = false
-
+	let Xd, Xdata = ''
 	const Xmap = new WeakMap();
+
 	if (!Xmap.has(mod.dispatch || mod)) {
 		Xmap.set(mod.dispatch || mod, {});
 
@@ -56,26 +72,18 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function X1(Xarray) {
-		Xdone = false
 		for (let i = 0; i < Xarray.length; i++) {
-			if (!Xdone) {
-				if (Xarray[i].command) Xshove(`<a href='admincommand:/@${Xarray[i].command}'>${Xarray[i].text}</a>`)
-				else if (!Xarray[i].command) Xshove(`${Xarray[i].text}`)
-				else continue;
-			} else break;
+			if (Xdata.length >= 16000) {
+				Xdata += `Gui data limit exceeded, some values may be missing.`;
+				break;
+			}
+			if (Xarray[i].command) Xdata += `<a href='admincommand:/@${Xarray[i].command}'>${Xarray[i].text}</a>`;
+			else if (!Xarray[i].command) Xdata += `${Xarray[i].text}`;
+			else continue;
 		}
 		return Xdata
 	}
 
-	function Xshove(stuff) {
-		if (Xdata.length >= 16000) {
-			Xdata += `Gui data limit exceeded, some values may be missing.`
-			Xdone = true
-			return
-		}
-		Xdata += stuff
-	}
-
 	// ~~~ * Gui Handler * ~~~ \\
 
 	function GuiHandler(page, arg) {
@@ -84,12 +92,12 @@ module.exports = function FpsUtils(mod) {
 			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>.`)
+				JsonSearch(arg, NpcData, `search`, `<font color="${LBlueClr}" size="+16">Search results for '${arg}'</font>.`)
 				break;
 			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>.`)
+				JsonSearch(arg, NpcData, `starts`, `<font color="${LBlueClr}" size="+16">Search results for '${arg}'</font>.`)
 				break;
 			case "npclist":
 				TmpData = []
@@ -181,7 +189,7 @@ module.exports = function FpsUtils(mod) {
 				], `<font color="${LPurpleClr}">[FPS] Options - Skills </font><font color="${YellowClr}">(Choose class)</font>`)
 				break;
 			case "class":
-				gui.parse(SkillsList(arg), `<font color="${LPurpleClr}">[FPS] Options - Skill list for "${arg}"</font>`)
+				gui.parse(SkillsList(arg), `<font color="${LPurpleClr}">[FPS] Options - Skill list for '${arg}'</font>`)
 				break;
 			case "role":
 				gui.parse([
@@ -280,12 +288,14 @@ module.exports = function FpsUtils(mod) {
 					{ text: `<font color="${PurpleClr}" size="+24"><p align="right">REFRESH</p></font><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;" },
 					{ 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;" },
 					{ 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: `<font color="${mod.settings.Mode === 3 ? GreenClr : RedClr}" size="+18">[Mode 3]</font><br><br>`, command: `fps mode 3;fps gui` },
+					{ text: "&nbsp;&nbsp;" },
+					{ text: `<font color="${mod.settings.Mode === 3 ? GreenClr : RedClr}" size="+18">[Mode 3]</font>`, command: `fps mode 3;fps gui` },
+					{ text: "&nbsp;&nbsp;&nbsp;&nbsp;" },
+					{ text: `<font color="${mod.settings.Fishing ? GreenClr : RedClr}" size="+18">[Fishing]</font><br><br>`, command: `fps fishing;fps gui` },
 					{ text: `<font color="${YellowClr}" size="+21">Hit:</font>&#09;&#09;&#09;` },
 					{ text: `<font color="${mod.settings.Hit_Other ? GreenClr : RedClr}" size="+18">[Players effect]</font>`, command: `fps hit other;fps gui` },
 					{ text: "&nbsp;&nbsp;" },
@@ -396,7 +406,7 @@ module.exports = function FpsUtils(mod) {
 			if (array[i].Name.includes(nameKey) && arg == `search`) TmpData.push({ command: `fps npc hide ${array[i].HuntingZoneId} ${array[i].TemplateId};fps gui npcsearch ${nameKey}`, text: `<font color="${mod.settings.NpcsBlacklist.some(arrVal => array[i].HuntingZoneId == arrVal.zone && array[i].TemplateId == arrVal.templateId) ? GreenClr : RedClr}" size="+17">${array[i].Name} - ${array[i].HuntingZoneId}, ${array[i].TemplateId}</font><br>` })
 			if (!isNaN(arg) && array[i].nameKey == arg) return true;
 		}
-		gui.parse(TmpData, `<font color="${LPurpleClr}">[FPS] Options - NPCs</font> | ` + title)
+		gui.parse(TmpData, `<font color="${LPurpleClr}">[FPS] Options - NPCs</font> |  ${title}`)
 		TmpData = []
 	}
 
@@ -409,7 +419,8 @@ module.exports = function FpsUtils(mod) {
 	// ~~~ * Command Functions * ~~~ \\
 
 	function Msg(msg) {
-		mod.command.message(notcaaliproxy ? `[FPS] ${msg}`.clr(LPurpleClr) : `${msg}`.clr(LPurpleClr))
+		if (notcaaliproxy) mod.command.message(`<font color="${LPurpleClr}">[FPS] ${msg}</font>`)
+		else mod.command.message(`<font color="${LPurpleClr}">${msg}</font>`)
 	}
 
 	function HideSpecificPlayer(name) {
@@ -451,6 +462,13 @@ module.exports = function FpsUtils(mod) {
 		}
 	}
 
+	function HideFishingNpcs() {
+		for (let i in SFishingNpcs) {
+			mod.toClient('S_DESPAWN_NPC', 3, { gameId: SFishingNpcs[i].gameId, loc: SFishingNpcs[i].loc, type: 1, unk: 0 })
+			HFishingNpcs[SFishingNpcs[i].gameId] = SFishingNpcs[i];
+		}
+	}
+
 	function ShowAllPlayers() {
 		for (let i in HiddenUsers) {
 			ModifyAppearance(HiddenUsers[i]);
@@ -459,6 +477,13 @@ module.exports = function FpsUtils(mod) {
 		}
 	}
 
+	function ShowFishingNpcs() {
+		for (let i in HFishingNpcs) {
+			mod.toClient('S_SPAWN_NPC', 10, HFishingNpcs[i]);
+			delete HFishingNpcs[i];
+		}
+	}
+
 	// ~~~ * Functions * ~~~ \\
 
 	function EqGid(xg) {
@@ -522,25 +547,27 @@ module.exports = function FpsUtils(mod) {
 		MyPlayerId = event.playerId;
 		if (mod.settings.ProjDebug) {
 			mod.settings.ProjDebug = false
-			Msg("Detected Projectile debug on, " + "turned off".clr(HPinkClr) + '.')
+			Msg(`<font color="${HPinkClr}">Auto Disabled</font> projectile debug, to reduce the unneeded spam.`)
 		}
 		if (mod.settings.AbnDebug) {
 			mod.settings.AbnDebug = false
-			Msg("Detected Abnormalities debug on, " + "turned off".clr(HPinkClr) + '.')
+			Msg(`<font color="${HPinkClr}">Auto Disabled</font> abnormalities debug, to reduce the unneeded spam.`)
 		}
 	}
 
 	function sLoadTopo() {
 		SpawnedUsers = {};
+		SFishingNpcs = {};
 		HiddenUsers = {};
 		HiddenNpcs = {};
+		HFishingNpcs = {};
 		if (mod.settings.ProjDebug) {
 			mod.settings.ProjDebug = false
-			Msg("Detected Projectile debug on, " + "turned off".clr(HPinkClr) + '.')
+			Msg(`<font color="${HPinkClr}">Auto Disabled</font> projectile debug, to reduce the unneeded spam.`)
 		}
 		if (mod.settings.AbnDebug) {
 			mod.settings.AbnDebug = false
-			Msg("Detected Abnormalities debug on, " + "turned off".clr(HPinkClr) + '.')
+			Msg(`<font color="${HPinkClr}">Auto Disabled</font> abnormalities debug, to reduce the unneeded spam.`)
 		}
 	}
 
@@ -574,7 +601,7 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function sStartCooltimeItem(event) {
-		if (event.cooldown == 0) return false;
+		if (event.cooldown === 0) return false;
 	}
 
 	function sStartActionScript(event) {
@@ -594,6 +621,46 @@ module.exports = function FpsUtils(mod) {
 		if (mod.settings.Mode >= 2) return false;
 	}
 
+	function sSocial(event) {
+		if (!mod.settings.Fishing) return;
+		if ([1, 2, 3, 31, 32, 33].includes(event.animation)) return false;
+	}
+
+	function sSystemMessage(event) {
+		if (!mod.settings.Fishing) return;
+		let SystemMessage = mod.parseSystemMessage(event.message)
+		if (['SMT_KOREAN_RATING_TEENAGER_PROHIBITED', 'SMT_FIELD_EVENT_WORLD_ANNOUNCE'].includes(SystemMessage.id)) return false;
+		if (['SMT_GACHA_REWARD', 'SMT_FISHING_REWARD'].includes(SystemMessage.id) && SystemMessage.tokens.UserName !== MyName) return false;
+	}
+
+	function sPartyMatchLink() {
+		if (mod.settings.Fishing) return false;
+	}
+
+	function sViewPartyInvite() {
+		if (mod.settings.Fishing) return false;
+	}
+
+	/*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 === oldCurChan.zone && event.channel === oldCurChan.channel && event.type === oldCurChan.type) return false;
+		oldCurChan.zone = event.zone;
+		oldCurChan.channel = event.channel;
+		oldCurChan.type = event.type;
+	}
+
+	function sItemCustomString(event) {
+		if (event.customStrings.length === 0) return false;
+	}
+
 	function sGuildName(event) {
 		if (mod.settings.Hideguildlogos) {
 			event.guildEmblem = '';
@@ -653,6 +720,11 @@ module.exports = function FpsUtils(mod) {
 		}
 	}
 
+	/*function sUserAppearanceChange(event) {
+		if (EqGid(event.id)) return;
+		if (mod.settings.ShowStyle) return false;
+	}*/
+
 	function sUserExternalChange(event) {
 		if (EqGid(event.gameId)) return;
 		if (mod.settings.ShowStyle) return false;
@@ -677,7 +749,8 @@ module.exports = function FpsUtils(mod) {
 			}
 		}
 		if (event.huntingZoneId === 1023) {
-			if (mod.settings.HideFireworks && (event.templateId === 60016000 || event.templateId === 80037000)) return false;
+			if (mod.settings.HideFireworks && [60016000, 80037000].includes(event.templateId)) return false;
+			if (!UsersSummonedNPCs.includes(event.id)) return;
 			if (EqGid(event.owner)) {
 				if (!mod.settings.HideMySummons) return;
 				HiddenNpcs[event.gameId] = event;
@@ -687,6 +760,13 @@ module.exports = function FpsUtils(mod) {
 			HiddenNpcs[event.gameId] = event;
 			return false;
 		}
+		if (FishingNpcs[event.huntingZoneId] && FishingNpcs[event.huntingZoneId].includes(event.templateId)) {
+			SFishingNpcs[event.gameId] = event;
+			if (mod.settings.Fishing) {
+				HFishingNpcs[event.gameId] = event;
+				return false;
+			}
+		}
 		if (mod.settings.ShowStyle) {
 			event.repairable = false;
 			return true;
@@ -695,17 +775,24 @@ module.exports = function FpsUtils(mod) {
 
 	function sDespawnNpc(event) {
 		delete HiddenNpcs[event.gameId];
+		delete HFishingNpcs[event.gameId];
+		delete SFishingNpcs[event.gameId];
 		if (!mod.settings.HideMonsterDeathAnimation || event.type !== 5) return;
 		event.type = 1;
 		return true;
 	}
 
+	function sNpcLocation(event) {
+		if (SFishingNpcs[event.gameId] && SFishingNpcs[event.gameId].gameId === event.gameId) SFishingNpcs[event.gameId].loc = event.dest
+		if (HFishingNpcs[event.gameId]) return false; //TODO, make other npcs despawn like fishing ones, so npcs doesn't freeze in their one spot. | HiddenNpcs[event.target] |
+	}
+
 	function sFearMoveStage(event) {
-		if ((!EqGid(event.target) && mod.settings.Mode === 3) || HiddenUsers[event.target] || HiddenNpcs[event.target]) return false;
+		if ((!EqGid(event.target) && mod.settings.Mode >= 2) || HiddenUsers[event.target] || HiddenNpcs[event.target] || HFishingNpcs[event.target]) return false;
 	}
 
 	function sFearMoveEnd(event) {
-		if ((!EqGid(event.target) && mod.settings.Mode === 3) || HiddenUsers[event.target] || HiddenNpcs[event.target]) return false;
+		if ((!EqGid(event.target) && mod.settings.Mode >= 2) || HiddenUsers[event.target] || HiddenNpcs[event.target] || HFishingNpcs[event.target]) return false;
 	}
 
 	function sAbnormalityBegin(event) {
@@ -719,14 +806,19 @@ module.exports = function FpsUtils(mod) {
 			if (mod.settings.HideOwnBlacklistedAbns && mod.settings.OwnAbnormalsBlacklist.includes(event.id)) return false;
 			return;
 		}
-		if (HiddenUsers[event.target]) return false;
+		if (HiddenUsers[event.target] || HiddenNpcs[event.target] || HFishingNpcs[event.target]) return false;
+		if (mod.settings.Fishing && event.id === 9943049) return false;
 		if (mod.settings.HideBlacklistedAbnormalities && mod.settings.AbnormalitiesBlacklist.includes(event.id)) return false;
 		if (mod.settings.HideAllAbnormalities && (SpawnedUsers[event.target] || SpawnedUsers[event.source] || mod.settings.AbnormalitiesBlacklist.includes(event.id))) return false;
 	}
 
 	function sAbnormalityRefresh(event) {
-		if (HiddenUsers[event.target]) return false;
-		if ((mod.settings.HideBlacklistedAbnormalities || mod.settings.HideAllAbnormalities) && (SpawnedUsers[[10306, 10316, 12001, 12003, 12120, 12130].includes(event.target)] || SpawnedUsers[[10306, 10316, 12001, 12003, 12120, 12130].includes(event.source)])) return false;
+		if (HiddenUsers[event.target] || HiddenNpcs[event.target] || HFishingNpcs[event.target]) return false;
+		if ((mod.settings.HideBlacklistedAbnormalities || mod.settings.HideAllAbnormalities) && (SpawnedUsers[[10306, 10316, 12001, 12003, 22040, 12120, 12130].includes(event.target)] || SpawnedUsers[[10306, 10316, 12001, 12003, 22040, 12120, 12130].includes(event.source)])) return false;
+	}
+
+	function sAbnormalityEnd(event) {
+		if (mod.settings.Fishing && event.id === 9943049) return false;
 	}
 
 	function sAbnormalityFail(event) {
@@ -799,6 +891,15 @@ module.exports = function FpsUtils(mod) {
 	mod.hook('S_PCBANGINVENTORY_DATALIST', 1, sPcBangInventory)
 	mod.hook('S_LOADING_SCREEN_CONTROL_INFO', 'raw', sLoadingScreenControlInfo)
 
+	mod.hook('S_SOCIAL', 1, sSocial)
+	mod.hook('S_SYSTEM_MESSAGE', 1, sSystemMessage)
+	mod.hook('S_PARTY_MATCH_LINK', 'raw', sPartyMatchLink)
+	mod.hook('S_VIEW_PARTY_INVITE', 'raw', sViewPartyInvite)
+	//mod.hook('S_QUEST_VILLAGER_INFO', 'raw', sQuestVillagerInfo) opcode not public... Waiting for confirmation from caali/pinkie.
+	mod.hook('S_UPDATE_ACHIEVEMENT_PROGRESS', 'raw', sUpdateAchievementProgress)
+	mod.hook('S_CURRENT_CHANNEL', 2, sCurrentChannel)
+	mod.hook('S_ITEM_CUSTOM_STRING', 2, sItemCustomString)
+
 	mod.hook('S_GUILD_NAME', 1, sGuildName)
 	mod.hook('S_APPLY_TITLE', 2, sApplyTitle)
 	mod.hook('S_IMAGE_DATA', 'raw', sImageData)
@@ -809,17 +910,20 @@ module.exports = function FpsUtils(mod) {
 	mod.hook('S_USER_LOCATION', 5, sUserLocation)
 	mod.hook('S_USER_MOVETYPE', 'raw', sUserMoveType)
 	mod.hook('S_PARTY_MEMBER_LIST', 7, sPartyMemberList)
+	//mod.hook('S_USER_APPEARANCE_CHANGE', 1, { order: 9999 }, sUserAppearanceChange) missing opcode, pinkie.
 	mod.hook('S_USER_EXTERNAL_CHANGE', 7, { order: 9999 }, sUserExternalChange)
 	mod.hook('S_UNICAST_TRANSFORM_DATA', 5, { order: 99999 }, sUnicastTransformData)
 
 	mod.hook('S_SPAWN_NPC', 10, sSpawnNpc)
 	mod.hook('S_DESPAWN_NPC', 3, sDespawnNpc)
+	mod.hook('S_NPC_LOCATION', 3, sNpcLocation)
 	mod.hook('S_FEARMOVE_STAGE', 1, sFearMoveStage)
 	mod.hook('S_FEARMOVE_END', 1, sFearMoveEnd)
 
 	mod.hook('S_ABNORMALITY_BEGIN', 3, { order: 999 }, sAbnormalityBegin)
 	mod.hook('S_ABNORMALITY_REFRESH', 1, { order: 999 }, sAbnormalityRefresh)
 	mod.hook('S_ABNORMALITY_FAIL', 1, sAbnormalityFail)
+	mod.hook('S_ABNORMALITY_END', 1, sAbnormalityEnd)
 
 	mod.hook('S_ACTION_STAGE', 9, { order: 999 }, sActionStage)
 	mod.hook('S_SPAWN_PROJECTILE', 5, { order: 999 }, sSpawnProjectile)
@@ -865,7 +969,7 @@ module.exports = function FpsUtils(mod) {
 						mod.settings.HideAllAbnormalities = false;
 						mod.settings.HideAllProjectiles = false;
 						mod.settings.Hit_Other = false;
-						Msg(`Mode 0.`.clr(RedClr));
+						Msg(`<font color="${RedClr}">Mode 0</font>.`);
 						break;
 					case "1":
 					case "one":
@@ -874,7 +978,7 @@ module.exports = function FpsUtils(mod) {
 						mod.settings.HideAllAbnormalities = false;
 						mod.settings.HideAllProjectiles = true;
 						mod.settings.Hit_Other = true;
-						Msg(`Mode 1.`.clr(BronzeClr));
+						Msg(`<font color="${BronzeClr}">Mode 1</font>.`);
 						break;
 					case "2":
 					case "two":
@@ -883,7 +987,7 @@ module.exports = function FpsUtils(mod) {
 						mod.settings.HideAllAbnormalities = true;
 						mod.settings.HideAllProjectiles = true;
 						mod.settings.Hit_Other = true;
-						Msg(`Mode 2.`.clr(SilverClr));
+						Msg(`<font color="${SilverClr}">Mode 2</font>.`);
 						break;
 					case "3":
 					case "three":
@@ -893,17 +997,17 @@ module.exports = function FpsUtils(mod) {
 						mod.settings.HideAllProjectiles = true;
 						mod.settings.Hit_Other = true;
 						mod.settings.OnlyParty = false;
-						Msg(`Mode 3.`.clr(GoldClr));
+						Msg(`<font color="${GoldClr}">Mode 3</font>.`);
 						break;
 					default:
-						Msg(`Invalid" ${arg}".`.clr(GrayClr));
-						Msg(`Modes: ` + `[0, 1, 2, 3]`.clr(PinkClr) + '.');
+						Msg(`<font color="${GrayClr}">Invalid" ${arg}"</font>.`);
+						Msg(`Modes: "<font color="${PinkClr}">[0, 1, 2, 3]</font>.`);
 						break;
 				}
 				break;
 			case "hide":
 				if (typeof arg === "string" && arg !== null) {
-					if (mod.settings.PlayersBlacklist.includes(arg)) return Msg(`Player "${arg}"` + ` Already hidden`.clr(RedClr) + '.');
+					if (mod.settings.PlayersBlacklist.includes(arg)) return Msg(`Player '${arg}' <font color="${RedClr}">Already hidden</font>.`);
 					else
 						if ((mod.settings.ClassesNames.includes(arg) && !mod.settings.ClassesBlacklist.includes(arg)) || (mod.settings.RolesNames.includes(arg) && !mod.settings.RolesBlacklist.includes(arg))) {
 							for (let i in mod.settings.ClassesData) {
@@ -917,20 +1021,20 @@ module.exports = function FpsUtils(mod) {
 									}
 								}
 							}
-							Msg(`Class/Role ${arg}` + ` Hidden`.clr(GreenClr) + '.');
+							Msg(`Class/Role ${arg} <font color="${GreenClr}">Hidden</font>.`);
 							return;
-						} else if (mod.settings.ClassesBlacklist.includes(arg) || mod.settings.RolesBlacklist.includes(arg)) return Msg(`Class/Role "${arg}"` + ` Already hidden`.clr(RedClr) + '.');
-					Msg(`Player "${arg}"` + ` Hidden`.clr(GreenClr) + '.');
+						} else if (mod.settings.ClassesBlacklist.includes(arg) || mod.settings.RolesBlacklist.includes(arg)) return Msg(`Class/Role '${arg}' <font color="${RedClr}">Already hidden</font>.`);
+					Msg(`Player '${arg}' <font color="${GreenClr}">Hidden</font>.`);
 					mod.settings.PlayersBlacklist.push(arg);
 					HideSpecificPlayer(arg);
-				} else Msg(`Invalid ${arg2}.`.clr(GrayClr));
+				} else Msg(`<font color="${GrayClr}">Invalid ${arg2}</font>.`);
 				break;
 			case "show":
 				if (typeof arg === "string" && arg !== null) {
 					if (mod.settings.PlayersBlacklist.includes(arg)) {
 						ShowSpecificPlayer(arg);
 						RemoveEntity(mod.settings.PlayersBlacklist, arg);
-						Msg(`Player "${arg}"` + ` Shown`.clr(RedClr) + '.');
+						Msg(`Player '${arg}' <font color="${RedClr}">Shown</font>.`);
 						return;
 					}
 					if ((mod.settings.ClassesNames.includes(arg) && mod.settings.ClassesBlacklist.includes(arg)) || (mod.settings.RolesBlacklist.includes(arg) && mod.settings.RolesNames.includes(arg))) {
@@ -945,14 +1049,14 @@ module.exports = function FpsUtils(mod) {
 								}
 							}
 						}
-						Msg(`Class "${arg}"` + ` Shown`.clr(RedClr) + '.');
-					} else if (!mod.settings.ClassesBlacklist.includes(arg) || !mod.settings.RolesBlacklist.includes(arg)) Msg(`Class/Role "${arg}"` + ` Already shown`.clr(RedClr) + '.');
-					else if (!mod.settings.PlayersBlacklist.includes(arg)) Msg(`Player "${arg}"` + ` Already shown`.clr(RedClr) + '.');
-					else Msg(`Invalid ${arg2}.`.clr(GrayClr));
+						Msg(`Class '${arg}' <font color="${RedClr}">Shown</font>.`);
+					} else if (!mod.settings.ClassesBlacklist.includes(arg) || !mod.settings.RolesBlacklist.includes(arg)) Msg(`Class/Role '${arg}' <font color="${RedClr}">Already shown</font>.`);
+					else if (!mod.settings.PlayersBlacklist.includes(arg)) Msg(`Player '${arg}' <font color="${RedClr}">Already shown</font>.`);
+					else Msg(`<font color="${GrayClr}">Invalid ${arg2}</font>.`);
 				}
 				break;
 			case "party":
-				if (mod.settings.Mode === 3) return Msg(`You've to disable mode 3 first.`.clr(RedClr));
+				if (mod.settings.Mode === 3) return Msg(`<font color="${RedClr}">You've to disable mode 3 first</font>.`);
 				mod.settings.OnlyParty = !mod.settings.OnlyParty
 				if (mod.settings.OnlyParty) {
 					for (let i in SpawnedUsers) {
@@ -962,27 +1066,27 @@ module.exports = function FpsUtils(mod) {
 						}
 					}
 				} else ShowAllPlayers();
-				Msg(`Everyone but party ${mod.settings.OnlyParty ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
+				Msg(`Everyone but party ${mod.settings.OnlyParty ? `<font color="${GreenClr}">Hidden</font>` : `<font color="${RedClr}">Shown</font>`}.`);
 				break;
 			case "raid":
 				mod.settings.RaidAutoChange = !mod.settings.RaidAutoChange
-				Msg(`Raid auto-state ${mod.settings.RaidAutoChange ? "Enabled".clr(GreenClr) : "Disabled".clr(RedClr)}.`);
+				Msg(`Raid auto-state ${mod.settings.RaidAutoChange ? `<font color="${GreenClr}">Enabled</font>` : `<font color="${RedClr}">Disabled</font>`}.`);
 				break;
 			case "list":
-				Msg(`Hidden players: ${mod.settings.PlayersBlacklist}.`.clr(PinkClr));
-				Msg(`Hidden classes: ${mod.settings.ClassesBlacklist}.`.clr(PinkClr));
-				Msg(`Hidden roles: ${mod.settings.RolesBlacklist}.`.clr(PinkClr));
+				Msg(`<font color="${PinkClr}">Hidden players: ${mod.settings.PlayersBlacklist}</font>.`);
+				Msg(`<font color="${PinkClr}">Hidden classes: ${mod.settings.ClassesBlacklist}</font>.`);
+				Msg(`<font color="${PinkClr}">Hidden roles: ${mod.settings.RolesBlacklist}</font>.`);
 				break;
 			case "summons":
 			case "sums":
 				switch (arg) {
 					case "me":
 						mod.settings.HideMySummons = !mod.settings.HideMySummons;
-						Msg(`Own summoned NPCs ${mod.settings.HideMySummons ? "Hidden".clr(RedClr) : "Shown".clr(GreenClr)}.`);
+						Msg(`Own summoned NPCs ${mod.settings.HideMySummons ? `<font color="${GreenClr}">Hidden</font>` : `<font color="${RedClr}">Shown</font>`}.`);
 						break;
 					default:
 						mod.settings.HideOthersSummons = !mod.settings.HideOthersSummons;
-						Msg(`Others summoned NPCs ${mod.settings.HideOthersSummons ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
+						Msg(`Others summoned NPCs ${mod.settings.HideOthersSummons ? `<font color="${GreenClr}">Hidden</font>` : `<font color="${RedClr}">Shown</font>`}.`);
 						break;
 				}
 				break;
@@ -991,7 +1095,7 @@ module.exports = function FpsUtils(mod) {
 				switch (arg) {
 					case "blacklist":
 						mod.settings.HideBlacklistedSkills = !mod.settings.HideBlacklistedSkills;
-						Msg(`Blacklisted skills ${mod.settings.HideBlacklistedSkills ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
+						Msg(`Blacklisted skills ${mod.settings.HideBlacklistedSkills ? `<font color="${GreenClr}">Hidden</font>` : `<font color="${RedClr}">Shown</font>`}.`);
 						break;
 					case "class":
 						if (mod.settings.ClassesNames.includes(arg2)) {
@@ -1002,22 +1106,22 @@ module.exports = function FpsUtils(mod) {
 											let index = mod.settings.ClassesData[i].CD_SkillsBlacklist.indexOf(arg3)
 											if (index !== -1) {
 												mod.settings.ClassesData[i].CD_SkillsBlacklist.splice(index, 1)
-												Msg(`Skill ID '${arg3}'` + ` Shown`.clr(RedClr) + ` for class '${arg2}'.`)
+												Msg(`Skill ID '${arg3}' <font color="${RedClr}">Shown</font> for class '${arg2}'.`)
 											}
 											return;
 										} else {
 											mod.settings.ClassesData[i].CD_SkillsBlacklist.push(arg3)
-											Msg(`Skill ID '${arg3}'` + ` Hidden`.clr(GreenClr) + ` for class '${arg2}'.`)
+											Msg(`Skill ID '${arg3}' <font color="${GreenClr}">Hidden</font> 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)}.`);
+										Msg(`Skills for '${arg2}' class ${mod.settings.ClassesData[i].CD_HideBlacklistedSkills ? `<font color="${GreenClr}">Hidden</font>` : `<font color="${RedClr}">Shown</font>`}.`);
 										return;
 									}
 								}
 							}
-						} else Msg(`Class ${arg2} not found.`.clr(RedClr));
+						} else Msg(`<font color="${RedClr}">Class ${arg2} not found</font>.`);
 						break;
 				}
 				break;
@@ -1026,44 +1130,44 @@ module.exports = function FpsUtils(mod) {
 				if (arg == 'hide') {
 					if (!arg2 || !arg3) {
 						mod.settings.HideBlacklistedNpcs = !mod.settings.HideBlacklistedNpcs;
-						Msg(`Blacklisted NPCs ${mod.settings.HideBlacklistedNpcs ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
+						Msg(`Blacklisted NPCs ${mod.settings.HideBlacklistedNpcs ? `<font color="${GreenClr}">Hidden</font>` : `<font color="${RedClr}">Shown</font>`}.`);
 						break;
 					}
 					let found = mod.settings.NpcsBlacklist.some(s => s.zone === arg2 && s.templateId === arg3);
 					if (found) {
-						Msg(`NPC HntZone '${arg2}', TmpId '${arg3}'` + ` Removed from the blacklist`.clr(RedClr) + '.')
+						Msg(`NPC HntZone '${arg2}', TmpId '${arg3}' <font color="${RedClr}">Removed from the blacklist</font>.`)
 						mod.settings.NpcsBlacklist = mod.settings.NpcsBlacklist.filter(obj => obj.zone != arg2 || obj.templateId != arg3);
 					} else {
-						Msg(`NPC HntZone '${arg2}', TmpId '${arg3}'` + ` Added to the blacklist`.clr(GreenClr) + '.')
+						Msg(`NPC HntZone '${arg2}', TmpId '${arg3}' <font color="${GreenClr}">Added to the blacklist</font>.`)
 						mod.settings.NpcsBlacklist.push({ zone: arg2, templateId: arg3 })
 					}
 					return;
 				} else mod.settings.HideBlacklistedNpcs = !mod.settings.HideBlacklistedNpcs;
-				Msg(`Blacklisted NPCs ${mod.settings.HideBlacklistedNpcs ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
+				Msg(`Blacklisted NPCs ${mod.settings.HideBlacklistedNpcs ? `<font color="${GreenClr}">Hidden</font>` : `<font color="${RedClr}">Shown</font>`}.`);
 				break;
 			case "hit":
 				switch (arg) {
 					case "me":
 						mod.settings.Hit_Me = !mod.settings.Hit_Me;
-						Msg(`Own hits effect ${mod.settings.Hit_Me ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
+						Msg(`Own hits effect ${mod.settings.Hit_Me ? `<font color="${GreenClr}">Hidden</font>` : `<font color="${RedClr}">Shown</font>`}.`);
 						break;
 					case "other":
 						mod.settings.Hit_Other = !mod.settings.Hit_Other;
-						Msg(`Players hit effect ${mod.settings.Hit_Other ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
+						Msg(`Players hit effect ${mod.settings.Hit_Other ? `<font color="${GreenClr}">Hidden</font>` : `<font color="${RedClr}">Shown</font>`}.`);
 						break;
 					case "damage":
 						mod.settings.Hit_Damage = !mod.settings.Hit_Damage;
-						Msg(`Damage numbers ${mod.settings.Hit_Damage ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
+						Msg(`Damage numbers ${mod.settings.Hit_Damage ? `<font color="${GreenClr}">Hidden</font>` : `<font color="${RedClr}">Shown</font>`}.`);
 						break;
 					default:
-						Msg(`Invalid &#40;hit&#41; "${arg}".`.clr(GrayClr));
+						Msg(`<font color="${GrayClr}">Invalid &#40;hit&#41; '${arg}'</font>.`);
 						break;
 				}
 				break;
 			case "fireworks":
 			case "firework":
 				mod.settings.HideFireworks = !mod.settings.HideFireworks;
-				Msg(`Fireworks ${mod.settings.HideFireworks ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
+				Msg(`Fireworks ${mod.settings.HideFireworks ? `<font color="${GreenClr}">Hidden</font>` : `<font color="${RedClr}">Shown</font>`}.`);
 				break;
 			case "abn":
 			case "effects":
@@ -1072,104 +1176,106 @@ module.exports = function FpsUtils(mod) {
 				switch (arg) {
 					case "all":
 						mod.settings.HideAllAbnormalities = !mod.settings.HideAllAbnormalities;
-						Msg(`All Abnormalities ${mod.settings.HideAllAbnormalities ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
+						Msg(`All Abnormalities ${mod.settings.HideAllAbnormalities ? `<font color="${GreenClr}">Hidden</font>` : `<font color="${RedClr}">Shown</font>`}.`);
 						break;
 					case "blacklist":
 						if (!arg2 || !arg3) {
 							mod.settings.HideBlacklistedAbnormalities = !mod.settings.HideBlacklistedAbnormalities;
-							Msg(`Blacklisted Abnormalities ${mod.settings.HideBlacklistedAbnormalities ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
+							Msg(`Blacklisted Abnormalities ${mod.settings.HideBlacklistedAbnormalities ? `<font color="${GreenClr}">Hidden</font>` : `<font color="${RedClr}">Shown</font>`}.`);
 							break;
 						} else if (arg2 && arg3) {
 							arg3 = Number(arg3);
 							if (!mod.settings.AbnormalitiesBlacklist.includes(arg3)) {
 								if (arg2 == 'add') {
 									mod.settings.AbnormalitiesBlacklist.push(arg3)
-									Msg(`Blacklisted Abnormalities` + ` added "${arg3}"`.clr(GreenClr) + '.')
+									Msg(`Blacklisted Abnormalities <font color="${GreenClr}">added '${arg3}'</font>..`)
 									return;
-								} else if (arg2 == 'remv') return Msg(`Blacklisted Abnormalities` + ` can't remove "${arg3}" as it's not there`.clr(GrayClr) + '.');
+								} else if (arg2 == 'remv') return Msg(`Blacklisted Abnormalities <font color="${RedClr}">can't remove '${arg3}' as it's not there</font>.`);
 
 							} else if (mod.settings.AbnormalitiesBlacklist.includes(arg3)) {
-								if (arg2 == 'add') return Msg(`Blacklisted Abnormalities` + ` can't add "${arg3}" as it's already there`.clr(GrayClr) + '.');
+								if (arg2 == 'add') return Msg(`Blacklisted Abnormalities <font color="${RedClr}">can't add '${arg3}' as it's already there</font>.`);
 								else if (arg2 == 'remv') {
 									let index = mod.settings.AbnormalitiesBlacklist.indexOf(arg3)
 									if (index !== -1) {
 										mod.settings.AbnormalitiesBlacklist.splice(index, 1)
-										Msg(`Blacklisted Abnormalities` + ` removed "${arg3}"`.clr(RedClr) + '.');
+										Msg(`Blacklisted Abnormalities <font color="${RedClr}">removed '${arg3}'</font>.`);
 										return;
 									}
 								}
-							} else return Msg(`Invalid &#40;abnormalities Blacklist&#41; "${arg}".`.clr(GrayClr));
+							} else return Msg(`<font color="${GrayClr}">Invalid &#40;abnormalities Blacklist&#41; '${arg}'</font>.`);
 						}
 						break;
 					case "log":
 					case "debug":
 						mod.settings.AbnDebug = !mod.settings.AbnDebug;
-						mod.settings.AbnDebug ? Msg(`Abnormalities debug ${"started".clr(GreenClr)}, check your proxy console for details.`) : Msg(`Abnormalities debug ${"stopped".clr(RedClr)}.`);
+						if (mod.settings.AbnDebug) Msg(`Abnormalities debug <font color="${GreenClr}">started</font>, check your proxy console for details.`)
+						else Msg(`Abnormalities debug <font color="${RedClr}">stopped</font>.`);
 						break;
 					default:
-						Msg(`Invalid &#40;abnormalities&#41; "${arg}".`.clr(GrayClr));
+						Msg(`<font color="${GrayClr}">Invalid &#40;abnormalities&#41; '${arg}'</font>.`);
 						break;
 				}
 				break;
 			case "guildlogo":
-				if (ChangeOnCd) return Msg(`Try again in 3 seconds.`.clr(PinkClr));
+				if (ChangeOnCd) return Msg(`<font color="${PinkClr}">Try again in 3 seconds</font>.`);
 				mod.settings.Hideguildlogos = !mod.settings.Hideguildlogos;
 				mod.toServer('C_SET_VISIBLE_RANGE', 1, { range: 0 });
 				setTimeout(() => mod.toServer('C_SET_VISIBLE_RANGE', 1, { range: LastVrange }), 1500);
 				ChangeOnCd = true;
 				setTimeout(() => ChangeOnCd = false, 2800);
-				Msg(`Guild Logos ${mod.settings.Hideguildlogos ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
+				Msg(`Guild Logos ${mod.settings.Hideguildlogos ? `<font color="${GreenClr}">Hidden</font>` : `<font color="${RedClr}">Shown</font>`}.`);
 				break;
 			case "costume":
 			case "style":
-				if (ChangeOnCd) return Msg(`Try again in 3 seconds.`.clr(PinkClr));
+				if (ChangeOnCd) return Msg(`<font color="${PinkClr}">Try again in 3 seconds</font>.`);
 				mod.settings.ShowStyle = !mod.settings.ShowStyle;
 				mod.toServer('C_SET_VISIBLE_RANGE', 1, { range: 0 })
 				setTimeout(() => mod.toServer('C_SET_VISIBLE_RANGE', 1, { range: LastVrange }), 1500);
 				ChangeOnCd = true
 				setTimeout(() => ChangeOnCd = false, 2800);
-				Msg(`Style of NPCs & others ${mod.settings.ShowStyle ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
+				Msg(`Style of NPCs & others ${mod.settings.ShowStyle ? `<font color="${GreenClr}">Hidden</font>` : `<font color="${RedClr}">Shown</font>`}.`);
 				break;
 			case "proj":
 			case "projectile":
 				switch (arg) {
 					case "all":
 						mod.settings.HideAllProjectiles = !mod.settings.HideAllProjectiles;
-						Msg(`Projectiles ${mod.settings.HideAllProjectiles ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
+						Msg(`Projectiles ${mod.settings.HideAllProjectiles ? `<font color="${GreenClr}">Hidden</font>` : `<font color="${RedClr}">Shown</font>`}.`);
 						break;
 					case "blacklist":
 						if (!arg2 || !arg3) {
 							mod.settings.HideBlacklistedProjectiles = !mod.settings.HideBlacklistedProjectiles;
-							Msg(`Blacklisted projectile ${mod.settings.HideBlacklistedProjectiles ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
+							Msg(`Blacklisted projectile ${mod.settings.HideBlacklistedProjectiles ? `<font color="${GreenClr}">Hidden</font>` : `<font color="${RedClr}">Shown</font>`}.`);
 							break;
 						} else if (arg2 && arg3) {
 							arg3 = Number(arg3);
 							if (!mod.settings.ProjectilesBlacklist.includes(arg3)) {
 								if (arg2 == 'add') {
 									mod.settings.ProjectilesBlacklist.push(arg3)
-									Msg(`Blacklisted projectile` + ` added "${arg3}"`.clr(GreenClr) + '.')
+									Msg(`Blacklisted projectile <font color="${GreenClr}">added '${arg3}'</font>.`)
 									return;
-								} else if (arg2 == 'remv') return Msg(`Blacklisted projectile` + ` can't remove "${arg3}" as it's not there`.clr(GrayClr) + '.');
+								} else if (arg2 == 'remv') return Msg(`Blacklisted projectile <font color="${RedClr}">can't remove '${arg3}' as it's not there</font>.`);
 							} else if (mod.settings.ProjectilesBlacklist.includes(arg3)) {
-								if (arg2 == 'add') return Msg(`Blacklisted projectile` + ` can't add "${arg3}" as it's already there`.clr(GrayClr) + '.');
+								if (arg2 == 'add') return Msg(`Blacklisted projectile <font color="${RedClr}">can't add '${arg3}' as it's already there</font>.`);
 								else if (arg2 == 'remv') {
 									let index = mod.settings.ProjectilesBlacklist.indexOf(arg3)
 									if (index !== -1) {
 										mod.settings.ProjectilesBlacklist.splice(index, 1)
-										Msg(`Blacklisted projectile` + ` removed "${arg3}"`.clr(RedClr) + '.')
+										Msg(`Blacklisted projectile <font color="${RedClr}">removed '${arg3}'</font>.`)
 										return;
 									}
 								}
-							} else return Msg(`Invalid &#40;projectile Blacklist&#41; "${arg}".`.clr(GrayClr));
+							} else return Msg(`<font color="${GrayClr}">Invalid &#40;projectile Blacklist&#41; '${arg}'</font>.`);
 						}
 						break;
 					case "log":
 					case "debug":
 						mod.settings.ProjDebug = !mod.settings.ProjDebug
-						mod.settings.ProjDebug ? Msg(`Projectile debug ${"started".clr(GreenClr)}, check your proxy console for details.`) : Msg(`Projectile debug ${"stopped".clr(RedClr)}.`);
+						if (mod.settings.ProjDebug) Msg(`Projectile debug <font color="${GreenClr}">started</font>, check your proxy console for details.`)
+						else Msg(`Projectile debug <font color="${RedClr}">stopped</font>.`);
 						break;
 					default:
-						Msg(`Invalid &#40;projectile&#41; "${arg}".`.clr(GrayClr));
+						Msg(`<font color="${GrayClr}">Invalid &#40;projectile&#41; '${arg}'</font>.`);
 						break;
 				}
 				break;
@@ -1209,64 +1315,76 @@ module.exports = function FpsUtils(mod) {
 						mod.toClient('S_SHOW_AWESOMIUMWEB_SHOP', 1, { link: 'https://duckduckgo.com/' });
 						break;
 					default:
-						Msg(`Invalid &#40;quicklink&#41; "${arg}".`.clr(GrayClr));
+						Msg(`<font color="${GrayClr}">Invalid &#40;quicklink&#41; '${arg}'</font>.`);
 						break;
 				}
 				break;
 			case "npczoom":
 				mod.settings.ActionScripts = !mod.settings.ActionScripts;
-				Msg(`Npc zoom-ins ${mod.settings.ActionScripts ? "Disabled".clr(GreenClr) : "Shown".clr(RedClr)}.`);
+				Msg(`Npc zoom-ins ${mod.settings.ActionScripts ? `<font color="${GreenClr}">Hidden</font>` : `<font color="${RedClr}">Shown</font>`}.`);
 				break;
 			case "dropitem":
 				if (arg == 'hide') {
 					if (!arg2) {
 						mod.settings.HideBlacklistedDrop = !mod.settings.HideBlacklistedDrop;
-						Msg(`Blacklisted Drops ${mod.settings.HideBlacklistedDrop ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
+						Msg(`Blacklisted Drops ${mod.settings.HideBlacklistedDrop ? `<font color="${GreenClr}">Hidden</font>` : `<font color="${RedClr}">Shown</font>`}.`);
 						break;
 					}
 					arg2 = Number(arg2);
 					let found = mod.settings.DropBlacklist.some(s => s === arg2);
 					if (found) {
-						Msg(`Drops id '${arg2}'` + ` Removed from the blacklist`.clr(RedClr) + '.')
+						Msg(`Drops id '${arg2}' <font color="${RedClr}">Removed from the blacklist</font>.`)
 						mod.settings.DropBlacklist = mod.settings.DropBlacklist.filter(obj => obj != arg2)
 					} else {
-						Msg(`Drops id '${arg2}'` + ` Added to the blacklist`.clr(GreenClr) + '.')
+						Msg(`Drops id '${arg2}' <font color="${GreenClr}">Added to the blacklist</font>.`)
 						mod.settings.DropBlacklist.push(arg2)
 					}
 					return;
 				} else mod.settings.HideBlacklistedDrop = !mod.settings.HideBlacklistedDrop;
-				Msg(`Blacklisted Drops ${mod.settings.HideBlacklistedDrop ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
+				Msg(`Blacklisted Drops ${mod.settings.HideBlacklistedDrop ? `<font color="${GreenClr}">Hidden</font>` : `<font color="${RedClr}">Shown</font>`}.`);
 				break;
 			case "monsterdeathani":
 			case "monstersdeathani":
 				mod.settings.HideMonsterDeathAnimation = !mod.settings.HideMonsterDeathAnimation;
-				Msg(`Monsters Death Animation is ${mod.settings.HideMonsterDeathAnimation ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
+				Msg(`Monsters Death Animation is ${mod.settings.HideMonsterDeathAnimation ? `<font color="${GreenClr}">Hidden</font>` : `<font color="${RedClr}">Shown</font>`}.`);
 				break;
 			case "screenabns":
 				if (arg == 'hide') {
 					if (!arg2) {
 						mod.settings.HideOwnBlacklistedAbns = !mod.settings.HideOwnBlacklistedAbns;
-						Msg(`Blacklisted ScreenAbns ${mod.settings.OwnAbnormalsBlacklist ? "Hidden".clr(GreenClr) : "Shown".clr(RedClr)}.`);
+						Msg(`Blacklisted ScreenAbns ${mod.settings.OwnAbnormalsBlacklist ? `<font color="${GreenClr}">Hidden</font>` : `<font color="${RedClr}">Shown</font>`}.`);
 						break;
 					}
 					arg2 = Number(arg2);
 					let found = mod.settings.OwnAbnormalsBlacklist.some(m => m === arg2);
 					if (found) {
-						Msg(`Abnormal id '${arg2}'` + " Removed from the blacklist".clr(RedClr) + '.')
+						Msg(`Abnormal id '${arg2}' <font color="${RedClr}">Removed from the blacklist</font>.`)
 						mod.settings.OwnAbnormalsBlacklist = mod.settings.OwnAbnormalsBlacklist.filter(obj => obj != arg2);
 					} else {
-						Msg(`Abnormal id '${arg2}'` + " Added to the blacklist".clr(GreenClr) + '.')
+						Msg(`Abnormal id '${arg2}' <font color="${GreenClr}">Added to the blacklist</font>.`)
 						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)}.`);
+				Msg(`Blacklisted ScreenAbns ${mod.settings.HideOwnBlacklistedAbns ? `<font color="${GreenClr}">Hidden</font>` : `<font color="${RedClr}">Shown</font>`}.`);
+				break;
+			case "fish":
+			case "fishing":
+				mod.settings.Fishing = !mod.settings.Fishing;
+				Msg(`Fishing mode is ${mod.settings.Fishing ? `<font color="${GreenClr}">Enabled</font>` : `<font color="${RedClr}">Disabled</font>`}.`);
+				if (mod.settings.Fishing) {
+					HideFishingNpcs();
+					if (!Alerted) {
+						Msg(`<font color="${PinkClr}">Reminder: All fishing npcs won't spawn until you turn off fishing mode</font>.`);
+						Alerted = true;
+					}
+				} else ShowFishingNpcs();
 				break;
 			case "help":
 				mod.command.exec(`fps gui help`)
 				break;
 			default:
-				Msg("Unknown command, check command list.".clr(RedClr));
+				Msg(`<font color="${RedClr}">Unknown command, check command list</font>.`);
 				mod.command.exec(`fps gui help`)
 				break;
 		}

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


+ 15 - 6
manifest.json

@@ -1,12 +1,12 @@
 {
     "files": {
-        "README.md": "d8054f0ce0c8a7679728694b1944090b9effecd22ec02414d7dd4bbb0f08c204",
+        "README.md": "b9cbe53c8ea61dbb4b8cf889842f5344bf5b1fed0c12edc3c6004bede865ae00",
         "lib/data/npcData.json": "df6ea18642a274017e173d9bf34884a44202c72b3e030085aa5bb64f7b2d6337",
         "lib/data/skillString.json": "9d69876fea0be8e6ac5dd43b3fc74ea023f6b8a6145384f8f780dd977045d8ef",
-        "lib/index.js": "763f08bce0b0f39994996988820550636a1ab3fa2ae112a759a480926883a1c0",
-        "lib/setting_migration.js": "b31d10274986e26f09643ddbd3b34735e3528065186c7b1d0c9ce49e7bdd4669",
-        "module.json": "e48239b7217927446de519dbc8c0b897be6e9957cc683c5b6bbed57f8b1ce07f",
-        "package.json": "9781ad8b7335e7a8117f89bc5a400b22e5b4311ab79926ad0458ca78c11b2960"
+        "lib/index.js": "09164f4380b4a5b7bf87555af887e5a1374748870a138e3ccbf3e367094d738b",
+        "lib/setting_migration.js": "15e78141c9b59b9aa563ec107048a1212523942a4ed23bea38803cdb8abe9df6",
+        "module.json": "d4b5d23aecb16e1ae6ba64f6b71842b0b88dd5c686f54a7d9c328604a0f2570b",
+        "package.json": "64239e69d6e4b0568f1dd8456edeb8585e7ba2bcab1ae9cf4625d7027de95ff3"
     },
     "defs": {
         "C_ADMIN": 1,
@@ -18,11 +18,13 @@
         "C_RETURN_TO_LOBBY": 1,
         "C_SET_VISIBLE_RANGE": 1,
         "S_ABNORMALITY_BEGIN": 3,
+        "S_ABNORMALITY_END": 1,
         "S_ABNORMALITY_FAIL": 1,
         "S_ABNORMALITY_REFRESH": 1,
         "S_ACTION_STAGE": 9,
         "S_ANNOUNCE_UPDATE_NOTIFICATION": 1,
         "S_APPLY_TITLE": 2,
+        "S_CURRENT_CHANNEL": 2,
         "S_DESPAWN_NPC": 3,
         "S_DESPAWN_USER": 3,
         "S_EACH_SKILL_RESULT": 12,
@@ -32,15 +34,19 @@
         "S_FONT_SWAP_INFO": "raw",
         "S_GUILD_NAME": 1,
         "S_IMAGE_DATA": "raw",
+        "S_ITEM_CUSTOM_STRING": 2,
         "S_LEAVE_PARTY": "raw",
         "S_LOADING_SCREEN_CONTROL_INFO": "raw",
         "S_LOAD_TOPO": "raw",
         "S_LOGIN": 12,
         "S_MOUNT_VEHICLE": 2,
+        "S_NPC_LOCATION": 3,
         "S_NPC_MENU_SELECT": 1,
+        "S_PARTY_MATCH_LINK": "raw",
         "S_PARTY_MEMBER_LIST": 7,
         "S_PCBANGINVENTORY_DATALIST": 1,
         "S_SHOW_AWESOMIUMWEB_SHOP": 1,
+        "S_SOCIAL": 1,
         "S_SPAWN_DROPITEM": 6,
         "S_SPAWN_NPC": 10,
         "S_SPAWN_PROJECTILE": 5,
@@ -48,10 +54,13 @@
         "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_USER_EXTERNAL_CHANGE": 7,
         "S_USER_LOCATION": 5,
-        "S_USER_MOVETYPE": "raw"
+        "S_USER_MOVETYPE": "raw",
+        "S_VIEW_PARTY_INVITE": "raw"
     }
 }

+ 4 - 2
module.json

@@ -2,12 +2,14 @@
     "disableAutoUpdate": false,
     "name": "fps-utils",
     "author": "Risenio",
+    "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": "6",
+    "version": "7",
     "options": {
         "niceName": "FPS",
-        "settingsVersion": 6,
+        "guiName": "Fps Utils",
+        "settingsVersion": 7,
         "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": "6",
+	"version": "7",
 	"homepage": "https://github.com/Risenio/fps-utils/wiki",
 	"keywords": [ "fps", "tera", "tera-proxy", "tera-fps" ],
     "contributors": ["codeagon", "Saegusae", "SerenTera", "Kyoukaya", "SaltyMonkey", "Leyki"],

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