|
|
@@ -5,8 +5,7 @@
|
|
|
const NpcData = require('./data/npcData.json'),
|
|
|
SkillData = require('./data/skillString.json'),
|
|
|
{ ImportantAbns, BlockedAbns, ReplaceAbnIds, AbnNoEffectInvisibleNpcSpamId } = require('./data/abnormalities.json'),
|
|
|
- { UserNpcs, TrapsIds, FireWorks, UserNpcsHzId, SmokeBombId, DivineWrathId, MoteIds } = require('./data/userSpawns.json'),
|
|
|
- ImportantProjectiles = { ...SmokeBombId, ...DivineWrathId },
|
|
|
+ { UserNpcs, TrapsIds, FireWorks, UserNpcsHzId, SmokeBombId, MoteIds } = require('./data/userSpawns.json'),
|
|
|
{ InvisibleNpcs, SpamAchIds, PClasses, PRoles, HexColors, Alphabet, StarterWeaponIds, InvalidVoiceId, MountToReplaceId, ImportantActionScripts } = require('./data/miscData.json'),
|
|
|
{ BnzC, SlvC, GldC, PnkC, HPkC, CPkC, RedC, GrnC, LPrC, PrpC, LBlC, BluC, DBlC, HBlC, GryC, YlwC } = HexColors;
|
|
|
|
|
|
@@ -18,7 +17,6 @@ module.exports = function FpsUtils(mod) {
|
|
|
// ~~~ * Constants * ~~~ \\
|
|
|
|
|
|
const Cfg = mod.settings,
|
|
|
- Cmd = mod.command,
|
|
|
NotCP = typeof mod.compileProto !== 'undefined';
|
|
|
|
|
|
// ~~~ * Variables * ~~~ \\
|
|
|
@@ -33,15 +31,14 @@ module.exports = function FpsUtils(mod) {
|
|
|
ProjDebug = false,
|
|
|
AbnDebug = false,
|
|
|
TmpData = [],
|
|
|
- PMembers = new Set(),
|
|
|
- BProjectiles = new Set(),
|
|
|
+ PMembers = [],
|
|
|
SUsers = {},
|
|
|
HUsers = {},
|
|
|
SNpcs = {},
|
|
|
HNpcs = {},
|
|
|
SPets = {},
|
|
|
HPets = {},
|
|
|
- HSeedBoxes = new Set();
|
|
|
+ HSeedBoxes = {};
|
|
|
|
|
|
// ~~~ * Gui Parser * ~~~ \\
|
|
|
|
|
|
@@ -52,12 +49,12 @@ module.exports = function FpsUtils(mod) {
|
|
|
|
|
|
mod.hook('C_CONFIRM_UPDATE_NOTIFICATION', 'raw', LastHook, () => false);
|
|
|
|
|
|
- mod.hook('C_ADMIN', 1, LastHookfn, (event) => {
|
|
|
+ /*mod.hook('C_ADMIN', 1, LastHookfn, (event) => {
|
|
|
const commands = event.command.split(";");
|
|
|
for (const cmd of commands)
|
|
|
- try { Cmd.exec(cmd); } catch (err) { continue; }
|
|
|
+ try { mod.command.exec(cmd); } catch (err) { continue; } // In case it errored out; prevent cAdmin from being sent to server.
|
|
|
return false;
|
|
|
- });
|
|
|
+ });*/
|
|
|
}
|
|
|
|
|
|
const gui = {
|
|
|
@@ -341,7 +338,7 @@ module.exports = function FpsUtils(mod) {
|
|
|
|
|
|
function Msg(msg) {
|
|
|
if (Cfg.StreamMode) return;
|
|
|
- Cmd.message(`<font color="${LPrC}">${NotCP ? '[FPS] ' : ''}${msg}</font>`);
|
|
|
+ mod.command.message(`<font color="${LPrC}">${NotCP ? '[FPS] ' : ''}${msg}</font>`);
|
|
|
}
|
|
|
|
|
|
function RemoveEntity(arr, elem) {
|
|
|
@@ -399,8 +396,8 @@ module.exports = function FpsUtils(mod) {
|
|
|
case 'pet':
|
|
|
for (const sPet in SPets) {
|
|
|
if (EqGid(SPets[sPet].ownerId) && whose === 'own') {
|
|
|
- UpdateNpcLoc(SPets[sPet], -1E2);
|
|
|
- ScaleUpEntity(SPets[sPet].gameId, 1E-3);
|
|
|
+ UpdateNpcLoc(SPets[sPet], -100);
|
|
|
+ ScaleUpEntity(SPets[sPet].gameId, 0.001);
|
|
|
}
|
|
|
if (!EqGid(SPets[sPet].ownerId) && whose === 'others')
|
|
|
mod.toClient('S_REQUEST_DESPAWN_SERVANT', 1, { gameId: SPets[sPet].gameId, despawnType: 1 });
|
|
|
@@ -424,7 +421,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', 17, HUsers[hUser]);
|
|
|
+ mod.toClient('S_SPAWN_USER', 15, HUsers[hUser]);
|
|
|
delete HUsers[hUser];
|
|
|
break;
|
|
|
}
|
|
|
@@ -434,7 +431,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', 12, HNpcs[hNpc]);
|
|
|
+ mod.toClient('S_SPAWN_NPC', 11, HNpcs[hNpc]);
|
|
|
delete HNpcs[hNpc];
|
|
|
break;
|
|
|
}
|
|
|
@@ -442,7 +439,7 @@ module.exports = function FpsUtils(mod) {
|
|
|
}
|
|
|
|
|
|
function ShowSpecificNpcByGid(gameId) {
|
|
|
- mod.toClient('S_SPAWN_NPC', 12, HNpcs[gameId]);
|
|
|
+ mod.toClient('S_SPAWN_NPC', 11, HNpcs[gameId]);
|
|
|
delete HNpcs[gameId];
|
|
|
}
|
|
|
|
|
|
@@ -476,7 +473,7 @@ module.exports = function FpsUtils(mod) {
|
|
|
function ShowAllPlayers() {
|
|
|
for (const hUser in HUsers) {
|
|
|
ModifyUserAppearance(HUsers[hUser]);
|
|
|
- mod.toClient('S_SPAWN_USER', 17, HUsers[hUser]);
|
|
|
+ mod.toClient('S_SPAWN_USER', 15, HUsers[hUser]);
|
|
|
delete HUsers[hUser];
|
|
|
}
|
|
|
}
|
|
|
@@ -487,7 +484,7 @@ module.exports = function FpsUtils(mod) {
|
|
|
let modified = undefined;
|
|
|
|
|
|
if (Cfg.ShowStyle) {
|
|
|
- event.weapon = StarterWeaponIds[event.templateId % 1E2 - 1];
|
|
|
+ event.weapon = StarterWeaponIds[event.templateId % 100 - 1];
|
|
|
event.body = event.hand = event.feet = event.underwear = event.head = event.face = 0;
|
|
|
if (event.mount) event.mount = MountToReplaceId;
|
|
|
event.title = 0;
|
|
|
@@ -530,8 +527,6 @@ module.exports = function FpsUtils(mod) {
|
|
|
}
|
|
|
|
|
|
if (!end) {
|
|
|
- if (typeof event.target === 'undefined') event.target = event.gameId
|
|
|
-
|
|
|
if (EqGid(event.target)) {
|
|
|
if (Cfg.HideOwnBlacklistedAbns && Cfg.OwnAbnormalsBlacklist.indexOf(event.id) !== -1) return false;
|
|
|
|
|
|
@@ -545,7 +540,6 @@ module.exports = function FpsUtils(mod) {
|
|
|
}
|
|
|
|
|
|
function ActionHCheck(event, end) {
|
|
|
- if (event.skill.npc) return;
|
|
|
let hidden = false;
|
|
|
|
|
|
if (EqGid(event.gameId) || !SUsers[event.gameId]) return undefined;
|
|
|
@@ -561,29 +555,22 @@ module.exports = function FpsUtils(mod) {
|
|
|
hidden = true;
|
|
|
}
|
|
|
|
|
|
- if (BProjectiles.has(event.id) && (Cfg.Mode >= 2 || Cfg.HideAllProjectiles)) hidden = true;
|
|
|
-
|
|
|
return !end && hidden ? false : undefined;
|
|
|
}
|
|
|
|
|
|
function ProjectileBCheck(event) {
|
|
|
- if (event.skill.npc) return;
|
|
|
- if (typeof event.id === 'undefined') event.id = event.actionId;
|
|
|
+ let blocked = false;
|
|
|
|
|
|
- if (typeof event.skill !== 'undefined') {
|
|
|
- if (ImportantProjectiles[ClassID(event.templateId)] && ImportantProjectiles[ClassID(event.templateId)] === Math.floor(event.skill.id / 1E4) || (Cfg.PvpTraps && TrapsIds.includes(event.skill.id))) return undefined;
|
|
|
- if ((Cfg.HideBlacklistedProjectiles || Cfg.HideAllProjectiles) && Cfg.ProjectilesBlacklist.includes(event.skill.id)) BProjectiles.add(event.id);
|
|
|
- }
|
|
|
+ if (event.skill.id === SmokeBombId || (Cfg.PvpTraps && TrapsIds.includes(event.skill.id))) return undefined;
|
|
|
|
|
|
- if (typeof event.gameId !== 'undefined')
|
|
|
- if (!EqGid(event.gameId) && SUsers[event.gameId] && (HUsers[event.gameId] || Cfg.Mode >= 2 || Cfg.HideAllProjectiles)) BProjectiles.add(event.id);
|
|
|
+ if ((Cfg.HideBlacklistedProjectiles || Cfg.HideAllProjectiles) && Cfg.ProjectilesBlacklist.includes(event.skill.id)) blocked = true;
|
|
|
+ if (!EqGid(event.gameId) && SUsers[event.gameId] && (HUsers[event.gameId] || Cfg.Mode >= 2 || Cfg.HideAllProjectiles)) blocked = true;
|
|
|
|
|
|
- return BProjectiles.has(event.id) ? false : undefined;
|
|
|
+ return blocked ? false : undefined;
|
|
|
}
|
|
|
|
|
|
function ModifySkillResult(event) {
|
|
|
- if (event.skill.npc) return;
|
|
|
- let returnValue = undefined;
|
|
|
+ let modified = undefined;
|
|
|
|
|
|
if (Cfg.Hit_Me && (EqGid(event.source) || EqGid(event.owner))) {
|
|
|
event.templateId = 0;
|
|
|
@@ -592,7 +579,7 @@ module.exports = function FpsUtils(mod) {
|
|
|
event.crit = event.stackExplode = event.superArmor = false;
|
|
|
event.superArmorId = event.hitCylinderId = 0;
|
|
|
|
|
|
- returnValue = true;
|
|
|
+ modified = true;
|
|
|
}
|
|
|
|
|
|
if (Cfg.Hit_Other && !EqGid(event.target) && !EqGid(event.source) && !EqGid(event.owner) && (SUsers[event.owner] || SUsers[event.source])) {
|
|
|
@@ -602,13 +589,13 @@ module.exports = function FpsUtils(mod) {
|
|
|
event.crit = event.stackExplode = event.superArmor = false;
|
|
|
event.superArmorId = event.hitCylinderId = 0;
|
|
|
|
|
|
- returnValue = true;
|
|
|
+ modified = true;
|
|
|
}
|
|
|
|
|
|
if (Cfg.Hit_Damage && (EqGid(event.source) || EqGid(event.owner) || EqGid(event.target) || UserNpcs.includes(event.templateId) && event.skill.huntingZoneId === UserNpcsHzId)) {
|
|
|
event.value = 0n;
|
|
|
|
|
|
- returnValue = true;
|
|
|
+ modified = true;
|
|
|
}
|
|
|
|
|
|
if (Cfg.Hit_All) {
|
|
|
@@ -619,12 +606,10 @@ module.exports = function FpsUtils(mod) {
|
|
|
event.crit = event.stackExplode = event.superArmor = false;
|
|
|
event.superArmorId = event.hitCylinderId = 0;
|
|
|
|
|
|
- returnValue = true;
|
|
|
+ modified = true;
|
|
|
}
|
|
|
|
|
|
- if (BProjectiles.has(event.id) && (Cfg.Mode >= 2 || Cfg.HideAllProjectiles)) returnValue = false;
|
|
|
-
|
|
|
- return returnValue;
|
|
|
+ return modified;
|
|
|
}
|
|
|
|
|
|
const UserBCheck = user => { for (const plBlist of Cfg.PlayersBlacklist) if (plBlist.toLowerCase() === user.toLowerCase()) return true; };
|
|
|
@@ -672,37 +657,12 @@ module.exports = function FpsUtils(mod) {
|
|
|
return blocked ? false : undefined;
|
|
|
}
|
|
|
|
|
|
- function updatePartySpawns(raid) {
|
|
|
- if (!Cfg.OnlyParty || !Cfg.RaidAutoChange) return
|
|
|
-
|
|
|
- if (Cfg.OnlyParty)
|
|
|
- for (const sUser in SUsers) {
|
|
|
- if (!PMembers.has(SUsers[sUser].name)) HideSpecificPlayerByName(SUsers[sUser].name);
|
|
|
- else if (HUsers[SUsers[sUser].gameId]) ShowSpecificPlayerByName(SUsers[sUser].name);
|
|
|
- }
|
|
|
-
|
|
|
- if (Cfg.RaidAutoChange && typeof raid !== 'undefined') {
|
|
|
- if (raid) {
|
|
|
- if (Cfg.Mode >= 2 || (LastFState === null && Cfg.Mode === 2)) return;
|
|
|
- LastFState = Cfg.Mode;
|
|
|
- Cmd.exec("fps state 2");
|
|
|
- } else {
|
|
|
- if (LastFState === null || Cfg.Mode !== 2) {
|
|
|
- LastFState = null;
|
|
|
- return;
|
|
|
- }
|
|
|
- Cmd.exec(`fps state ${LastFState}`);
|
|
|
- LastFState = null;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
function EqGid(xG) {
|
|
|
return (xG === MyGameId);
|
|
|
}
|
|
|
|
|
|
function ClassID(m) {
|
|
|
- return (m % 1E2);
|
|
|
+ return (m % 100);
|
|
|
}
|
|
|
|
|
|
function log(name, type, from, target, id) {
|
|
|
@@ -710,7 +670,7 @@ module.exports = function FpsUtils(mod) {
|
|
|
}
|
|
|
|
|
|
function UpdateUserLoc(event) {
|
|
|
- mod.toClient('S_USER_LOCATION', 6, { gameId: event.gameId, loc: event.loc, w: event.w, speed: 3E2, dest: event.loc, type: 7 });
|
|
|
+ mod.toClient('S_USER_LOCATION', 5, { gameId: event.gameId, loc: event.loc, w: event.w, speed: 3E2, dest: event.loc, type: 7 });
|
|
|
}
|
|
|
|
|
|
function UpdateNpcLoc(event, zMod = 0) {
|
|
|
@@ -726,9 +686,6 @@ module.exports = function FpsUtils(mod) {
|
|
|
MyName = event.name;
|
|
|
ProjDebug = false;
|
|
|
AbnDebug = false;
|
|
|
- PMembers.clear();
|
|
|
- BProjectiles.clear();
|
|
|
- HSeedBoxes.clear();
|
|
|
if (Cfg.StreamMode) console.log("\x1b[94mINFO\x1b[34m [FPS-UTILS]\x1b[39m - Steam Mode is enabled, No messages will be sent in-game messages until its disabled.");
|
|
|
}
|
|
|
|
|
|
@@ -748,6 +705,21 @@ module.exports = function FpsUtils(mod) {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ function sLeaveParty() {
|
|
|
+ if (Cfg.OnlyParty)
|
|
|
+ for (const sUser in SUsers)
|
|
|
+ if (PMembers.includes(SUsers[sUser].name)) HideSpecificPlayerByName(SUsers[sUser].name);
|
|
|
+ PMembers = [];
|
|
|
+ if (Cfg.RaidAutoChange) {
|
|
|
+ if (LastFState === null || Cfg.Mode !== 2) {
|
|
|
+ LastFState = null;
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ mod.command.exec(`fps mode ${LastFState}`);
|
|
|
+ LastFState = null;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
function sMountVehicle(event) {
|
|
|
if (EqGid(event.gameId)) return;
|
|
|
SUsers[event.gameId].mount = event.id;
|
|
|
@@ -786,7 +758,6 @@ module.exports = function FpsUtils(mod) {
|
|
|
AllowedAchUps--;
|
|
|
return;
|
|
|
}
|
|
|
- if (Cfg.Mode < 2) return;
|
|
|
for (const Achieve of event.achievements) if (SpamAchIds.indexOf(Achieve.id) !== -1 || !Achieve.requirements.length) return false;
|
|
|
}
|
|
|
|
|
|
@@ -818,7 +789,7 @@ module.exports = function FpsUtils(mod) {
|
|
|
function sSpawnUser(event) {
|
|
|
SUsers[event.gameId] = event;
|
|
|
SUsers[event.gameId].spawnFx = 1;
|
|
|
- if (Cfg.Mode === 3 || UserBCheck(event.name) || Cfg.ClassesData[ClassID(event.templateId)].isHidden || (Cfg.OnlyParty && !PMembers.has(event.name))) {
|
|
|
+ if (Cfg.Mode === 3 || UserBCheck(event.name) || Cfg.ClassesData[ClassID(event.templateId)].isHidden || (Cfg.OnlyParty && !PMembers.includes(event.name))) {
|
|
|
HUsers[event.gameId] = event;
|
|
|
HUsers[event.gameId].spawnFx = 1;
|
|
|
return false;
|
|
|
@@ -868,6 +839,29 @@ module.exports = function FpsUtils(mod) {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ function sPartyMemberList(event) {
|
|
|
+ event.members.map(value => PMembers.push(value.name));
|
|
|
+ if (Cfg.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 (Cfg.RaidAutoChange) {
|
|
|
+ if (event.raid) {
|
|
|
+ if (Cfg.Mode >= 2 || (LastFState === null && Cfg.Mode === 2)) return;
|
|
|
+ LastFState = Cfg.Mode;
|
|
|
+ mod.command.exec("fps state 2");
|
|
|
+ } else {
|
|
|
+ if (LastFState === null || Cfg.Mode !== 2) {
|
|
|
+ LastFState = null;
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ mod.command.exec(`fps state ${LastFState}`);
|
|
|
+ LastFState = null;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
function sUserAppearanceChange(event) {
|
|
|
if (EqGid(event.id)) return;
|
|
|
if (Cfg.ShowStyle) return false;
|
|
|
@@ -908,21 +902,6 @@ module.exports = function FpsUtils(mod) {
|
|
|
return modified;
|
|
|
}
|
|
|
|
|
|
- function sPartyMemberList(event) {
|
|
|
- event.members.map(value => { PMembers.add(value.name) });
|
|
|
- updatePartySpawns(event.raid);
|
|
|
- }
|
|
|
-
|
|
|
- function sLeavePartyMember(event) {
|
|
|
- PMembers.delete(event.name);
|
|
|
- updatePartySpawns();
|
|
|
- }
|
|
|
-
|
|
|
- function sLeaveParty() {
|
|
|
- PMembers.clear();
|
|
|
- updatePartySpawns(false);
|
|
|
- }
|
|
|
-
|
|
|
function sSpawnNpc(event) {
|
|
|
SNpcs[event.gameId] = event;
|
|
|
SNpcs[event.gameId].spawnType = 1;
|
|
|
@@ -991,8 +970,8 @@ module.exports = function FpsUtils(mod) {
|
|
|
if (EqGid(event.ownerId) && Cfg.HideMyServants) {
|
|
|
HPets[event.gameId] = event;
|
|
|
process.nextTick(() => {
|
|
|
- UpdateNpcLoc(event, -1E2);
|
|
|
- ScaleUpEntity(event.gameId, 1E-3);
|
|
|
+ UpdateNpcLoc(event, -100);
|
|
|
+ ScaleUpEntity(event.gameId, 0.001);
|
|
|
});
|
|
|
} else if (!EqGid(event.ownerId) && Cfg.HideOthersServants) {
|
|
|
HPets[event.gameId] = event;
|
|
|
@@ -1024,18 +1003,6 @@ module.exports = function FpsUtils(mod) {
|
|
|
return ModifyAbnormalities(event);
|
|
|
}
|
|
|
|
|
|
- function sAbnormalityResist(event) {
|
|
|
- return ModifyAbnormalities(event);
|
|
|
- }
|
|
|
-
|
|
|
- function sAbnormalityDamageAbsorb(event) {
|
|
|
- return ModifyAbnormalities(event);
|
|
|
- }
|
|
|
-
|
|
|
- function sAbnormalityFail(event) {
|
|
|
- return ModifyAbnormalities(event);
|
|
|
- }
|
|
|
-
|
|
|
function sAbnormalityEnd(event) {
|
|
|
return ModifyAbnormalities(event, true);
|
|
|
}
|
|
|
@@ -1048,15 +1015,16 @@ module.exports = function FpsUtils(mod) {
|
|
|
return ActionHCheck(event, true);
|
|
|
}
|
|
|
|
|
|
- function sInstanceArrow(event) {
|
|
|
+ function sStartUserProjectile(event) {
|
|
|
if (ProjDebug) {
|
|
|
- if (EqGid(event.gameId)) log('Projectile-Arrow', 'Spawned', 'from', MyName, event.skill.id);
|
|
|
- if (SUsers[event.gameId]) log('Projectile-Arrow', 'Spawned', 'from', SUsers[event.gameId].name, 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);
|
|
|
}
|
|
|
return ProjectileBCheck(event);
|
|
|
}
|
|
|
|
|
|
function sSpawnProjectile(event) {
|
|
|
+ if (event.skill.npc) return;
|
|
|
if (ProjDebug) {
|
|
|
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);
|
|
|
@@ -1064,26 +1032,6 @@ module.exports = function FpsUtils(mod) {
|
|
|
return ProjectileBCheck(event);
|
|
|
}
|
|
|
|
|
|
- function sStartUserProjectile(event) {
|
|
|
- if (ProjDebug) {
|
|
|
- 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);
|
|
|
- }
|
|
|
- return ProjectileBCheck(event);
|
|
|
- }
|
|
|
-
|
|
|
- /*function sChangeDestposProjectile(event) {
|
|
|
- return ProjectileBCheck(event);
|
|
|
- }*/
|
|
|
-
|
|
|
- function sEndUserProjectile(event) {
|
|
|
- BProjectiles.delete(event.id);
|
|
|
- }
|
|
|
-
|
|
|
- function sDespawnProjectile(event) {
|
|
|
- BProjectiles.delete(event.id);
|
|
|
- }
|
|
|
-
|
|
|
function sPlayerChangeMp(event) {
|
|
|
if (!Cfg.HideMpNumbers || !EqGid(event.target)) return;
|
|
|
if (event.type !== 0) {
|
|
|
@@ -1128,29 +1076,32 @@ module.exports = function FpsUtils(mod) {
|
|
|
}
|
|
|
|
|
|
function sSpawnEventSeed(event) {
|
|
|
- if (HUsers[event.owner] || Cfg.Mode >= 2) {
|
|
|
- HSeedBoxes.add(event.gameId);
|
|
|
+ if (HUsers[event.owner]) {
|
|
|
+ HSeedBoxes[event.gameId] = event;
|
|
|
return false;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
function sUpdateEventSeedState(event) {
|
|
|
- if (HSeedBoxes.has(event.gameId)) return false;
|
|
|
+ if (HSeedBoxes[event.gameId]) return false;
|
|
|
}
|
|
|
|
|
|
function sResultEventSeed(event) {
|
|
|
- if (HSeedBoxes.has(event.gameId)) return false;
|
|
|
+ if (HSeedBoxes[event.gameId]) return false;
|
|
|
}
|
|
|
|
|
|
function sDespawnEventSeed(event) {
|
|
|
- HSeedBoxes.delete(event.gameId);
|
|
|
+ if (HSeedBoxes[event.gameId]) {
|
|
|
+ delete HSeedBoxes[event.gameId];
|
|
|
+ return false;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
function sFieldEventOnEnter() {
|
|
|
if (Cfg.GuardianAutoChange) {
|
|
|
if ((LastGState !== null && Cfg.Mode === 2) || Cfg.Mode >= 2) return;
|
|
|
LastGState = Cfg.Mode;
|
|
|
- Cmd.exec("fps state 2");
|
|
|
+ mod.command.exec("fps state 2");
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -1160,15 +1111,16 @@ module.exports = function FpsUtils(mod) {
|
|
|
LastGState = null;
|
|
|
return;
|
|
|
}
|
|
|
- Cmd.exec(`fps state ${LastGState}`);
|
|
|
+ mod.command.exec(`fps state ${LastGState}`);
|
|
|
LastGState = null;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
// ~~~ * Packet Hooks * ~~~ \\
|
|
|
|
|
|
- mod.hook('S_LOGIN', mod.majorPatchVersion < 114 ? 14 : 15, sLogin)
|
|
|
+ mod.hook('S_LOGIN', 14, sLogin)
|
|
|
mod.hook('S_LOAD_TOPO', 'raw', sLoadTopo)
|
|
|
+ mod.hook('S_LEAVE_PARTY', 'raw', sLeaveParty)
|
|
|
mod.hook('S_MOUNT_VEHICLE', 2, LastHook, sMountVehicle)
|
|
|
mod.hook('S_UNMOUNT_VEHICLE', 2, LastHook, sUnmountVehicle)
|
|
|
mod.hook('C_SET_VISIBLE_RANGE', 1, cSetVisibleRange)
|
|
|
@@ -1184,23 +1136,20 @@ module.exports = function FpsUtils(mod) {
|
|
|
mod.hook('S_APPLY_TITLE', 3, LastHook, sApplyTitle)
|
|
|
mod.hook('S_IMAGE_DATA', 'raw', LastHook, sImageData)
|
|
|
|
|
|
- mod.hook('S_SPAWN_USER', 17, LastHook, sSpawnUser)
|
|
|
- mod.hook('S_SPAWN_USER', 17, LastHookfn, sSpawnUserfn)
|
|
|
+ mod.hook('S_SPAWN_USER', 15, LastHook, sSpawnUser)
|
|
|
+ mod.hook('S_SPAWN_USER', 15, LastHookfn, sSpawnUserfn)
|
|
|
mod.hook('S_DESPAWN_USER', 3, sDespawnUser)
|
|
|
- mod.hook('S_USER_LOCATION', 6, LastHook, sUserLocation)
|
|
|
- mod.hook('S_USER_STATUS', 4, LastHook, sUserStatus)
|
|
|
+ mod.hook('S_USER_LOCATION', 5, LastHook, sUserLocation)
|
|
|
+ mod.hook('S_USER_STATUS', 3, LastHook, sUserStatus)
|
|
|
mod.hook('S_DEAD_LOCATION', 2, sDeadLocation)
|
|
|
mod.hook('S_USER_MOVETYPE', 1, LastHook, sUserMovetype)
|
|
|
+ mod.hook('S_PARTY_MEMBER_LIST', 7, sPartyMemberList)
|
|
|
mod.hook('S_USER_APPEARANCE_CHANGE', 1, LastHook, sUserAppearanceChange)
|
|
|
mod.hook('S_USER_CHANGE_FACE_CUSTOM', 2, LastHook, sUserChangeFaceCustom)
|
|
|
mod.hook('S_USER_EXTERNAL_CHANGE', 7, LastHook, sUserExternalChange)
|
|
|
mod.hook('S_UNICAST_TRANSFORM_DATA', 6, LastHook, sUnicastTransformData)
|
|
|
|
|
|
- mod.hook('S_PARTY_MEMBER_LIST', 9, sPartyMemberList)
|
|
|
- mod.hook('S_LEAVE_PARTY_MEMBER', 2, sLeavePartyMember)
|
|
|
- mod.hook('S_LEAVE_PARTY', 'raw', sLeaveParty)
|
|
|
-
|
|
|
- mod.hook('S_SPAWN_NPC', 12, LastHook, sSpawnNpc)
|
|
|
+ mod.hook('S_SPAWN_NPC', 11, LastHook, sSpawnNpc)
|
|
|
mod.hook('S_DESPAWN_NPC', 3, LastHook, sDespawnNpc)
|
|
|
mod.hook('S_NPC_LOCATION', 3, LastHook, sNpcLocation)
|
|
|
mod.hook('S_CREATURE_LIFE', 3, sCreatureLife)
|
|
|
@@ -1209,60 +1158,52 @@ module.exports = function FpsUtils(mod) {
|
|
|
mod.hook('S_FEARMOVE_END', 2, LastHook, sFearMoveEnd)
|
|
|
|
|
|
mod.hook('S_REQUEST_SPAWN_SERVANT', 4, LastHook, sRequestSpawnServant)
|
|
|
- mod.hook('S_REQUEST_DESPAWN_SERVANT', 1, sRequestDespawnServant)
|
|
|
+ mod.hook('S_REQUEST_DESPAWN_SERVANT', 1, LastHook, sRequestDespawnServant)
|
|
|
mod.hook('S_QUEST_BALLOON', 1, LastHook, sQuestBalloon)
|
|
|
|
|
|
- mod.hook('S_ABNORMALITY_BEGIN', 5, LastHookfn, sAbnormalityBegin)
|
|
|
- mod.hook('S_ABNORMALITY_REFRESH', 2, LastHookfn, sAbnormalityRefresh)
|
|
|
- mod.hook('S_ABNORMALITY_RESIST', 1, LastHookfn, sAbnormalityResist)
|
|
|
- mod.hook('S_ABNORMALITY_DAMAGE_ABSORB', 1, LastHookfn, sAbnormalityDamageAbsorb)
|
|
|
- mod.hook('S_ABNORMALITY_FAIL', 2, LastHookfn, sAbnormalityFail)
|
|
|
+ mod.hook('S_ABNORMALITY_BEGIN', 3, LastHookfn, sAbnormalityBegin)
|
|
|
+ mod.hook('S_ABNORMALITY_REFRESH', 1, LastHookfn, sAbnormalityRefresh)
|
|
|
mod.hook('S_ABNORMALITY_END', 1, LastHookfn, sAbnormalityEnd)
|
|
|
|
|
|
mod.hook('S_ACTION_STAGE', 9, LastHook, sActionStage)
|
|
|
mod.hook('S_ACTION_END', 5, LastHook, sActionEnd)
|
|
|
- mod.hook('S_INSTANCE_ARROW', 4, LastHook, sInstanceArrow)
|
|
|
- mod.hook('S_SPAWN_PROJECTILE', 6, LastHook, sSpawnProjectile)
|
|
|
+ mod.hook('S_SPAWN_PROJECTILE', 5, LastHook, sSpawnProjectile)
|
|
|
mod.hook('S_START_USER_PROJECTILE', 9, LastHook, sStartUserProjectile)
|
|
|
- //mod.hook('S_CHANGE_DESTPOS_PROJECTILE', 1, LastHook, sChangeDestposProjectile) //! Awaiting public def !\\
|
|
|
- mod.hook('S_END_USER_PROJECTILE', 4, sEndUserProjectile)
|
|
|
- mod.hook('S_DESPAWN_PROJECTILE', 2, sDespawnProjectile)
|
|
|
-
|
|
|
mod.hook('S_PLAYER_CHANGE_MP', 1, LastHook, sPlayerChangeMp)
|
|
|
mod.hook('S_CREATURE_CHANGE_HP', 6, LastHook, sCreatureChangeHp)
|
|
|
- mod.hook('S_EACH_SKILL_RESULT', 15, LastHook, sEachSkillResult)
|
|
|
mod.hook('S_ITEM_EXPLOSION_RESULT', 2, LastHook, sItemExplosionResult)
|
|
|
- mod.hook('S_SPAWN_DROPITEM', 9, LastHook, sSpawnDropItem)
|
|
|
+ mod.hook('S_EACH_SKILL_RESULT', 14, LastHook, sEachSkillResult)
|
|
|
+ mod.hook('S_SPAWN_DROPITEM', 8, LastHook, sSpawnDropItem)
|
|
|
mod.hook('S_FONT_SWAP_INFO', 'raw', LastHookfn, sFontSwapInfo)
|
|
|
|
|
|
- mod.hook('S_SPAWN_EVENT_SEED', 2, LastHook, sSpawnEventSeed)
|
|
|
- mod.hook('S_UPDATE_EVENT_SEED_STATE', 4, LastHook, sUpdateEventSeedState)
|
|
|
- mod.hook('S_RESULT_EVENT_SEED', 2, LastHook, sResultEventSeed)
|
|
|
- mod.hook('S_DESPAWN_EVENT_SEED', 1, sDespawnEventSeed)
|
|
|
+ mod.hook('S_SPAWN_EVENT_SEED', 2, LastHookfn, sSpawnEventSeed)
|
|
|
+ mod.hook('S_UPDATE_EVENT_SEED_STATE', 4, LastHookfn, sUpdateEventSeedState)
|
|
|
+ mod.hook('S_RESULT_EVENT_SEED', 2, LastHookfn, sResultEventSeed)
|
|
|
+ mod.hook('S_DESPAWN_EVENT_SEED', 1, LastHookfn, sDespawnEventSeed)
|
|
|
|
|
|
mod.hook('S_FIELD_EVENT_ON_ENTER', 'raw', sFieldEventOnEnter)
|
|
|
mod.hook('S_FIELD_EVENT_ON_LEAVE', 'raw', sFieldEventOnLeave)
|
|
|
|
|
|
// ~~~ * Commands * ~~~ \\
|
|
|
|
|
|
- Cmd.add('0', () => Cmd.exec('fps mode 0'));
|
|
|
- Cmd.add('1', () => Cmd.exec('fps mode 1'));
|
|
|
- Cmd.add('2', () => Cmd.exec('fps mode 2'));
|
|
|
- Cmd.add('3', () => Cmd.exec('fps mode 3'));
|
|
|
+ mod.command.add('0', () => mod.command.exec('fps mode 0'));
|
|
|
+ mod.command.add('1', () => mod.command.exec('fps mode 1'));
|
|
|
+ mod.command.add('2', () => mod.command.exec('fps mode 2'));
|
|
|
+ mod.command.add('3', () => mod.command.exec('fps mode 3'));
|
|
|
|
|
|
- Cmd.add(['fps', '!fps', 'fps-utils', '!fps-utils'], (key, arg, arg2, arg3) => {
|
|
|
+ mod.command.add(['fps', '!fps', 'fps-utils', '!fps-utils'], (key, arg, arg2, arg3) => {
|
|
|
key = key ? key.toLowerCase() : key;
|
|
|
arg = arg ? arg.toLowerCase() : arg;
|
|
|
arg2 = arg2 ? arg2.toLowerCase() : arg2;
|
|
|
arg3 = arg3 ? arg3.toLowerCase() : arg3;
|
|
|
switch (key) {
|
|
|
- case "b": Cmd.exec('fps skills blacklist'); break;
|
|
|
- case "p": Cmd.exec('fps party'); break;
|
|
|
+ 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": Cmd.exec('fps mode 0'); break;
|
|
|
- case "1": Cmd.exec('fps mode 1'); break;
|
|
|
- case "2": Cmd.exec('fps mode 2'); break;
|
|
|
- case "3": Cmd.exec('fps mode 3'); break;
|
|
|
+ case "0": mod.command.exec('fps mode 0'); break;
|
|
|
+ case "1": mod.command.exec('fps mode 1'); break;
|
|
|
+ case "2": mod.command.exec('fps mode 2'); break;
|
|
|
+ case "3": mod.command.exec('fps mode 3'); break;
|
|
|
case "m": case "mod": case "mode": case "state":
|
|
|
switch (arg) {
|
|
|
case "0": case "off": case "zero":
|
|
|
@@ -1299,7 +1240,7 @@ module.exports = function FpsUtils(mod) {
|
|
|
Msg(`<font color="${GldC}">Mode 3</font>.`);
|
|
|
break;
|
|
|
default:
|
|
|
- Msg(`<font color="${GryC}">Invalid arg: '${arg}'</font>.`);
|
|
|
+ Msg(`<font color="${GryC}">Invalid" ${arg}"</font>.`);
|
|
|
Msg(`Modes: "<font color="${PnkC}">[0, 1, 2, 3]</font>.`);
|
|
|
break;
|
|
|
}
|
|
|
@@ -1325,7 +1266,7 @@ module.exports = function FpsUtils(mod) {
|
|
|
Msg(`Player '${arg}' <font color="${GrnC}">Hidden</font>.`);
|
|
|
Cfg.PlayersBlacklist.push(arg);
|
|
|
HideSpecificPlayerByName(arg);
|
|
|
- } else Msg(`<font color="${GryC}">Invalid arg: '${arg2}'</font>.`);
|
|
|
+ } else Msg(`<font color="${GryC}">Invalid ${arg2}</font>.`);
|
|
|
break;
|
|
|
case "show":
|
|
|
if (typeof arg === "string" && arg !== null) {
|
|
|
@@ -1348,16 +1289,16 @@ module.exports = function FpsUtils(mod) {
|
|
|
Msg(`Class '${arg}' <font color="${RedC}">Shown</font>.`);
|
|
|
} else if (!Cfg.ClassesBlacklist.includes(arg) || !Cfg.RolesBlacklist.includes(arg)) Msg(`Class/Role '${arg}' <font color="${RedC}">Already shown</font>.`);
|
|
|
else if (!Cfg.PlayersBlacklist.includes(arg)) Msg(`Player '${arg}' <font color="${RedC}">Already shown</font>.`);
|
|
|
- else Msg(`<font color="${GryC}">Invalid arg: '${arg2}'</font>.`);
|
|
|
+ else Msg(`<font color="${GryC}">Invalid ${arg2}</font>.`);
|
|
|
}
|
|
|
break;
|
|
|
case "party":
|
|
|
if (Cfg.Mode === 3) return Msg(`<font color="${RedC}">You've to disable mode 3 first</font>.`);
|
|
|
- //if(!PMembers.size) return Msg(`<font color="${GryC}">You must be in party in-order to enable this</font>.`);
|
|
|
+ //if(!PMembers.length) return Msg(`<font color="${GryC}">You must be in party in-order to enable this</font>.`);
|
|
|
Cfg.OnlyParty = !Cfg.OnlyParty;
|
|
|
if (Cfg.OnlyParty) {
|
|
|
for (const sUser in SUsers) {
|
|
|
- if (!PMembers.has(SUsers[sUser].name)) HideSpecificPlayerByName(SUsers[sUser].name);
|
|
|
+ if (!PMembers.includes(SUsers[sUser].name)) HideSpecificPlayerByName(SUsers[sUser].name);
|
|
|
else if (HUsers[SUsers[sUser].gameId]) ShowSpecificPlayerByName(SUsers[sUser].name);
|
|
|
}
|
|
|
} else ShowAllPlayers();
|
|
|
@@ -1477,7 +1418,7 @@ module.exports = function FpsUtils(mod) {
|
|
|
Msg(`Hit all ${Cfg.Hit_All ? `<font color="${GrnC}">Hidden</font>` : `<font color="${RedC}">Shown</font>`}.`);
|
|
|
break;
|
|
|
default:
|
|
|
- Msg(`<font color="${GryC}">Invalid hit arg: '${arg}'</font>.`);
|
|
|
+ Msg(`<font color="${GryC}">Invalid (hit) '${arg}'</font>.`);
|
|
|
break;
|
|
|
}
|
|
|
break;
|
|
|
@@ -1515,7 +1456,7 @@ module.exports = function FpsUtils(mod) {
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
|
- } else return Msg(`<font color="${GryC}">Invalid abnormalities Blacklist arg: '${arg}'</font>.`);
|
|
|
+ } else return Msg(`<font color="${GryC}">Invalid (abnormalities Blacklist) '${arg}'</font>.`);
|
|
|
}
|
|
|
break;
|
|
|
case "log":
|
|
|
@@ -1525,7 +1466,7 @@ module.exports = function FpsUtils(mod) {
|
|
|
else Msg(`Abnormalities debug <font color="${RedC}">stopped</font>.`);
|
|
|
break;
|
|
|
default:
|
|
|
- Msg(`<font color="${GryC}">Invalid abnormalities arg: '${arg}'</font>.`);
|
|
|
+ Msg(`<font color="${GryC}">Invalid (abnormalities) '${arg}'</font>.`);
|
|
|
break;
|
|
|
}
|
|
|
break;
|
|
|
@@ -1576,7 +1517,7 @@ module.exports = function FpsUtils(mod) {
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
|
- } else return Msg(`<font color="${GryC}">Invalid projectile Blacklist arg: '${arg}'</font>.`);
|
|
|
+ } else return Msg(`<font color="${GryC}">Invalid (projectile Blacklist) '${arg}'</font>.`);
|
|
|
}
|
|
|
break;
|
|
|
case "log": case "debug":
|
|
|
@@ -1585,7 +1526,7 @@ module.exports = function FpsUtils(mod) {
|
|
|
else Msg(`Projectile debug <font color="${RedC}">stopped</font>.`);
|
|
|
break;
|
|
|
default:
|
|
|
- Msg(`<font color="${GryC}">Invalid projectile arg: '${arg}'</font>.`);
|
|
|
+ Msg(`<font color="${GryC}">Invalid (projectile) '${arg}'</font>.`);
|
|
|
break;
|
|
|
}
|
|
|
break;
|
|
|
@@ -1622,7 +1563,7 @@ module.exports = function FpsUtils(mod) {
|
|
|
mod.toServer('C_RESET_ALL_DUNGEON', 1);
|
|
|
break;
|
|
|
default:
|
|
|
- Msg(`<font color="${GryC}">Invalid quicklink '${arg}'</font>.`);
|
|
|
+ Msg(`<font color="${GryC}">Invalid (quicklink) '${arg}'</font>.`);
|
|
|
break;
|
|
|
}
|
|
|
break;
|
|
|
@@ -1711,12 +1652,12 @@ module.exports = function FpsUtils(mod) {
|
|
|
else console.log("\x1b[94mINFO\x1b[34m [FPS-UTILS]\x1b[39m - Steam Mode has been disabled.");
|
|
|
break;
|
|
|
case "help": case "h":
|
|
|
- Cmd.exec("fps gui help");
|
|
|
+ mod.command.exec("fps gui help");
|
|
|
break;
|
|
|
default:
|
|
|
//Msg(`<font color="${RedC}">Unknown command, check command list</font>.`);
|
|
|
- //Cmd.exec("fps gui help");
|
|
|
- Cmd.exec("fps gui");
|
|
|
+ //mod.command.exec("fps gui help");
|
|
|
+ mod.command.exec("fps gui");
|
|
|
break;
|
|
|
}
|
|
|
if (!NotCP && typeof Cfg.ClassesData["12"] === 'undefined') mod.saveSettings();
|