Просмотр исходного кода

Fix config saving, crashes(maybe)

Pentagon лет назад: 8
Родитель
Сommit
608dbf9e85
1 измененных файлов с 13 добавлено и 15 удалено
  1. 13 15
      index.js

+ 13 - 15
index.js

@@ -317,7 +317,6 @@ module.exports = function FpsUtils2(dispatch) {
 
 
 
 
     let spawnedPlayers = {},
     let spawnedPlayers = {},
-            mode = config.mode,
             myId,
             myId,
             hiddenNpcs = {},
             hiddenNpcs = {},
             hiddenUsers = {};
             hiddenUsers = {};
@@ -334,33 +333,33 @@ module.exports = function FpsUtils2(dispatch) {
                 switch (arg) {
                 switch (arg) {
                     case "0":
                     case "0":
                     case "off":
                     case "off":
-                        if (mode === 3) {
+                        if (config.mode === 3) {
                             showAll();
                             showAll();
                         }
                         }
-                        mode = 0;
+                        config.mode = 0;
                         message(`All FPS improvements disabled`);
                         message(`All FPS improvements disabled`);
                         break
                         break
                     case "1":
                     case "1":
-                        if (mode === 3) {
+                        if (config.mode === 3) {
                             showAll();
                             showAll();
                         }
                         }
-                        mode = 1;
+                        config.mode = 1;
                         //config.hideAllAbnormies = true;
                         //config.hideAllAbnormies = true;
                         config.hitOther = true;
                         config.hitOther = true;
                         message(`FPS mode set to 1, projectiles hidden and abnormalities disabled`);
                         message(`FPS mode set to 1, projectiles hidden and abnormalities disabled`);
                         break
                         break
                     case "2":
                     case "2":
-                        if (mode === 3) {
+                        if (config.mode === 3) {
                             showAll();
                             showAll();
                         }
                         }
-                        mode = 2;
+                        config.mode = 2;
                         // config.hideAllAbnormies = true;
                         // config.hideAllAbnormies = true;
                         config.hitOther = true;
                         config.hitOther = true;
                         message(`FPS mode set to 2, all skill effects disabled`);
                         message(`FPS mode set to 2, all skill effects disabled`);
                         break
                         break
                     case "3":
                     case "3":
                         hideAll();
                         hideAll();
-                        mode = 3;
+                        config.mode = 3;
                         config.hideAllAbnormies = true;
                         config.hideAllAbnormies = true;
                         config.hitOther = true;
                         config.hitOther = true;
                         message(`FPS mode set to 3, hiding all players, their effects and their hit effects.`);
                         message(`FPS mode set to 3, hiding all players, their effects and their hit effects.`);
@@ -645,7 +644,7 @@ module.exports = function FpsUtils2(dispatch) {
             firstRun = false;
             firstRun = false;
         }
         }
         spawnedPlayers[event.gameId] = event;
         spawnedPlayers[event.gameId] = event;
-        if (mode === 3 || config.blacklistedNames.includes(event.name.toString().toLowerCase()) || config.classes[getClass(event.templateId)].isHidden === true) { //includes should work!!
+        if (config.mode === 3 || config.blacklistedNames.includes(event.name.toString().toLowerCase()) || config.classes[getClass(event.templateId)].isHidden === true) { //includes should work!!
             hiddenUsers[event.gameId] = event;
             hiddenUsers[event.gameId] = event;
             return false;
             return false;
         }
         }
@@ -755,7 +754,7 @@ module.exports = function FpsUtils2(dispatch) {
 
 
     dispatch.hook('S_ACTION_STAGE', 4, {order: 999}, (event) => {
     dispatch.hook('S_ACTION_STAGE', 4, {order: 999}, (event) => {
         if (!event.gameId.equals(myId) && spawnedPlayers[event.gameId]) {
         if (!event.gameId.equals(myId) && spawnedPlayers[event.gameId]) {
-            if (!event.target.equals(myId) && (mode === 2 || hiddenUsers[event.gameId])) {
+            if (!event.target.equals(myId) && (config.mode === 2 || hiddenUsers[event.gameId])) {
                 updateLoc(event);
                 updateLoc(event);
                 return false;
                 return false;
             }
             }
@@ -773,7 +772,7 @@ module.exports = function FpsUtils2(dispatch) {
     });
     });
 
 
     dispatch.hook('S_START_USER_PROJECTILE', 5, {order: 999}, (event) => {
     dispatch.hook('S_START_USER_PROJECTILE', 5, {order: 999}, (event) => {
-        if (!event.gameId.equals(myId) && spawnedPlayers[event.gameId] && (hiddenUsers[event.gameId] || mode > 0 || config.hideProjectiles)) {
+        if (!event.gameId.equals(myId) && spawnedPlayers[event.gameId] && (hiddenUsers[event.gameId] || config.mode > 0 || config.hideProjectiles)) {
             return false;
             return false;
         }
         }
         if (config.blacklistProjectiles && config.hiddenProjectiles.includes(event.skill)) {
         if (config.blacklistProjectiles && config.hiddenProjectiles.includes(event.skill)) {
@@ -782,7 +781,7 @@ module.exports = function FpsUtils2(dispatch) {
     });
     });
 
 
     dispatch.hook('S_SPAWN_PROJECTILE', 3, {order: 999}, (event) => {
     dispatch.hook('S_SPAWN_PROJECTILE', 3, {order: 999}, (event) => {
-        if (!event.gameId.equals(myId) && spawnedPlayers[event.gameId] && (hiddenUsers[event.gameId] || mode > 0 || config.hideProjectiles)) {
+        if (!event.gameId.equals(myId) && spawnedPlayers[event.gameId] && (hiddenUsers[event.gameId] || config.mode > 0 || config.hideProjectiles)) {
             return false;
             return false;
         }
         }
         if (config.blacklistProjectiles && config.hiddenProjectiles.includes(event.skill)) {
         if (config.blacklistProjectiles && config.hiddenProjectiles.includes(event.skill)) {
@@ -791,13 +790,12 @@ module.exports = function FpsUtils2(dispatch) {
     });
     });
 
 
     dispatch.hook('S_FEARMOVE_STAGE', 1, (event) => {
     dispatch.hook('S_FEARMOVE_STAGE', 1, (event) => {
-        if (!event.target.equals(myId) && (mode === 3 || hiddenUsers[event.target] || hiddenNpcs[event.target])) {
+        if ((!event.target.equals(myId) && config.mode === 3) || hiddenUsers[event.target]) {
             return false;
             return false;
         }
         }
     });
     });
-
     dispatch.hook('S_FEARMOVE_END', 1, (event) => {
     dispatch.hook('S_FEARMOVE_END', 1, (event) => {
-        if (!event.target.equals(myId) && (mode === 3 || hiddenUsers[event.target] || hiddenNpcs[event.target])) {
+        if ((!event.target.equals(myId) && config.mode === 3) || hiddenUsers[event.target]) {
             return false;
             return false;
         }
         }
     });
     });