Browse Source

Small update.

Added ability to hide partners speech popups.
Now it hides the boxes/eggs opening animations for hidden players.
Settings version 19.
Risenio 6 years ago
parent
commit
6b6fa2cf9b
3 changed files with 83 additions and 15 deletions
  1. 67 11
      lib/index.js
  2. 6 1
      lib/setting_migration.js
  3. 10 3
      manifest.json

+ 67 - 11
lib/index.js

@@ -35,7 +35,8 @@ module.exports = function FpsUtils(mod) {
 		SNpcs = {},
 		HNpcs = {},
 		SPets = {},
-		HPets = {};
+		HPets = {},
+		HSeedBoxes = {};
 
 	// ~~~ * Gui Parser * ~~~ \\
 
@@ -264,7 +265,8 @@ module.exports = function FpsUtils(mod) {
 					{ 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="${mod.settings.HideFireworks ? GrnC : RedC}" size="+18">[Firework]</font>`, command: "fps fireworks;fps gui" }, { text: "&nbsp;&nbsp;" },
+					{ text: `<font color="${mod.settings.HideServantBalloons ? GrnC : RedC}" size="+18">[Pets Popup]</font><br><br>`, command: "fps petspopup;fps gui" },
 					{ text: `<font color="${YlwC}" size="+20">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;" },
@@ -634,8 +636,8 @@ module.exports = function FpsUtils(mod) {
 		let modified = false;
 
 		if (mod.settings.Hit_Me && (EqGid(event.source) || EqGid(event.owner))) {
-			event.templateId = 0; //10101
-			event.skill.id = 0; //10100
+			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;
@@ -886,7 +888,13 @@ module.exports = function FpsUtils(mod) {
 		if (HUsers[event.gameId]) HUsers[event.gameId].loc = event.loc;
 	}
 
-	function sUserMoveType() { return false; }
+	function sUserMovetype(event) {
+		if (SUsers[event.gameId]) SUsers[event.gameId].w = event.w
+		if (HUsers[event.gameId]) {
+			HUsers[event.gameId].w = event.w
+			return false
+		}
+	}
 
 	function sPartyMemberList(event) {
 		event.members.map(value => PMembers.push(value.name))
@@ -995,6 +1003,11 @@ module.exports = function FpsUtils(mod) {
 		delete SPets[event.gameId];
 	}
 
+	function sQuestBalloon(event) {
+		if (!SPets[event.source]) return;
+		if (mod.settings.HideServantBalloons) return false;
+	}
+
 	function sAbnormalityBegin(event) {
 		if (AbnDebug) {
 			if (EqGid(event.target)) log('Abnormality', 'Applied', 'on', MyName, event.id);
@@ -1039,7 +1052,7 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	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;
@@ -1047,7 +1060,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;
@@ -1058,9 +1071,19 @@ module.exports = function FpsUtils(mod) {
 		return ModifySkillResult(event);
 	}
 
+	function sItemExplosionResult(event) {
+		if (mod.settings.Mode >= 2 || (EqGid(event.gameId) && mod.settings.Hit_Me) || (!EqGid(event.gameId) && mod.settings.Hit_Other) || mod.settings.Hit_All || HUsers[event.gameId]) {
+			for (const gameId of event.items) {
+				if (SUsers[event.gameId] && mod.settings.HideBlacklistedDrop && mod.settings.DropBlacklist.some(item => [8008, 8009, 8010, 8011, 8012, 8013, 8014, 8015, 8016, 8017, 8018, 8019, 8020, 8021, 8022, 8023].indexOf(item) !== -1)) continue;
+				mod.toClient('S_DESPAWN_DROPITEM', 4, { gameId });
+			}
+			return false
+		}
+	}
+
 	function sSpawnDropItem(event) {
 		if (EqGid(event.source)) return;
-		if (mod.settings.HideBlacklistedDrop && mod.settings.DropBlacklist.includes(event.item)) return false;
+		if (mod.settings.HideBlacklistedDrop && mod.settings.DropBlacklist.indexOf(event.item) !== -1) return false;
 		if (mod.settings.Mode >= 2) {
 			event.explode = 0;
 			return true;
@@ -1071,6 +1094,28 @@ module.exports = function FpsUtils(mod) {
 		if (mod.settings.Hit_Damage || mod.settings.Hit_All) return false;
 	}
 
+	function sSpawnEventSeed(event) {
+		if (HUsers[NotCP ? event.gameId : event.owner]) {
+			HSeedBoxes[NotCP ? event.target : event.gameId] = event;
+			return false;
+		}
+	}
+
+	function sUpdateEventSeedState(event) {
+		if (HSeedBoxes[event.gameId]) return false;
+	}
+
+	function sResultEventSeed(event) {
+		if (HSeedBoxes[NotCP ? event.cid : event.gameId]) return false;
+	}
+
+	function sDespawnEventSeed(event) {
+		if (HSeedBoxes[event.gameId]) {
+			delete HSeedBoxes[event.gameId];
+			return false;
+		}
+	}
+
 	function sFieldEventOnEnter() {
 		if (mod.settings.GuardianAutoChange) {
 			if ((LastGState !== null && mod.settings.Mode === 2) || mod.settings.Mode >= 2) return;
@@ -1116,7 +1161,7 @@ module.exports = function FpsUtils(mod) {
 	mod.hook('S_USER_LOCATION', 5, Last_Hook, sUserLocation)
 	mod.hook('S_USER_STATUS', 3, Last_Hook, sUserStatus)
 	mod.hook('S_DEAD_LOCATION', 2, sDeadLocation)
-	mod.hook('S_USER_MOVETYPE', 'raw', Last_Hook, sUserMoveType)
+	mod.hook('S_USER_MOVETYPE', 1, Last_Hook, sUserMovetype)
 	mod.hook('S_PARTY_MEMBER_LIST', 7, sPartyMemberList)
 	mod.hook('S_USER_APPEARANCE_CHANGE', 1, Last_Hook, sUserAppearanceChange)
 	mod.hook('S_USER_EXTERNAL_CHANGE', 7, Last_Hook, sUserExternalChange)
@@ -1131,7 +1176,8 @@ module.exports = function FpsUtils(mod) {
 	mod.hook('S_FEARMOVE_END', 2, Last_Hook, sFearMoveEnd)
 
 	mod.hook('S_REQUEST_SPAWN_SERVANT', 4, Last_Hook, sRequestSpawnServant)
-	mod.hook('S_REQUEST_DESPAWN_SERVANT', 1, sRequestDespawnServant)
+	mod.hook('S_REQUEST_DESPAWN_SERVANT', 1, Last_Hook, sRequestDespawnServant)
+	mod.hook('S_QUEST_BALLOON', 1, Last_Hook, sQuestBalloon)
 
 	mod.hook('S_ABNORMALITY_BEGIN', 3, Last_Hook, sAbnormalityBegin)
 	mod.hook('S_ABNORMALITY_REFRESH', 1, Last_Hook, sAbnormalityRefresh)
@@ -1143,10 +1189,16 @@ module.exports = function FpsUtils(mod) {
 	mod.hook('S_START_USER_PROJECTILE', 9, Last_Hook, sStartUserProjectile)
 	mod.hook('S_PLAYER_CHANGE_MP', 1, Last_Hook, sPlayerChangeMp)
 	mod.hook('S_CREATURE_CHANGE_HP', 6, Last_Hook, sCreatureChangeHp)
+	mod.hook('S_ITEM_EXPLOSION_RESULT', 2, Last_Hook, sItemExplosionResult)
 	mod.hook('S_EACH_SKILL_RESULT', 14, Last_Hook, sEachSkillResult)
 	mod.hook('S_SPAWN_DROPITEM', 8, Last_Hook, sSpawnDropItem)
 	mod.hook('S_FONT_SWAP_INFO', 'raw', Last_Hookfn, sFontSwapInfo)
 
+	mod.hook('S_SPAWN_EVENT_SEED', 1, NotCP ? 1 : 2, Last_Hookfn, sSpawnEventSeed)
+	mod.hook('S_UPDATE_EVENT_SEED_STATE', 3, Last_Hookfn, sUpdateEventSeedState)
+	mod.hook('S_RESULT_EVENT_SEED', NotCP ? 1 : 2, Last_Hookfn, sResultEventSeed)
+	mod.hook('S_DESPAWN_EVENT_SEED', 1, Last_Hookfn, sDespawnEventSeed)
+
 	mod.hook('S_FIELD_EVENT_ON_ENTER', 'raw', sFieldEventOnEnter)
 	mod.hook('S_FIELD_EVENT_ON_LEAVE', 'raw', sFieldEventOnLeave)
 
@@ -1165,7 +1217,7 @@ module.exports = function FpsUtils(mod) {
 		arg3 = arg3 ? arg3.toLowerCase() : arg3;
 		switch (key) {
 			case "b":
-				mod.command.exec('fps skills blacklist')
+				mod.command.exec('fps skills blacklist');
 				break;
 			case "g": case "gui":
 				GuiHandler(arg, arg2);
@@ -1622,6 +1674,10 @@ module.exports = function FpsUtils(mod) {
 				mod.settings.MuteOthersVoice = !mod.settings.MuteOthersVoice;
 				Msg(`Mute others voice is ${mod.settings.MuteOthersVoice ? `<font color="${GrnC}">Enabled</font>` : `<font color="${RedC}">Disabled</font>`}.`);
 				break;
+			case "petspopup":
+				mod.settings.HideServantBalloons = !mod.settings.HideServantBalloons;
+				Msg(`Hide Pets Popup chat balloons is ${mod.settings.HideServantBalloons ? `<font color="${GrnC}">Enabled</font>` : `<font color="${RedC}">Disabled</font>`}.`);
+				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>`}.`);

+ 6 - 1
lib/setting_migration.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const DefaultSettings = {
-	_version: 18,
+	_version: 19,
 	Mode: 0,
 	StreamMode: false,
 	OnlyParty: false,
@@ -15,6 +15,7 @@ const DefaultSettings = {
 	Hit_Damage: false,
 	Hit_All: false,
 	HideFireworks: true,
+	HideServantBalloons: false,
 	Hideguildlogos: false,
 	HideMonsterDeathAnimation: false,
 	HideHpNumbers: false,
@@ -145,6 +146,10 @@ function MigrateSettings(from_ver, to_ver, settings) {
 				settings._version = 18;
 				settings.MuteOthersVoice = DefaultSettings.MuteOthersVoice;
 				break;
+			case 19:
+				settings._version = 19;
+				settings.HideServantBalloons = DefaultSettings.HideServantBalloons;
+				break;
 			default:
 				console.log(`\x1b[94mINFO\x1b[34m [FPS-UTILS]\x1b[39m - Your \x1b[31 ["config.json" (caali's Toolbox) OR "settings/fps-utils.json" (pinkie's Proxy)]\x1b[39m seems to be outdated.\x1b[32m Re-created new one.\x1b[39m\x1b[0m`);
 				Object.keys(settings).forEach(key => delete settings[key]);

+ 10 - 3
manifest.json

@@ -3,8 +3,8 @@
         "README.md": "7eae31e8066dad35209a4833ce708b0aeb8bca60deb8574ff84b99792ddfe862",
         "lib/data/npcData.json": "f59f23f654bd7d9ca2147fe40e82641088accaed9836cf742eb2ddaa6c575dd5",
         "lib/data/skillString.json": "9d69876fea0be8e6ac5dd43b3fc74ea023f6b8a6145384f8f780dd977045d8ef",
-        "lib/index.js": "4fd4ecd755d2024a620d4b5b86e935af6958cd35aa88f594c799a82395986046",
-        "lib/setting_migration.js": "1d917a6bcf967316a2f8ce21e853eca68ae5f07bd000f17ee4b799bac7ab01ca",
+        "lib/index.js": "1e145e3070e88708e593f2d760db34ef430a0ebb3fc080918d3bf0626bdbba4b",
+        "lib/setting_migration.js": "27d46c0f126e6068b317e60b0712750d9c9f12cf6b39b4570b54c20d489cea4d",
         "module.json": "dd28251d203a38582cbbe31d1f904436865e05149465359c0fde8f8db45a829b",
         "package.json": "19c3f3629a7f9b3b30825da28331dbed10478c600a72cf2b9f5a46d674edbfa9"
     },
@@ -28,6 +28,8 @@
         "S_CREATURE_LIFE": 3,
         "S_CREATURE_ROTATE": 2,
         "S_DEAD_LOCATION": 2,
+        "S_DESPAWN_DROPITEM": 4,
+        "S_DESPAWN_EVENT_SEED": 1,
         "S_DESPAWN_NPC": 3,
         "S_DESPAWN_USER": 3,
         "S_EACH_SKILL_RESULT": 14,
@@ -40,6 +42,7 @@
         "S_GUILD_NAME": 2,
         "S_IMAGE_DATA": "raw",
         "S_ITEM_CUSTOM_STRING": 2,
+        "S_ITEM_EXPLOSION_RESULT": 2,
         "S_LEAVE_PARTY": "raw",
         "S_LOADING_SCREEN_CONTROL_INFO": "raw",
         "S_LOAD_TOPO": "raw",
@@ -49,10 +52,13 @@
         "S_NPC_MENU_SELECT": 1,
         "S_PARTY_MEMBER_LIST": 7,
         "S_PLAYER_CHANGE_MP": 1,
+        "S_QUEST_BALLOON": 1,
         "S_REQUEST_DESPAWN_SERVANT": 1,
         "S_REQUEST_SPAWN_SERVANT": 4,
+        "S_RESULT_EVENT_SEED": 2,
         "S_SOCIAL": 1,
         "S_SPAWN_DROPITEM": 8,
+        "S_SPAWN_EVENT_SEED": 1,
         "S_SPAWN_NPC": 11,
         "S_SPAWN_PROJECTILE": 5,
         "S_SPAWN_USER": 15,
@@ -62,10 +68,11 @@
         "S_UNICAST_TRANSFORM_DATA": 6,
         "S_UNMOUNT_VEHICLE": 2,
         "S_UPDATE_ACHIEVEMENT_PROGRESS": 1,
+        "S_UPDATE_EVENT_SEED_STATE": 3,
         "S_USER_APPEARANCE_CHANGE": 1,
         "S_USER_EXTERNAL_CHANGE": 7,
         "S_USER_LOCATION": 5,
-        "S_USER_MOVETYPE": "raw",
+        "S_USER_MOVETYPE": 1,
         "S_USER_STATUS": 3
     }
 }