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

Small update.

More accurate respawn location for NPCs/servants.
More accurate "movement" location for players with mode 2.
Fixed the issue with Hit modes, where it would still make sound and show weird lighting effect.
Reverted the functionality of `fps hit me` to block damage numbers (I failed to find a skill id that doesn't show hit effect *at all*).
Deleted `fps quicklink searchengine` due to the removal of support on TLS v1.0 & v1.1 which tera uses.
Risenio лет назад: 6
Родитель
Сommit
3e05650308
2 измененных файлов с 96 добавлено и 71 удалено
  1. 94 69
      lib/index.js
  2. 2 2
      manifest.json

+ 94 - 69
lib/index.js

@@ -301,11 +301,10 @@ module.exports = function FpsUtils(mod) {
 					{ text: `<font color="${BluC}" size="+22">Quick Links:</font><br>` },
 					{ text: `<font color="${YlwC}" size="+20">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">[Broker]</font>`, command: "fps quicklink broker" }, { text: "&nbsp;&nbsp;&nbsp;&nbsp;" },
+					{ text: `<font color="${PrpC}" size="+17">[Talent]</font>`, command: "fps quicklink talents" }, { text: "&nbsp;&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="${PrpC}" size="+17">[Hat Style]</font><br>`, command: "fps quicklink hatrestyle" },
 					{ text: `<font color="${YlwC}" size="+20">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;" },
@@ -567,48 +566,96 @@ module.exports = function FpsUtils(mod) {
 			modified = true;
 		}
 
-		return modified;
+		return modified ? true : undefined;
+	}
+
+	function ModifyAbnormalities(event, end) {
+		if (ImportantAbns.indexOf(event.id) !== -1) return undefined;
+
+		if ([90442103, 90442107].indexOf(event.id) !== -1) {
+			event.id = 47702000;
+
+			return true;
+		}
+
+		if (!end) {
+			if (EqGid(event.target)) {
+				if (mod.settings.HideOwnBlacklistedAbns && mod.settings.OwnAbnormalsBlacklist.indexOf(event.id) !== -1) return false;
+
+				return undefined;
+			}
+
+			if (HUsers[event.target] || HNpcs[event.target] || event.id === 9943049) return false;
+			if (mod.settings.HideBlacklistedAbnormalities && (mod.settings.AbnormalitiesBlacklist.indexOf(event.id) !== -1 || BlockedAbns.indexOf(event.id) !== -1)) return false;
+			if (mod.settings.HideAllAbnormalities && (SUsers[event.target] || mod.settings.AbnormalitiesBlacklist.indexOf(event.id) !== -1 || BlockedAbns.indexOf(event.id) !== -1)) return false;
+		}
+	}
+
+	function ActionHCheck(event, end) {
+		let hidden = false;
+
+		if (EqGid(event.gameId) || !SUsers[event.gameId]) return undefined;
+
+		if (mod.settings.Mode >= 2 || HUsers[event.gameId] || mod.settings.ClassesData[ClassID(event.templateId)].CD_HideBlacklistedSkills) hidden = true;
+		if (mod.settings.HideBlacklistedSkills && mod.settings.ClassesData[ClassID(event.templateId)].CD_SkillsBlacklist.includes(Math.floor(event.skill.id / 10000).toString())) hidden = true;
+
+		if (hidden) UpdateUserLoc(event);
+
+		if (HNpcs[event.gameId]) {
+			HNpcs[event.gameId].loc = event.loc;
+
+			hidden = true;
+		}
+
+		return !end && hidden ? false : undefined;
+	}
+
+	function ProjectileBCheck(event) {
+		let blocked = false;
+
+		if ((mod.settings.Mode !== 3 && event.skill.id === 90120) || (mod.settings.PvpTraps && TrapsIds.includes(event.skill.id))) return undefined;
+
+		if ((mod.settings.HideBlacklistedProjectiles || mod.settings.HideAllProjectiles) && mod.settings.ProjectilesBlacklist.includes(event.skill.id)) blocked = true;
+		if (!EqGid(event.gameId) && SUsers[event.gameId] && (HUsers[event.gameId] || mod.settings.Mode >= 2 || mod.settings.HideAllProjectiles)) blocked = true;
+
+		return blocked ? false : undefined;
 	}
 
 	function ModifySkillResult(event) {
 		let modified = false;
 
 		if (mod.settings.Hit_Me && (EqGid(event.source) || EqGid(event.owner))) {
-			event.templateId = 10101;
-			event.skill.id = 10100;
-			event.time = 0;
-			event.crit = event.stackExplode = false;
-			event.superArmor = false;
+			event.templateId = 0; //10101
+			event.skill.id = 0; //10100
+			event.time = event.type = event.noctEffect = 0;
+			event.crit = event.stackExplode = event.superArmor = false;
 			event.superArmorId = event.hitCylinderId = 0;
 
 			modified = true;
 		}
 
 		if (mod.settings.Hit_Other && !EqGid(event.target) && !EqGid(event.source) && !EqGid(event.owner) && (SUsers[event.owner] || SUsers[event.source])) {
-			event.type = event.noctEffect = 0;
-			event.value = 0;
-			event.crit = event.stackExplode = false;
-			event.superArmor = false;
+			event.templateId = 0;
+			event.skill.id = 0;
+			event.time = event.type = event.noctEffect = 0;
+			event.crit = event.stackExplode = event.superArmor = false;
 			event.superArmorId = event.hitCylinderId = 0;
 
 			modified = true;
 		}
 
-		if (mod.settings.Hit_Damage && (EqGid(event.source) || EqGid(event.owner) || UserNPCs.includes(event.templateId) && event.skill.huntingZoneId === 1023)) {
-			event.type = event.noctEffect = 0;
-			event.value = 0;
-			event.crit = event.stackExplode = false;
-			event.superArmor = false;
-			event.superArmorId = event.hitCylinderId = 0;
+		if (mod.settings.Hit_Damage && (EqGid(event.source) || EqGid(event.owner) || EqGid(event.target) || UserNPCs.includes(event.templateId) && event.skill.huntingZoneId === 1023)) {
+			event.value = 0n;
 
 			modified = true;
 		}
 
 		if (mod.settings.Hit_All) {
-			event.type = event.noctEffect = 0;
-			event.value = 0;
-			event.crit = event.stackExplode = false;
-			event.superArmor = false;
+			event.templateId = 0;
+			event.skill.id = 0;
+			event.time = event.type = event.noctEffect = 0;
+			event.value = 0n;
+			event.crit = event.stackExplode = event.superArmor = false;
 			event.superArmorId = event.hitCylinderId = 0;
 
 			modified = true;
@@ -659,7 +706,7 @@ module.exports = function FpsUtils(mod) {
 			}
 		}
 
-		return blocked;
+		return blocked ? false : undefined;
 	}
 
 	function EqGid(xg) {
@@ -687,7 +734,6 @@ module.exports = function FpsUtils(mod) {
 		MyName = event.name;
 		ProjDebug = false;
 		AbnDebug = false;
-		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 its disabled.");
 	}
 
@@ -696,7 +742,7 @@ module.exports = function FpsUtils(mod) {
 		SNpcs = {};
 		HUsers = {};
 		HNpcs = {};
-		AllowedAchUps = 1;
+		AllowedAchUps = 2;
 		if (ProjDebug) {
 			ProjDebug = false
 			Msg(`<font color="${HPkC}">Auto Disabled</font> projectile debug, to reduce the unneeded spam.`);
@@ -754,7 +800,10 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function sUpdateAchievementProgress(event) {
-		if (AllowedAchUps) { AllowedAchUps--; return; }
+		if (AllowedAchUps) {
+			AllowedAchUps--;
+			return;
+		}
 		for (const Achieve of event.achievements) if (SpamAchIds.indexOf(Achieve.id) > -1 || !Achieve.requirements.length) return false;
 	}
 
@@ -791,11 +840,11 @@ module.exports = function FpsUtils(mod) {
 			HUsers[event.gameId].spawnFx = 1;
 			return false;
 		}
-		if (ModifyUserAppearance(event)) return true;
+		return ModifyUserAppearance(event);
 	}
 
 	function sSpawnUserfn(event) {
-		if (ModifyUserAppearance(event)) return true;
+		return ModifyUserAppearance(event);
 	}
 
 	function sDespawnUser(event) {
@@ -871,7 +920,7 @@ module.exports = function FpsUtils(mod) {
 		SNpcs[event.gameId] = event;
 		SNpcs[event.gameId].spawnType = 1;
 		SNpcs[event.gameId].spawnScript = 0;
-		if (NpcBCheck(event)) return false;
+		return NpcBCheck(event);
 	}
 
 	function sDespawnNpc(event) {
@@ -933,39 +982,23 @@ 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 ([90442103, 90442107].indexOf(event.id) !== -1) { event.id = 47702000; return true; }
-		if (ImportantAbns.indexOf(event.id) !== -1) return;
-		if (EqGid(event.target)) {
-			if (mod.settings.HideOwnBlacklistedAbns && mod.settings.OwnAbnormalsBlacklist.indexOf(event.id) !== -1) return false;
-			return;
-		}
-		if (HUsers[event.target] || HNpcs[event.target]) return false;
-		if (event.id === 9943049) return false;
-		if (mod.settings.HideBlacklistedAbnormalities && (mod.settings.AbnormalitiesBlacklist.indexOf(event.id) !== -1 || BlockedAbns.indexOf(event.id) !== -1)) return false;
-		if (mod.settings.HideAllAbnormalities && (SUsers[event.target] || mod.settings.AbnormalitiesBlacklist.indexOf(event.id) !== -1 || BlockedAbns.indexOf(event.id) !== -1)) return false;
+		return ModifyAbnormalities(event);
 	}
 
 	function sAbnormalityRefresh(event) {
-		if ([90442103, 90442107].indexOf(event.id) !== -1) { event.id = 47702000; return true; }
-		if (ImportantAbns.indexOf(event.id) !== -1) return;
-		if (event.id === 9943049) return false;
-		if (HUsers[event.target] || HNpcs[event.target]) return false;
-
-		if (mod.settings.HideBlacklistedAbnormalities && (mod.settings.AbnormalitiesBlacklist.indexOf(event.id) !== -1 || BlockedAbns.indexOf(event.id) !== -1)) return false;
-		if (mod.settings.HideAllAbnormalities && (SUsers[event.target] || mod.settings.AbnormalitiesBlacklist.indexOf(event.id) !== -1 || BlockedAbns.indexOf(event.id) !== -1)) return false;
+		return ModifyAbnormalities(event);
 	}
 
 	function sAbnormalityEnd(event) {
-		if ([90442103, 90442107].indexOf(event.id) !== -1) { event.id = 47702000; return true; }
-		if (event.id === 9943049) return false;
+		return ModifyAbnormalities(event, true);
 	}
 
 	function sActionStage(event) {
-		if (EqGid(event.gameId) || !SUsers[event.gameId]) return;
-		if ((mod.settings.Mode >= 2) || HUsers[event.gameId] || mod.settings.ClassesData[ClassID(event.templateId)].CD_HideBlacklistedSkills || (mod.settings.HideBlacklistedSkills && mod.settings.ClassesData[ClassID(event.templateId)].CD_SkillsBlacklist.includes(Math.floor(event.skill.id / 10000).toString()))) {
-			UpdateUserLoc(event);
-			return false;
-		}
+		return ActionHCheck(event);
+	}
+
+	function sActionEnd(event) {
+		return ActionHCheck(event, true);
 	}
 
 	function sStartUserProjectile(event) {
@@ -973,10 +1006,7 @@ module.exports = function FpsUtils(mod) {
 			if (EqGid(event.gameId)) log('Projectile', 'Started', 'from', MyName, event.skill.id);
 			if (SUsers[event.gameId]) log('Projectile', 'Started', 'from', SUsers[event.gameId].name, event.skill.id);
 		}
-		if (mod.settings.Mode !== 3 && event.skill.id === 90120) return;
-		if (mod.settings.PvpTraps && TrapsIds.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 >= 2 || mod.settings.HideAllProjectiles)) return false;
+		return ProjectileBCheck(event);
 	}
 
 	function sSpawnProjectile(event) {
@@ -985,14 +1015,11 @@ module.exports = function FpsUtils(mod) {
 			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);
 		}
-		if (mod.settings.Mode !== 3 && event.skill.id === 90120) return;
-		if (mod.settings.PvpTraps && TrapsIds.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 >= 2 || mod.settings.HideAllProjectiles)) return false;
+		return ProjectileBCheck(event);
 	}
 
 	function sPlayerChangeMp(event) {
-		if (!mod.settings.HideMpNumbers || !EqGid(event.target)) return;
+		if (!mod.settings.HideMpNumbers || (!EqGid(event.target))) return;
 		if (event.type !== 0) {
 			event.type = 0;
 			return true;
@@ -1000,7 +1027,7 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function sCreatureChangeHp(event) {
-		if (!mod.settings.HideHpNumbers || !EqGid(event.target)) return;
+		if (!mod.settings.HideHpNumbers || (!EqGid(event.target))) return;
 		if (event.type !== 10) {
 			event.type = 10;
 			return true;
@@ -1090,6 +1117,7 @@ module.exports = function FpsUtils(mod) {
 	mod.hook('S_ABNORMALITY_END', 1, Last_Hook, sAbnormalityEnd)
 
 	mod.hook('S_ACTION_STAGE', 9, Last_Hook, sActionStage)
+	mod.hook('S_ACTION_END', 5, Last_Hook, sActionEnd)
 	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, Last_Hook, sPlayerChangeMp)
@@ -1491,9 +1519,6 @@ module.exports = function FpsUtils(mod) {
 					case "reset":
 						mod.toServer('C_RESET_ALL_DUNGEON', 1);
 						break;
-					case "searchengine":
-						mod.toClient('S_SHOW_AWESOMIUMWEB_SHOP', 1, { link: 'https://www.dogpile.com/' });	// To-do... delete this feature; most search engines have/going to remove support for TLSv1.0 & 1.1 which tera uses Starting on January 1st, 2020.
-						break;
 					default:
 						Msg(`<font color="${GryC}">Invalid &#40;quicklink&#41; '${arg}'</font>.`);
 						break;
@@ -1571,7 +1596,7 @@ module.exports = function FpsUtils(mod) {
 				break;
 			case "stream":
 				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>`}.`);
 				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.");
 				break;

+ 2 - 2
manifest.json

@@ -3,7 +3,7 @@
         "README.md": "7eae31e8066dad35209a4833ce708b0aeb8bca60deb8574ff84b99792ddfe862",
         "lib/data/npcData.json": "dad0fe8bf2942a36c9a33b324e43fdda9bcc3b411541d31ae9d01be5169bdfb7",
         "lib/data/skillString.json": "9d69876fea0be8e6ac5dd43b3fc74ea023f6b8a6145384f8f780dd977045d8ef",
-        "lib/index.js": "c10e310e221b508e2e772ce7f219f5786b42211952f0765ca5931b1d4ecacfcc",
+        "lib/index.js": "d163972dc0c1d104c63d67ceb6b0fc716a059007893d78eae3cacb89b5738e7f",
         "lib/setting_migration.js": "9f0816758b88300afd97ca8aaa8cfc0dadedcdda17713d6e709772a9c0dddcea",
         "module.json": "2e105877c06e04aee1225aff0fff699d74cd1c250a975ea0c50f40f8772ea8b9",
         "package.json": "a8aa5a079bc568096b2037f2777f9b01e97ba08ba62a515b7d6908f4bc6e1b51"
@@ -20,6 +20,7 @@
         "S_ABNORMALITY_BEGIN": 3,
         "S_ABNORMALITY_END": 1,
         "S_ABNORMALITY_REFRESH": 1,
+        "S_ACTION_END": 5,
         "S_ACTION_STAGE": 9,
         "S_ANNOUNCE_UPDATE_NOTIFICATION": 1,
         "S_APPLY_TITLE": 3,
@@ -49,7 +50,6 @@
         "S_PLAYER_CHANGE_MP": 1,
         "S_REQUEST_DESPAWN_SERVANT": 1,
         "S_REQUEST_SPAWN_SERVANT": 3,
-        "S_SHOW_AWESOMIUMWEB_SHOP": 1,
         "S_SOCIAL": 1,
         "S_SPAWN_DROPITEM": 8,
         "S_SPAWN_NPC": 11,