|
@@ -902,7 +902,7 @@ module.exports = function FpsUtils(mod) {
|
|
|
if (SUsers[event.target]) log('Abnormality', 'Applied', 'on', SUsers[event.target].name, event.id);
|
|
if (SUsers[event.target]) log('Abnormality', 'Applied', 'on', SUsers[event.target].name, event.id);
|
|
|
if (SUsers[event.source]) log('Abnormality', 'Started', 'from', SUsers[event.source].name, event.id);
|
|
if (SUsers[event.source]) log('Abnormality', 'Started', 'from', SUsers[event.source].name, event.id);
|
|
|
}
|
|
}
|
|
|
- if([90442103, 90442107].includes(event.id)) { event.id = 47702000; return true; }
|
|
|
|
|
|
|
+ if ([90442103, 90442107].includes(event.id)) { event.id = 47702000; return true; }
|
|
|
if (ImportantAbns.includes(event.id)) return;
|
|
if (ImportantAbns.includes(event.id)) return;
|
|
|
if (EqGid(event.target)) {
|
|
if (EqGid(event.target)) {
|
|
|
if (mod.settings.HideOwnBlacklistedAbns && mod.settings.OwnAbnormalsBlacklist.includes(event.id)) return false;
|
|
if (mod.settings.HideOwnBlacklistedAbns && mod.settings.OwnAbnormalsBlacklist.includes(event.id)) return false;
|
|
@@ -915,14 +915,14 @@ module.exports = function FpsUtils(mod) {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
function sAbnormalityRefresh(event) {
|
|
function sAbnormalityRefresh(event) {
|
|
|
- if([90442103, 90442107].includes(event.id)) { event.id = 47702000; return true; }
|
|
|
|
|
|
|
+ if ([90442103, 90442107].includes(event.id)) { event.id = 47702000; return true; }
|
|
|
if (ImportantAbns.includes(event.id)) return;
|
|
if (ImportantAbns.includes(event.id)) return;
|
|
|
if (HUsers[event.target] || HNpcs[event.target]) return false;
|
|
if (HUsers[event.target] || HNpcs[event.target]) return false;
|
|
|
if ((mod.settings.HideBlacklistedAbnormalities || mod.settings.HideAllAbnormalities) && (SUsers[[10306, 10316, 12001, 12003, 22040, 12120, 12130].includes(event.target)] || SUsers[[10306, 10316, 12001, 12003, 22040, 12120, 12130].includes(event.source)])) return false;
|
|
if ((mod.settings.HideBlacklistedAbnormalities || mod.settings.HideAllAbnormalities) && (SUsers[[10306, 10316, 12001, 12003, 22040, 12120, 12130].includes(event.target)] || SUsers[[10306, 10316, 12001, 12003, 22040, 12120, 12130].includes(event.source)])) return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
function sAbnormalityEnd(event) {
|
|
function sAbnormalityEnd(event) {
|
|
|
- if([90442103, 90442107].includes(event.id)) { event.id = 47702000; return true; }
|
|
|
|
|
|
|
+ if ([90442103, 90442107].includes(event.id)) { event.id = 47702000; return true; }
|
|
|
if (event.id === 9943049) return false;
|
|
if (event.id === 9943049) return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -932,7 +932,16 @@ module.exports = function FpsUtils(mod) {
|
|
|
|
|
|
|
|
function sActionStage(event) {
|
|
function sActionStage(event) {
|
|
|
if (EqGid(event.gameId) || !SUsers[event.gameId]) return;
|
|
if (EqGid(event.gameId) || !SUsers[event.gameId]) return;
|
|
|
- if ((mod.settings.Mode >= 2) || HUsers[event.gameId] || (mod.settings.HideBlacklistedSkills && mod.settings.ClassesData[ClassID(event.templateId)].CD_SkillsBlacklist.includes(Math.floor(((Classic_NOTCP ? (event.skill - 0x4000000) : event.skill.id) / 10000).toString()))) || mod.settings.ClassesData[ClassID(event.templateId)].CD_HideBlacklistedSkills) {
|
|
|
|
|
|
|
+ if ((mod.settings.Mode >= 2) || HUsers[event.gameId] || mod.settings.ClassesData[ClassID(event.templateId)].CD_HideBlacklistedSkills) {
|
|
|
|
|
+ UpdateUserLoc(event);
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
|
|
+ if (Classic_NOTCP) {
|
|
|
|
|
+ if (mod.settings.HideBlacklistedSkills && mod.settings.ClassesData[ClassID(event.templateId)].CD_SkillsBlacklist.includes(Math.floor((event.skill - 0x4000000) / 10000).toString())) {
|
|
|
|
|
+ UpdateUserLoc(event);
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
|
|
+ } else if (mod.settings.HideBlacklistedSkills && mod.settings.ClassesData[ClassID(event.templateId)].CD_SkillsBlacklist.includes(Math.floor(event.skill.id / 10000).toString())) {
|
|
|
UpdateUserLoc(event);
|
|
UpdateUserLoc(event);
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
@@ -940,22 +949,28 @@ module.exports = function FpsUtils(mod) {
|
|
|
|
|
|
|
|
function sStartUserProjectile(event) {
|
|
function sStartUserProjectile(event) {
|
|
|
if (ProjDebug) {
|
|
if (ProjDebug) {
|
|
|
- if (EqGid(event.gameId)) log('Projectile', 'Started', 'from', MyName, (Classic_NOTCP ? (event.skill - 0x4000000) : event.skill.id));
|
|
|
|
|
- if (SUsers[event.gameId]) log('Projectile', 'Started', 'from', SUsers[event.gameId].name, (Classic_NOTCP ? (event.skill - 0x4000000) : event.skill.id));
|
|
|
|
|
|
|
+ if (EqGid(event.gameId)) if (Classic_NOTCP) log('Projectile', 'Started', 'from', MyName, event.skill - 0x4000000); else log('Projectile', 'Started', 'from', MyName, event.skill.id);
|
|
|
|
|
+ if (SUsers[event.gameId]) if (Classic_NOTCP) log('Projectile', 'Started', 'from', SUsers[event.gameId].name, event.skill - 0x4000000); else log('Projectile', 'Started', 'from', SUsers[event.gameId].name, event.skill.id);
|
|
|
|
|
+ }
|
|
|
|
|
+ if (mod.settings.PvpTraps) {
|
|
|
|
|
+ if (Classic_NOTCP && TrapsIds.includes(event.skill - 0x4000000)) return;
|
|
|
|
|
+ else if (TrapsIds.includes(event.skill.id)) return;
|
|
|
}
|
|
}
|
|
|
- if (mod.settings.PvpTraps && TrapsIds.includes((Classic_NOTCP ? (event.skill - 0x4000000) : event.skill.id))) return;
|
|
|
|
|
- if ((mod.settings.HideBlacklistedProjectiles || mod.settings.HideAllProjectiles) && mod.settings.ProjectilesBlacklist.includes((Classic_NOTCP ? (event.skill - 0x4000000) : event.skill.id))) return false;
|
|
|
|
|
|
|
+ if ((mod.settings.HideBlacklistedProjectiles || mod.settings.HideAllProjectiles)) { if (Classic_NOTCP && mod.settings.ProjectilesBlacklist.includes(event.skill - 0x4000000)) return false; else if (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;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
function sSpawnProjectile(event) {
|
|
function sSpawnProjectile(event) {
|
|
|
if (Classic_NOTCP ? (Boolean(event.skill & 0x40000000) === true) : event.skill.npc) return;
|
|
if (Classic_NOTCP ? (Boolean(event.skill & 0x40000000) === true) : event.skill.npc) return;
|
|
|
if (ProjDebug) {
|
|
if (ProjDebug) {
|
|
|
- if (EqGid(event.gameId)) log('Projectile', 'Spawned', 'from', MyName, (Classic_NOTCP ? (event.skill - 0x4000000) : event.skill.id));
|
|
|
|
|
- if (SUsers[event.gameId]) log('Projectile', 'Spawned', 'from', SUsers[event.gameId].name, (Classic_NOTCP ? (event.skill - 0x4000000) : event.skill.id));
|
|
|
|
|
|
|
+ if (EqGid(event.gameId)) if (Classic_NOTCP) log('Projectile', 'Spawned', 'from', MyName, event.skill - 0x4000000); else log('Projectile', 'Spawned', 'from', MyName, event.skill.id);
|
|
|
|
|
+ if (SUsers[event.gameId]) if (Classic_NOTCP) log('Projectile', 'Spawned', 'from', SUsers[event.gameId].name, event.skill - 0x4000000); else log('Projectile', 'Spawned', 'from', SUsers[event.gameId].name, event.skill.id);
|
|
|
|
|
+ }
|
|
|
|
|
+ if (mod.settings.PvpTraps) {
|
|
|
|
|
+ if (Classic_NOTCP && TrapsIds.includes(event.skill - 0x4000000)) return;
|
|
|
|
|
+ else if (TrapsIds.includes(event.skill.id)) return;
|
|
|
}
|
|
}
|
|
|
- if (mod.settings.PvpTraps && TrapsIds.includes((Classic_NOTCP ? (event.skill - 0x4000000) : event.skill.id))) return;
|
|
|
|
|
- if ((mod.settings.HideBlacklistedProjectiles || mod.settings.HideAllProjectiles) && mod.settings.ProjectilesBlacklist.includes((Classic_NOTCP ? (event.skill - 0x4000000) : event.skill.id))) return false;
|
|
|
|
|
|
|
+ if ((mod.settings.HideBlacklistedProjectiles || mod.settings.HideAllProjectiles)) { if (Classic_NOTCP && mod.settings.ProjectilesBlacklist.includes(event.skill - 0x4000000)) return false; else if (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;
|
|
|
}
|
|
}
|
|
|
|
|
|