Adding Config import to all .ts files in preparation for v1.2.0

Fixing ammo.ts not equal to variables
Fixing default config values for a few options.

Valens-AIO/config/config.ts

@@ -11,7 +11,7 @@ export interface Config
     locations: Locations
     loot: Loot
     raid: Raid
-    prewipe_events: PrewipeEvents
+    prewipeEvents: PrewipeEvents
 }
   
 export interface Ammo 
@@ -57,14 +57,20 @@ export interface Pmc
   
 export interface DifficultyWeights 
 {
-    useWeights: boolean
-    weights: Record<string, number>
     difficulty: string
+    useWeights: boolean
+    weights: Weights
 }
   
+export interface Weights 
+{
+    easy: number
+    normal: number
+    hard: number
+    impossible: number
+}
   
 export interface ConvertIntoPmcChance 
-
 {
     assault: number
     cursedAssault: number

Valens-AIO/src/airdrop.ts

@@ -1,11 +1,12 @@
 /*import { IDatabaseTables } from "@spt-aki/models/spt/server/IDatabaseTables";
+import { Config } from "../config/config";
 import { Logger } from "./logger";
 import { IAirdropConfig } from "@spt-aki/models/spt/config/IAirdropConfig";
 import { DatabaseServer } from "@spt-aki/servers/DatabaseServer";
 
 export class Airdrop
 {
-    private modConfig = require("../config/config.jsonc");
+    private modConfig: Config = require("../config/config.jsonc");
     private logger: Logger;
     private tables: IDatabaseTables;
     private airdropConfig: IAirdropConfig;

Valens-AIO/src/ammo.ts

@@ -1,10 +1,11 @@
 import { DatabaseServer } from "@spt-aki/servers/DatabaseServer";
 import { Logger } from "./logger";
 import { Grenade, MarksmanCaliber, PistolCaliber, RifleCaliber, Shotguns } from "./ammotypes";
+import { Config } from "config/config";
 
 export class Ammo
 {
-    private modConfig = require("../config/config.json")
+    private modConfig: Config = require("../config/config.json")
     private logger: Logger;
     private databaseServer: DatabaseServer;
 
@@ -28,7 +29,7 @@ export class Ammo
             }
         }
         
-        if (mod.ammoStacks.marksmanCartridges != 1)
+        if (mod.ammoStacks.marksmanCartridges != 40)
         {
             for (const value of Object.values(MarksmanCaliber)) 
             {
@@ -37,7 +38,7 @@ export class Ammo
             }
         }
         
-        if (mod.ammoStacks.pistolCartridges != 1)
+        if (mod.ammoStacks.pistolCartridges != 50)
         {
             for (const value of Object.values(PistolCaliber)) 
             {
@@ -46,7 +47,7 @@ export class Ammo
             }
         }
          
-        if (mod.ammoStacks.rifleCartridges != 1)
+        if (mod.ammoStacks.rifleCartridges != 60)
         {
             for (const value of Object.values(RifleCaliber))
             {
@@ -55,7 +56,7 @@ export class Ammo
             }
         }
  
-        if (mod.ammoStacks.shotgunCartridges != 1)
+        if (mod.ammoStacks.shotgunCartridges != 20)
         {
             for (const value of Object.values(Shotguns))
             {

Valens-AIO/src/ammotypes.ts

@@ -16,7 +16,7 @@ export enum MarksmanCaliber
     BCP_FMJ = "5e023e53d4353e3302577c4c",
     ULTRA_NOSLER = "5e023e88277cce2b522ff2b1",
     TCW_SP = "5e023e6e34d52a55c3304f71",
-    M993 = "5e023e6e34d52a55c3304f71",
+    M993 = "5efb0c1bd79ff02a1f5e68d9",
     TAC_X = "5fc382b6d6fa9c00c571bbc3",
     UCW = "5fc382c1016cce60e8341b20",
     AP = "5fc382a9d724d907e2077dab",
@@ -91,6 +91,7 @@ export enum RifleCaliber
     PS_GS = "56dff3afd2720bba668b4567",
     SP = "56dff421d2720b5f5a8b4567",
     PPBS_GS_IGOLNIK = "5c0d5e4486f77478390952fe",
+    BS_7N40 = "61962b617c6c7b169525f168",
     PRS_GS = "56dff338d2720bbd668b4569",
     BT_GS = "56dff061d2720bb5668b4567",
     US_GS = "56dff4ecd2720b5f5a8b4568",
@@ -158,7 +159,7 @@ export enum Shotguns
     STAR_SLUG = "5d6e6a05a4b93618084f58d0",
     BUCKSHOT_73MM = "5d6e69c7a4b9360b6c0d54e4",
     DEVASTATOR_SLUG = "5d6e6a5fa4b93614ec501745",
-    BUCKSHOT_56MM = "5d6e6a5fa4b93614ec501745",
+    BUCKSHOT_56MM = "5d6e695fa4b936359b35d852",
     POLEVA_6U_SLUG_20GA = "5d6e6a42a4b9364f07165f52",
     POLEVA_3_SLUG_20GA = "5d6e6a53a4b9361bd473feec",
     BUCKSHOT_62MM = "5d6e69b9a4b9361bc8618958",

Valens-AIO/src/bots.ts

@@ -10,7 +10,7 @@ import { ITrader } from "@spt-aki/models/eft/common/tables/ITrader";
 
 export class Bots
 {
-    private modConfig: Config= require("../config/config.json");
+    private modConfig: Config = require("../config/config.json");
     private logger: Logger;
     private botConfig: IBotConfig;
     private tables: IDatabaseTables;
@@ -104,8 +104,8 @@ export class Bots
         {
             this.botConfig.pmc.types.assault = mod.pmc.convertIntoPmcChance.assault;
             this.botConfig.pmc.types.cursedAssault = mod.pmc.convertIntoPmcChance.cursedAssault;
-            this.botConfig.pmc.type.pmcBot = mod.pmc.convertIntoPmcChance.pmcBot;
+            this.botConfig.pmc.types.pmcBot = mod.pmc.convertIntoPmcChance.pmcBot;
-            this.botConfig.pmc.type.exUsec = mod.pmc.convertIntoPmcChance.exUsec;
+            this.botConfig.pmc.types.exUsec = mod.pmc.convertIntoPmcChance.exUsec;
         }
 
         /*if (mod.pmc.convertIntoPmcChance.assault.min != 15 || mod.pmc.convertIntoPmcChance.assault.max != 40
@@ -148,7 +148,7 @@ export class Bots
         }
 
         // Prewipe Events
-        if (this.modConfig.prewipe_events.killaOnFactory)
+        if (this.modConfig.prewipeEvents.killaOnFactory)
         {
             const killaWave = this.createBossWave("bossKilla", 100, "followerBully", 0, locations.factory4_day.base.OpenZones);
             this.tables.locations.factory4_day.base.BossLocationSpawn.push(killaWave);
@@ -156,7 +156,7 @@ export class Bots
             this.logger.info("Killa Prewipe Event Enabled");
         }
 
-        if (this.modConfig.prewipe_events.allBossesOnReserve)
+        if (this.modConfig.prewipeEvents.allBossesOnReserve)
         {
             let bossWave = this.createBossWave("bossKilla", 100, "followerBully", 0, locations.rezervbase.base.OpenZones);
             locations.rezervbase.base.BossLocationSpawn.push(bossWave);
@@ -169,7 +169,7 @@ export class Bots
             this.logger.info("Bosses On Reserve Prewipe Event Enabled");
         }
   
-        if (this.modConfig.prewipe_events.glukharOnLabs)
+        if (this.modConfig.prewipeEvents.glukharOnLabs)
         {
             const glugluWave: BossLocationSpawn = {
                 "BossName": "bossGluhar",
@@ -215,7 +215,7 @@ export class Bots
         }
 
         // All cheap items on traders
-        if (this.modConfig.prewipe_events.allTradersSellCheapItems)
+        if (this.modConfig.prewipeEvents.allTradersSellCheapItems)
         {
             this.logger.info("Cheap Items On Traders Prewipe Event Enabled");
             for (const trader in this.traders)
@@ -242,7 +242,7 @@ export class Bots
             }
         }
 
-        if (this.modConfig.prewipe_events.makeObdolbosPowerful) 
+        if (this.modConfig.prewipeEvents.makeObdolbosPowerful) 
         {
             const obdolbosBuff = [
                 {

Valens-AIO/src/flea.ts

@@ -1,10 +1,11 @@
 import { IDatabaseTables } from "@spt-aki/models/spt/server/IDatabaseTables";
 import { IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig";
 import { Logger } from "./logger";
+import { Config } from "config/config";
 
 export class Flea
 {
-    private modConfig = require("../config/config.json");
+    private modConfig: Config = require("../config/config.json");
     private logger: Logger;
     private ragfairConfig: IRagfairConfig;
     private tables: IDatabaseTables;

Valens-AIO/src/globals.ts

@@ -1,9 +1,10 @@
 import { DatabaseServer } from "@spt-aki/servers/DatabaseServer";
+import { Config } from "config/config";
 import { Logger } from "./logger";
 
 export class Globals
 {
-    private modConfig = require("../config/config.json");
+    private modConfig: Config = require("../config/config.json");
     private logger: Logger;
     private databaseServer: DatabaseServer;
 

Valens-AIO/src/hideout.ts

@@ -1,9 +1,10 @@
 import { DatabaseServer } from "@spt-aki/servers/DatabaseServer";
 import { Logger } from "./logger";
+import { Config } from "./config/config";
 
 export class Hideout
 {
-    private modConfig = require("../config/config.json")
+    private modConfig: Config = require("../config/config.json")
     private logger: Logger;
     private databaseServer: DatabaseServer;
 

Valens-AIO/src/insurance.ts

@@ -1,9 +1,10 @@
 import { IInsuranceConfig } from "@spt-aki/models/spt/config/IInsuranceConfig";
+import { Config } from "config/config";
 import { Logger } from "./logger";
 
 export class Insurance
 {
-    private modConfig = require("../config/config.json");
+    private modConfig: Config = require("../config/config.json");
     private logger: Logger;
     private insuranceConfig: IInsuranceConfig;
     

Valens-AIO/src/items.ts

@@ -1,9 +1,10 @@
 import { DatabaseServer } from "@spt-aki/servers/DatabaseServer";
+import { Config } from "config/config";
 import { Logger } from "./logger";
 
 export class Items
 {
-    private modConfig = require("../config/config.json")
+    private modConfig: Config = require("../config/config.json")
     private logger: Logger;
     private tables: DatabaseServer;
     private wtf;

Valens-AIO/src/locations.ts

@@ -1,10 +1,11 @@
 import { IDatabaseTables } from "@spt-aki/models/spt/server/IDatabaseTables";
 import { DatabaseServer } from "@spt-aki/servers/DatabaseServer";
+import { Config } from "config/config";
 import { Logger } from "./logger";
 
 export class Locations
 {
-    private modConfig = require("../config/config.json");
+    private modConfig: Config = require("../config/config.json");
     private logger: Logger;
     private tables: IDatabaseTables;
 

Valens-AIO/src/logger.ts

@@ -1,8 +1,9 @@
 import { ILogger } from "@spt-aki/models/spt/utils/ILogger";
+import { Config } from "config/config";
 
 export class Logger
 {
-    private modConfig = require("../config/config.json");
+    private modConfig: Config = require("../config/config.json");
     private logger: ILogger;
 
     constructor (logger: ILogger)

Valens-AIO/src/loot.ts

@@ -1,11 +1,12 @@
 import { ILocationConfig } from "@spt-aki/models/spt/config/ILocationConfig";
 import { IDatabaseTables } from "@spt-aki/models/spt/server/IDatabaseTables";
 import { DatabaseServer } from "@spt-aki/servers/DatabaseServer";
+import { Config } from "config/config";
 import { Logger } from "./logger";
 
 export class Loot
 {
-    private modConfig = require("../config/config.json");
+    private modConfig: Config = require("../config/config.json");
     private logger: Logger;
     private tables: IDatabaseTables;
     private locationConfig: ILocationConfig;

Valens-AIO/src/mod.ts

@@ -22,11 +22,12 @@ import { Raid } from "./raid";
 import { Globals } from "./globals";
 import { Insurance } from "./insurance";
 import { Logger } from "./logger";
+import { Config } from "config/config";
 //import { Airdrop } from "./airdrop";
 
 class ValensAIO implements IPostDBLoadMod
 {
-    private modConfig = require("../config/config.json");
+    private modConfig: Config = require("../config/config.json");
     private logger: ILogger;
     private tables: IDatabaseTables;
     private databaseServer: DatabaseServer;

Valens-AIO/src/raid.ts

@@ -2,10 +2,11 @@ import { IDatabaseTables } from "@spt-aki/models/spt/server/IDatabaseTables";
 import { DatabaseServer } from "@spt-aki/servers/DatabaseServer";
 import { IInRaidConfig } from "@spt-aki/models/spt/config/IInRaidConfig";
 import { Logger } from "./logger";
+import { Config } from "config/config";
 
 export class Raid
 {
-    private modConfig = require("../config/config.json")
+    private modConfig: Config = require("../config/config.json")
     private logger: Logger;
     private tables: IDatabaseTables;
     private inRaidConfig: IInRaidConfig;