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

Fixes.

Fixed the issue(s) with gls & bahaar. (take 2)
Risenio лет назад: 7
Родитель
Сommit
53357df11c
2 измененных файлов с 63 добавлено и 51 удалено
  1. 62 50
      lib/index.js
  2. 1 1
      manifest.json

+ 62 - 50
lib/index.js

@@ -4,12 +4,45 @@
 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 = '#5BC0BE', HBlC = '#08B3E5', GryC = '#778899', YlwC = '#C0B94D', OngC = '#FFBE5E';
+	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';
 	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 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 = [90440009, 90442106, 90442110, 90442111, 90442112, 90442113, 90442114, 90442400, 90442401, 90442402, 90442403, 90442404, 90442405, 90442406, 90442407, 90442408, 90442502];
+	const ImportantAbns = [
+		90440009, 90442106, 90442110, 90442111, 90442112, 90442113, 90442114, 90442400, 90442401, 90442402, 90442403, 90442404, 90442405, 90442406, 90442407, 90442408, 90442502,
+
+		78200123, // - Stunned; Cannot move.
+		78200126, // - Eye debuff.
+
+		78200130, // - pink circle?
+		78200131, // - violet circle?
+
+		// 78200142 - blue circle?
+		// 78200143 - purple effect with gathering?
+
+		// 78200148 - Delicate Green Aroma
+		// 78200149 - Sweet Violet Aroma
+
+		// 78200157 - rose flower above head
+		// 78200158 - yellow=>white flower with shaking
+		// 78200157 - yellow explosion
+
+		78200161, // - BIG dount (green effect)
+		78200162, // - BIG dount (blue effect)
+
+		//78200165 - Heavy blue-white debuff?
+
+		78200203, // - Bloody Statue's Gaze
+		78200204, // - Radiant Statue's Gaze
+		78200205, // - Cursed Statue's Gaze
+
+		78200209, // - Restraint; The three statues bind Ptakum.
+		78200234, // - Restraint; A statue binds you.
+		78200235, // - Restraint; Two statues bind you.
+		78200236, // - Restraint; Three statues bind you.
+	];
+
 
 	let MyGameId,
 		MyName,
@@ -241,56 +274,46 @@ module.exports = function FpsUtils(mod) {
 					{ 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="${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="${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="${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="${YlwC}" size="+21">UI:</font>` }, { text: "&#09;&#09;" },
 					{ text: `<font color="${PrpC}" size="+17">[Mail]</font>`, command: "fps quicklink parcel" }, { text: "&nbsp;&nbsp;&nbsp;" },
@@ -299,13 +322,13 @@ module.exports = function FpsUtils(mod) {
 					{ 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="${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="${YlwC}" size="+21">Party:</font>` }, { text: "&#09;" },
+					{ text: `<font color="${CPKC}" 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" }
+					{ text: `<font color="${YlwC}" size="+21">System:</font>` }, { text: "&#09;" },
+					{ text: `<font color="${CPKC}" size="+18">[Character Selection]</font>`, command: "fps quicklink lobby" }, { text: "&#09;&#09;&#09;&#09;&#09;&#09;&nbsp;" },
+					{ text: `<font color="${CPKC}" 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>`)
 		}
 	}
@@ -555,7 +578,7 @@ module.exports = function FpsUtils(mod) {
 	function NpcBCheck(event) {
 		let blocked = false;
 
-		if (mod.settings.ShowStyle) event.repairable = false;
+		//if (mod.settings.ShowStyle) event.repairable = false;
 
 		if (mod.settings.HideBlacklistedNpcs) {
 			for (let i = 0; i < mod.settings.NpcsBlacklist.length; i++) {
@@ -782,21 +805,11 @@ module.exports = function FpsUtils(mod) {
 		if (mod.settings.ShowStyle) return false;
 	}
 
-	function sUserAppearanceChangefn(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;
 	}
 
-	function sUserExternalChangefn(event) {
-		if (EqGid(event.gameId)) return;
-		if (mod.settings.ShowStyle) return false;
-	}
-
 	function sUnicastTransformData(event) {
 		if (!event.gameId || EqGid(event.gameId)) return;
 		if (mod.settings.ShowStyle) return false;
@@ -811,10 +824,7 @@ module.exports = function FpsUtils(mod) {
 		SNpcs[event.gameId].spawnType = 1;
 		SNpcs[event.gameId].spawnScript = 0;
 		if (NpcBCheck(event)) return false;
-		if (mod.settings.ShowStyle) {
-			event.repairable = false;
-			return true;
-		}
+		//if (mod.settings.ShowStyle) { event.repairable = false; return true; } // {p}artially... This option is used not only for the icons above npcs heads, but it's used also for showing the whole shape of some npcs, e.g. bahaar & glsh. :\
 	}
 
 	function sDespawnNpc(event) {
@@ -886,7 +896,7 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function sActionStage(event) {
-		if (EqGid(event.gameId) || !SUsers[event.gameId]) return;
+		if (EqGid(event.gameId) || !SUsers[event.gameId] || event.skill.npc) 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) {
 			UpdateUserLoc(event);
 			return false;
@@ -904,6 +914,7 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function sSpawnProjectile(event) {
+		if (event.skill.npc) return;
 		if (ProjDebug) {
 			if (EqGid(event.gameId)) log('Projectile', 'Spawned', 'from', MyName, event.skill.id)
 			if (SUsers[event.gameId]) log('Projectile', 'Spawned', 'from', SUsers[event.gameId].name, event.skill.id)
@@ -953,6 +964,9 @@ module.exports = function FpsUtils(mod) {
 
 	// ~~~ * Packet Hooks * ~~~ \\
 
+	const Last_Hook = { order: 100010 }
+	const Last_Hookfn = { order: 100010, filter: { fake: null } };
+
 	mod.hook('S_LOGIN', 12, sLogin)
 	mod.hook('S_LOAD_TOPO', 'raw', sLoadTopo)
 	mod.hook('S_LEAVE_PARTY', 'raw', sLeaveParty)
@@ -964,26 +978,24 @@ module.exports = function FpsUtils(mod) {
 	mod.hook('S_PCBANGINVENTORY_DATALIST', 1, sPcBangInventory)
 
 	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_UPDATE_ACHIEVEMENT_PROGRESS', 1, Last_Hookfn, sUpdateAchievementProgress)
 	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)
 
-	mod.hook('S_SPAWN_USER', 14, { order: 9999 }, sSpawnUser)
-	mod.hook('S_SPAWN_USER', 14, { order: 99999, filter: { fake: null } }, sSpawnUserfn)
-	mod.hook('S_DESPAWN_USER', 3, { order: 999 }, sDespawnUser)
+	mod.hook('S_SPAWN_USER', 14, Last_Hook, sSpawnUser)
+	mod.hook('S_SPAWN_USER', 14, Last_Hookfn, sSpawnUserfn)
+	mod.hook('S_DESPAWN_USER', 3, Last_Hook, sDespawnUser)
 	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', { 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)
-	mod.hook('S_USER_EXTERNAL_CHANGE', 7, { order: 9999 }, sUserExternalChange)
-	mod.hook('S_USER_EXTERNAL_CHANGE', 7, { order: 99999, filter: { fake: null } }, sUserExternalChangefn)
-	mod.hook('S_UNICAST_TRANSFORM_DATA', 5, { order: 99999 }, sUnicastTransformData)
+	mod.hook('S_USER_MOVETYPE', 'raw', Last_Hook, sUserMoveType)
+	mod.hook('S_PARTY_MEMBER_LIST', 7, Last_Hook, sPartyMemberList)
+	mod.hook('S_USER_APPEARANCE_CHANGE', 1, Last_Hookfn, sUserAppearanceChange)
+	mod.hook('S_USER_EXTERNAL_CHANGE', 7, Last_Hookfn, sUserExternalChange)
+	mod.hook('S_UNICAST_TRANSFORM_DATA', 5, Last_Hook, sUnicastTransformData)
 
 	mod.hook('S_SPAWN_NPC', 11, sSpawnNpc)
 	mod.hook('S_DESPAWN_NPC', 3, sDespawnNpc)
@@ -992,17 +1004,17 @@ module.exports = function FpsUtils(mod) {
 	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_BEGIN', 3, Last_Hook, sAbnormalityBegin)
+	mod.hook('S_ABNORMALITY_REFRESH', 1, Last_Hook, 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)
-	mod.hook('S_START_USER_PROJECTILE', 9, { order: 999 }, sStartUserProjectile)
+	mod.hook('S_ACTION_STAGE', 9, Last_Hook, sActionStage)
+	mod.hook('S_SPAWN_PROJECTILE', 5, Last_Hook, sSpawnProjectile)
+	mod.hook('S_START_USER_PROJECTILE', 9, Last_Hook, sStartUserProjectile)
 	mod.hook('S_PLAYER_CHANGE_MP', 1, sPlayerChangeMp)
 	mod.hook('S_CREATURE_CHANGE_HP', 6, sCreatureChangeHp)
-	mod.hook('S_EACH_SKILL_RESULT', 12, { order: 10010 }, sEachSkillResult)
+	mod.hook('S_EACH_SKILL_RESULT', 12, Last_Hook, sEachSkillResult)
 	mod.hook('S_SPAWN_DROPITEM', 6, sSpawnDropItem)
 	mod.hook('S_FONT_SWAP_INFO', 'raw', sFontSwapInfo)
 

+ 1 - 1
manifest.json

@@ -3,7 +3,7 @@
         "README.md": "d460498a2503b6857f0faed356b8f06cf4108ae863d022e361f6762877966837",
         "lib/data/npcData.json": "d3e7b59617ef841447567d69b074aa2dd6958eabb1a231c5821ffa7165daeac6",
         "lib/data/skillString.json": "9d69876fea0be8e6ac5dd43b3fc74ea023f6b8a6145384f8f780dd977045d8ef",
-        "lib/index.js": "b120183372438614938eb426cd0669744a32a4dde4df83ddc0ba7cf9c0a6dd09",
+        "lib/index.js": "927087603bc33c01302beabc91f4dc10a9191fc9adb051b5811c26a8d3ddb029",
         "lib/setting_migration.js": "6f9169f0a607b77b4922dee0fdbaaae6dedcc181ccf2af234baf92530a50cf75",
         "module.json": "53bbd3e486323e381ea9f89fe262c23b1389a54b954fe2fd91c368791cce1b7d",
         "package.json": "b90a372cfaa137b9cf1835345248c5d6a600b4168faec199792e29d7491af7e1"