|
|
@@ -400,7 +400,7 @@ module.exports = function FpsUtils(mod) {
|
|
|
for (let i in HUsers) {
|
|
|
if (HUsers[i].name.toString().toLowerCase() === name.toLowerCase()) {
|
|
|
ModifyUserAppearance(HUsers[i]);
|
|
|
- mod.toClient('S_SPAWN_USER', NotCP ? 14 : 15, HUsers[i]);
|
|
|
+ mod.toClient('S_SPAWN_USER', 15, HUsers[i]);
|
|
|
delete HUsers[i];
|
|
|
}
|
|
|
}
|
|
|
@@ -509,14 +509,14 @@ module.exports = function FpsUtils(mod) {
|
|
|
case 'own':
|
|
|
for (let p in HPets) {
|
|
|
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]
|
|
|
}
|
|
|
break;
|
|
|
case 'others':
|
|
|
for (let p in HPets) {
|
|
|
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]
|
|
|
}
|
|
|
break;
|
|
|
@@ -530,7 +530,7 @@ module.exports = function FpsUtils(mod) {
|
|
|
function ShowAllPlayers() {
|
|
|
for (let i in HUsers) {
|
|
|
ModifyUserAppearance(HUsers[i]);
|
|
|
- mod.toClient('S_SPAWN_USER', NotCP ? 14 : 15, HUsers[i]);
|
|
|
+ mod.toClient('S_SPAWN_USER', 15, HUsers[i]);
|
|
|
delete HUsers[i];
|
|
|
}
|
|
|
}
|
|
|
@@ -899,13 +899,11 @@ module.exports = function FpsUtils(mod) {
|
|
|
}
|
|
|
|
|
|
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) {
|
|
|
- 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) {
|
|
|
@@ -1058,8 +1056,8 @@ module.exports = function FpsUtils(mod) {
|
|
|
mod.hook('S_APPLY_TITLE', 2, Last_Hook, sApplyTitle)
|
|
|
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_USER_LOCATION', 5, Last_Hook, sUserLocation)
|
|
|
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_USER_APPEARANCE_CHANGE', 1, Last_Hook, sUserAppearanceChange)
|
|
|
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_DESPAWN_NPC', 3, Last_Hook, sDespawnNpc)
|
|
|
mod.hook('S_NPC_LOCATION', 3, Last_Hook, sNpcLocation)
|
|
|
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_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_CREATURE_CHANGE_HP', 6, Last_Hook, sCreatureChangeHp)
|
|
|
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_FIELD_EVENT_ON_ENTER', 'raw', sFieldEventOnEnter)
|