Merge pull request 'Correct bad enum reference' (#1) from GGaulin/ALT-Mods:master into master

Reviewed-on: #1

Ereshkigal-AIO/ZEreshkigal-AllinOneMod/dist/locale/locale.json

@@ -2,7 +2,7 @@
     "items": {
         "default": "{OPTION NAME} option is incorrect, {option to enable} or {option to disable}, check the readme.pdf for more info.",
         "allExaminedItems": "AllExaminedItems option is incorrect, it must be true to true to activate or false to disable, check the readme.pdf for more info.",
-        "weightChanges": "WeightChanger option is incorrect, it must be a number to be correct and will only work as a multiplier above 0, if you selected a number below 0, Defaulting to 0. check the readme.pdf for more info.",
+        "weightChanges": "WeightChanges option is incorrect, it must be a number to be correct and will only work as a multiplier above 0, if you selected a number below 0, Defaulting to 0. check the readme.pdf for more info.",
         "moreStack": "MoreStack option is incorrect, it must be a number to activate or false to disable. check the readme.pdf for more info.",
         "equipRigsWithArmors": "EquipRigsWithArmors option is incorrect, it must be true to activate or false to disable. check the readme.pdf for more info.",
         "forceMoneyStack": "ForceMoneyStack option is incorrect, it must be a number to activate or false to disable. check the readme.pdf for more info.",
@@ -88,7 +88,7 @@
             "removeItemsFromQuestLocks": "RemoveItemsFromQuestLocks option is incorrect, it must be true to activate or false to disable. Check the readme.pdf for more info.",
             "all4StarAndLL1": "AllTraders4Stars & UnlockAllItemsAtLL1 are active, disable one of them!"
         },
-        "maxInsuranceStorageTime": "WeightChanger option is incorrect, it must be a number to activate or false to disable. check the readme.pdf for more info.",
+        "maxInsuranceStorageTime": "MaxInsuranceStorageTime option is incorrect, it must be a number to activate or false to disable. check the readme.pdf for more info.",
         "PreventFenceMastering": "PreventFenceMastering option is incorrect, it must be true to activate or false to disable. Check the readme.pdf for more info.",
         "removeFIRConditionOnQuests": "Remove FIR condition on quests option is incorrect, it must be true to activate or false to disable. check the readme.pdf for more info."
     },

Ereshkigal-AIO/ZEreshkigal-AllinOneMod/dist/package.json

@@ -5,7 +5,7 @@
     "license": "CC-BY-NC-ND 4.0",
     "author": "Ereshkigal",
     "akiVersion": "3.0.0",
-    "updated by": "CWX, Valens",
+    "updated by": "CWX, Valens, GGaulin",
     "scripts": {
         "setup:environment": "npm i",
         "build:unzipped": "copyfiles -e \"./node_modules/**/*.*\" -e \"./dist/**/*.*\" -e \"./package-lock.json\" -e \"./tsconfig.json\" -e \"./README.txt\" -e \"./mod.code-workspace\" ./**/*.* ./dist",

Ereshkigal-AIO/ZEreshkigal-AllinOneMod/dist/package.json.bak

@@ -1,9 +0,0 @@
-{
-    "name": "AllinOneMod",
-    "author": "Ereshkigal",
-    "version": "3.0.0",
-    "akiVersion": "3.0.0",
-    "license": "CC-BY-NC-ND 4.0",
-    "main": "./src/mod.js",
-    "updated by": "CWX, Valens"
-}

Ereshkigal-AIO/ZEreshkigal-AllinOneMod/dist/src/Notifications.ts

@@ -19,9 +19,9 @@ export class Notifications
         
         if (!config.other.hideWarningMessage)
         {
-            this.logger.info("[AIO Mod INFORMATION]");
+            this.logger.log("[AIO Mod INFORMATION]", "yellow");
             this.logger.info("Please read the README.PDF carefully as this has all the information you need.");
-            this.logger.info("[AIO Mod INFORMATION]");
+            this.logger.log("[AIO Mod INFORMATION]", "yellow");
         }
 
         //Items:
@@ -280,7 +280,7 @@ export class Notifications
         if (config.hideout.changeFuelConsumptionRate !== false)
         {
             this.logger.info("AllInOne Mod: changeFuelConsumptionRate activated.");
-            if (typeof config.items.weaponDurabilities.maximumSpawnDurability !== "number")
+            if (typeof config.hideout.changeFuelConsumptionRate !== "number")
             {
                 this.logger.warning(locale.hideout.changeFuelConsumptionRate);
             }
@@ -561,7 +561,7 @@ export class Notifications
         // All Quests Available
         if (config.traders.allQuestsAvailable)
         {
-            this.logger.info("AllInOne Mod: removeScavKarma activated.");
+            this.logger.info("AllInOne Mod: allQuestsAvailable activated.");
             if (typeof config.traders.allQuestsAvailable !== "boolean")
             {
                 this.logger.warning(locale.traders.allQuestsAvailable);
@@ -664,13 +664,13 @@ export class Notifications
         if (config.traders.maxInsuranceStorageTime)
         {
             this.logger.info("AllInOne Mod: maxInsuranceStorageTime activated.")
-            if (typeof config.traders.maxInsuranceStorageTime !== "boolean")
+            if (typeof config.traders.maxInsuranceStorageTime !== "boolean" && config.traders.maxInsuranceStorageTime <= 0)
             {
                 this.logger.warning(locale.traders.maxInsuranceStorageTime);
             }
         }
 
-        // Max Insurance Storage Time
+        // Prevent Fence Mastering
         if (config.traders.preventFenceMastering)
         {
             this.logger.info("AllInOne Mod: preventFenceMastering activated.")
@@ -724,7 +724,7 @@ export class Notifications
         // Extended Raid
         if (config.raids.extendedRaid !== false)
         {
-            this.logger.info("AllInOne Mod: changeFleaMarketLvl activated.");
+            this.logger.info("AllInOne Mod: extendedRaid activated.");
             if (typeof config.raids.extendedRaid !== "number")
             {
                 this.logger.warning(locale.raids.extendedRaid);

Ereshkigal-AIO/ZEreshkigal-AllinOneMod/dist/src/traders.ts

@@ -3,7 +3,7 @@ import type { DatabaseServer } from "@spt-aki/servers/DatabaseServer";
 import { AIOConfigHandler } from "./AIOConfigHandler";
 import { Other } from "./other";
 import { Money } from "@spt-aki/models/enums/Money"
-import { Traders as eftTraders} from "@spt-aki/models/spt/helpers/Traders"
+import { Traders as eftTraders} from "@spt-aki/models/enums/Traders"
 
 @injectable()
 export class Traders

Ereshkigal-AIO/ZEreshkigal-AllinOneMod/locale/locale.json

@@ -2,7 +2,7 @@
     "items": {
         "default": "{OPTION NAME} option is incorrect, {option to enable} or {option to disable}, check the readme.pdf for more info.",
         "allExaminedItems": "AllExaminedItems option is incorrect, it must be true to true to activate or false to disable, check the readme.pdf for more info.",
-        "weightChanges": "WeightChanger option is incorrect, it must be a number to be correct and will only work as a multiplier above 0, if you selected a number below 0, Defaulting to 0. check the readme.pdf for more info.",
+        "weightChanges": "WeightChanges option is incorrect, it must be a number to be correct and will only work as a multiplier above 0, if you selected a number below 0, Defaulting to 0. check the readme.pdf for more info.",
         "moreStack": "MoreStack option is incorrect, it must be a number to activate or false to disable. check the readme.pdf for more info.",
         "equipRigsWithArmors": "EquipRigsWithArmors option is incorrect, it must be true to activate or false to disable. check the readme.pdf for more info.",
         "forceMoneyStack": "ForceMoneyStack option is incorrect, it must be a number to activate or false to disable. check the readme.pdf for more info.",
@@ -88,7 +88,7 @@
             "removeItemsFromQuestLocks": "RemoveItemsFromQuestLocks option is incorrect, it must be true to activate or false to disable. Check the readme.pdf for more info.",
             "all4StarAndLL1": "AllTraders4Stars & UnlockAllItemsAtLL1 are active, disable one of them!"
         },
-        "maxInsuranceStorageTime": "WeightChanger option is incorrect, it must be a number to activate or false to disable. check the readme.pdf for more info.",
+        "maxInsuranceStorageTime": "MaxInsuranceStorageTime option is incorrect, it must be a number to activate or false to disable. check the readme.pdf for more info.",
         "PreventFenceMastering": "PreventFenceMastering option is incorrect, it must be true to activate or false to disable. Check the readme.pdf for more info.",
         "removeFIRConditionOnQuests": "Remove FIR condition on quests option is incorrect, it must be true to activate or false to disable. check the readme.pdf for more info."
     },

Ereshkigal-AIO/ZEreshkigal-AllinOneMod/package.json

@@ -5,7 +5,7 @@
     "license": "CC-BY-NC-ND 4.0",
     "author": "Ereshkigal",
     "akiVersion": "3.0.0",
-    "updated by": "CWX, Valens",
+    "updated by": "CWX, Valens, GGaulin",
     "scripts": {
         "setup:environment": "npm i",
         "build:unzipped": "copyfiles -e \"./node_modules/**/*.*\" -e \"./dist/**/*.*\" -e \"./package-lock.json\" -e \"./tsconfig.json\" -e \"./README.txt\" -e \"./mod.code-workspace\" ./**/*.* ./dist",

Ereshkigal-AIO/ZEreshkigal-AllinOneMod/package.json.bak

@@ -1,9 +0,0 @@
-{
-    "name": "AllinOneMod",
-    "author": "Ereshkigal",
-    "version": "3.0.0",
-    "akiVersion": "3.0.0",
-    "license": "CC-BY-NC-ND 4.0",
-    "main": "./src/mod.js",
-    "updated by": "CWX, Valens"
-}

Ereshkigal-AIO/ZEreshkigal-AllinOneMod/src/Notifications.ts

@@ -19,9 +19,9 @@ export class Notifications
         
         if (!config.other.hideWarningMessage)
         {
-            this.logger.info("[AIO Mod INFORMATION]");
+            this.logger.log("[AIO Mod INFORMATION]", "yellow");
             this.logger.info("Please read the README.PDF carefully as this has all the information you need.");
-            this.logger.info("[AIO Mod INFORMATION]");
+            this.logger.log("[AIO Mod INFORMATION]", "yellow");
         }
 
         //Items:
@@ -280,7 +280,7 @@ export class Notifications
         if (config.hideout.changeFuelConsumptionRate !== false)
         {
             this.logger.info("AllInOne Mod: changeFuelConsumptionRate activated.");
-            if (typeof config.items.weaponDurabilities.maximumSpawnDurability !== "number")
+            if (typeof config.hideout.changeFuelConsumptionRate !== "number")
             {
                 this.logger.warning(locale.hideout.changeFuelConsumptionRate);
             }
@@ -561,7 +561,7 @@ export class Notifications
         // All Quests Available
         if (config.traders.allQuestsAvailable)
         {
-            this.logger.info("AllInOne Mod: removeScavKarma activated.");
+            this.logger.info("AllInOne Mod: allQuestsAvailable activated.");
             if (typeof config.traders.allQuestsAvailable !== "boolean")
             {
                 this.logger.warning(locale.traders.allQuestsAvailable);
@@ -664,13 +664,13 @@ export class Notifications
         if (config.traders.maxInsuranceStorageTime)
         {
             this.logger.info("AllInOne Mod: maxInsuranceStorageTime activated.")
-            if (typeof config.traders.maxInsuranceStorageTime !== "boolean")
+            if (typeof config.traders.maxInsuranceStorageTime !== "boolean" && config.traders.maxInsuranceStorageTime <= 0)
             {
                 this.logger.warning(locale.traders.maxInsuranceStorageTime);
             }
         }
 
-        // Max Insurance Storage Time
+        // Prevent Fence Mastering
         if (config.traders.preventFenceMastering)
         {
             this.logger.info("AllInOne Mod: preventFenceMastering activated.")
@@ -724,7 +724,7 @@ export class Notifications
         // Extended Raid
         if (config.raids.extendedRaid !== false)
         {
-            this.logger.info("AllInOne Mod: changeFleaMarketLvl activated.");
+            this.logger.info("AllInOne Mod: extendedRaid activated.");
             if (typeof config.raids.extendedRaid !== "number")
             {
                 this.logger.warning(locale.raids.extendedRaid);

Ereshkigal-AIO/ZEreshkigal-AllinOneMod/src/traders.ts

@@ -3,7 +3,7 @@ import type { DatabaseServer } from "@spt-aki/servers/DatabaseServer";
 import { AIOConfigHandler } from "./AIOConfigHandler";
 import { Other } from "./other";
 import { Money } from "@spt-aki/models/enums/Money"
-import { Traders as eftTraders} from "@spt-aki/models/spt/helpers/Traders"
+import { Traders as eftTraders} from "@spt-aki/models/enums/Traders"
 
 @injectable()
 export class Traders