Updates for SPT 3.11

Author: refringe

.github/ISSUE_TEMPLATE/GENERAL.yml

@@ -30,9 +30,7 @@ body:
       label: SPT Version
       description: What version of SPT are you running?
       options:
-        - 3.10
-        - 3.9
-        - 3.8
+        - "3.11"
     validations:
       required: true
   - type: textarea

.github/README.md

@@ -23,16 +23,18 @@ _\*Many of these options are configurable._
 
 If you experience any problems, please [submit a detailed bug report](https://github.com/refringe/CustomRaidTimes/issues).
 
-## To Build Locally:
+# To Build Locally:
 
 This project has been built in [Visual Studio Code](https://code.visualstudio.com/) (VSC) using [Node.js](https://nodejs.org/). If you are unfamiliar with Node.js, I recommend using [NVM](https://github.com/nvm-sh/nvm) to manage installation and switching versions. If you do not wish to use NVM, you will need to install the version of Node.js listed within the `.nvmrc` file manually.
 
-This project uses Biome to format code on save.
+This project uses [Biome](https://biomejs.dev/) to format code on save.
 
 To build the project locally:
 
 1. Clone the repository.
 2. Open the `mod.code-workspace` file in Visual Studio Code (VSC).
-3. Run `nvm use` in the terminal.
-4. Run `npm install` in the terminal.
-5. Run `npm run build` in the terminal.
+3. Install the [Biome](https://marketplace.visualstudio.com/items?itemName=biomejs.biome) VSC extension.
+4. Install the [JSON5](https://marketplace.visualstudio.com/items?itemName=mrmlnc.vscode-json5) VSC extension.
+5. Run `nvm use` in the terminal.
+6. Run `npm install` in the terminal.
+7. Run `npm run build` in the terminal.

.nvmrc

@@ -1 +1 @@
-v20.11.1
+v22.12.0

package-lock.json

@@ -1,10 +1,10 @@
 {
     "name": "custom-raid-times",
-    "version": "1.8.0",
+    "version": "1.8.1",
     "main": "src/CustomRaidTimes.js",
     "license": "MIT",
     "author": "Refringe",
-    "sptVersion": "~3.10",
+    "sptVersion": "~3.11",
     "scripts": {
         "setup": "npm i",
         "postinstall": "node ./postInstall.mjs",
@@ -19,12 +19,12 @@
     },
     "devDependencies": {
         "@biomejs/biome": "1.9.4",
-        "@types/node": "22.10.10",
+        "@types/node": "22.10.5",
         "archiver": "7.0.1",
-        "fs-extra": "11.3.0",
+        "fs-extra": "11.2.0",
         "ignore": "7.0.3",
         "tsyringe": "4.8.0",
-        "typescript": "5.7.3",
+        "typescript": "5.8.2",
         "winston": "3.17.0"
     }
 }

package.json

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
 /*
- * This script is used to remove the local tsyringe package when running inside the SPT-AKI project directory. This is
- * necessary because the local tsyringe package will override the SPT-AKI tsyringe package, which will cause dependency
+ * This script is used to remove the local tsyringe package when running inside the SPT project directory. This is
+ * necessary because the local tsyringe package will override the SPT tsyringe package, which will cause dependency
  * injection to fail in a very confusing way, which will likely consume your afternoon and make you want to cry. :D
  */
 

postInstall.mjs

@@ -1,8 +1,8 @@
 import { ILocationBase } from "@spt/models/eft/common/ILocationBase";
 import { IGetRaidTimeRequest } from "@spt/models/eft/game/IGetRaidTimeRequest";
-import { IGetRaidTimeResponse } from "@spt/models/eft/game/IGetRaidTimeResponse";
 import type { IPostDBLoadMod } from "@spt/models/external/IPostDBLoadMod";
 import type { IPreSptLoadMod } from "@spt/models/external/IPreSptLoadMod";
+import { IRaidChanges } from "@spt/models/spt/location/IRaidChanges";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService";
@@ -82,11 +82,8 @@ class CustomRaidTimes implements IPostDBLoadMod, IPreSptLoadMod {
             container.afterResolution(
                 "RaidTimeAdjustmentService",
                 (_t, result: RaidTimeAdjustmentService) => {
-                    result.getRaidAdjustments = (
-                        sessionId: string,
-                        request: IGetRaidTimeRequest,
-                    ): IGetRaidTimeResponse => {
-                        return this.getRaidAdjustments(request);
+                    result.getRaidAdjustments = (sessionId: string, request: IGetRaidTimeRequest): IRaidChanges => {
+                        return this.getRaidAdjustments(sessionId, request);
                     };
                 },
                 { frequency: "Always" },
@@ -95,26 +92,33 @@ class CustomRaidTimes implements IPostDBLoadMod, IPreSptLoadMod {
     }
 
     /**
-     * Return the same response as the original method, even if you're a scav.
+     * This method is used to override the default getRaidAdjustments method. This is only used if the `overrideScav`
+     * setting in the configuration file is set to true. If this is not done, the user's custom times will be modified
+     * from the times set in the configuration file possibly causing confusion.
+     *
      * @override @spt/services/RaidTimeAdjustmentService.getRaidAdjustments
      */
-    private getRaidAdjustments(request: IGetRaidTimeRequest): IGetRaidTimeResponse {
+    public getRaidAdjustments(sessionId: string, request: IGetRaidTimeRequest): IRaidChanges {
         const databaseService = this.container.resolve<DatabaseService>("DatabaseService");
 
         const globals = databaseService.getGlobals();
         const mapBase: ILocationBase = databaseService.getLocation(request.Location.toLowerCase()).base;
         const baseEscapeTimeMinutes = mapBase.EscapeTimeLimit;
 
-        const result: IGetRaidTimeResponse = {
-            RaidTimeMinutes: baseEscapeTimeMinutes,
-            ExitChanges: [],
-            NewSurviveTimeSeconds: undefined,
-            OriginalSurvivalTimeSeconds: globals.config.exp.match_end.survived_seconds_requirement,
+        // Prep result object to return
+        const result: IRaidChanges = {
+            newSurviveTimeSeconds: globals.config.exp.match_end.survived_seconds_requirement,
+            originalSurvivalTimeSeconds: globals.config.exp.match_end.survived_seconds_requirement,
+            dynamicLootPercent: 100,
+            staticLootPercent: 100,
+            simulatedRaidStartSeconds: 0,
+            raidTimeMinutes: baseEscapeTimeMinutes,
+            exitChanges: [],
         };
 
         this.logger.log("CustomRaidTimes: The `getRaidAdjustments` override has been triggered.", "cyan");
 
-        return result;
+        return result; // Return here regardless of side.
     }
 
     /**

src/CustomRaidTimes.ts

@@ -0,0 +1,20 @@
+import { EntryType } from "./models/enums/EntryType";
+export declare class ProgramStatics {
+    private static _ENTRY_TYPE;
+    private static _DEBUG;
+    private static _COMPILED;
+    private static _MODS;
+    private static _EXPECTED_NODE;
+    private static _SPT_VERSION;
+    private static _COMMIT;
+    private static _BUILD_TIME;
+    static initialize(): void;
+    static get ENTRY_TYPE(): EntryType;
+    static get DEBUG(): boolean;
+    static get COMPILED(): boolean;
+    static get MODS(): boolean;
+    static get EXPECTED_NODE(): string;
+    static get SPT_VERSION(): string;
+    static get COMMIT(): string;
+    static get BUILD_TIME(): number;
+}

types/ProgramStatics.d.ts

@@ -1,6 +1,9 @@
 import { ClientLogController } from "@spt/controllers/ClientLogController";
 import { ModLoadOrder } from "@spt/loaders/ModLoadOrder";
 import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
+import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
+import { IInsuranceConfig } from "@spt/models/spt/config/IInsuranceConfig";
+import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
 import { IClientLogRequest } from "@spt/models/spt/logging/IClientLogRequest";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { LocalisationService } from "@spt/services/LocalisationService";
@@ -12,6 +15,9 @@ export declare class ClientLogCallbacks {
     protected configServer: ConfigServer;
     protected localisationService: LocalisationService;
     protected modLoadOrder: ModLoadOrder;
+    protected botConfig: IBotConfig;
+    protected pmcConfig: IPmcConfig;
+    protected insuranceConfig: IInsuranceConfig;
     constructor(httpResponse: HttpResponseUtil, clientLogController: ClientLogController, configServer: ConfigServer, localisationService: LocalisationService, modLoadOrder: ModLoadOrder);
     /**
      * Handle /singleplayer/log
@@ -25,4 +31,5 @@ export declare class ClientLogCallbacks {
      * Handle /singleplayer/enableBSGlogging
      */
     bsgLogging(): string;
+    private handleClientLog;
 }

types/callbacks/ClientLogCallbacks.d.ts

@@ -1,12 +1,13 @@
 import { CustomizationController } from "@spt/controllers/CustomizationController";
-import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import { IPmcData } from "@spt/models/eft/common/IPmcData";
-import { ISuit } from "@spt/models/eft/common/tables/ITrader";
-import { IBuyClothingRequestData } from "@spt/models/eft/customization/IBuyClothingRequestData";
-import { IGetSuitsResponse } from "@spt/models/eft/customization/IGetSuitsResponse";
-import { IWearClothingRequestData } from "@spt/models/eft/customization/IWearClothingRequestData";
-import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import type { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import type { IPmcData } from "@spt/models/eft/common/IPmcData";
+import type { ICustomisationStorage } from "@spt/models/eft/common/tables/ICustomisationStorage";
+import type { ISuit } from "@spt/models/eft/common/tables/ITrader";
+import type { IBuyClothingRequestData } from "@spt/models/eft/customization/IBuyClothingRequestData";
+import type { ICustomizationSetRequest } from "@spt/models/eft/customization/ICustomizationSetRequest";
+import type { IHideoutCustomisation } from "@spt/models/eft/hideout/IHideoutCustomisation";
+import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
 import { SaveServer } from "@spt/servers/SaveServer";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 export declare class CustomizationCallbacks {
@@ -18,18 +19,20 @@ export declare class CustomizationCallbacks {
      * Handle client/trading/customization/storage
      * @returns IGetSuitsResponse
      */
-    getSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IGetSuitsResponse>;
+    getCustomisationUnlocks(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ICustomisationStorage[]>;
     /**
      * Handle client/trading/customization
      * @returns ISuit[]
      */
     getTraderSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ISuit[]>;
-    /**
-     * Handle CustomizationWear event
-     */
-    wearClothing(pmcData: IPmcData, body: IWearClothingRequestData, sessionID: string): IItemEventRouterResponse;
     /**
      * Handle CustomizationBuy event
      */
-    buyClothing(pmcData: IPmcData, body: IBuyClothingRequestData, sessionID: string): IItemEventRouterResponse;
+    buyCustomisation(pmcData: IPmcData, body: IBuyClothingRequestData, sessionID: string): IItemEventRouterResponse;
+    /** Handle client/hideout/customization/offer/list */
+    getHideoutCustomisation(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutCustomisation>;
+    /** Handle client/customization/storage */
+    getStorage(url: string, request: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ICustomisationStorage[]>;
+    /** Handle CustomizationSet */
+    setCustomisation(pmcData: IPmcData, request: ICustomizationSetRequest, sessionID: string): IItemEventRouterResponse;
 }