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

Fixes.

Added new hit mode (ALL).
Fixed the issue where hiding damage numbers doesn't hide thrall's damage/heal numbers.
Fixed the issue were activating hit own would also prevent numbers from showing.
Settings version 9. :moon:
Risenio лет назад: 7
Родитель
Сommit
19c397d432
5 измененных файлов с 55 добавлено и 24 удалено
  1. 43 16
      lib/index.js
  2. 5 1
      lib/setting_migration.js
  3. 4 4
      manifest.json
  4. 2 2
      module.json
  5. 1 1
      package.json

+ 43 - 16
lib/index.js

@@ -245,9 +245,10 @@ module.exports = function FpsUtils(mod) {
 					{ text: `<font color="${mod.settings.Mode === 3 ? GrnC : RedC}" size="+18">[Mode 3]</font>`, command: "fps mode 3;fps gui" }, { text: "&nbsp;&nbsp;&nbsp;&nbsp;" },
 					{ text: `<font color="${mod.settings.Fishing ? GrnC : RedC}" size="+18">[Fishing]</font><br><br>`, command: "fps fishing;fps gui" },
 					{ text: `<font color="${YlwC}" size="+21">Hit:</font>` }, { text: "&#09;&#09;&#09;" },
-					{ text: `<font color="${mod.settings.Hit_Other ? GrnC : RedC}" size="+18">[Players effect]</font>`, command: "fps hit other;fps gui" }, { text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.Hit_Me ? GrnC : RedC}" size="+18">[Own effect]</font>`, command: "fps hit me;fps gui" }, { text: "&nbsp;&nbsp;" },
-					{ text: `<font color="${mod.settings.Hit_Damage ? GrnC : RedC}" size="+18">[Damage numbers]</font><br><br>`, command: "fps hit damage;fps gui" },
+					{ 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(self)]</font>`, command: "fps hit me;fps gui" }, { text: "&nbsp;&nbsp;" },
+					{ text: `<font color="${mod.settings.Hit_Damage ? GrnC : RedC}" size="+18">[Damage numbers]</font>`, command: "fps hit damage;fps gui" }, { text: "&nbsp;&nbsp;" },
+					{ text: `<font color="${mod.settings.Hit_All ? GrnC : RedC}" size="+18">[ALL]</font><br><br>`, command: "fps hit all;fps gui" },
 					{ text: `<font color="${YlwC}" size="+21">Hide:</font>` }, { text: "&#09;&#09;" },
 					{ text: `<font color="${mod.settings.HideOthersSummons ? GrnC : RedC}" size="+17">[Players summons]</font>`, command: "fps summons;fps gui" }, { text: "&nbsp;&nbsp;" },
 					{ text: `<font color="${mod.settings.HideMySummons ? GrnC : RedC}" size="+17">[Own summons]</font>`, command: "fps summons me;fps gui" }, { text: "&nbsp;&nbsp;" },
@@ -517,17 +518,40 @@ module.exports = function FpsUtils(mod) {
 	function ModifySkillResult(event) {
 		let modified = false;
 
-		if (mod.settings.Hit_Me) {
-			event.skill = { reserved: 0, npc: false, type: 0, huntingZoneId: 0, id: 0 };
+		if (mod.settings.Hit_Me && (EqGid(event.source) || EqGid(event.owner))) {
+			event.templateId = 10101;
+			event.skill.id = 10100;
+			event.time = 0;
+			event.crit = false;
+
 			modified = true;
 		}
 
-		if (mod.settings.Hit_Damage) {
-			event.damage = event.type = event.crit = event.noctEffect = event.stackExplode = 0;
+		if (mod.settings.Hit_Other && !EqGid(event.target) && !EqGid(event.source) && !EqGid(event.owner) && (SUsers[event.owner] || SUsers[event.source])) {
+			event.templateId = 10101;
+			event.skill.id = 10100;
+			event.time = 0;
+			event.crit = false;
+
 			modified = true;
 		}
 
-		return modified;
+		if (mod.settings.Hit_Damage && (EqGid(event.source) || EqGid(event.owner) || UserSumNPCs.includes(event.templateId) && event.skill.huntingZoneId === 1023)) {
+			event.id = event.damage = event.type = event.noctEffect = event.reaction.id = 0;
+			event.crit = event.stackExplode = event.blocked = false;
+
+			modified = true;
+		}
+
+		if (mod.settings.Hit_All) {
+			event.id = event.damage = event.type = event.noctEffect = event.reaction.id = 0;
+			event.crit = event.stackExplode = event.blocked = false;
+			event.target = 0;
+
+			modified = true;
+		}
+
+		return modified ? true : undefined;
 	}
 
 	function NpcBCheck(event) {
@@ -911,12 +935,7 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function sEachSkillResult(event) {
-		if ((EqGid(event.source) || EqGid(event.owner)) && ModifySkillResult(event)) return true;
-		if (!EqGid(event.target) && mod.settings.Hit_Other && (SUsers[event.owner] || SUsers[event.source])) {
-			event.skill = { reserved: 0, npc: false, type: 0, huntingZoneId: 0, id: 0 };
-			event.id = event.damage = event.type = event.crit = event.noctEffect = event.crit = event.stackExplode = event.blocked = event.reaction.skill = 0;
-			return true;
-		}
+		return ModifySkillResult(event);
 	}
 
 	function sSpawnDropItem(event) {
@@ -934,7 +953,7 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function sFontSwapInfo() {
-		if (mod.settings.Hit_Damage) return false;
+		if (mod.settings.Hit_Damage || mod.settings.Hit_All) return false;
 	}
 
 	// ~~~ * Packet Hooks * ~~~ \\
@@ -954,7 +973,7 @@ module.exports = function FpsUtils(mod) {
 	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 currently not public, but soon it will be.
+	//mod.hook('S_QUEST_VILLAGER_INFO', 'raw', sQuestVillagerInfo) opcode currently not public, but soon it will be. **someday** qq
 	mod.hook('S_UPDATE_ACHIEVEMENT_PROGRESS', 'raw', sUpdateAchievementProgress)
 	mod.hook('S_CURRENT_CHANNEL', 2, sCurrentChannel)
 	mod.hook('S_ITEM_CUSTOM_STRING', 2, sItemCustomString)
@@ -1222,17 +1241,25 @@ module.exports = function FpsUtils(mod) {
 			case "hit":
 				switch (arg) {
 					case "me":
+						if (mod.settings.Hit_All) return Msg(`<font color="${RedC}">You've to disable hit ALL first</font>.`);
 						mod.settings.Hit_Me = !mod.settings.Hit_Me;
 						Msg(`Own hits effect ${mod.settings.Hit_Me ? `<font color="${GrnC}">Hidden</font>` : `<font color="${RedC}">Shown</font>`}.`);
 						break;
 					case "other":
+						if (mod.settings.Hit_All) return Msg(`<font color="${RedC}">You've to disable hit ALL first</font>.`);
 						mod.settings.Hit_Other = !mod.settings.Hit_Other;
 						Msg(`Players hit effect ${mod.settings.Hit_Other ? `<font color="${GrnC}">Hidden</font>` : `<font color="${RedC}">Shown</font>`}.`);
 						break;
 					case "damage":
+						if (mod.settings.Hit_All) return Msg(`<font color="${RedC}">You've to disable hit ALL first</font>.`);
 						mod.settings.Hit_Damage = !mod.settings.Hit_Damage;
 						Msg(`Damage numbers ${mod.settings.Hit_Damage ? `<font color="${GrnC}">Hidden</font>` : `<font color="${RedC}">Shown</font>`}.`);
 						break;
+					case "all":
+						mod.settings.Hit_Me = mod.settings.Hit_Other = mod.settings.Hit_Damage = false;
+						mod.settings.Hit_All = !mod.settings.Hit_All;
+						Msg(`Hit all ${mod.settings.Hit_All ? `<font color="${GrnC}">Hidden</font>` : `<font color="${RedC}">Shown</font>`}.`);
+						break;
 					default:
 						Msg(`<font color="${GryC}">Invalid &#40;hit&#41; '${arg}'</font>.`);
 						break;

+ 5 - 1
lib/setting_migration.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const DefaultSettings = {
-	_version: 8,
+	_version: 9,
 	Mode: 0,
 	Fishing: false,
 	OnlyParty: false,
@@ -12,6 +12,7 @@ const DefaultSettings = {
 	Hit_Me: false,
 	Hit_Other: false,
 	Hit_Damage: false,
+	Hit_All: false,
 	HideFireworks: true,
 	Hideguildlogos: false,
 	HideMonsterDeathAnimation: true,
@@ -96,6 +97,9 @@ function MigrateSettings(from_ver, to_ver, settings) {
 				settings._version = 8;
 				settings.PvpTraps = DefaultSettings.PvpTraps;
 				break;
+			case 9:
+				settings.Hit_All = DefaultSettings.Hit_All;
+				break;
 			default:
 				console.log(`[FPS-UTILS] -\x1b[31m Your 'config.json' seems to be too old.\x1b[32m Re-created new one.\x1b[0m`);
 				Object.keys(settings).forEach(key => delete settings[key]);

+ 4 - 4
manifest.json

@@ -3,10 +3,10 @@
         "README.md": "c60e209ff27cf5363b147186c20ccac2fcdc339d12af40f201a7dd9151c33d41",
         "lib/data/npcData.json": "737fd1ff6b53121fc2fa716bc7f1c5688a4db2353dedf9c024bb879cd0cfa5a0",
         "lib/data/skillString.json": "9d69876fea0be8e6ac5dd43b3fc74ea023f6b8a6145384f8f780dd977045d8ef",
-        "lib/index.js": "013958429435386ab1b63e8d86169390db11c63fb97bf1396e770098a42b7129",
-        "lib/setting_migration.js": "ceab7591a1d4cfbc16f43019a78c515f1b8d9ef7d834ad5722e19a65b80ceef9",
-        "module.json": "817f90bb235687a40044b2875128ae848928efc62b3d3ecbde72d528e1fc033d",
-        "package.json": "c6c696814caec5c2994c9bf6c75f52ac65b6199e0f61b246da2ad73d406ce877"
+        "lib/index.js": "b2f54e8b7de0bae69854065e4cc598d6eb952705e0ca70d9e50885a22aac2e45",
+        "lib/setting_migration.js": "1c2766f31b067510c4aa964382f6b9949a0098fe4d6c2805b696e0e71414f546",
+        "module.json": "58359cb9ec21bbca8bee51974026774b2ae8287db7cea164f7165ace99ef39f4",
+        "package.json": "948e48143610cdfb056b0dbcb6fae6833f4930ed9fe20a9c70688fdf6f8c316e"
     },
     "defs": {
         "C_ADMIN": 1,

+ 2 - 2
module.json

@@ -5,11 +5,11 @@
     "homepage": "https://github.com/Risenio/fps-utils/wiki",
     "description": "A free script filled with features dedicated to improve your fps.",
     "contributors": ["codeagon","Saegusae","SerenTera","Kyoukaya","SaltyMonkey","Leyki"],
-    "version": "8",
+    "version": "9",
     "options": {
         "niceName": "FPS",
         "guiName": "Fps Utils",
-        "settingsVersion": 8,
+        "settingsVersion": 9,
         "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": "8",
+	"version": "9",
 	"homepage": "https://github.com/Risenio/fps-utils/wiki",
 	"keywords": [ "fps", "tera", "tera-proxy", "tera-fps" ],
     "contributors": ["codeagon", "Saegusae", "SerenTera", "Kyoukaya", "SaltyMonkey", "Leyki"],