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

Small fixes.

Fixed couple typos.
Fixed list check.
---
Updated Fearmove packets.
Risenio лет назад: 7
Родитель
Сommit
49279df8c5
2 измененных файлов с 20 добавлено и 18 удалено
  1. 17 15
      lib/index.js
  2. 3 3
      manifest.json

+ 17 - 15
lib/index.js

@@ -3,9 +3,9 @@
 
 
 // ~~~ * Data * ~~~ \\
 // ~~~ * Data * ~~~ \\
 
 
-const NotCP = typeof global.TeraProxy === 'undefined' || typeof global.TeraProxy.UILanguage === 'undefined';
+const NotCP = typeof global.TeraProxy === "undefined" || typeof global.TeraProxy.UILanguage === "undefined";
 const NpcData = require("./data/npcData.json"), SkillData = require("./data/skillString.json");
 const NpcData = require("./data/npcData.json"), SkillData = require("./data/skillString.json");
-const Last_Hook = { order: 100010 }, Last_Hookfn = { order: 100010, filter: { fake: null } }
+const Last_Hook = { order: 100010 }, Last_Hookfn = { order: 100010, filter: { fake: null } };
 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 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], 23: [201, 202], 34: [8000], 61: [9901], 62: [9001, 9002, 9003, 9004, 9901], 83: [9901], 207: [9901], 223: [9901], 230: [9901] };
 const InvisibleNpcs = { 8: [6011], 12: [1], 23: [201, 202], 34: [8000], 61: [9901], 62: [9001, 9002, 9003, 9004, 9901], 83: [9901], 207: [9901], 223: [9901], 230: [9901] };
 const TrapsIds = [30120, 30220, 30320, 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 TrapsIds = [30120, 30220, 30320, 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];
@@ -588,7 +588,7 @@ module.exports = function FpsUtils(mod) {
 			event.crit = event.stackExplode = false;
 			event.crit = event.stackExplode = false;
 			event.superArmor = false;
 			event.superArmor = false;
 			event.superArmorId = event.hitCylinderId = 0;
 			event.superArmorId = event.hitCylinderId = 0;
-			
+
 			modified = true;
 			modified = true;
 		}
 		}
 
 
@@ -685,7 +685,7 @@ module.exports = function FpsUtils(mod) {
 		ProjDebug = false;
 		ProjDebug = false;
 		AbnDebug = false;
 		AbnDebug = false;
 		AllowedAchUps = 2;
 		AllowedAchUps = 2;
-		if (mod.settings.StreamMode) console.log("\x1b[94mINFO\x1b[34m [FPS-UTILS]\x1b[39m - Steam Mode is enabled, No messages will be sent in-game messages until it's disabled.");
+		if (mod.settings.StreamMode) console.log("\x1b[94mINFO\x1b[34m [FPS-UTILS]\x1b[39m - Steam Mode is enabled, No messages will be sent in-game messages until its disabled.");
 	}
 	}
 
 
 	function sLoadTopo() {
 	function sLoadTopo() {
@@ -899,11 +899,13 @@ module.exports = function FpsUtils(mod) {
 	}
 	}
 
 
 	function sFearMoveStage(event) {
 	function sFearMoveStage(event) {
-		if ((!EqGid(event.target) && mod.settings.Mode === 3) || HUsers[event.target] || HNpcs[event.target]) return false;
+		if (typeof event.target !== "undefined" && ((!EqGid(event.target) && mod.settings.Mode === 3) || HUsers[event.target] || HNpcs[event.target])) return false;
+		if (typeof event.gameId !== "undefined" && ((!EqGid(event.gameId) && mod.settings.Mode === 3) || HUsers[event.gameId] || HNpcs[event.gameId])) return false;
 	}
 	}
 
 
 	function sFearMoveEnd(event) {
 	function sFearMoveEnd(event) {
-		if ((!EqGid(event.target) && mod.settings.Mode === 3) || HUsers[event.target] || HNpcs[event.target]) return false;
+		if (typeof event.target !== "undefined" && ((!EqGid(event.target) && mod.settings.Mode === 3) || HUsers[event.target] || HNpcs[event.target])) return false;
+		if (typeof event.gameId !== "undefined" && ((!EqGid(event.gameId) && mod.settings.Mode === 3) || HUsers[event.gameId] || HNpcs[event.gameId])) return false;
 	}
 	}
 
 
 	function sRequestSpawnServant(event) {
 	function sRequestSpawnServant(event) {
@@ -1072,8 +1074,8 @@ module.exports = function FpsUtils(mod) {
 	mod.hook('S_DESPAWN_NPC', 3, Last_Hook, sDespawnNpc)
 	mod.hook('S_DESPAWN_NPC', 3, Last_Hook, sDespawnNpc)
 	mod.hook('S_NPC_LOCATION', 3, Last_Hook, sNpcLocation)
 	mod.hook('S_NPC_LOCATION', 3, Last_Hook, sNpcLocation)
 	mod.hook('S_CREATURE_ROTATE', 2, Last_Hook, sCreatureRotate)
 	mod.hook('S_CREATURE_ROTATE', 2, Last_Hook, sCreatureRotate)
-	mod.hook('S_FEARMOVE_STAGE', 1, Last_Hook, sFearMoveStage)
-	mod.hook('S_FEARMOVE_END', 1, Last_Hook, sFearMoveEnd)
+	mod.hook('S_FEARMOVE_STAGE', NotCP ? 1 : 2, Last_Hook, sFearMoveStage)
+	mod.hook('S_FEARMOVE_END', NotCP ? 1 : 2, Last_Hook, sFearMoveEnd)
 
 
 	mod.hook('S_REQUEST_SPAWN_SERVANT', NotCP ? 1 : 2, Last_Hook, sRequestSpawnServant)
 	mod.hook('S_REQUEST_SPAWN_SERVANT', NotCP ? 1 : 2, Last_Hook, sRequestSpawnServant)
 	mod.hook('S_REQUEST_DESPAWN_SERVANT', 1, sRequestDespawnServant)
 	mod.hook('S_REQUEST_DESPAWN_SERVANT', 1, sRequestDespawnServant)
@@ -1236,21 +1238,21 @@ module.exports = function FpsUtils(mod) {
 				Msg(`Pvp Traps are ${mod.settings.PvpTraps ? `<font color="${GrnC}">Shown<font color="${PnkC}">(not affected by hide all projectiles)</font></font>` : `<font color="${RedC}">Normal<font color="${PnkC}">(affected by hide all projectiles)</font></font>`}.`);
 				Msg(`Pvp Traps are ${mod.settings.PvpTraps ? `<font color="${GrnC}">Shown<font color="${PnkC}">(not affected by hide all projectiles)</font></font>` : `<font color="${RedC}">Normal<font color="${PnkC}">(affected by hide all projectiles)</font></font>`}.`);
 				break;
 				break;
 			case "list":
 			case "list":
-				Msg(`<font color="${PnkC}">Hidden players: ${mod.settings.PlayersBlacklist}</font>.`);
-				Msg(`<font color="${PnkC}">Hidden classes: ${mod.settings.ClassesBlacklist}</font>.`);
-				Msg(`<font color="${PnkC}">Hidden roles: ${mod.settings.RolesBlacklist}</font>.`);
+				Msg(`<font color="${PnkC}">Hidden players: ${mod.settings.PlayersBlacklist.length ? mod.settings.PlayersBlacklist : 0}</font>.`);
+				Msg(`<font color="${PnkC}">Hidden classes: ${mod.settings.ClassesBlacklist.length ? mod.settings.ClassesBlacklist : 0}</font>.`);
+				Msg(`<font color="${PnkC}">Hidden roles: ${mod.settings.RolesBlacklist.length ? mod.settings.RolesBlacklist : 0}</font>.`);
 				break;
 				break;
 			case "summons": case "sums":
 			case "summons": case "sums":
 				switch (arg) {
 				switch (arg) {
 					case "me":
 					case "me":
 						mod.settings.HideMySummons = !mod.settings.HideMySummons;
 						mod.settings.HideMySummons = !mod.settings.HideMySummons;
 						mod.settings.HideMySummons ? HideNpcs('own') : ShowNpcs('own');
 						mod.settings.HideMySummons ? HideNpcs('own') : ShowNpcs('own');
-						Msg(`Own summoned NPCs ${mod.settings.HideMySummons ? `<font color="${GrnC}">Hidden</font>` : `<font color="${RedC}">Shown</font>`}.`);
+						Msg(`Own summoned NPCs are ${mod.settings.HideMySummons ? `<font color="${GrnC}">Hidden</font>` : `<font color="${RedC}">Shown</font>`}.`);
 						break;
 						break;
 					default:
 					default:
 						mod.settings.HideOthersSummons = !mod.settings.HideOthersSummons;
 						mod.settings.HideOthersSummons = !mod.settings.HideOthersSummons;
 						mod.settings.HideOthersSummons ? HideNpcs('others') : ShowNpcs('others');
 						mod.settings.HideOthersSummons ? HideNpcs('others') : ShowNpcs('others');
-						Msg(`Others summoned NPCs ${mod.settings.HideOthersSummons ? `<font color="${GrnC}">Hidden</font>` : `<font color="${RedC}">Shown</font>`}.`);
+						Msg(`Others summoned NPCs are ${mod.settings.HideOthersSummons ? `<font color="${GrnC}">Hidden</font>` : `<font color="${RedC}">Shown</font>`}.`);
 						break;
 						break;
 				}
 				}
 				break;
 				break;
@@ -1545,7 +1547,7 @@ module.exports = function FpsUtils(mod) {
 					default:
 					default:
 						mod.settings.HideOthersServants = !mod.settings.HideOthersServants;
 						mod.settings.HideOthersServants = !mod.settings.HideOthersServants;
 						mod.settings.HideOthersServants ? HideNpcs('pet', 'others') : ShowNpcs('pet', 'others');
 						mod.settings.HideOthersServants ? HideNpcs('pet', 'others') : ShowNpcs('pet', 'others');
-						Msg(`Others summoned NPCs ${mod.settings.HideOthersServants ? `<font color="${GrnC}">Hidden</font>` : `<font color="${RedC}">Shown</font>`}.`);
+						Msg(`Others summoned Servants are ${mod.settings.HideOthersServants ? `<font color="${GrnC}">Hidden</font>` : `<font color="${RedC}">Shown</font>`}.`);
 						break;
 						break;
 				}
 				}
 				break;
 				break;
@@ -1560,7 +1562,7 @@ module.exports = function FpsUtils(mod) {
 			case "stream":
 			case "stream":
 				mod.settings.StreamMode = !mod.settings.StreamMode;
 				mod.settings.StreamMode = !mod.settings.StreamMode;
 				Msg(`Stream mode is ${mod.settings.StreamMode ? `<font color="${GrnC}">Enabled</font>` : `<font color="${RedC}">Disabled</font>`}.`); // It will only show when disabled.
 				Msg(`Stream mode is ${mod.settings.StreamMode ? `<font color="${GrnC}">Enabled</font>` : `<font color="${RedC}">Disabled</font>`}.`); // It will only show when disabled.
-				if (mod.settings.StreamMode) console.log("\x1b[94mINFO\x1b[34m [FPS-UTILS]\x1b[39m - Steam Mode has been enabled, No messages will be sent in-game messages until it's disabled.");
+				if (mod.settings.StreamMode) console.log("\x1b[94mINFO\x1b[34m [FPS-UTILS]\x1b[39m - Steam Mode has been enabled, No messages will be sent in-game messages until its disabled.");
 				else console.log("\x1b[94mINFO\x1b[34m [FPS-UTILS]\x1b[39m - Steam Mode has been disabled.");
 				else console.log("\x1b[94mINFO\x1b[34m [FPS-UTILS]\x1b[39m - Steam Mode has been disabled.");
 				break;
 				break;
 			case "help": case "h":
 			case "help": case "h":

+ 3 - 3
manifest.json

@@ -3,7 +3,7 @@
         "README.md": "bc59f32c10752de9a4123dec9688be45e9e97bd5ef6cd20ecdf249635fafc333",
         "README.md": "bc59f32c10752de9a4123dec9688be45e9e97bd5ef6cd20ecdf249635fafc333",
         "lib/data/npcData.json": "dad0fe8bf2942a36c9a33b324e43fdda9bcc3b411541d31ae9d01be5169bdfb7",
         "lib/data/npcData.json": "dad0fe8bf2942a36c9a33b324e43fdda9bcc3b411541d31ae9d01be5169bdfb7",
         "lib/data/skillString.json": "9d69876fea0be8e6ac5dd43b3fc74ea023f6b8a6145384f8f780dd977045d8ef",
         "lib/data/skillString.json": "9d69876fea0be8e6ac5dd43b3fc74ea023f6b8a6145384f8f780dd977045d8ef",
-        "lib/index.js": "3f52845ae5f95fe2aeb3605bbf4495ccb16ec6cbbcd3241648145044ea989a1d",
+        "lib/index.js": "226224ed2d9012ca6ba256166c822f24e2f04539e002871b659fe06a4678a414",
         "lib/setting_migration.js": "9f0816758b88300afd97ca8aaa8cfc0dadedcdda17713d6e709772a9c0dddcea",
         "lib/setting_migration.js": "9f0816758b88300afd97ca8aaa8cfc0dadedcdda17713d6e709772a9c0dddcea",
         "module.json": "2e105877c06e04aee1225aff0fff699d74cd1c250a975ea0c50f40f8772ea8b9",
         "module.json": "2e105877c06e04aee1225aff0fff699d74cd1c250a975ea0c50f40f8772ea8b9",
         "package.json": "a8aa5a079bc568096b2037f2777f9b01e97ba08ba62a515b7d6908f4bc6e1b51"
         "package.json": "a8aa5a079bc568096b2037f2777f9b01e97ba08ba62a515b7d6908f4bc6e1b51"
@@ -30,8 +30,8 @@
         "S_DESPAWN_USER": 3,
         "S_DESPAWN_USER": 3,
         "S_EACH_SKILL_RESULT": 13,
         "S_EACH_SKILL_RESULT": 13,
         "S_EXIT": 3,
         "S_EXIT": 3,
-        "S_FEARMOVE_END": 1,
-        "S_FEARMOVE_STAGE": 1,
+        "S_FEARMOVE_END": 2,
+        "S_FEARMOVE_STAGE": 2,
         "S_FIELD_EVENT_ON_ENTER": "raw",
         "S_FIELD_EVENT_ON_ENTER": "raw",
         "S_FIELD_EVENT_ON_LEAVE": "raw",
         "S_FIELD_EVENT_ON_LEAVE": "raw",
         "S_FONT_SWAP_INFO": "raw",
         "S_FONT_SWAP_INFO": "raw",