Browse Source

Fix servant. 1.0

Risenio 7 years ago
parent
commit
6621445388
2 changed files with 15 additions and 17 deletions
  1. 13 15
      lib/index.js
  2. 2 2
      manifest.json

+ 13 - 15
lib/index.js

@@ -400,7 +400,7 @@ module.exports = function FpsUtils(mod) {
 		for (let i in HUsers) {
 		for (let i in HUsers) {
 			if (HUsers[i].name.toString().toLowerCase() === name.toLowerCase()) {
 			if (HUsers[i].name.toString().toLowerCase() === name.toLowerCase()) {
 				ModifyUserAppearance(HUsers[i]);
 				ModifyUserAppearance(HUsers[i]);
-				mod.toClient('S_SPAWN_USER', NotCP ? 14 : 15, HUsers[i]);
+				mod.toClient('S_SPAWN_USER', 15, HUsers[i]);
 				delete HUsers[i];
 				delete HUsers[i];
 			}
 			}
 		}
 		}
@@ -509,14 +509,14 @@ module.exports = function FpsUtils(mod) {
 					case 'own':
 					case 'own':
 						for (let p in HPets) {
 						for (let p in HPets) {
 							if (!EqGid(HPets[p].ownerId)) continue
 							if (!EqGid(HPets[p].ownerId)) continue
-							mod.toClient('S_REQUEST_SPAWN_SERVANT', NotCP ? 1 : 2, HPets[p])
+							mod.toClient('S_REQUEST_SPAWN_SERVANT', NotCP ? 2 : 3, HPets[p])
 							delete HPets[p]
 							delete HPets[p]
 						}
 						}
 						break;
 						break;
 					case 'others':
 					case 'others':
 						for (let p in HPets) {
 						for (let p in HPets) {
 							if (EqGid(HPets[p].ownerId)) continue
 							if (EqGid(HPets[p].ownerId)) continue
-							mod.toClient('S_REQUEST_SPAWN_SERVANT', NotCP ? 1 : 2, HPets[p])
+							mod.toClient('S_REQUEST_SPAWN_SERVANT', NotCP ? 2 : 3, HPets[p])
 							delete HPets[p]
 							delete HPets[p]
 						}
 						}
 						break;
 						break;
@@ -530,7 +530,7 @@ module.exports = function FpsUtils(mod) {
 	function ShowAllPlayers() {
 	function ShowAllPlayers() {
 		for (let i in HUsers) {
 		for (let i in HUsers) {
 			ModifyUserAppearance(HUsers[i]);
 			ModifyUserAppearance(HUsers[i]);
-			mod.toClient('S_SPAWN_USER', NotCP ? 14 : 15, HUsers[i]);
+			mod.toClient('S_SPAWN_USER', 15, HUsers[i]);
 			delete HUsers[i];
 			delete HUsers[i];
 		}
 		}
 	}
 	}
@@ -899,13 +899,11 @@ module.exports = function FpsUtils(mod) {
 	}
 	}
 
 
 	function sFearMoveStage(event) {
 	function sFearMoveStage(event) {
-		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;
+		if ((!EqGid(event.gameId) && mod.settings.Mode === 3) || HUsers[event.gameId] || HNpcs[event.gameId]) return false;
 	}
 	}
 
 
 	function sFearMoveEnd(event) {
 	function sFearMoveEnd(event) {
-		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;
+		if ((!EqGid(event.gameId) && mod.settings.Mode === 3) || HUsers[event.gameId] || HNpcs[event.gameId]) return false;
 	}
 	}
 
 
 	function sRequestSpawnServant(event) {
 	function sRequestSpawnServant(event) {
@@ -1058,8 +1056,8 @@ module.exports = function FpsUtils(mod) {
 	mod.hook('S_APPLY_TITLE', 2, Last_Hook, sApplyTitle)
 	mod.hook('S_APPLY_TITLE', 2, Last_Hook, sApplyTitle)
 	mod.hook('S_IMAGE_DATA', 'raw', Last_Hook, sImageData)
 	mod.hook('S_IMAGE_DATA', 'raw', Last_Hook, sImageData)
 
 
-	mod.hook('S_SPAWN_USER', NotCP ? 14 : 15, Last_Hook, sSpawnUser)
-	mod.hook('S_SPAWN_USER', NotCP ? 14 : 15, Last_Hookfn, sSpawnUserfn)
+	mod.hook('S_SPAWN_USER', 15, Last_Hook, sSpawnUser)
+	mod.hook('S_SPAWN_USER', 15, Last_Hookfn, sSpawnUserfn)
 	mod.hook('S_DESPAWN_USER', 3, sDespawnUser)
 	mod.hook('S_DESPAWN_USER', 3, sDespawnUser)
 	mod.hook('S_USER_LOCATION', 5, Last_Hook, sUserLocation)
 	mod.hook('S_USER_LOCATION', 5, Last_Hook, sUserLocation)
 	mod.hook('S_USER_STATUS', 3, Last_Hook, sUserStatus)
 	mod.hook('S_USER_STATUS', 3, Last_Hook, sUserStatus)
@@ -1068,16 +1066,16 @@ module.exports = function FpsUtils(mod) {
 	mod.hook('S_PARTY_MEMBER_LIST', 7, sPartyMemberList)
 	mod.hook('S_PARTY_MEMBER_LIST', 7, sPartyMemberList)
 	mod.hook('S_USER_APPEARANCE_CHANGE', 1, Last_Hook, sUserAppearanceChange)
 	mod.hook('S_USER_APPEARANCE_CHANGE', 1, Last_Hook, sUserAppearanceChange)
 	mod.hook('S_USER_EXTERNAL_CHANGE', 7, Last_Hook, sUserExternalChange)
 	mod.hook('S_USER_EXTERNAL_CHANGE', 7, Last_Hook, sUserExternalChange)
-	mod.hook('S_UNICAST_TRANSFORM_DATA', NotCP ? 5 : 6, Last_Hook, sUnicastTransformData)
+	mod.hook('S_UNICAST_TRANSFORM_DATA', 6, Last_Hook, sUnicastTransformData)
 
 
 	mod.hook('S_SPAWN_NPC', 11, Last_Hook, sSpawnNpc)
 	mod.hook('S_SPAWN_NPC', 11, Last_Hook, sSpawnNpc)
 	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', NotCP ? 1 : 2, Last_Hook, sFearMoveStage)
-	mod.hook('S_FEARMOVE_END', NotCP ? 1 : 2, Last_Hook, sFearMoveEnd)
+	mod.hook('S_FEARMOVE_STAGE', 2, Last_Hook, sFearMoveStage)
+	mod.hook('S_FEARMOVE_END', 2, Last_Hook, sFearMoveEnd)
 
 
-	mod.hook('S_REQUEST_SPAWN_SERVANT', NotCP ? 1 : 2, Last_Hook, sRequestSpawnServant)
+	mod.hook('S_REQUEST_SPAWN_SERVANT', NotCP ? 2 : 3, Last_Hook, sRequestSpawnServant)
 	mod.hook('S_REQUEST_DESPAWN_SERVANT', 1, sRequestDespawnServant)
 	mod.hook('S_REQUEST_DESPAWN_SERVANT', 1, sRequestDespawnServant)
 
 
 	mod.hook('S_ABNORMALITY_BEGIN', 3, Last_Hook, sAbnormalityBegin)
 	mod.hook('S_ABNORMALITY_BEGIN', 3, Last_Hook, sAbnormalityBegin)
@@ -1090,7 +1088,7 @@ module.exports = function FpsUtils(mod) {
 	mod.hook('S_PLAYER_CHANGE_MP', 1, Last_Hook, sPlayerChangeMp)
 	mod.hook('S_PLAYER_CHANGE_MP', 1, Last_Hook, sPlayerChangeMp)
 	mod.hook('S_CREATURE_CHANGE_HP', 6, Last_Hook, sCreatureChangeHp)
 	mod.hook('S_CREATURE_CHANGE_HP', 6, Last_Hook, sCreatureChangeHp)
 	mod.hook('S_EACH_SKILL_RESULT', 13, Last_Hook, sEachSkillResult)
 	mod.hook('S_EACH_SKILL_RESULT', 13, Last_Hook, sEachSkillResult)
-	mod.hook('S_SPAWN_DROPITEM', NotCP ? 7 : 8, Last_Hook, sSpawnDropItem)
+	mod.hook('S_SPAWN_DROPITEM', 8, Last_Hook, sSpawnDropItem)
 	mod.hook('S_FONT_SWAP_INFO', 'raw', Last_Hookfn, sFontSwapInfo)
 	mod.hook('S_FONT_SWAP_INFO', 'raw', Last_Hookfn, sFontSwapInfo)
 
 
 	mod.hook('S_FIELD_EVENT_ON_ENTER', 'raw', sFieldEventOnEnter)
 	mod.hook('S_FIELD_EVENT_ON_ENTER', 'raw', sFieldEventOnEnter)

+ 2 - 2
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": "226224ed2d9012ca6ba256166c822f24e2f04539e002871b659fe06a4678a414",
+        "lib/index.js": "0cee4701bc45217cb7df444f11133664f263f9f3b50d8f3ac1a43afb2aafc351",
         "lib/setting_migration.js": "9f0816758b88300afd97ca8aaa8cfc0dadedcdda17713d6e709772a9c0dddcea",
         "lib/setting_migration.js": "9f0816758b88300afd97ca8aaa8cfc0dadedcdda17713d6e709772a9c0dddcea",
         "module.json": "2e105877c06e04aee1225aff0fff699d74cd1c250a975ea0c50f40f8772ea8b9",
         "module.json": "2e105877c06e04aee1225aff0fff699d74cd1c250a975ea0c50f40f8772ea8b9",
         "package.json": "a8aa5a079bc568096b2037f2777f9b01e97ba08ba62a515b7d6908f4bc6e1b51"
         "package.json": "a8aa5a079bc568096b2037f2777f9b01e97ba08ba62a515b7d6908f4bc6e1b51"
@@ -48,7 +48,7 @@
         "S_PARTY_MEMBER_LIST": 7,
         "S_PARTY_MEMBER_LIST": 7,
         "S_PLAYER_CHANGE_MP": 1,
         "S_PLAYER_CHANGE_MP": 1,
         "S_REQUEST_DESPAWN_SERVANT": 1,
         "S_REQUEST_DESPAWN_SERVANT": 1,
-        "S_REQUEST_SPAWN_SERVANT": 2,
+        "S_REQUEST_SPAWN_SERVANT": 3,
         "S_SHOW_AWESOMIUMWEB_SHOP": 1,
         "S_SHOW_AWESOMIUMWEB_SHOP": 1,
         "S_SOCIAL": 1,
         "S_SOCIAL": 1,
         "S_SPAWN_DROPITEM": 8,
         "S_SPAWN_DROPITEM": 8,