Browse Source

Update for P101.

• sSpawnNpc to v12.

• `fps party` now updates player visibility real-time.
• Servants respawn now in more accurate spot.
• Added `fps p` as alternative command for `fps party`.
Risenio 6 years ago
parent
commit
035eff9186
3 changed files with 56 additions and 39 deletions
  1. 52 36
      lib/index.js
  2. 3 3
      manifest.json
  3. 1 0
      module.json

+ 52 - 36
lib/index.js

@@ -58,8 +58,7 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	const gui = {
-		parse(Xarray, title) {
-			let body = '';
+		parse(Xarray, title, body = '') {
 			for (const data of Xarray) {
 				if (body.length >= 16000) {
 					body += 'Gui data limit exceeded, some values may be missing.';
@@ -334,7 +333,7 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function ClassNameFromID(name) {
-		for (const Class_data of Object.keys(mod.settings.ClassesData)) if (mod.settings.ClassesData[Class_data].name === name) return Class_data;
+		for (const cData of Object.keys(mod.settings.ClassesData)) if (mod.settings.ClassesData[cData].name === name) return cData;
 	}
 
 	// ~~~ * Command Functions * ~~~ \\
@@ -418,7 +417,7 @@ module.exports = function FpsUtils(mod) {
 		for (const hUser in HUsers) {
 			if (HUsers[hUser].name.toString().toLowerCase() === name.toLowerCase()) {
 				ModifyUserAppearance(HUsers[hUser]);
-				mod.toClient('S_SPAWN_USER', NotCP ? 15 : 16, HUsers[hUser]);
+				mod.toClient('S_SPAWN_USER', 16, HUsers[hUser]);
 				delete HUsers[hUser];
 				break;
 			}
@@ -428,7 +427,7 @@ module.exports = function FpsUtils(mod) {
 	function ShowSpecificNpcByHzTi(hz, ti) {
 		for (const hNpc in HNpcs) {
 			if (HNpcs[hNpc].huntingZoneId === hz && HNpcs[hNpc].templateId === ti) {
-				mod.toClient('S_SPAWN_NPC', 11, HNpcs[hNpc]);
+				mod.toClient('S_SPAWN_NPC', mod.majorPatchVersion < 101 ? 11 : 12, HNpcs[hNpc]);
 				delete HNpcs[hNpc];
 				break;
 			}
@@ -436,7 +435,7 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function ShowSpecificNpcByGid(gameId) {
-		mod.toClient('S_SPAWN_NPC', 11, HNpcs[gameId])
+		mod.toClient('S_SPAWN_NPC', mod.majorPatchVersion < 101 ? 11 : 12, HNpcs[gameId])
 		delete HNpcs[gameId]
 	}
 
@@ -466,7 +465,7 @@ module.exports = function FpsUtils(mod) {
 	function ShowAllPlayers() {
 		for (const hUser in HUsers) {
 			ModifyUserAppearance(HUsers[hUser]);
-			mod.toClient('S_SPAWN_USER', NotCP ? 15 : 16, HUsers[hUser]);
+			mod.toClient('S_SPAWN_USER', 16, HUsers[hUser]);
 			delete HUsers[hUser];
 		}
 	}
@@ -695,8 +694,10 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function sLeaveParty() {
+		if (mod.settings.OnlyParty)
+			for (const sUser in SUsers)
+				if (PMembers.includes(SUsers[sUser].name)) HideSpecificPlayerByName(SUsers[sUser].name)
 		PMembers = []
-		//if (mod.settings.OnlyParty) mod.command.exec('fps party')
 		if (mod.settings.RaidAutoChange) {
 			if (LastState === null || mod.settings.Mode !== 2) {
 				LastState = null;
@@ -828,8 +829,13 @@ module.exports = function FpsUtils(mod) {
 
 	function sPartyMemberList(event) {
 		event.members.map(value => PMembers.push(value.name))
+		if (mod.settings.OnlyParty)
+			for (const sUser in SUsers) {
+				if (!PMembers.includes(SUsers[sUser].name)) HideSpecificPlayerByName(SUsers[sUser].name)
+				else if (HUsers[SUsers[sUser].gameId]) ShowSpecificPlayerByName(SUsers[sUser].name)
+			}
 		if (mod.settings.RaidAutoChange) {
-			if (event.members.length >= 18) {
+			if (event.members.length >= 18) { //event.raid
 				if (mod.settings.Mode >= 2 || (LastState === null && mod.settings.Mode === 2)) return;
 				LastState = mod.settings.Mode;
 				mod.command.exec("fps state 2");
@@ -904,6 +910,15 @@ module.exports = function FpsUtils(mod) {
 			SNpcs[event.gameId].loc = event.dest;
 			SNpcs[event.gameId].w = event.w;
 		}
+		if (SPets[event.gameId]) {
+			SPets[event.gameId].loc = event.dest;
+			SPets[event.gameId].w = event.w;
+		}
+		if (HPets[event.gameId]) {
+			HPets[event.gameId].loc = event.dest;
+			HPets[event.gameId].w = event.w;
+			return false
+		}
 		if (HNpcs[event.gameId]) {
 			HNpcs[event.gameId].loc = event.dest;
 			HNpcs[event.gameId].w = event.w;
@@ -1106,8 +1121,8 @@ module.exports = function FpsUtils(mod) {
 	mod.hook('S_APPLY_TITLE', 3, Last_Hook, sApplyTitle)
 	mod.hook('S_IMAGE_DATA', 'raw', Last_Hook, sImageData)
 
-	mod.hook('S_SPAWN_USER', NotCP ? 15 : 16, Last_Hook, sSpawnUser)
-	mod.hook('S_SPAWN_USER', NotCP ? 15 : 16, Last_Hookfn, sSpawnUserfn)
+	mod.hook('S_SPAWN_USER', 16, Last_Hook, sSpawnUser)
+	mod.hook('S_SPAWN_USER', 16, Last_Hookfn, sSpawnUserfn)
 	mod.hook('S_DESPAWN_USER', 3, sDespawnUser)
 	mod.hook('S_USER_LOCATION', 5, Last_Hook, sUserLocation)
 	mod.hook('S_USER_STATUS', 3, Last_Hook, sUserStatus)
@@ -1119,7 +1134,7 @@ module.exports = function FpsUtils(mod) {
 	mod.hook('S_USER_EXTERNAL_CHANGE', 7, Last_Hook, sUserExternalChange)
 	mod.hook('S_UNICAST_TRANSFORM_DATA', 6, Last_Hook, sUnicastTransformData)
 
-	mod.hook('S_SPAWN_NPC', 11, Last_Hook, sSpawnNpc)
+	mod.hook('S_SPAWN_NPC', mod.majorPatchVersion < 101 ? 11 : 12, Last_Hook, sSpawnNpc)
 	mod.hook('S_DESPAWN_NPC', 3, Last_Hook, sDespawnNpc)
 	mod.hook('S_NPC_LOCATION', 3, Last_Hook, sNpcLocation)
 	mod.hook('S_CREATURE_LIFE', 3, sCreatureLife)
@@ -1143,7 +1158,7 @@ module.exports = function FpsUtils(mod) {
 	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', NotCP ? 8 : 9, Last_Hook, sSpawnDropItem)
+	mod.hook('S_SPAWN_DROPITEM', 9, Last_Hook, sSpawnDropItem)
 	mod.hook('S_FONT_SWAP_INFO', 'raw', Last_Hookfn, sFontSwapInfo)
 
 	mod.hook('S_SPAWN_EVENT_SEED', 2, Last_Hookfn, sSpawnEventSeed)
@@ -1154,7 +1169,6 @@ module.exports = function FpsUtils(mod) {
 	mod.hook('S_FIELD_EVENT_ON_ENTER', 'raw', sFieldEventOnEnter)
 	mod.hook('S_FIELD_EVENT_ON_LEAVE', 'raw', sFieldEventOnLeave)
 
-
 	// ~~~ * Commands * ~~~ \\
 
 	mod.command.add('0', () => mod.command.exec('fps mode 0'))
@@ -1169,6 +1183,7 @@ module.exports = function FpsUtils(mod) {
 		arg3 = arg3 ? arg3.toLowerCase() : arg3;
 		switch (key) {
 			case "b": mod.command.exec('fps skills blacklist'); break;
+			case "p": mod.command.exec('fps party'); break;
 			case "g": case "gui": GuiHandler(arg, arg2); break;
 			case "0": mod.command.exec('fps mode 0'); break;
 			case "1": mod.command.exec('fps mode 1'); break;
@@ -1220,13 +1235,14 @@ module.exports = function FpsUtils(mod) {
 					if (mod.settings.PlayersBlacklist.includes(arg)) return Msg(`Player '${arg}' <font color="${RedC}">Already hidden</font>.`);
 					else
 						if ((GameJobs.includes(arg) && !mod.settings.ClassesBlacklist.includes(arg)) || (GameRoles.includes(arg) && !mod.settings.RolesBlacklist.includes(arg))) {
-							for (const cD in mod.settings.ClassesData) {
-								if ((mod.settings.ClassesData[cD].name === arg || mod.settings.ClassesData[cD].role.includes(arg)) && !mod.settings.ClassesData[cD].isHidden) {
-									mod.settings.ClassesData[cD].isHidden = true;
-									if (mod.settings.ClassesData[cD].name === arg) mod.settings.ClassesBlacklist.push(arg);
-									if (mod.settings.ClassesData[cD].role.includes(arg)) mod.settings.RolesBlacklist.push(arg);
-									let classtohide = mod.settings.ClassesData[cD].model;
-									for (const sUser in SUsers) if (ClassID(SUsers[sUser].templateId) === classtohide) HideSpecificPlayerByName(SUsers[sUser].name);
+							for (const cData in mod.settings.ClassesData) {
+								if ((mod.settings.ClassesData[cData].name === arg || mod.settings.ClassesData[cData].role.includes(arg)) && !mod.settings.ClassesData[cData].isHidden) {
+									mod.settings.ClassesData[cData].isHidden = true;
+									if (mod.settings.ClassesData[cData].name === arg) mod.settings.ClassesBlacklist.push(arg);
+									if (mod.settings.ClassesData[cData].role.includes(arg)) mod.settings.RolesBlacklist.push(arg);
+									let classtohide = mod.settings.ClassesData[cData].model;
+									for (const sUser in SUsers)
+										if (ClassID(SUsers[sUser].templateId) === classtohide) HideSpecificPlayerByName(SUsers[sUser].name);
 								}
 							}
 							Msg(`Class/Role ${arg} <font color="${GrnC}">Hidden</font>.`);
@@ -1246,12 +1262,12 @@ module.exports = function FpsUtils(mod) {
 						return;
 					}
 					if ((GameJobs.includes(arg) && mod.settings.ClassesBlacklist.includes(arg)) || (mod.settings.RolesBlacklist.includes(arg) && GameRoles.includes(arg))) {
-						for (const cD in mod.settings.ClassesData) {
-							if (mod.settings.ClassesData[cD].name === arg || mod.settings.ClassesData[cD].role.includes(arg)) {
-								if (mod.settings.ClassesData[cD].name === arg) RemoveEntity(mod.settings.ClassesBlacklist, arg);
-								if (mod.settings.ClassesData[cD].role.includes(arg)) RemoveEntity(mod.settings.RolesBlacklist, arg);
-								mod.settings.ClassesData[cD].isHidden = false;
-								let classToShow = mod.settings.ClassesData[cD].model;
+						for (const cData in mod.settings.ClassesData) {
+							if (mod.settings.ClassesData[cData].name === arg || mod.settings.ClassesData[cData].role.includes(arg)) {
+								if (mod.settings.ClassesData[cData].name === arg) RemoveEntity(mod.settings.ClassesBlacklist, arg);
+								if (mod.settings.ClassesData[cData].role.includes(arg)) RemoveEntity(mod.settings.RolesBlacklist, arg);
+								mod.settings.ClassesData[cData].isHidden = false;
+								let classToShow = mod.settings.ClassesData[cData].model;
 								for (const hUser in HUsers) if (ClassID(HUsers[hUser].templateId) === classToShow) ShowSpecificPlayerByName(HUsers[hUser].name);
 							}
 						}
@@ -1268,7 +1284,7 @@ module.exports = function FpsUtils(mod) {
 				if (mod.settings.OnlyParty) {
 					for (const sUser in SUsers) {
 						if (!PMembers.includes(SUsers[sUser].name)) HideSpecificPlayerByName(SUsers[sUser].name)
-						else if (HUsers.includes(SUsers[sUser].name)) ShowSpecificPlayerByName(SUsers[sUser].name)
+						else if (HUsers[SUsers[sUser].gameId]) ShowSpecificPlayerByName(SUsers[sUser].name)
 					}
 				} else ShowAllPlayers();
 				Msg(`Everyone but party ${mod.settings.OnlyParty ? `<font color="${GrnC}">Hidden</font>` : `<font color="${RedC}">Shown</font>`}.`);
@@ -1314,24 +1330,24 @@ module.exports = function FpsUtils(mod) {
 						break;
 					case "class":
 						if (GameJobs.includes(arg2)) {
-							for (const cD in mod.settings.ClassesData) {
-								if (mod.settings.ClassesData[cD].name === arg2) {
+							for (const cData in mod.settings.ClassesData) {
+								if (mod.settings.ClassesData[cData].name === arg2) {
 									if (arg3 && !isNaN(arg3) && arg3 < 50) {
-										if (mod.settings.ClassesData[cD].CD_SkillsBlacklist.includes(arg3)) {
-											let index = mod.settings.ClassesData[cD].CD_SkillsBlacklist.indexOf(arg3);
+										if (mod.settings.ClassesData[cData].CD_SkillsBlacklist.includes(arg3)) {
+											let index = mod.settings.ClassesData[cData].CD_SkillsBlacklist.indexOf(arg3);
 											if (index !== -1) {
-												mod.settings.ClassesData[cD].CD_SkillsBlacklist.splice(index, 1);
+												mod.settings.ClassesData[cData].CD_SkillsBlacklist.splice(index, 1);
 												Msg(`Skill ID '${arg3}' <font color="${RedC}">Shown</font> for class '${arg2}'.`);
 											}
 											return;
 										} else {
-											mod.settings.ClassesData[cD].CD_SkillsBlacklist.push(arg3);
+											mod.settings.ClassesData[cData].CD_SkillsBlacklist.push(arg3);
 											Msg(`Skill ID '${arg3}' <font color="${GrnC}">Hidden</font> for class '${arg2}'.`);
 											return;
 										}
 									} else {
-										mod.settings.ClassesData[cD].CD_HideBlacklistedSkills = !mod.settings.ClassesData[cD].CD_HideBlacklistedSkills;
-										Msg(`Skills for '${arg2}' class ${mod.settings.ClassesData[cD].CD_HideBlacklistedSkills ? `<font color="${GrnC}">Hidden</font>` : `<font color="${RedC}">Shown</font>`}.`);
+										mod.settings.ClassesData[cData].CD_HideBlacklistedSkills = !mod.settings.ClassesData[cData].CD_HideBlacklistedSkills;
+										Msg(`Skills for '${arg2}' class ${mod.settings.ClassesData[cData].CD_HideBlacklistedSkills ? `<font color="${GrnC}">Hidden</font>` : `<font color="${RedC}">Shown</font>`}.`);
 										return;
 									}
 								}

+ 3 - 3
manifest.json

@@ -3,9 +3,9 @@
         "README.md": "8c89fbefc91e4e75ee5981cf2f59834ae9f231c5179e150aaa0c2bedeaf79e37",
         "lib/data/npcData.json": "57c6e0ca4d6e996eb295868cf964c61322182c8df68c9787528a20c617bf356a",
         "lib/data/skillString.json": "90f7cf9e29f0c143ffe4650bebe85c097371507a23c9fd2a0ab6c877d5451e58",
-        "lib/index.js": "7f66965693e5be56ed7b44ba76a7a76a2d69d316f82b8b54f8974b847807882a",
+        "lib/index.js": "8d939a7c070e5e2ab9619e505d1f9354397b8c291902fbb053730459c8dd9882",
         "lib/setting_migration.js": "1821fbb5ed37672bd9a8daa54f8ab392e35aa6c38b1602c560865b3bf6a7c6a2",
-        "module.json": "78da47cb0d20f744f00596e394fa8452e8ffeb5f80dcb08a220d0b4bff6ab8e4",
+        "module.json": "11fae284a4b493d9e4c9b14e86710cf63449c582dfa4142c91e387b12ff63d1b",
         "package.json": "cfce7f8421833b9d63eef6f93ca3efb48ec5f4c8dc82345c77708e596ff9aa1c"
     },
     "defs": {
@@ -59,7 +59,7 @@
         "S_SOCIAL": 1,
         "S_SPAWN_DROPITEM": 9,
         "S_SPAWN_EVENT_SEED": 2,
-        "S_SPAWN_NPC": 11,
+        "S_SPAWN_NPC": [11, 12],
         "S_SPAWN_PROJECTILE": 5,
         "S_SPAWN_USER": 16,
         "S_START_ACTION_SCRIPT": 3,

+ 1 - 0
module.json

@@ -3,6 +3,7 @@
     "name": "fps-utils",
     "author": "Risenio",
     "homepage": "https://github.com/Risenio/fps-utils/wiki",
+    "readmePath": "./README.md",
     "description": "A free script filled with features dedicated to improve your fps.",
     "contributors": ["Saegusae","codeagon","SerenTera","Kyoukaya","SaltyMonkey","Leyki"],
     "version": "19",