|
@@ -5,7 +5,7 @@ module.exports = function FpsUtils(mod) {
|
|
|
|
|
|
|
|
// ~~~ * Data * ~~~ \\
|
|
// ~~~ * Data * ~~~ \\
|
|
|
|
|
|
|
|
- const NotCP = typeof global.TeraProxy === 'undefined';
|
|
|
|
|
|
|
+ const NotCP = typeof global.TeraProxy === 'undefined' || typeof global.TeraProxy.UILanguage === 'undefined';
|
|
|
const NpcData = require("./data/npcData.json"), SkillData = require("./data/skillString.json");
|
|
const NpcData = require("./data/npcData.json"), SkillData = require("./data/skillString.json");
|
|
|
const BnzC = '#BC8F8F', SlvC = '#9A9A9A', GldC = '#DAA520', PnkC = '#FFB7C5', HPkC = '#FF69B4', CPKC = '#ED5D92', RedC = '#FE6F5E', GrnC = '#4DE19C', LPrC = '#E0B0FF', PrpC = '#9966CC', LBlC = '#4DDCE1', BluC = '#436EEE', DBlC = '#5BC0BE', HBlC = '#08B3E5', GryC = '#778899', YlwC = '#C0B94D';
|
|
const BnzC = '#BC8F8F', SlvC = '#9A9A9A', GldC = '#DAA520', PnkC = '#FFB7C5', HPkC = '#FF69B4', CPKC = '#ED5D92', RedC = '#FE6F5E', GrnC = '#4DE19C', LPrC = '#E0B0FF', PrpC = '#9966CC', LBlC = '#4DDCE1', BluC = '#436EEE', DBlC = '#5BC0BE', HBlC = '#08B3E5', GryC = '#778899', YlwC = '#C0B94D';
|
|
|
const InvisibleNpcs = { 8: [6011], 12: [1], 23: [201, 202], 34: [8000], 61: [9901], 62: [9001, 9002, 9003, 9004, 9901], 83: [9901], 207: [9901], 223: [9901], 230: [9901] };
|
|
const InvisibleNpcs = { 8: [6011], 12: [1], 23: [201, 202], 34: [8000], 61: [9901], 62: [9001, 9002, 9003, 9004, 9901], 83: [9901], 207: [9901], 223: [9901], 230: [9901] };
|
|
@@ -392,7 +392,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', 14, HUsers[i]);
|
|
|
|
|
|
|
+ mod.toClient('S_SPAWN_USER', NotCP ? 14 : 15, HUsers[i]);
|
|
|
delete HUsers[i];
|
|
delete HUsers[i];
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -501,14 +501,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', 1, HPets[p])
|
|
|
|
|
|
|
+ mod.toClient('S_REQUEST_SPAWN_SERVANT', NotCP ? 1 : 2, 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', 1, HPets[p])
|
|
|
|
|
|
|
+ mod.toClient('S_REQUEST_SPAWN_SERVANT', NotCP ? 1 : 2, HPets[p])
|
|
|
delete HPets[p]
|
|
delete HPets[p]
|
|
|
}
|
|
}
|
|
|
break;
|
|
break;
|
|
@@ -522,7 +522,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', 14, HUsers[i]);
|
|
|
|
|
|
|
+ mod.toClient('S_SPAWN_USER', NotCP ? 14 : 15, HUsers[i]);
|
|
|
delete HUsers[i];
|
|
delete HUsers[i];
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -948,7 +948,7 @@ module.exports = function FpsUtils(mod) {
|
|
|
if (EqGid(event.gameId)) log('Projectile', 'Started', 'from', MyName, event.skill.id);
|
|
if (EqGid(event.gameId)) log('Projectile', 'Started', 'from', MyName, event.skill.id);
|
|
|
if (SUsers[event.gameId]) log('Projectile', 'Started', 'from', SUsers[event.gameId].name, event.skill.id);
|
|
if (SUsers[event.gameId]) log('Projectile', 'Started', 'from', SUsers[event.gameId].name, event.skill.id);
|
|
|
}
|
|
}
|
|
|
- if(mod.settings.Mode !== 3 && event.skill.id === 90120) return;
|
|
|
|
|
|
|
+ if (mod.settings.Mode !== 3 && event.skill.id === 90120) return;
|
|
|
if (mod.settings.PvpTraps && TrapsIds.includes(event.skill.id)) return;
|
|
if (mod.settings.PvpTraps && TrapsIds.includes(event.skill.id)) return;
|
|
|
if ((mod.settings.HideBlacklistedProjectiles || mod.settings.HideAllProjectiles) && mod.settings.ProjectilesBlacklist.includes(event.skill.id)) return false;
|
|
if ((mod.settings.HideBlacklistedProjectiles || mod.settings.HideAllProjectiles) && mod.settings.ProjectilesBlacklist.includes(event.skill.id)) return false;
|
|
|
if (!EqGid(event.gameId) && SUsers[event.gameId] && (HUsers[event.gameId] || mod.settings.Mode >= 2 || mod.settings.HideAllProjectiles)) return false;
|
|
if (!EqGid(event.gameId) && SUsers[event.gameId] && (HUsers[event.gameId] || mod.settings.Mode >= 2 || mod.settings.HideAllProjectiles)) return false;
|
|
@@ -960,7 +960,7 @@ module.exports = function FpsUtils(mod) {
|
|
|
if (EqGid(event.gameId)) log('Projectile', 'Spawned', 'from', MyName, event.skill.id);
|
|
if (EqGid(event.gameId)) log('Projectile', 'Spawned', 'from', MyName, event.skill.id);
|
|
|
if (SUsers[event.gameId]) log('Projectile', 'Spawned', 'from', SUsers[event.gameId].name, event.skill.id);
|
|
if (SUsers[event.gameId]) log('Projectile', 'Spawned', 'from', SUsers[event.gameId].name, event.skill.id);
|
|
|
}
|
|
}
|
|
|
- if(mod.settings.Mode !== 3 && event.skill.id === 90120) return;
|
|
|
|
|
|
|
+ if (mod.settings.Mode !== 3 && event.skill.id === 90120) return;
|
|
|
if (mod.settings.PvpTraps && TrapsIds.includes(event.skill.id)) return;
|
|
if (mod.settings.PvpTraps && TrapsIds.includes(event.skill.id)) return;
|
|
|
if ((mod.settings.HideBlacklistedProjectiles || mod.settings.HideAllProjectiles) && mod.settings.ProjectilesBlacklist.includes(event.skill.id)) return false;
|
|
if ((mod.settings.HideBlacklistedProjectiles || mod.settings.HideAllProjectiles) && mod.settings.ProjectilesBlacklist.includes(event.skill.id)) return false;
|
|
|
if (!EqGid(event.gameId) && SUsers[event.gameId] && (HUsers[event.gameId] || mod.settings.Mode >= 2 || mod.settings.HideAllProjectiles)) return false;
|
|
if (!EqGid(event.gameId) && SUsers[event.gameId] && (HUsers[event.gameId] || mod.settings.Mode >= 2 || mod.settings.HideAllProjectiles)) return false;
|
|
@@ -1021,8 +1021,8 @@ module.exports = function FpsUtils(mod) {
|
|
|
mod.hook('S_APPLY_TITLE', 2, sApplyTitle)
|
|
mod.hook('S_APPLY_TITLE', 2, sApplyTitle)
|
|
|
mod.hook('S_IMAGE_DATA', 'raw', sImageData)
|
|
mod.hook('S_IMAGE_DATA', 'raw', sImageData)
|
|
|
|
|
|
|
|
- mod.hook('S_SPAWN_USER', 14, Last_Hook, sSpawnUser)
|
|
|
|
|
- mod.hook('S_SPAWN_USER', 14, Last_Hookfn, sSpawnUserfn)
|
|
|
|
|
|
|
+ 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_DESPAWN_USER', 3, Last_Hook, sDespawnUser)
|
|
mod.hook('S_DESPAWN_USER', 3, Last_Hook, sDespawnUser)
|
|
|
mod.hook('S_USER_LOCATION', 5, sUserLocation)
|
|
mod.hook('S_USER_LOCATION', 5, sUserLocation)
|
|
|
mod.hook('S_USER_STATUS', 3, sUserStatus)
|
|
mod.hook('S_USER_STATUS', 3, sUserStatus)
|
|
@@ -1031,7 +1031,7 @@ 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_Hookfn, sUserAppearanceChange)
|
|
mod.hook('S_USER_APPEARANCE_CHANGE', 1, Last_Hookfn, sUserAppearanceChange)
|
|
|
mod.hook('S_USER_EXTERNAL_CHANGE', 7, Last_Hookfn, sUserExternalChange)
|
|
mod.hook('S_USER_EXTERNAL_CHANGE', 7, Last_Hookfn, sUserExternalChange)
|
|
|
- mod.hook('S_UNICAST_TRANSFORM_DATA', 5, Last_Hook, sUnicastTransformData)
|
|
|
|
|
|
|
+ mod.hook('S_UNICAST_TRANSFORM_DATA', NotCP ? 5 : 6, Last_Hook, sUnicastTransformData)
|
|
|
|
|
|
|
|
mod.hook('S_SPAWN_NPC', 11, sSpawnNpc)
|
|
mod.hook('S_SPAWN_NPC', 11, sSpawnNpc)
|
|
|
mod.hook('S_DESPAWN_NPC', 3, sDespawnNpc)
|
|
mod.hook('S_DESPAWN_NPC', 3, sDespawnNpc)
|
|
@@ -1040,7 +1040,7 @@ module.exports = function FpsUtils(mod) {
|
|
|
mod.hook('S_FEARMOVE_STAGE', 1, sFearMoveStage)
|
|
mod.hook('S_FEARMOVE_STAGE', 1, sFearMoveStage)
|
|
|
mod.hook('S_FEARMOVE_END', 1, sFearMoveEnd)
|
|
mod.hook('S_FEARMOVE_END', 1, sFearMoveEnd)
|
|
|
|
|
|
|
|
- mod.hook('S_REQUEST_SPAWN_SERVANT', 1, sRequestSpawnServant)
|
|
|
|
|
|
|
+ mod.hook('S_REQUEST_SPAWN_SERVANT', NotCP ? 1 : 2, 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)
|
|
@@ -1053,7 +1053,7 @@ module.exports = function FpsUtils(mod) {
|
|
|
mod.hook('S_PLAYER_CHANGE_MP', 1, sPlayerChangeMp)
|
|
mod.hook('S_PLAYER_CHANGE_MP', 1, sPlayerChangeMp)
|
|
|
mod.hook('S_CREATURE_CHANGE_HP', 6, sCreatureChangeHp)
|
|
mod.hook('S_CREATURE_CHANGE_HP', 6, 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', 7, sSpawnDropItem)
|
|
|
|
|
|
|
+ mod.hook('S_SPAWN_DROPITEM', NotCP ? 7 : 8, sSpawnDropItem)
|
|
|
mod.hook('S_FONT_SWAP_INFO', 'raw', sFontSwapInfo)
|
|
mod.hook('S_FONT_SWAP_INFO', 'raw', sFontSwapInfo)
|
|
|
|
|
|
|
|
// ~~~ * Commands * ~~~ \\
|
|
// ~~~ * Commands * ~~~ \\
|