|
@@ -35,7 +35,8 @@ module.exports = function FpsUtils(mod) {
|
|
|
SNpcs = {},
|
|
SNpcs = {},
|
|
|
HNpcs = {},
|
|
HNpcs = {},
|
|
|
SPets = {},
|
|
SPets = {},
|
|
|
- HPets = {};
|
|
|
|
|
|
|
+ HPets = {},
|
|
|
|
|
+ HSeedBoxes = {};
|
|
|
|
|
|
|
|
// ~~~ * Gui Parser * ~~~ \\
|
|
// ~~~ * Gui Parser * ~~~ \\
|
|
|
|
|
|
|
@@ -264,7 +265,8 @@ module.exports = function FpsUtils(mod) {
|
|
|
{ text: `<font color="${LBlC}" size="+18">[Classes/Roles]</font>`, command: "fps gui role" }, { text: " " },
|
|
{ text: `<font color="${LBlC}" size="+18">[Classes/Roles]</font>`, command: "fps gui role" }, { text: " " },
|
|
|
{ text: `<font color="${mod.settings.ShowStyle ? GrnC : RedC}" size="+18">[Style]</font>`, command: "fps style;fps gui" }, { text: " " },
|
|
{ text: `<font color="${mod.settings.ShowStyle ? GrnC : RedC}" size="+18">[Style]</font>`, command: "fps style;fps gui" }, { text: " " },
|
|
|
{ text: `<font color="${mod.settings.Hideguildlogos ? GrnC : RedC}" size="+18">[Guild Logos]</font>`, command: "fps guildlogo;fps gui" }, { text: " " },
|
|
{ text: `<font color="${mod.settings.Hideguildlogos ? GrnC : RedC}" size="+18">[Guild Logos]</font>`, command: "fps guildlogo;fps gui" }, { text: " " },
|
|
|
- { text: `<font color="${mod.settings.HideFireworks ? GrnC : RedC}" size="+18">[Fireworks]</font><br><br>`, command: "fps fireworks;fps gui" },
|
|
|
|
|
|
|
+ { text: `<font color="${mod.settings.HideFireworks ? GrnC : RedC}" size="+18">[Firework]</font>`, command: "fps fireworks;fps gui" }, { text: " " },
|
|
|
|
|
+ { text: `<font color="${mod.settings.HideServantBalloons ? GrnC : RedC}" size="+18">[Pets Popup]</font><br><br>`, command: "fps petspopup;fps gui" },
|
|
|
{ text: `<font color="${YlwC}" size="+20">Self(own):</font>` }, { text: "	" },
|
|
{ text: `<font color="${YlwC}" size="+20">Self(own):</font>` }, { text: "	" },
|
|
|
{ text: `<font color="${mod.settings.HideHpNumbers ? GrnC : RedC}" size="+18">[HP Nums]</font>`, command: "fps hpnumbers;fps gui" }, { text: " " },
|
|
{ text: `<font color="${mod.settings.HideHpNumbers ? GrnC : RedC}" size="+18">[HP Nums]</font>`, command: "fps hpnumbers;fps gui" }, { text: " " },
|
|
|
{ text: `<font color="${mod.settings.HideMpNumbers ? GrnC : RedC}" size="+18">[MP Nums]</font>`, command: "fps mpnumbers;fps gui" }, { text: " " },
|
|
{ text: `<font color="${mod.settings.HideMpNumbers ? GrnC : RedC}" size="+18">[MP Nums]</font>`, command: "fps mpnumbers;fps gui" }, { text: " " },
|
|
@@ -634,8 +636,8 @@ module.exports = function FpsUtils(mod) {
|
|
|
let modified = false;
|
|
let modified = false;
|
|
|
|
|
|
|
|
if (mod.settings.Hit_Me && (EqGid(event.source) || EqGid(event.owner))) {
|
|
if (mod.settings.Hit_Me && (EqGid(event.source) || EqGid(event.owner))) {
|
|
|
- event.templateId = 0; //10101
|
|
|
|
|
- event.skill.id = 0; //10100
|
|
|
|
|
|
|
+ event.templateId = 0;
|
|
|
|
|
+ event.skill.id = 0;
|
|
|
event.time = event.type = event.noctEffect = 0;
|
|
event.time = event.type = event.noctEffect = 0;
|
|
|
event.crit = event.stackExplode = event.superArmor = false;
|
|
event.crit = event.stackExplode = event.superArmor = false;
|
|
|
event.superArmorId = event.hitCylinderId = 0;
|
|
event.superArmorId = event.hitCylinderId = 0;
|
|
@@ -886,7 +888,13 @@ module.exports = function FpsUtils(mod) {
|
|
|
if (HUsers[event.gameId]) HUsers[event.gameId].loc = event.loc;
|
|
if (HUsers[event.gameId]) HUsers[event.gameId].loc = event.loc;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- function sUserMoveType() { return false; }
|
|
|
|
|
|
|
+ function sUserMovetype(event) {
|
|
|
|
|
+ if (SUsers[event.gameId]) SUsers[event.gameId].w = event.w
|
|
|
|
|
+ if (HUsers[event.gameId]) {
|
|
|
|
|
+ HUsers[event.gameId].w = event.w
|
|
|
|
|
+ return false
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
function sPartyMemberList(event) {
|
|
function sPartyMemberList(event) {
|
|
|
event.members.map(value => PMembers.push(value.name))
|
|
event.members.map(value => PMembers.push(value.name))
|
|
@@ -995,6 +1003,11 @@ module.exports = function FpsUtils(mod) {
|
|
|
delete SPets[event.gameId];
|
|
delete SPets[event.gameId];
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ function sQuestBalloon(event) {
|
|
|
|
|
+ if (!SPets[event.source]) return;
|
|
|
|
|
+ if (mod.settings.HideServantBalloons) return false;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
function sAbnormalityBegin(event) {
|
|
function sAbnormalityBegin(event) {
|
|
|
if (AbnDebug) {
|
|
if (AbnDebug) {
|
|
|
if (EqGid(event.target)) log('Abnormality', 'Applied', 'on', MyName, event.id);
|
|
if (EqGid(event.target)) log('Abnormality', 'Applied', 'on', MyName, event.id);
|
|
@@ -1039,7 +1052,7 @@ module.exports = function FpsUtils(mod) {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
function sPlayerChangeMp(event) {
|
|
function sPlayerChangeMp(event) {
|
|
|
- if (!mod.settings.HideMpNumbers || (!EqGid(event.target))) return;
|
|
|
|
|
|
|
+ if (!mod.settings.HideMpNumbers || !EqGid(event.target)) return;
|
|
|
if (event.type !== 0) {
|
|
if (event.type !== 0) {
|
|
|
event.type = 0;
|
|
event.type = 0;
|
|
|
return true;
|
|
return true;
|
|
@@ -1047,7 +1060,7 @@ module.exports = function FpsUtils(mod) {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
function sCreatureChangeHp(event) {
|
|
function sCreatureChangeHp(event) {
|
|
|
- if (!mod.settings.HideHpNumbers || (!EqGid(event.target))) return;
|
|
|
|
|
|
|
+ if (!mod.settings.HideHpNumbers || !EqGid(event.target)) return;
|
|
|
if (event.type !== 10) {
|
|
if (event.type !== 10) {
|
|
|
event.type = 10;
|
|
event.type = 10;
|
|
|
return true;
|
|
return true;
|
|
@@ -1058,9 +1071,19 @@ module.exports = function FpsUtils(mod) {
|
|
|
return ModifySkillResult(event);
|
|
return ModifySkillResult(event);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ function sItemExplosionResult(event) {
|
|
|
|
|
+ if (mod.settings.Mode >= 2 || (EqGid(event.gameId) && mod.settings.Hit_Me) || (!EqGid(event.gameId) && mod.settings.Hit_Other) || mod.settings.Hit_All || HUsers[event.gameId]) {
|
|
|
|
|
+ for (const gameId of event.items) {
|
|
|
|
|
+ if (SUsers[event.gameId] && mod.settings.HideBlacklistedDrop && mod.settings.DropBlacklist.some(item => [8008, 8009, 8010, 8011, 8012, 8013, 8014, 8015, 8016, 8017, 8018, 8019, 8020, 8021, 8022, 8023].indexOf(item) !== -1)) continue;
|
|
|
|
|
+ mod.toClient('S_DESPAWN_DROPITEM', 4, { gameId });
|
|
|
|
|
+ }
|
|
|
|
|
+ return false
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
function sSpawnDropItem(event) {
|
|
function sSpawnDropItem(event) {
|
|
|
if (EqGid(event.source)) return;
|
|
if (EqGid(event.source)) return;
|
|
|
- if (mod.settings.HideBlacklistedDrop && mod.settings.DropBlacklist.includes(event.item)) return false;
|
|
|
|
|
|
|
+ if (mod.settings.HideBlacklistedDrop && mod.settings.DropBlacklist.indexOf(event.item) !== -1) return false;
|
|
|
if (mod.settings.Mode >= 2) {
|
|
if (mod.settings.Mode >= 2) {
|
|
|
event.explode = 0;
|
|
event.explode = 0;
|
|
|
return true;
|
|
return true;
|
|
@@ -1071,6 +1094,28 @@ module.exports = function FpsUtils(mod) {
|
|
|
if (mod.settings.Hit_Damage || mod.settings.Hit_All) return false;
|
|
if (mod.settings.Hit_Damage || mod.settings.Hit_All) return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ function sSpawnEventSeed(event) {
|
|
|
|
|
+ if (HUsers[NotCP ? event.gameId : event.owner]) {
|
|
|
|
|
+ HSeedBoxes[NotCP ? event.target : event.gameId] = event;
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ function sUpdateEventSeedState(event) {
|
|
|
|
|
+ if (HSeedBoxes[event.gameId]) return false;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ function sResultEventSeed(event) {
|
|
|
|
|
+ if (HSeedBoxes[NotCP ? event.cid : event.gameId]) return false;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ function sDespawnEventSeed(event) {
|
|
|
|
|
+ if (HSeedBoxes[event.gameId]) {
|
|
|
|
|
+ delete HSeedBoxes[event.gameId];
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
function sFieldEventOnEnter() {
|
|
function sFieldEventOnEnter() {
|
|
|
if (mod.settings.GuardianAutoChange) {
|
|
if (mod.settings.GuardianAutoChange) {
|
|
|
if ((LastGState !== null && mod.settings.Mode === 2) || mod.settings.Mode >= 2) return;
|
|
if ((LastGState !== null && mod.settings.Mode === 2) || mod.settings.Mode >= 2) return;
|
|
@@ -1116,7 +1161,7 @@ module.exports = function FpsUtils(mod) {
|
|
|
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)
|
|
|
mod.hook('S_DEAD_LOCATION', 2, sDeadLocation)
|
|
mod.hook('S_DEAD_LOCATION', 2, sDeadLocation)
|
|
|
- mod.hook('S_USER_MOVETYPE', 'raw', Last_Hook, sUserMoveType)
|
|
|
|
|
|
|
+ mod.hook('S_USER_MOVETYPE', 1, Last_Hook, sUserMovetype)
|
|
|
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)
|
|
@@ -1131,7 +1176,8 @@ module.exports = function FpsUtils(mod) {
|
|
|
mod.hook('S_FEARMOVE_END', 2, Last_Hook, sFearMoveEnd)
|
|
mod.hook('S_FEARMOVE_END', 2, Last_Hook, sFearMoveEnd)
|
|
|
|
|
|
|
|
mod.hook('S_REQUEST_SPAWN_SERVANT', 4, Last_Hook, sRequestSpawnServant)
|
|
mod.hook('S_REQUEST_SPAWN_SERVANT', 4, Last_Hook, sRequestSpawnServant)
|
|
|
- mod.hook('S_REQUEST_DESPAWN_SERVANT', 1, sRequestDespawnServant)
|
|
|
|
|
|
|
+ mod.hook('S_REQUEST_DESPAWN_SERVANT', 1, Last_Hook, sRequestDespawnServant)
|
|
|
|
|
+ mod.hook('S_QUEST_BALLOON', 1, Last_Hook, sQuestBalloon)
|
|
|
|
|
|
|
|
mod.hook('S_ABNORMALITY_BEGIN', 3, Last_Hook, sAbnormalityBegin)
|
|
mod.hook('S_ABNORMALITY_BEGIN', 3, Last_Hook, sAbnormalityBegin)
|
|
|
mod.hook('S_ABNORMALITY_REFRESH', 1, Last_Hook, sAbnormalityRefresh)
|
|
mod.hook('S_ABNORMALITY_REFRESH', 1, Last_Hook, sAbnormalityRefresh)
|
|
@@ -1143,10 +1189,16 @@ module.exports = function FpsUtils(mod) {
|
|
|
mod.hook('S_START_USER_PROJECTILE', 9, Last_Hook, sStartUserProjectile)
|
|
mod.hook('S_START_USER_PROJECTILE', 9, Last_Hook, sStartUserProjectile)
|
|
|
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_ITEM_EXPLOSION_RESULT', 2, Last_Hook, sItemExplosionResult)
|
|
|
mod.hook('S_EACH_SKILL_RESULT', 14, Last_Hook, sEachSkillResult)
|
|
mod.hook('S_EACH_SKILL_RESULT', 14, Last_Hook, sEachSkillResult)
|
|
|
mod.hook('S_SPAWN_DROPITEM', 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_SPAWN_EVENT_SEED', 1, NotCP ? 1 : 2, Last_Hookfn, sSpawnEventSeed)
|
|
|
|
|
+ mod.hook('S_UPDATE_EVENT_SEED_STATE', 3, Last_Hookfn, sUpdateEventSeedState)
|
|
|
|
|
+ mod.hook('S_RESULT_EVENT_SEED', NotCP ? 1 : 2, Last_Hookfn, sResultEventSeed)
|
|
|
|
|
+ mod.hook('S_DESPAWN_EVENT_SEED', 1, Last_Hookfn, sDespawnEventSeed)
|
|
|
|
|
+
|
|
|
mod.hook('S_FIELD_EVENT_ON_ENTER', 'raw', sFieldEventOnEnter)
|
|
mod.hook('S_FIELD_EVENT_ON_ENTER', 'raw', sFieldEventOnEnter)
|
|
|
mod.hook('S_FIELD_EVENT_ON_LEAVE', 'raw', sFieldEventOnLeave)
|
|
mod.hook('S_FIELD_EVENT_ON_LEAVE', 'raw', sFieldEventOnLeave)
|
|
|
|
|
|
|
@@ -1165,7 +1217,7 @@ module.exports = function FpsUtils(mod) {
|
|
|
arg3 = arg3 ? arg3.toLowerCase() : arg3;
|
|
arg3 = arg3 ? arg3.toLowerCase() : arg3;
|
|
|
switch (key) {
|
|
switch (key) {
|
|
|
case "b":
|
|
case "b":
|
|
|
- mod.command.exec('fps skills blacklist')
|
|
|
|
|
|
|
+ mod.command.exec('fps skills blacklist');
|
|
|
break;
|
|
break;
|
|
|
case "g": case "gui":
|
|
case "g": case "gui":
|
|
|
GuiHandler(arg, arg2);
|
|
GuiHandler(arg, arg2);
|
|
@@ -1622,6 +1674,10 @@ module.exports = function FpsUtils(mod) {
|
|
|
mod.settings.MuteOthersVoice = !mod.settings.MuteOthersVoice;
|
|
mod.settings.MuteOthersVoice = !mod.settings.MuteOthersVoice;
|
|
|
Msg(`Mute others voice is ${mod.settings.MuteOthersVoice ? `<font color="${GrnC}">Enabled</font>` : `<font color="${RedC}">Disabled</font>`}.`);
|
|
Msg(`Mute others voice is ${mod.settings.MuteOthersVoice ? `<font color="${GrnC}">Enabled</font>` : `<font color="${RedC}">Disabled</font>`}.`);
|
|
|
break;
|
|
break;
|
|
|
|
|
+ case "petspopup":
|
|
|
|
|
+ mod.settings.HideServantBalloons = !mod.settings.HideServantBalloons;
|
|
|
|
|
+ Msg(`Hide Pets Popup chat balloons is ${mod.settings.HideServantBalloons ? `<font color="${GrnC}">Enabled</font>` : `<font color="${RedC}">Disabled</font>`}.`);
|
|
|
|
|
+ break;
|
|
|
case "stream":
|
|
case "stream":
|
|
|
mod.settings.StreamMode = !mod.settings.StreamMode;
|
|
mod.settings.StreamMode = !mod.settings.StreamMode;
|
|
|
Msg(`Stream mode is ${mod.settings.StreamMode ? `<font color="${GrnC}">Enabled</font>` : `<font color="${RedC}">Disabled</font>`}.`);
|
|
Msg(`Stream mode is ${mod.settings.StreamMode ? `<font color="${GrnC}">Enabled</font>` : `<font color="${RedC}">Disabled</font>`}.`);
|