|
@@ -218,31 +218,31 @@ module.exports = function FpsUtils(mod) {
|
|
|
{ text: `<font size="20"><font color="${LBlC}">Command</font> <font color="${SlvC}">Arg(s)</font> <font color="${CPKC}">Example</font><br>` },
|
|
{ text: `<font size="20"><font color="${LBlC}">Command</font> <font color="${SlvC}">Arg(s)</font> <font color="${CPKC}">Example</font><br>` },
|
|
|
{ text: `<font color="${HBlC}">gui ^ g</font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!fps gui</font><br>` },
|
|
{ text: `<font color="${HBlC}">gui ^ g</font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!fps gui</font><br>` },
|
|
|
{ text: `<font color="${HBlC}"> N/A</font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!fps-util</font><br>` },
|
|
{ text: `<font color="${HBlC}"> N/A</font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!fps-util</font><br>` },
|
|
|
- { text: `<font color="${HBlC}">0 ^ 1 ^ 2 ^ 3</font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!0 ^ !1 ^ !2 ^ !3</font><br>` },
|
|
|
|
|
|
|
+ { text: `<font color="${HBlC}">0 ^ 1 ^ 2 ^ 3</font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!0 ^ !1 ^ !2 ^ !3</font><br>` },
|
|
|
{ text: `<font color="${HBlC}">mode</font> <font color="${DBlC}">0 ^ 1 ^ 2 ^ 3</font> <font color="${HPkC}">!fps mode 2</font><br>` },
|
|
{ text: `<font color="${HBlC}">mode</font> <font color="${DBlC}">0 ^ 1 ^ 2 ^ 3</font> <font color="${HPkC}">!fps mode 2</font><br>` },
|
|
|
- { text: `<font color="${HBlC}">hide^show</font> <font color="${DBlC}">Player^Class^Role</font> <font color="${HPkC}">!fps hide mie</font><br>` },
|
|
|
|
|
- { text: `<font color="${HBlC}">party</font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!fps party</font><br>` },
|
|
|
|
|
|
|
+ { text: `<font color="${HBlC}">hide^show</font> <font color="${DBlC}">Player^Class^Role</font> <font color="${HPkC}">!fps hide mie</font><br>` },
|
|
|
|
|
+ { text: `<font color="${HBlC}">party</font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!fps party</font><br>` },
|
|
|
{ text: `<font color="${HBlC}">raid</font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!fps raid</font><br>` },
|
|
{ text: `<font color="${HBlC}">raid</font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!fps raid</font><br>` },
|
|
|
- { text: `<font color="${HBlC}">list</font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!fps list</font><br>` },
|
|
|
|
|
|
|
+ { text: `<font color="${HBlC}">list</font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!fps list</font><br>` },
|
|
|
{ text: `<font color="${HBlC}">sums</font> <font color="${DBlC}">other ^ me</font> <font color="${HPkC}">!fps sums me</font><br>` },
|
|
{ text: `<font color="${HBlC}">sums</font> <font color="${DBlC}">other ^ me</font> <font color="${HPkC}">!fps sums me</font><br>` },
|
|
|
{ text: `<font color="${HBlC}">skill</font> <font color="${DBlC}">blacklist</font> <font color="${HPkC}">!fps skill blacklist</font><br>` },
|
|
{ text: `<font color="${HBlC}">skill</font> <font color="${DBlC}">blacklist</font> <font color="${HPkC}">!fps skill blacklist</font><br>` },
|
|
|
{ text: `<font color="${HBlC}">npc</font> <font color="${DBlC}">N/A ^ hide</font> <font color="${HPkC}">!fps npc</font><br>` },
|
|
{ text: `<font color="${HBlC}">npc</font> <font color="${DBlC}">N/A ^ hide</font> <font color="${HPkC}">!fps npc</font><br>` },
|
|
|
- { text: `<font color="${HBlC}">hit</font> <font color="${DBlC}">me^other^damage</font> <font color="${HPkC}">!fps hit me</font><br>` },
|
|
|
|
|
- { text: `<font color="${HBlC}">firework</font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!fps firework</font><br>` },
|
|
|
|
|
|
|
+ { text: `<font color="${HBlC}">hit</font> <font color="${DBlC}">me^other^damage</font> <font color="${HPkC}">!fps hit me</font><br>` },
|
|
|
|
|
+ { text: `<font color="${HBlC}">firework</font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!fps firework</font><br>` },
|
|
|
{ text: `<font color="${HBlC}">abn</font> <font color="${DBlC}">all ^ blacklist</font> <font color="${HPkC}">!fps abn blacklist</font><br>` },
|
|
{ text: `<font color="${HBlC}">abn</font> <font color="${DBlC}">all ^ blacklist</font> <font color="${HPkC}">!fps abn blacklist</font><br>` },
|
|
|
{ text: `<font color="${HBlC}">proj</font> <font color="${DBlC}">all ^ blacklist</font> <font color="${HPkC}">!fps proj all</font><br>` },
|
|
{ text: `<font color="${HBlC}">proj</font> <font color="${DBlC}">all ^ blacklist</font> <font color="${HPkC}">!fps proj all</font><br>` },
|
|
|
{ text: `<font color="${HBlC}">guildlogo</font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!fps guildlogo</font><br>` },
|
|
{ text: `<font color="${HBlC}">guildlogo</font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!fps guildlogo</font><br>` },
|
|
|
- { text: `<font color="${HBlC}">style</font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!fps style</font><br>` },
|
|
|
|
|
- { text: `<font color="${HBlC}">gui npcsearch</font> <font color="${DBlC}">"target"</font> <font color="${HPkC}">!fps gui npcsearch E</font><br>` },
|
|
|
|
|
|
|
+ { text: `<font color="${HBlC}">style</font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!fps style</font><br>` },
|
|
|
|
|
+ { text: `<font color="${HBlC}">gui npcsearch</font> <font color="${DBlC}">"target"</font> <font color="${HPkC}">!fps gui npcsearch E</font><br>` },
|
|
|
{ text: `<font color="${HBlC}">npczoom</font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!fps npczoom</font><br>` },
|
|
{ text: `<font color="${HBlC}">npczoom</font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!fps npczoom</font><br>` },
|
|
|
{ text: `<font color="${HBlC}">dropitem</font> <font color="${DBlC}">N/A ^ hide</font> <font color="${HPkC}">!fps dropitem</font><br>` },
|
|
{ text: `<font color="${HBlC}">dropitem</font> <font color="${DBlC}">N/A ^ hide</font> <font color="${HPkC}">!fps dropitem</font><br>` },
|
|
|
{ text: `<font color="${HBlC}">monsterdeathani</font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!fps monsterdeathani</font><br>` },
|
|
{ text: `<font color="${HBlC}">monsterdeathani</font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!fps monsterdeathani</font><br>` },
|
|
|
- { text: `<font color="${HBlC}">screenabns</font> <font color="${DBlC}">N/A ^ hide</font> <font color="${HPkC}">!fps screenabns</font><br>` },
|
|
|
|
|
- { text: `<font color="${HBlC}">hpnumbers</font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!fps hpnumbers</font><br>` },
|
|
|
|
|
- { text: `<font color="${HBlC}">mpnumbers</font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!fps mpnumbers</font></font><br>` },
|
|
|
|
|
- { text: `<font color="${HBlC}">pet </font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!fps raid</font></font><br>` },
|
|
|
|
|
- { text: `<font color="${HBlC}">guardian </font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!fps guardian</font></font><br>` },
|
|
|
|
|
- { text: `<font color="${HBlC}">stream </font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!fps stream</font></font><br>` }
|
|
|
|
|
|
|
+ { text: `<font color="${HBlC}">screenabns</font> <font color="${DBlC}">N/A ^ hide</font> <font color="${HPkC}">!fps screenabns</font><br>` },
|
|
|
|
|
+ { text: `<font color="${HBlC}">hpnumbers</font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!fps hpnumbers</font><br>` },
|
|
|
|
|
+ { text: `<font color="${HBlC}">mpnumbers</font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!fps mpnumbers</font><br>` },
|
|
|
|
|
+ { text: `<font color="${HBlC}">pet</font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!fps raid</font><br>` },
|
|
|
|
|
+ { text: `<font color="${HBlC}">guardian</font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!fps guardian</font><br>` },
|
|
|
|
|
+ { text: `<font color="${HBlC}">stream</font> <font color="${DBlC}">N/A</font> <font color="${HPkC}">!fps stream</font></font><br>` },
|
|
|
], `<font color="${LPrC}">[FPS] HELP</font>`)
|
|
], `<font color="${LPrC}">[FPS] HELP</font>`)
|
|
|
break;
|
|
break;
|
|
|
default:
|
|
default:
|
|
@@ -701,7 +701,10 @@ module.exports = function FpsUtils(mod) {
|
|
|
function sLeaveParty() {
|
|
function sLeaveParty() {
|
|
|
PMembers = []
|
|
PMembers = []
|
|
|
if (mod.settings.RaidAutoChange) {
|
|
if (mod.settings.RaidAutoChange) {
|
|
|
- if (LastState !== null || mod.settings.Mode !== 2) return;
|
|
|
|
|
|
|
+ if (LastState === null || mod.settings.Mode !== 2) {
|
|
|
|
|
+ LastState = null;
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
mod.command.exec(`fps mode ${LastState}`);
|
|
mod.command.exec(`fps mode ${LastState}`);
|
|
|
LastState = null;
|
|
LastState = null;
|
|
|
}
|
|
}
|
|
@@ -821,15 +824,15 @@ module.exports = function FpsUtils(mod) {
|
|
|
event.members.map(value => PMembers.push(value.name))
|
|
event.members.map(value => PMembers.push(value.name))
|
|
|
if (mod.settings.RaidAutoChange) {
|
|
if (mod.settings.RaidAutoChange) {
|
|
|
if (event.members.length >= 18) {
|
|
if (event.members.length >= 18) {
|
|
|
- if (mod.settings.Mode === 3 || (LastState !== null && mod.settings.Mode === 2)) return;
|
|
|
|
|
|
|
+ if (mod.settings.Mode >= 2 || (LastState === null && mod.settings.Mode === 2)) return;
|
|
|
LastState = mod.settings.Mode;
|
|
LastState = mod.settings.Mode;
|
|
|
- mod.command.exec("fps mode 2");
|
|
|
|
|
|
|
+ mod.command.exec("fps state 2");
|
|
|
} else {
|
|
} else {
|
|
|
- if (LastState !== null || mod.settings.Mode !== 2) {
|
|
|
|
|
|
|
+ if (LastState === null || mod.settings.Mode !== 2) {
|
|
|
LastState = null;
|
|
LastState = null;
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
- mod.command.exec(`fps mode ${LastState}`);
|
|
|
|
|
|
|
+ mod.command.exec(`fps state ${LastState}`);
|
|
|
LastState = null;
|
|
LastState = null;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -1010,16 +1013,19 @@ module.exports = function FpsUtils(mod) {
|
|
|
|
|
|
|
|
function sFieldEventOnEnter() {
|
|
function sFieldEventOnEnter() {
|
|
|
if (mod.settings.GuardianAutoChange) {
|
|
if (mod.settings.GuardianAutoChange) {
|
|
|
- if (mod.settings.Mode >= 2) return;
|
|
|
|
|
|
|
+ if ((LastGState !== null && mod.settings.Mode === 2) || mod.settings.Mode >= 2) return;
|
|
|
LastGState = mod.settings.Mode;
|
|
LastGState = mod.settings.Mode;
|
|
|
- mod.command.exec('2')
|
|
|
|
|
|
|
+ mod.command.exec("fps state 2")
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
function sFieldEventOnLeave() {
|
|
function sFieldEventOnLeave() {
|
|
|
if (mod.settings.GuardianAutoChange) {
|
|
if (mod.settings.GuardianAutoChange) {
|
|
|
- if (LastGState !== null || mod.settings.Mode !== 2) return;
|
|
|
|
|
- mod.command.exec(`fps mode ${LastGState}`);
|
|
|
|
|
|
|
+ if (LastGState === null || mod.settings.Mode !== 2) {
|
|
|
|
|
+ LastGState = null;
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ mod.command.exec(`fps state ${LastGState}`);
|
|
|
LastGState = null;
|
|
LastGState = null;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -1551,7 +1557,7 @@ module.exports = function FpsUtils(mod) {
|
|
|
if (mod.settings.StreamMode) console.log("\x1b[94mINFO\x1b[34m [FPS-UTILS]\x1b[39m - Steam Mode has been enabled, No messages will be sent in-game messages until it's disabled.");
|
|
if (mod.settings.StreamMode) console.log("\x1b[94mINFO\x1b[34m [FPS-UTILS]\x1b[39m - Steam Mode has been enabled, No messages will be sent in-game messages until it's disabled.");
|
|
|
else console.log("\x1b[94mINFO\x1b[34m [FPS-UTILS]\x1b[39m - Steam Mode has been disabled.");
|
|
else console.log("\x1b[94mINFO\x1b[34m [FPS-UTILS]\x1b[39m - Steam Mode has been disabled.");
|
|
|
break;
|
|
break;
|
|
|
- case "help":
|
|
|
|
|
|
|
+ case "help": case "h":
|
|
|
mod.command.exec("fps gui help");
|
|
mod.command.exec("fps gui help");
|
|
|
break;
|
|
break;
|
|
|
default:
|
|
default:
|