Risenio 7 years ago
parent
commit
bb7ef3772c
2 changed files with 31 additions and 25 deletions
  1. 30 24
      lib/index.js
  2. 1 1
      manifest.json

+ 30 - 24
lib/index.js

@@ -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 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}">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}">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}">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}">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}">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}">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}">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}">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}">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>`)
 				break;
 			default:
@@ -701,7 +701,10 @@ module.exports = function FpsUtils(mod) {
 	function sLeaveParty() {
 		PMembers = []
 		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}`);
 			LastState = null;
 		}
@@ -821,15 +824,15 @@ module.exports = function FpsUtils(mod) {
 		event.members.map(value => PMembers.push(value.name))
 		if (mod.settings.RaidAutoChange) {
 			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;
-				mod.command.exec("fps mode 2");
+				mod.command.exec("fps state 2");
 			} else {
-				if (LastState !== null || mod.settings.Mode !== 2) {
+				if (LastState === null || mod.settings.Mode !== 2) {
 					LastState = null;
 					return;
 				}
-				mod.command.exec(`fps mode ${LastState}`);
+				mod.command.exec(`fps state ${LastState}`);
 				LastState = null;
 			}
 		}
@@ -1010,16 +1013,19 @@ module.exports = function FpsUtils(mod) {
 
 	function sFieldEventOnEnter() {
 		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;
-			mod.command.exec('2')
+			mod.command.exec("fps state 2")
 		}
 	}
 
 	function sFieldEventOnLeave() {
 		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;
 		}
 	}
@@ -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.");
 				else console.log("\x1b[94mINFO\x1b[34m [FPS-UTILS]\x1b[39m - Steam Mode has been disabled.");
 				break;
-			case "help":
+			case "help": case "h":
 				mod.command.exec("fps gui help");
 				break;
 			default:

+ 1 - 1
manifest.json

@@ -3,7 +3,7 @@
         "README.md": "bc59f32c10752de9a4123dec9688be45e9e97bd5ef6cd20ecdf249635fafc333",
         "lib/data/npcData.json": "96b4dea1b39c9b29d5bddbbc67f56cd52f085070ad1f67bf952fcb077d4d5af4",
         "lib/data/skillString.json": "9d69876fea0be8e6ac5dd43b3fc74ea023f6b8a6145384f8f780dd977045d8ef",
-        "lib/index.js": "4e3343b9e09bab90cb2b52d89c6aec4c23a24044520877d5c670be356b6140fc",
+        "lib/index.js": "be5005203df6011fd9f4620668d42580489f3a9ca9b8686f50200b44aa8cccd0",
         "lib/setting_migration.js": "9f0816758b88300afd97ca8aaa8cfc0dadedcdda17713d6e709772a9c0dddcea",
         "module.json": "2e105877c06e04aee1225aff0fff699d74cd1c250a975ea0c50f40f8772ea8b9",
         "package.json": "a8aa5a079bc568096b2037f2777f9b01e97ba08ba62a515b7d6908f4bc6e1b51"