Merge branch 'main' of https://dev.sp-tarkov.com/gasmo/ScavXpCounts

.buildignore

@@ -0,0 +1,23 @@
+/.buildignore
+/.DS_Store
+/.editorconfig
+/.eslintignore
+/.eslintrc.json
+/.git
+/.github
+/.gitignore
+/.gitlab
+/.nvmrc
+/.prettierrc
+/.vscode
+/build.mjs
+/dist
+/images
+/mod.code-workspace
+/node_modules
+/package-lock.json
+/tsconfig.json
+/types
+/user
+README.md
+LICENSE

README.md

@@ -1,2 +1,19 @@
-## Description ##
-Simple server mod that makes experience earned as a player scav count towards your PMC.
+Quick server mod that adds experience from player scav raids to your PMC, including skill progress.
+
+Also allows for syncing your Scav and PMC experience so that they do not differ at all.
+
+
+## Installation:
+
+Extract contents of zip file into your SPT folder.
+
+
+## Configuration:
+
+In the "config.json" file there are options that you can enable or disable.
+
+* EnableMod: self-explanatory.
+* EnableSkillXp: enables the transfer of skill experience from Scav to PMC.
+* EnableGeneralXp: enables the transfer of general experience from Scav to PMC.
+* EnableSkillSync: enables the syncing of skills between Scav and PMC (always the higher of the two).
+* EnableGeneralSync: enables the syncing of general experience from Scav and PMC (always the higher of the two).

build.mjs

@@ -0,0 +1,381 @@
+#!/usr/bin/env node
+
+/**
+ * Build Script
+ *
+ * This script automates the build process for server-side SPT mod projects, facilitating the creation of distributable
+ * mod packages. It performs a series of operations as outlined below:
+ * - Loads the .buildignore file, which is used to list files that should be ignored during the build process.
+ * - Loads the package.json to get project details so a descriptive name can be created for the mod package.
+ * - Creates a distribution directory and a temporary working directory.
+ * - Copies files to the temporary directory while respecting the .buildignore rules.
+ * - Creates a zip archive of the project files.
+ * - Moves the zip file to the root of the distribution directory.
+ * - Cleans up the temporary directory.
+ *
+ * It's typical that this script be customized to suit the needs of each project. For example, the script can be updated
+ * to perform additional operations, such as moving the mod package to a specific location or uploading it to a server.
+ * This script is intended to be a starting point for developers to build upon.
+ *
+ * Usage:
+ * - Run this script using npm: `npm run build`
+ * - Use `npm run buildinfo` for detailed logging.
+ *
+ * Note:
+ * - Ensure that all necessary Node.js modules are installed before running the script: `npm install`
+ * - The script reads configurations from the `package.json` and `.buildignore` files; ensure they are correctly set up.
+ *
+ * @author Refringe
+ * @version v1.0.0
+ */
+
+import os from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import fs from "fs-extra";
+import ignore from "ignore";
+import archiver from "archiver";
+import winston from "winston";
+
+// Get the command line arguments to determine whether to use verbose logging.
+const args = process.argv.slice(2);
+const verbose = args.includes("--verbose") || args.includes("-v");
+
+// Configure the Winston logger to use colours.
+const logColors = {
+    error: "red",
+    warn: "yellow",
+    info: "grey",
+    success: "green",
+};
+winston.addColors(logColors);
+
+// Create a logger instance to log build progress. Configure the logger levels to allow for different levels of logging
+// based on the verbosity flag, and set the console transport to log messages of the appropriate level.
+const logger = winston.createLogger({
+    levels: {
+        error: 0,
+        warn: 1,
+        success: 2,
+        info: 3,
+    },
+    format: winston.format.combine(
+        winston.format.colorize(),
+        winston.format.printf(info => {
+            return `${info.level}: ${info.message}`;
+        })
+    ),
+    transports: [
+        new winston.transports.Console({
+            level: verbose ? "info" : "success",
+        }),
+    ],
+});
+
+/**
+ * The main function orchestrates the build process for creating a distributable mod package. It leverages a series of
+ * helper functions to perform various tasks such as loading configuration files, setting up directories, copying files
+ * according to `.buildignore` rules, and creating a ZIP archive of the project files.
+ *
+ * Utilizes the Winston logger to provide information on the build status at different stages of the process.
+ *
+ * @returns {void}
+ */
+async function main() {
+    // Get the current directory where the script is being executed
+    const currentDir = getCurrentDirectory();
+
+    // Defining at this scope because we need to use it in the finally block.
+    let projectDir;
+
+    try {
+        // Load the .buildignore file to set up an ignore handler for the build process.
+        const buildIgnorePatterns = await loadBuildIgnoreFile(currentDir);
+
+        // Load the package.json file to get project details.
+        const packageJson = await loadPackageJson(currentDir);
+
+        // Create a descriptive name for the mod package.
+        const projectName = createProjectName(packageJson);
+        logger.log("success", `Project name created: ${projectName}`);
+
+        // Remove the old distribution directory and create a fresh one.
+        const distDir = await removeOldDistDirectory(currentDir);
+        logger.log("info", "Distribution directory successfully cleaned.");
+
+        // Create a temporary working directory to perform the build operations.
+        projectDir = await createTemporaryDirectoryWithProjectName(projectName);
+        logger.log("success", "Temporary working directory successfully created.");
+        logger.log("info", projectDir);
+
+        // Copy files to the temporary directory while respecting the .buildignore rules.
+        logger.log("info", "Beginning copy operation using .buildignore file...");
+        await copyFiles(currentDir, projectDir, buildIgnorePatterns);
+        logger.log("success", "Files successfully copied to temporary directory.");
+
+        // Create a zip archive of the project files.
+        logger.log("info", "Beginning folder compression...");
+        const zipFilePath = path.join(path.dirname(projectDir), `${projectName}.zip`);
+        await createZipFile(projectDir, zipFilePath, "user/mods/" + projectName);
+        logger.log("success", "Archive successfully created.");
+        logger.log("info", zipFilePath);
+
+        // Move the zip file inside of the project directory, within the temporary working directory.
+        const zipFileInProjectDir = path.join(projectDir, `${projectName}.zip`);
+        await fs.move(zipFilePath, zipFileInProjectDir);
+        logger.log("success", "Archive successfully moved.");
+        logger.log("info", zipFileInProjectDir);
+
+        // Move the temporary directory into the distribution directory.
+        await fs.move(projectDir, distDir);
+        logger.log("success", "Temporary directory successfully moved into project distribution directory.");
+
+        // Log the success message. Write out the path to the mod package.
+        logger.log("success", "------------------------------------");
+        logger.log("success", "Build script completed successfully!");
+        logger.log("success", "Your mod package has been created in the 'dist' directory:");
+        logger.log("success", `/${path.relative(process.cwd(), path.join(distDir, `${projectName}.zip`))}`);
+        logger.log("success", "------------------------------------");
+        if (!verbose) {
+            logger.log("success", "To see a detailed build log, use `npm run buildinfo`.");
+            logger.log("success", "------------------------------------");
+        }
+    } catch (err) {
+        // If any of the file operations fail, log the error.
+        logger.log("error", "An error occurred: " + err);
+    } finally {
+        // Clean up the temporary directory, even if the build fails.
+        if (projectDir) {
+            try {
+                await fs.promises.rm(projectDir, { force: true, recursive: true });
+                logger.log("info", "Cleaned temporary directory.");
+            } catch (err) {
+                logger.log("error", "Failed to clean temporary directory: " + err);
+            }
+        }
+    }
+}
+
+/**
+ * Retrieves the current working directory where the script is being executed. This directory is used as a reference
+ * point for various file operations throughout the build process, ensuring that paths are resolved correctly regardless
+ * of the location from which the script is invoked.
+ *
+ * @returns {string} The absolute path of the current working directory.
+ */
+function getCurrentDirectory() {
+    return path.dirname(fileURLToPath(import.meta.url));
+}
+
+/**
+ * Loads the `.buildignore` file and sets up an ignore handler using the `ignore` module. The `.buildignore` file
+ * contains a list of patterns describing files and directories that should be ignored during the build process. The
+ * ignore handler created by this method is used to filter files and directories when copying them to the temporary
+ * directory, ensuring that only necessary files are included in the final mod package.
+ *
+ * @param {string} currentDirectory - The absolute path of the current working directory.
+ * @returns {Promise<ignore>} A promise that resolves to an ignore handler.
+ */
+async function loadBuildIgnoreFile(currentDir) {
+    const buildIgnorePath = path.join(currentDir, ".buildignore");
+
+    try {
+        // Attempt to read the contents of the .buildignore file asynchronously.
+        const fileContent = await fs.promises.readFile(buildIgnorePath, "utf-8");
+
+        // Return a new ignore instance and add the rules from the .buildignore file (split by newlines).
+        return ignore().add(fileContent.split("\n"));
+    } catch (err) {
+        logger.log("warn", "Failed to read .buildignore file. No files or directories will be ignored.");
+
+        // Return an empty ignore instance, ensuring the build process can continue.
+        return ignore();
+    }
+}
+
+/**
+ * Loads the `package.json` file and returns its content as a JSON object. The `package.json` file contains important
+ * project details such as the name and version, which are used in later stages of the build process to create a
+ * descriptive name for the mod package. The method reads the file from the current working directory, ensuring that it
+ * accurately reflects the current state of the project.
+ *
+ * @param {string} currentDirectory - The absolute path of the current working directory.
+ * @returns {Promise<Object>} A promise that resolves to a JSON object containing the contents of the `package.json`.
+ */
+async function loadPackageJson(currentDir) {
+    const packageJsonPath = path.join(currentDir, "package.json");
+
+    // Read the contents of the package.json file asynchronously as a UTF-8 string.
+    const packageJsonContent = await fs.promises.readFile(packageJsonPath, "utf-8");
+
+    return JSON.parse(packageJsonContent);
+}
+
+/**
+ * Constructs a descriptive name for the mod package using details from the `package.json` file. The name is created by
+ * concatenating the project name, version, and a timestamp, resulting in a unique and descriptive file name for each
+ * build. This name is used as the base name for the temporary working directory and the final ZIP archive, helping to
+ * identify different versions of the mod package easily.
+ *
+ * @param {Object} packageJson - A JSON object containing the contents of the `package.json` file.
+ * @returns {string} A string representing the constructed project name.
+ */
+function createProjectName(packageJson) {
+    // Remove any non-alphanumeric characters from the author and name.
+    const author = packageJson.author.replace(/\W/g, "");
+    const name = packageJson.name.replace(/\W/g, "");
+
+    // Ensure the name is lowercase, as per the package.json specification.
+    return `${name}`.toLowerCase();
+}
+
+/**
+ * Defines the location of the distribution directory where the final mod package will be stored and deletes any 
+ * existing distribution directory to ensure a clean slate for the build process.
+ *
+ * @param {string} currentDirectory - The absolute path of the current working directory.
+ * @returns {Promise<string>} A promise that resolves to the absolute path to the distribution directory.
+ */
+async function removeOldDistDirectory(projectDir) {
+    const distPath = path.join(projectDir, "dist");
+    await fs.remove(distPath);
+    return distPath;
+}
+
+/**
+ * Creates a temporary working directory using the project name. This directory serves as a staging area where project
+ * files are gathered before being archived into the final mod package. The method constructs a unique directory path
+ * by appending the project name to a base temporary directory path, ensuring that each build has its own isolated
+ * working space. This approach facilitates clean and organized build processes, avoiding potential conflicts with other
+ * builds.
+ *
+ * @param {string} currentDirectory - The absolute path of the current working directory.
+ * @param {string} projectName - The constructed project name, used to create a unique path for the temporary directory.
+ * @returns {Promise<string>} A promise that resolves to the absolute path of the newly created temporary directory.
+ */
+async function createTemporaryDirectoryWithProjectName(projectName) {
+    // Create a new directory in the system's temporary folder to hold the project files.
+    const tempDir = await fs.promises.mkdtemp(path.join(os.tmpdir(), "spt-mod-build-"));
+
+    // Create a subdirectory within the temporary directory using the project name for this specific build.
+    const projectDir = path.join(tempDir, projectName);
+    await fs.ensureDir(projectDir);
+
+    return projectDir;
+}
+
+/**
+ * Copies the project files to the temporary directory while respecting the rules defined in the `.buildignore` file.
+ * The method is recursive, iterating over all files and directories in the source directory and using the ignore
+ * handler to filter out files and directories that match the patterns defined in the `.buildignore` file. This ensures
+ * that only the necessary files are included in the final mod package, adhering to the specifications defined by the
+ * developer in the `.buildignore` file.
+ *
+ * The copy operations are delayed and executed in parallel to improve efficiency and reduce the build time. This is
+ * achieved by creating an array of copy promises and awaiting them all at the end of the function.
+ *
+ * @param {string} sourceDirectory - The absolute path of the current working directory.
+ * @param {string} destinationDirectory - The absolute path of the temporary directory where the files will be copied.
+ * @param {Ignore} ignoreHandler - The ignore handler created from the `.buildignore` file.
+ * @returns {Promise<void>} A promise that resolves when all copy operations are completed successfully.
+ */
+async function copyFiles(srcDir, destDir, ignoreHandler) {
+    try {
+        // Read the contents of the source directory to get a list of entries (files and directories).
+        const entries = await fs.promises.readdir(srcDir, { withFileTypes: true });
+
+        // Initialize an array to hold the promises returned by recursive calls to copyFiles and copyFile operations.
+        const copyOperations = [];
+
+        for (const entry of entries) {
+            // Define the source and destination paths for each entry.
+            const srcPath = path.join(srcDir, entry.name);
+            const destPath = path.join(destDir, entry.name);
+
+            // Get the relative path of the source file to check against the ignore handler.
+            const relativePath = path.relative(process.cwd(), srcPath);
+
+            // If the ignore handler dictates that this file should be ignored, skip to the next iteration.
+            if (ignoreHandler.ignores(relativePath)) {
+                logger.log("info", `Ignored: /${path.relative(process.cwd(), srcPath)}`);
+                continue;
+            }
+
+            if (entry.isDirectory()) {
+                // If the entry is a directory, create the corresponding temporary directory and make a recursive call
+                // to copyFiles to handle copying the contents of the directory.
+                await fs.ensureDir(destPath);
+                copyOperations.push(copyFiles(srcPath, destPath, ignoreHandler));
+            } else {
+                // If the entry is a file, add a copyFile operation to the copyOperations array and log the event when
+                // the operation is successful.
+                copyOperations.push(
+                    fs.copy(srcPath, destPath).then(() => {
+                        logger.log("info", `Copied: /${path.relative(process.cwd(), srcPath)}`);
+                    })
+                );
+            }
+        }
+
+        // Await all copy operations to ensure all files and directories are copied before exiting the function.
+        await Promise.all(copyOperations);
+    } catch (err) {
+        // Log an error message if any error occurs during the copy process.
+        logger.log("error", "Error copying files: " + err);
+    }
+}
+
+/**
+ * Creates a ZIP archive of the project files located in the temporary directory. The method uses the `archiver` module
+ * to create a ZIP file, which includes all the files that have been copied to the temporary directory during the build
+ * process. The ZIP file is named using the project name, helping to identify the contents of the archive easily.
+ *
+ * @param {string} directoryPath - The absolute path of the temporary directory containing the project files.
+ * @param {string} projectName - The constructed project name, used to name the ZIP file.
+ * @returns {Promise<string>} A promise that resolves to the absolute path of the created ZIP file.
+ */
+async function createZipFile(directoryToZip, zipFilePath, containerDirName) {
+    return new Promise((resolve, reject) => {
+        // Create a write stream to the specified ZIP file path.
+        const output = fs.createWriteStream(zipFilePath);
+
+        // Create a new archiver instance with ZIP format and maximum compression level.
+        const archive = archiver("zip", {
+            zlib: { level: 9 },
+        });
+
+        // Set up an event listener for the 'close' event to resolve the promise when the archiver has finalized.
+        output.on("close", function () {
+            logger.log("info", "Archiver has finalized. The output and the file descriptor have closed.");
+            resolve();
+        });
+
+        // Set up an event listener for the 'warning' event to handle warnings appropriately, logging them or rejecting
+        // the promise based on the error code.
+        archive.on("warning", function (err) {
+            if (err.code === "ENOENT") {
+                logger.log("warn", `Archiver issued a warning: ${err.code} - ${err.message}`);
+            } else {
+                reject(err);
+            }
+        });
+
+        // Set up an event listener for the 'error' event to reject the promise if any error occurs during archiving.
+        archive.on("error", function (err) {
+            reject(err);
+        });
+
+        // Pipe archive data to the file.
+        archive.pipe(output);
+
+        // Add the directory to the archive, under the provided directory name.
+        archive.directory(directoryToZip, containerDirName);
+
+        // Finalize the archive, indicating that no more files will be added and triggering the 'close' event once all
+        // data has been written.
+        archive.finalize();
+    });
+}
+
+// Engage!
+main();

config.json

@@ -0,0 +1,12 @@
+{
+    "_EnableMod": "Enables the mod",
+    "EnableMod": true,
+    "_EnableSkillXp": "Enables the addition of scav skill xp to pmc xp",
+    "EnableSkillXp": true,
+    "_EnableGeneralXp": "Enables the addition of scav general xp to pmc xp",
+    "EnableGeneralXp": true,
+    "_EnableSkillSync": "Enables the syncing of scav skill xp to pmc skill xp (both are set to the higher of the two)",
+    "EnableSkillSync": true,
+    "_EnableGeneralSync": "Enables the syncing of scav general xp to pmc general xp (both are set to the higher of the two)",
+    "EnableGeneralSync": true
+}

mod.code-workspace

@@ -1,12 +1,13 @@
 {
-	"folders": [
-		{
-			"path": "."
-		}
-	],
-	"extensions": {
-		"recommendations": [
-			"dbaeumer.vscode-eslint"
-		]
-	}
+    "folders": [
+        {
+            "path": "."
+        }
+    ],
+    "extensions": {
+        "recommendations": [
+            "dbaeumer.vscode-eslint",
+            "refringe.spt-id-highlighter"
+        ]
+    }
 }

package.json

@@ -1,23 +1,30 @@
 {
     "name": "ScavXpCounts",
-    "version": "1.0.1",
+    "version": "2.0.0",
     "main": "src/mod.js",
     "license": "MIT",
     "author": "gasmo",
-    "akiVersion": "~3.6",
+    "sptVersion": "~3.9",
+    "loadBefore": [],
+    "loadAfter": [],
+    "incompatibilities": [],
+    "isBundleMod": false,
     "scripts": {
         "setup": "npm i",
-        "build": "node ./packageBuild.ts"
+        "build": "node ./build.mjs",
+        "buildinfo": "node ./build.mjs --verbose"
     },
     "devDependencies": {
-        "@types/node": "20.4.5",
-        "@typescript-eslint/eslint-plugin": "6.2.0",
-        "@typescript-eslint/parser": "6.2.0",
-        "bestzip": "2.2.1",
-        "eslint": "8.46.0",
-        "fs-extra": "11.1.1",
-        "glob": "10.3.3",
+        "@types/node": "20.11",
+        "@typescript-eslint/eslint-plugin": "7.2",
+        "@typescript-eslint/parser": "7.2",
+        "archiver": "^6.0",
+        "eslint": "8.57",
+        "fs-extra": "11.2",
+        "ignore": "^5.2",
         "tsyringe": "4.8.0",
-        "typescript": "5.1.6"
-    }
+        "typescript": "5.4",
+        "winston": "3.12"
+    },
+    "contributors": []
 }

packageBuild.ts

@@ -1,75 +0,0 @@
-#!/usr/bin/env node
-
-// This is a simple script used to build a mod package. The script will copy necessary files to the build directory
-// and compress the build directory into a zip file that can be easily shared.
-
-const fs = require("fs-extra");
-const glob = require("glob");
-const zip = require('bestzip');
-const path = require("path");
-const minimatch = require('minimatch');
-
-// Load the package.json file to get some information about the package so we can name things appropriately. This is
-// atypical, and you would never do this in a production environment, but this script is only used for development so
-// it's fine in this case. Some of these values are stored in environment variables, but those differ between node
-// versions; the 'author' value is not available after node v14.
-const { author, name:packageName, version } = require("./package.json");
-
-// Generate the name of the package, stripping out all non-alphanumeric characters in the 'author' and 'name'.
-const modName = `${author.replace(/[^a-z0-9]/gi, "")}-${packageName.replace(/[^a-z0-9]/gi, "")}`;
-console.log(`Generated package name: ${modName}`);
-
-// Delete the old build directory and compressed package file.
-fs.rmSync(`${__dirname}/dist`, { force: true, recursive: true });
-console.log("Previous build files deleted.");
-
-// Generate a list of files that should not be copied over into the distribution directory. This is a blacklist to ensure
-// we always copy over additional files and directories that authors may have added to their project. This may need to be
-// expanded upon by the mod author to allow for node modules that are used within the mod; example commented out below.
-const ignoreList = [
-    "node_modules/",
-    // "node_modules/!(weighted|glob)", // Instead of excluding the entire node_modules directory, allow two node modules.
-    "src/**/*.js",
-    "types/",
-    ".git/",
-    ".gitea/",
-    ".eslintignore",
-    ".eslintrc.json",
-    ".gitignore",
-    ".DS_Store",
-    "packageBuild.ts",
-    "mod.code-workspace",
-    "package-lock.json",
-    "tsconfig.json"
-];
-const exclude = glob.sync(`{${ignoreList.join(",")}}`, { realpath: true, dot: true });
-
-fs.copySync(__dirname, path.normalize(`${__dirname}/../~${modName}`), {filter: (src) =>
-{
-    const relativePath = path.relative(__dirname, src);
-    const shouldExclude = exclude.some((pattern) => minimatch(relativePath, pattern));
-    console.log(`${relativePath} - Excluded: ${shouldExclude}`);
-    return !shouldExclude;
-},});
-
-fs.moveSync(path.normalize(`${__dirname}/../~${modName}`), path.normalize(`${__dirname}/${modName}`), { overwrite: true });
-fs.copySync(path.normalize(`${__dirname}/${modName}`), path.normalize(`${__dirname}/dist`));
-console.log("Build files copied.");
-
-// Compress the files for easy distribution. The compressed file is saved into the dist directory. When uncompressed we
-// need to be sure that it includes a directory that the user can easily copy into their game mods directory.
-zip({
-    source: modName,
-    destination: `dist/${modName}.zip`,
-    cwd: __dirname
-}).catch(function(err)
-{
-    console.error("A bestzip error has occurred: ", err.stack);
-}).then(function()
-{
-    console.log(`Compressed mod package to: /dist/${modName}.zip`);
-
-    // Now that we're done with the compression we can delete the temporary build directory.
-    fs.rmSync(`${__dirname}/${modName}`, { force: true, recursive: true });
-    console.log("Build successful! your zip file has been created and is ready to be uploaded to hub.sp-tarkov.com/files/");
-});

src/mod.ts

@@ -1,38 +1,216 @@
 import { DependencyContainer } from "tsyringe";
-import { IPreAkiLoadMod } from "@spt-aki/models/external/IPreAkiLoadMod"
-import { InRaidHelper } from "@spt-aki/helpers/InRaidHelper";
-import { IPmcData } from "@spt-aki/models/eft/common/IPmcData";
-import { ISaveProgressRequestData } from "@spt-aki/models/eft/inRaid/ISaveProgressRequestData";
-import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper";
+import { IPreSptLoadMod } from "@spt/models/external/IPreSptLoadMod";
+import { IPostSptLoadMod } from "@spt/models/external/IPostSptLoadMod";
+import { InRaidHelper } from "@spt/helpers/InRaidHelper";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRequestData";
+import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import config from "../config.json";
+import { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
 
-class Mod implements IPreAkiLoadMod
+class Mod implements IPreSptLoadMod, IPostSptLoadMod
 {
     private static container: DependencyContainer;
+    private logger: ILogger;
+    private profileHelper: ProfileHelper;
 
-    // Perform these actions before server fully loads
-    public preAkiLoad(container: DependencyContainer): void
+    /**
+     * This function will be called before Aki is loaded.
+     * @param container the dependency container
+     */
+    public preSptLoad(container: DependencyContainer): void
     {
-        Mod.container = container;
-        const oldClass = Mod.container.resolve<InRaidHelper>("InRaidHelper");
+        if (!config.EnableMod) return;
 
-        container.afterResolution("InRaidHelper", (_t, result: InRaidHelper) =>
+        Mod.container = container;
+        this.logger = Mod.container.resolve<ILogger>("WinstonLogger");
+
+        if (config.EnableSkillXp || config.EnableGeneralXp) this.patchInRaidHelper();
+    }
+
+    /**
+     * This function will be called after Aki is loaded.
+     * @param container the dependency container
+     */
+    public postSptLoad(container: DependencyContainer): void
+    {
+        if (!config.EnableMod) return;
+
+        Mod.container = container;
+
+        this.profileHelper = Mod.container.resolve<ProfileHelper>("ProfileHelper");
+        if (config.EnableSkillSync) this.syncSkillsForAllProfiles();
+        if (config.EnableGeneralSync) this.syncGeneralXpForAllProfiles();
+    }
+
+    /**
+     * This function will sync the skill progress between PMC and Scav characters on a profile.
+     * @param profile the profile to sync
+     */
+    private syncSkillsForProfile(profile: ISptProfile): void
+    {
+        this.logger.debug(`[ScavXpCounts] Syncing skill progress between PMC and Scav characters for ${profile.info.username}`);
+
+        let totalSkillXP = 0; // The total skill experience added
+
+        const pmcData: IPmcData = profile.characters.pmc;   // Get the PMC and Scav data
+        const scavData: IPmcData = profile.characters.scav; 
+
+        if (!pmcData.Skills || !scavData.Skills) return; // If the PMC or Scav skills do not exist, return
+        
+        pmcData.Skills.Common.forEach((skill) => // Loop through all skills
         {
-            result.updateProfileBaseStats = (profileData: IPmcData, saveProgressRequest: ISaveProgressRequestData, sessionID: string): IPmcData =>
+            const scavSkill = scavData.Skills.Common.find(p => p.Id === skill.Id); // Find the scav skill
+
+            if (!scavSkill || !skill) return; // If the scav or pmc skill does not exist, return
+
+            const maxProgress = Math.max(skill.Progress, scavSkill.Progress);      // Get the max progress
+
+            if (maxProgress != skill.Progress)
             {
-                if (saveProgressRequest.isPlayerScav)
+                totalSkillXP += maxProgress - skill.Progress;
+                this.logger.debug(`[ScavXpCounts] Setting PMC ${skill.Id} to ${maxProgress}`);
+                skill.Progress = maxProgress;     // Ensure the PMC skill is set to the max progress
+            }
+
+            if (maxProgress != scavSkill.Progress)
+            {
+                totalSkillXP += maxProgress - scavSkill.Progress;
+                this.logger.debug(`[ScavXpCounts] Setting Scav ${skill.Id} to ${maxProgress}`);
+                scavSkill.Progress = maxProgress; // Ensure the Scav skill is set to the max progress
+            }
+        });
+
+        if (totalSkillXP > 0) this.logger.debug(`[ScavXpCounts] Synced ${totalSkillXP.toFixed(2)} total points of skill experience`);
+    }
+
+    /**
+     * This function will sync the skill progress between PMC and Scav characters on all profiles.
+     * @param profiles the profiles to sync
+     */
+    private syncSkillsForAllProfiles(): void
+    {
+        this.logger.debug("[ScavXpCounts] Syncing skill progress between PMC and Scav characters on all profiles");
+        const profiles = this.profileHelper.getProfiles();
+
+        Object.keys(profiles).forEach((key) => // Loop through all profiles
+        {
+            this.syncSkillsForProfile(profiles[key]);
+        });
+
+        this.logger.info("[ScavXpCounts] Synced skill progress for all profiles.");
+    }
+
+    /**
+     * This function will sync the general progress between PMC and Scav characters on a profile.
+     * @param profile the profile to sync
+     */
+    private syncGeneralXpForProfile(profile: ISptProfile): void
+    {
+        this.logger.debug(`[ScavXpCounts] Syncing general progress between PMC and Scav characters for ${profile.info.username}`)
+
+        const pmcData: IPmcData = profile.characters.pmc;
+        const scavData: IPmcData = profile.characters.scav;
+        
+        if (!pmcData.Info || !scavData.Info) return; // If the PMC or Scav info does not exist, return
+
+        const maxExperience = Math.max(pmcData.Info.Experience, scavData.Info.Experience); // Get the max experience
+        const maxLevel = Math.max(pmcData.Info.Level, scavData.Info.Level);                // Get the max level
+
+        if (maxExperience != pmcData.Info.Experience)
+        {
+            this.logger.debug(`[ScavXpCounts] Adding ${(maxExperience - pmcData.Info.Experience).toFixed(2)} general XP to PMC character`);
+            pmcData.Info.Experience = maxExperience; // Ensure the PMC experience is set to the max experience
+            pmcData.Info.Level = maxLevel;           // Ensure the PMC level is set to the max level
+        }
+
+        if (maxExperience != scavData.Info.Experience)
+        {
+            this.logger.debug(`[ScavXpCounts] Adding ${(maxExperience - scavData.Info.Experience).toFixed(2)} general XP to Scav character`);
+            scavData.Info.Experience = maxExperience; // Ensure the Scav experience is set to the max experience
+            scavData.Info.Level = maxLevel;           // Ensure the Scav level is set to the max level
+        }
+    }
+
+    /**
+     * This function will sync the general progress between PMC and Scav characters on all profiles.
+     * @param profiles the profiles to sync
+     */
+    private syncGeneralXpForAllProfiles(): void
+    {
+        this.logger.debug("[ScavXpCounts] Syncing general progress between PMC and Scav characters on all profiles");
+        const profiles = this.profileHelper.getProfiles();
+
+        Object.keys(profiles).forEach((key) => this.syncGeneralXpForProfile(profiles[key]));
+
+        this.logger.info("[ScavXpCounts] Synced general progress for all profiles");
+    }
+
+    /**
+     * This function will patch the InRaidHelper to sync the experience between PMC and Scav characters, and add the post raid experience to the PMC character.
+     */
+    private patchInRaidHelper(): void
+    {
+        const oldClass = Mod.container.resolve<InRaidHelper>("InRaidHelper"); // Get the original class
+
+        Mod.container.afterResolution("InRaidHelper", (_t, result: InRaidHelper) => // Patch the original class after it has been resolved
+        {
+            result.updateProfileBaseStats = (profileData: IPmcData, saveProgressRequest: ISaveProgressRequestData, sessionID: string): void => // Patch the original function
+            {
+                if (saveProgressRequest.isPlayerScav) // If the player is a scav
                 {
-                    const profileHelper = Mod.container.resolve<ProfileHelper>("ProfileHelper");
-                    const pmcData = profileHelper.getPmcProfile(sessionID);
-                    pmcData.Info.Experience += saveProgressRequest.profile.Stats.TotalSessionExperience;
-                    saveProgressRequest.profile.Skills.Common.forEach((skill) =>
-                    {
-                        pmcData.Skills.Common.find(p => p.Id === skill.Id).Progress += skill.PointsEarnedDuringSession;
-                    })
+                    const pmcData = Mod.container.resolve<ProfileHelper>("ProfileHelper").getPmcProfile(sessionID);
+                    if (config.EnableGeneralXp) this.addGeneralXP(pmcData, saveProgressRequest); // Add the post raid experience to the PMC character
+                    if (config.EnableSkillXp) this.addSkillXP(pmcData, saveProgressRequest);     // Add the post raid skill experience to the PMC character
                 }
-                return oldClass.updateProfileBaseStats(profileData, saveProgressRequest, sessionID);
+
+                oldClass.updateProfileBaseStats(profileData, saveProgressRequest, sessionID);    // Call the original function
+
+                const profile = Mod.container.resolve<ProfileHelper>("ProfileHelper").getFullProfile(sessionID);
+                if (config.EnableGeneralSync) this.syncGeneralXpForProfile(profile);             // Sync the general experience for the profile
+                if (config.EnableSkillSync) this.syncSkillsForProfile(profile);                  // Sync the skill progress for the profile
             }
         }, {frequency: "Always"});
     }
+
+    /**
+     * This function will add the post raid skill experience to the character on the given PmcData.
+     * @param pmcData the PMC profile
+     * @param saveProgressRequest the save progress request
+     */
+    private addSkillXP(pmcData: IPmcData, saveProgressRequest: ISaveProgressRequestData): void
+    {
+        let totalSkillXP = 0;
+
+        saveProgressRequest.profile.Skills.Common.forEach((skill) => // Loop through all skills
+        {
+            if (skill.PointsEarnedDuringSession > 0)
+            {
+                totalSkillXP += skill.PointsEarnedDuringSession;
+
+                const pmcSkill = pmcData.Skills.Common.find(p => p.Id === skill.Id); // Find the PMC skill
+                if (!pmcSkill || !skill) return; // If the PMC or Scav skill does not exist, return
+
+                pmcSkill.Progress += skill.PointsEarnedDuringSession; // Add the skill experience to the PMC profile
+                this.logger.debug(`[ScavXpCounts] Added ${skill.PointsEarnedDuringSession.toFixed(2)} experience to ${skill.Id}`);
+            }
+        })
+
+        if (totalSkillXP > 0) this.logger.debug(`[ScavXpCounts] Added ${totalSkillXP.toFixed(2)} total points of skill experience to PMC`);
+    }
+
+    /**
+     * This function will add the post raid experience to the character on the given PmcData.
+     * @param pmcData the PMC profile
+     * @param saveProgressRequest the save progress request
+     */
+    private addGeneralXP(pmcData: IPmcData, saveProgressRequest: ISaveProgressRequestData): void
+    {
+        pmcData.Info.Experience += saveProgressRequest.profile.Stats.Eft.TotalSessionExperience; // Add the post raid experience to the PMC profile
+
+        this.logger.debug(`[ScavXpCounts] Added ${saveProgressRequest.profile.Stats.Eft.TotalSessionExperience.toFixed(0)} experience to PMC.`);
+    }
 }
 
 module.exports = { mod: new Mod() }

tsconfig.json

@@ -1,9 +1,9 @@
 {
     "compilerOptions": {
         "allowJs": true,
-        "module": "CommonJS",
-        "target": "es2021",
-        "moduleResolution": "node",
+        "module": "NodeNext",
+        "target": "ES2022",
+        "moduleResolution": "NodeNext",
         "esModuleInterop": true,
         "downlevelIteration": true,
         "experimentalDecorators": true,
@@ -12,14 +12,8 @@
         "outDir": "tmp",
         "baseUrl": ".",
         "paths": {
-            "@spt-aki/*": ["./types/*"]
+            "@spt/*": ["./types/*"]
         }
     },
-    "lib": [
-        "es2020"
-    ],
-    "include": [
-        "src/*",
-        "src/**/*"
-    ]
+    "exclude": ["node_modules", "dist", "tmp"],
 }

types/ErrorHandler.d.ts

@@ -2,5 +2,5 @@ export declare class ErrorHandler {
     private logger;
     private readLine;
     constructor();
-    handleCriticalError(err: any): void;
+    handleCriticalError(err: Error): void;
 }

types/Program.d.ts

@@ -1,5 +1,5 @@
 export declare class Program {
     private errorHandler;
     constructor();
-    start(): void;
+    start(): Promise<void>;
 }

types/TYPES.d.ts

@@ -1,3 +0,0 @@
-export declare const TYPES: {
-    [name: string]: symbol;
-};

types/callbacks/AchievementCallbacks.d.ts

@@ -0,0 +1,21 @@
+import { AchievementController } from "@spt/controllers/AchievementController";
+import { ProfileController } from "@spt/controllers/ProfileController";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { ICompletedAchievementsResponse } from "@spt/models/eft/profile/ICompletedAchievementsResponse";
+import { IGetAchievementsResponse } from "@spt/models/eft/profile/IGetAchievementsResponse";
+import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
+export declare class AchievementCallbacks {
+    protected achievementController: AchievementController;
+    protected profileController: ProfileController;
+    protected httpResponse: HttpResponseUtil;
+    constructor(achievementController: AchievementController, profileController: ProfileController, httpResponse: HttpResponseUtil);
+    /**
+     * Handle client/achievement/list
+     */
+    getAchievements(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IGetAchievementsResponse>;
+    /**
+     * Handle client/achievement/statistic
+     */
+    statistic(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ICompletedAchievementsResponse>;
+}

types/callbacks/BotCallbacks.d.ts

@@ -1,9 +1,10 @@
-import { BotController } from "../controllers/BotController";
-import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData";
-import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { IBotBase } from "../models/eft/common/tables/IBotBase";
-import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
+import { BotController } from "@spt/controllers/BotController";
+import { IGenerateBotsRequestData } from "@spt/models/eft/bot/IGenerateBotsRequestData";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IBotBase } from "@spt/models/eft/common/tables/IBotBase";
+import { Difficulties } from "@spt/models/eft/common/tables/IBotType";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 export declare class BotCallbacks {
     protected botController: BotController;
     protected httpResponse: HttpResponseUtil;
@@ -19,16 +20,21 @@ export declare class BotCallbacks {
      * @returns string
      */
     getBotDifficulty(url: string, info: IEmptyRequestData, sessionID: string): string;
+    /**
+     * Handle singleplayer/settings/bot/difficulties
+     * @returns dictionary of every bot and its diffiulty settings
+     */
+    getAllBotDifficulties(url: string, info: IEmptyRequestData, sessionID: string): Record<string, Difficulties>;
     /**
      * Handle client/game/bot/generate
      * @returns IGetBodyResponseData
      */
-    generateBots(url: string, info: IGenerateBotsRequestData, sessionID: string): IGetBodyResponseData<IBotBase[]>;
+    generateBots(url: string, info: IGenerateBotsRequestData, sessionID: string): Promise<IGetBodyResponseData<IBotBase[]>>;
     /**
      * Handle singleplayer/settings/bot/maxCap
      * @returns string
      */
-    getBotCap(): string;
+    getBotCap(url: string, info: any, sessionID: string): string;
     /**
      * Handle singleplayer/settings/bot/getBotBehaviours
      * @returns string

types/callbacks/BuildsCallbacks.d.ts

@@ -0,0 +1,34 @@
+import { BuildController } from "@spt/controllers/BuildController";
+import { ISetMagazineRequest } from "@spt/models/eft/builds/ISetMagazineRequest";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
+import { IPresetBuildActionRequestData } from "@spt/models/eft/presetBuild/IPresetBuildActionRequestData";
+import { IRemoveBuildRequestData } from "@spt/models/eft/presetBuild/IRemoveBuildRequestData";
+import { IUserBuilds } from "@spt/models/eft/profile/ISptProfile";
+import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
+export declare class BuildsCallbacks {
+    protected httpResponse: HttpResponseUtil;
+    protected buildController: BuildController;
+    constructor(httpResponse: HttpResponseUtil, buildController: BuildController);
+    /**
+     * Handle client/builds/list
+     */
+    getBuilds(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IUserBuilds>;
+    /**
+     * Handle client/builds/magazine/save
+     */
+    createMagazineTemplate(url: string, request: ISetMagazineRequest, sessionID: string): INullResponseData;
+    /**
+     * Handle client/builds/weapon/save
+     */
+    setWeapon(url: string, info: IPresetBuildActionRequestData, sessionID: string): INullResponseData;
+    /**
+     * Handle client/builds/equipment/save
+     */
+    setEquipment(url: string, info: IPresetBuildActionRequestData, sessionID: string): INullResponseData;
+    /**
+     * Handle client/builds/delete
+     */
+    deleteBuild(url: string, info: IRemoveBuildRequestData, sessionID: string): INullResponseData;
+}

types/callbacks/BundleCallbacks.d.ts

@@ -1,18 +1,13 @@
-import { BundleLoader } from "../loaders/BundleLoader";
-import { IHttpConfig } from "../models/spt/config/IHttpConfig";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { ConfigServer } from "../servers/ConfigServer";
-import { HttpFileUtil } from "../utils/HttpFileUtil";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
+import { BundleLoader } from "@spt/loaders/BundleLoader";
+import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 export declare class BundleCallbacks {
-    protected logger: ILogger;
     protected httpResponse: HttpResponseUtil;
-    protected httpFileUtil: HttpFileUtil;
     protected bundleLoader: BundleLoader;
     protected configServer: ConfigServer;
     protected httpConfig: IHttpConfig;
-    constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpFileUtil: HttpFileUtil, bundleLoader: BundleLoader, configServer: ConfigServer);
-    sendBundle(sessionID: string, req: any, resp: any, body: any): any;
+    constructor(httpResponse: HttpResponseUtil, bundleLoader: BundleLoader, configServer: ConfigServer);
     /**
      * Handle singleplayer/bundles
      */

types/callbacks/ClientLogCallbacks.d.ts

@@ -0,0 +1,28 @@
+import { ClientLogController } from "@spt/controllers/ClientLogController";
+import { ModLoadOrder } from "@spt/loaders/ModLoadOrder";
+import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
+import { IClientLogRequest } from "@spt/models/spt/logging/IClientLogRequest";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { LocalisationService } from "@spt/services/LocalisationService";
+import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
+/** Handle client logging related events */
+export declare class ClientLogCallbacks {
+    protected httpResponse: HttpResponseUtil;
+    protected clientLogController: ClientLogController;
+    protected configServer: ConfigServer;
+    protected localisationService: LocalisationService;
+    protected modLoadOrder: ModLoadOrder;
+    constructor(httpResponse: HttpResponseUtil, clientLogController: ClientLogController, configServer: ConfigServer, localisationService: LocalisationService, modLoadOrder: ModLoadOrder);
+    /**
+     * Handle /singleplayer/log
+     */
+    clientLog(url: string, info: IClientLogRequest, sessionID: string): INullResponseData;
+    /**
+     * Handle /singleplayer/release
+     */
+    releaseNotes(): string;
+    /**
+     * Handle /singleplayer/enableBSGlogging
+     */
+    bsgLogging(): string;
+}

types/callbacks/CustomizationCallbacks.d.ts

@@ -1,14 +1,14 @@
-import { CustomizationController } from "../controllers/CustomizationController";
-import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { ISuit } from "../models/eft/common/tables/ITrader";
-import { IBuyClothingRequestData } from "../models/eft/customization/IBuyClothingRequestData";
-import { IGetSuitsResponse } from "../models/eft/customization/IGetSuitsResponse";
-import { IWearClothingRequestData } from "../models/eft/customization/IWearClothingRequestData";
-import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { SaveServer } from "../servers/SaveServer";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
+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 { SaveServer } from "@spt/servers/SaveServer";
+import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 export declare class CustomizationCallbacks {
     protected customizationController: CustomizationController;
     protected saveServer: SaveServer;

types/callbacks/DataCallbacks.d.ts

@@ -1,27 +1,31 @@
-import { HideoutController } from "../controllers/HideoutController";
-import { RagfairController } from "../controllers/RagfairController";
-import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { IGlobals } from "../models/eft/common/IGlobals";
-import { ICustomizationItem } from "../models/eft/common/tables/ICustomizationItem";
-import { IHandbookBase } from "../models/eft/common/tables/IHandbookBase";
-import { IGetItemPricesResponse } from "../models/eft/game/IGetItemPricesResponse";
-import { IHideoutArea } from "../models/eft/hideout/IHideoutArea";
-import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction";
-import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase";
-import { IHideoutSettingsBase } from "../models/eft/hideout/IHideoutSettingsBase";
-import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { ISettingsBase } from "../models/spt/server/ISettingsBase";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
+import { HideoutController } from "@spt/controllers/HideoutController";
+import { RagfairController } from "@spt/controllers/RagfairController";
+import { TraderHelper } from "@spt/helpers/TraderHelper";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IGlobals } from "@spt/models/eft/common/IGlobals";
+import { ICustomizationItem } from "@spt/models/eft/common/tables/ICustomizationItem";
+import { IHandbookBase } from "@spt/models/eft/common/tables/IHandbookBase";
+import { IGetItemPricesResponse } from "@spt/models/eft/game/IGetItemPricesResponse";
+import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
+import { IHideoutProduction } from "@spt/models/eft/hideout/IHideoutProduction";
+import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
+import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { ISettingsBase } from "@spt/models/spt/server/ISettingsBase";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
+import { TimeUtil } from "@spt/utils/TimeUtil";
 /**
  * Handle client requests
  */
 export declare class DataCallbacks {
     protected httpResponse: HttpResponseUtil;
-    protected databaseServer: DatabaseServer;
+    protected timeUtil: TimeUtil;
+    protected traderHelper: TraderHelper;
+    protected databaseService: DatabaseService;
     protected ragfairController: RagfairController;
     protected hideoutController: HideoutController;
-    constructor(httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, ragfairController: RagfairController, hideoutController: HideoutController);
+    constructor(httpResponse: HttpResponseUtil, timeUtil: TimeUtil, traderHelper: TraderHelper, databaseService: DatabaseService, ragfairController: RagfairController, hideoutController: HideoutController);
     /**
      * Handle client/settings
      * @returns ISettingsBase

types/callbacks/DialogueCallbacks.d.ts

@@ -1,31 +1,36 @@
-import { DialogueController } from "../controllers/DialogueController";
-import { OnUpdate } from "../di/OnUpdate";
-import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { IAcceptFriendRequestData, ICancelFriendRequestData } from "../models/eft/dialog/IAcceptFriendRequestData";
-import { IChatServer } from "../models/eft/dialog/IChatServer";
-import { IClearMailMessageRequest } from "../models/eft/dialog/IClearMailMessageRequest";
-import { IDeleteFriendRequest } from "../models/eft/dialog/IDeleteFriendRequest";
-import { IFriendRequestData } from "../models/eft/dialog/IFriendRequestData";
-import { IFriendRequestSendResponse } from "../models/eft/dialog/IFriendRequestSendResponse";
-import { IGetAllAttachmentsRequestData } from "../models/eft/dialog/IGetAllAttachmentsRequestData";
-import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachmentsResponse";
-import { IGetChatServerListRequestData } from "../models/eft/dialog/IGetChatServerListRequestData";
-import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse";
-import { IGetMailDialogInfoRequestData } from "../models/eft/dialog/IGetMailDialogInfoRequestData";
-import { IGetMailDialogListRequestData } from "../models/eft/dialog/IGetMailDialogListRequestData";
-import { IGetMailDialogViewRequestData } from "../models/eft/dialog/IGetMailDialogViewRequestData";
-import { IGetMailDialogViewResponseData } from "../models/eft/dialog/IGetMailDialogViewResponseData";
-import { IPinDialogRequestData } from "../models/eft/dialog/IPinDialogRequestData";
-import { IRemoveDialogRequestData } from "../models/eft/dialog/IRemoveDialogRequestData";
-import { IRemoveMailMessageRequest } from "../models/eft/dialog/IRemoveMailMessageRequest";
-import { ISendMessageRequest } from "../models/eft/dialog/ISendMessageRequest";
-import { ISetDialogReadRequestData } from "../models/eft/dialog/ISetDialogReadRequestData";
-import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { INullResponseData } from "../models/eft/httpResponse/INullResponseData";
-import { DialogueInfo } from "../models/eft/profile/IAkiProfile";
-import { HashUtil } from "../utils/HashUtil";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
-import { TimeUtil } from "../utils/TimeUtil";
+import { DialogueController } from "@spt/controllers/DialogueController";
+import { OnUpdate } from "@spt/di/OnUpdate";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IUIDRequestData } from "@spt/models/eft/common/request/IUIDRequestData";
+import { IAcceptFriendRequestData, ICancelFriendRequestData, IDeclineFriendRequestData } from "@spt/models/eft/dialog/IAcceptFriendRequestData";
+import { IAddUserGroupMailRequest } from "@spt/models/eft/dialog/IAddUserGroupMailRequest";
+import { IChangeGroupMailOwnerRequest } from "@spt/models/eft/dialog/IChangeGroupMailOwnerRequest";
+import { IChatServer } from "@spt/models/eft/dialog/IChatServer";
+import { IClearMailMessageRequest } from "@spt/models/eft/dialog/IClearMailMessageRequest";
+import { ICreateGroupMailRequest } from "@spt/models/eft/dialog/ICreateGroupMailRequest";
+import { IDeleteFriendRequest } from "@spt/models/eft/dialog/IDeleteFriendRequest";
+import { IFriendRequestData } from "@spt/models/eft/dialog/IFriendRequestData";
+import { IFriendRequestSendResponse } from "@spt/models/eft/dialog/IFriendRequestSendResponse";
+import { IGetAllAttachmentsRequestData } from "@spt/models/eft/dialog/IGetAllAttachmentsRequestData";
+import { IGetAllAttachmentsResponse } from "@spt/models/eft/dialog/IGetAllAttachmentsResponse";
+import { IGetChatServerListRequestData } from "@spt/models/eft/dialog/IGetChatServerListRequestData";
+import { IGetFriendListDataResponse } from "@spt/models/eft/dialog/IGetFriendListDataResponse";
+import { IGetMailDialogInfoRequestData } from "@spt/models/eft/dialog/IGetMailDialogInfoRequestData";
+import { IGetMailDialogListRequestData } from "@spt/models/eft/dialog/IGetMailDialogListRequestData";
+import { IGetMailDialogViewRequestData } from "@spt/models/eft/dialog/IGetMailDialogViewRequestData";
+import { IGetMailDialogViewResponseData } from "@spt/models/eft/dialog/IGetMailDialogViewResponseData";
+import { IPinDialogRequestData } from "@spt/models/eft/dialog/IPinDialogRequestData";
+import { IRemoveDialogRequestData } from "@spt/models/eft/dialog/IRemoveDialogRequestData";
+import { IRemoveMailMessageRequest } from "@spt/models/eft/dialog/IRemoveMailMessageRequest";
+import { IRemoveUserGroupMailRequest } from "@spt/models/eft/dialog/IRemoveUserGroupMailRequest";
+import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest";
+import { ISetDialogReadRequestData } from "@spt/models/eft/dialog/ISetDialogReadRequestData";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
+import { DialogueInfo } from "@spt/models/eft/profile/ISptProfile";
+import { HashUtil } from "@spt/utils/HashUtil";
+import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
+import { TimeUtil } from "@spt/utils/TimeUtil";
 export declare class DialogueCallbacks implements OnUpdate {
     protected hashUtil: HashUtil;
     protected timeUtil: TimeUtil;
@@ -60,7 +65,7 @@ export declare class DialogueCallbacks implements OnUpdate {
      * Handle client/mail/dialog/getAllAttachments
      * @returns IGetAllAttachmentsResponse
      */
-    getAllAttachments(url: string, info: IGetAllAttachmentsRequestData, sessionID: string): IGetBodyResponseData<IGetAllAttachmentsResponse>;
+    getAllAttachments(url: string, info: IGetAllAttachmentsRequestData, sessionID: string): IGetBodyResponseData<IGetAllAttachmentsResponse | undefined>;
     /** Handle client/mail/msg/send */
     sendMessage(url: string, request: ISendMessageRequest, sessionID: string): IGetBodyResponseData<string>;
     /** Handle client/friend/request/list/outbox */
@@ -73,10 +78,18 @@ export declare class DialogueCallbacks implements OnUpdate {
      * Handle client/friend/request/send
      */
     sendFriendRequest(url: string, request: IFriendRequestData, sessionID: string): IGetBodyResponseData<IFriendRequestSendResponse>;
+    /**
+     * Handle client/friend/request/accept-all
+     */
+    acceptAllFriendRequests(url: string, request: IEmptyRequestData, sessionID: string): INullResponseData;
     /**
      * Handle client/friend/request/accept
      */
     acceptFriendRequest(url: string, request: IAcceptFriendRequestData, sessionID: string): IGetBodyResponseData<boolean>;
+    /**
+     * Handle client/friend/request/decline
+     */
+    declineFriendRequest(url: string, request: IDeclineFriendRequestData, sessionID: string): IGetBodyResponseData<boolean>;
     /**
      * Handle client/friend/request/cancel
      */
@@ -84,15 +97,15 @@ export declare class DialogueCallbacks implements OnUpdate {
     /** Handle client/friend/delete */
     deleteFriend(url: string, request: IDeleteFriendRequest, sessionID: string): INullResponseData;
     /** Handle client/friend/ignore/set */
-    ignoreFriend(url: string, request: {
-        uid: string;
-    }, sessionID: string): any;
+    ignoreFriend(url: string, request: IUIDRequestData, sessionID: string): INullResponseData;
     /** Handle client/friend/ignore/remove */
-    unIgnoreFriend(url: string, request: {
-        uid: string;
-    }, sessionID: string): any;
+    unIgnoreFriend(url: string, request: IUIDRequestData, sessionID: string): INullResponseData;
     clearMail(url: string, request: IClearMailMessageRequest, sessionID: string): IGetBodyResponseData<any[]>;
     removeMail(url: string, request: IRemoveMailMessageRequest, sessionID: string): IGetBodyResponseData<any[]>;
+    createGroupMail(url: string, info: ICreateGroupMailRequest, sessionID: string): IGetBodyResponseData<any[]>;
+    changeMailGroupOwner(url: string, info: IChangeGroupMailOwnerRequest, sessionID: string): IGetBodyResponseData<any[]>;
+    addUserToMail(url: string, info: IAddUserGroupMailRequest, sessionID: string): IGetBodyResponseData<any[]>;
+    removeUserFromMail(url: string, info: IRemoveUserGroupMailRequest, sessionID: string): IGetBodyResponseData<any[]>;
     onUpdate(timeSinceLastRun: number): Promise<boolean>;
     getRoute(): string;
 }

types/callbacks/GameCallbacks.d.ts

@@ -1,26 +1,33 @@
-import { GameController } from "../controllers/GameController";
-import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { ICheckVersionResponse } from "../models/eft/game/ICheckVersionResponse";
-import { ICurrentGroupResponse } from "../models/eft/game/ICurrentGroupResponse";
-import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse";
-import { IGameEmptyCrcRequestData } from "../models/eft/game/IGameEmptyCrcRequestData";
-import { IGameKeepAliveResponse } from "../models/eft/game/IGameKeepAliveResponse";
-import { IGameLogoutResponseData } from "../models/eft/game/IGameLogoutResponseData";
-import { IGameStartResponse } from "../models/eft/game/IGameStartResponse";
-import { IReportNicknameRequestData } from "../models/eft/game/IReportNicknameRequestData";
-import { IServerDetails } from "../models/eft/game/IServerDetails";
-import { IVersionValidateRequestData } from "../models/eft/game/IVersionValidateRequestData";
-import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { INullResponseData } from "../models/eft/httpResponse/INullResponseData";
-import { SaveServer } from "../servers/SaveServer";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
-import { Watermark } from "../utils/Watermark";
-declare class GameCallbacks {
+import { GameController } from "@spt/controllers/GameController";
+import { OnLoad } from "@spt/di/OnLoad";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IUIDRequestData } from "@spt/models/eft/common/request/IUIDRequestData";
+import { ICheckVersionResponse } from "@spt/models/eft/game/ICheckVersionResponse";
+import { ICurrentGroupResponse } from "@spt/models/eft/game/ICurrentGroupResponse";
+import { IGameConfigResponse } from "@spt/models/eft/game/IGameConfigResponse";
+import { IGameEmptyCrcRequestData } from "@spt/models/eft/game/IGameEmptyCrcRequestData";
+import { IGameKeepAliveResponse } from "@spt/models/eft/game/IGameKeepAliveResponse";
+import { IGameLogoutResponseData } from "@spt/models/eft/game/IGameLogoutResponseData";
+import { IGameModeRequestData } from "@spt/models/eft/game/IGameModeRequestData";
+import { IGameModeResponse } from "@spt/models/eft/game/IGameModeResponse";
+import { IGameStartResponse } from "@spt/models/eft/game/IGameStartResponse";
+import { IGetRaidTimeRequest } from "@spt/models/eft/game/IGetRaidTimeRequest";
+import { IGetRaidTimeResponse } from "@spt/models/eft/game/IGetRaidTimeResponse";
+import { IServerDetails } from "@spt/models/eft/game/IServerDetails";
+import { IVersionValidateRequestData } from "@spt/models/eft/game/IVersionValidateRequestData";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
+import { SaveServer } from "@spt/servers/SaveServer";
+import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
+import { Watermark } from "@spt/utils/Watermark";
+export declare class GameCallbacks implements OnLoad {
     protected httpResponse: HttpResponseUtil;
     protected watermark: Watermark;
     protected saveServer: SaveServer;
     protected gameController: GameController;
     constructor(httpResponse: HttpResponseUtil, watermark: Watermark, saveServer: SaveServer, gameController: GameController);
+    onLoad(): Promise<void>;
+    getRoute(): string;
     /**
      * Handle client/game/version/validate
      * @returns INullResponseData
@@ -42,6 +49,11 @@ declare class GameCallbacks {
      * @returns IGameConfigResponse
      */
     getGameConfig(url: string, info: IGameEmptyCrcRequestData, sessionID: string): IGetBodyResponseData<IGameConfigResponse>;
+    /**
+     * Handle client/game/mode
+     * @returns IGameModeResponse
+     */
+    getGameMode(url: string, info: IGameModeRequestData, sessionID: string): IGetBodyResponseData<IGameModeResponse>;
     /**
      * Handle client/server/list
      */
@@ -64,6 +76,10 @@ declare class GameCallbacks {
      * @returns string
      */
     getVersion(url: string, info: IEmptyRequestData, sessionID: string): string;
-    reportNickname(url: string, info: IReportNicknameRequestData, sessionID: string): INullResponseData;
+    reportNickname(url: string, info: IUIDRequestData, sessionID: string): INullResponseData;
+    /**
+     * Handle singleplayer/settings/getRaidTime
+     * @returns string
+     */
+    getRaidTime(url: string, request: IGetRaidTimeRequest, sessionID: string): IGetRaidTimeResponse;
 }
-export { GameCallbacks };

types/callbacks/HandbookCallbacks.d.ts

@@ -1,5 +1,5 @@
-import { HandbookController } from "../controllers/HandbookController";
-import { OnLoad } from "../di/OnLoad";
+import { HandbookController } from "@spt/controllers/HandbookController";
+import { OnLoad } from "@spt/di/OnLoad";
 export declare class HandbookCallbacks implements OnLoad {
     protected handbookController: HandbookController;
     constructor(handbookController: HandbookController);

types/callbacks/HealthCallbacks.d.ts

@@ -1,21 +1,21 @@
-import { HealthController } from "../controllers/HealthController";
-import { ProfileHelper } from "../helpers/ProfileHelper";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { IHealthTreatmentRequestData } from "../models/eft/health/IHealthTreatmentRequestData";
-import { IOffraidEatRequestData } from "../models/eft/health/IOffraidEatRequestData";
-import { IOffraidHealRequestData } from "../models/eft/health/IOffraidHealRequestData";
-import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData";
-import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { IWorkoutData } from "../models/eft/health/IWorkoutData";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
+import { HealthController } from "@spt/controllers/HealthController";
+import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IHealthTreatmentRequestData } from "@spt/models/eft/health/IHealthTreatmentRequestData";
+import { IOffraidEatRequestData } from "@spt/models/eft/health/IOffraidEatRequestData";
+import { IOffraidHealRequestData } from "@spt/models/eft/health/IOffraidHealRequestData";
+import { ISyncHealthRequestData } from "@spt/models/eft/health/ISyncHealthRequestData";
+import { IWorkoutData } from "@spt/models/eft/health/IWorkoutData";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 export declare class HealthCallbacks {
     protected httpResponse: HttpResponseUtil;
     protected profileHelper: ProfileHelper;
     protected healthController: HealthController;
     constructor(httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, healthController: HealthController);
     /**
-     * Custom aki server request found in modules/HealthSynchronizer.cs
+     * Custom spt server request found in modules/HealthSynchronizer.cs
      * @param url
      * @param info HealthListener.Instance.CurrentHealth class
      * @param sessionID session id
@@ -23,7 +23,7 @@ export declare class HealthCallbacks {
      */
     syncHealth(url: string, info: ISyncHealthRequestData, sessionID: string): IGetBodyResponseData<string>;
     /**
-     * Custom aki server request found in modules/QTEPatch.cs
+     * Custom spt server request found in modules/QTEPatch.cs
      * @param url
      * @param info HealthListener.Instance.CurrentHealth class
      * @param sessionID session id

types/callbacks/HideoutCallbacks.d.ts

@@ -1,21 +1,22 @@
-import { HideoutController } from "../controllers/HideoutController";
-import { OnUpdate } from "../di/OnUpdate";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { IHandleQTEEventRequestData } from "../models/eft/hideout/IHandleQTEEventRequestData";
-import { IHideoutContinuousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinuousProductionStartRequestData";
-import { IHideoutImproveAreaRequestData } from "../models/eft/hideout/IHideoutImproveAreaRequestData";
-import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData";
-import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData";
-import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData";
-import { IHideoutTakeItemOutRequestData } from "../models/eft/hideout/IHideoutTakeItemOutRequestData";
-import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData";
-import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutToggleAreaRequestData";
-import { IHideoutUpgradeCompleteRequestData } from "../models/eft/hideout/IHideoutUpgradeCompleteRequestData";
-import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData";
-import { IRecordShootingRangePoints } from "../models/eft/hideout/IRecordShootingRangePoints";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { IHideoutConfig } from "../models/spt/config/IHideoutConfig";
-import { ConfigServer } from "../servers/ConfigServer";
+import { HideoutController } from "@spt/controllers/HideoutController";
+import { OnUpdate } from "@spt/di/OnUpdate";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IHandleQTEEventRequestData } from "@spt/models/eft/hideout/IHandleQTEEventRequestData";
+import { IHideoutCancelProductionRequestData } from "@spt/models/eft/hideout/IHideoutCancelProductionRequestData";
+import { IHideoutContinuousProductionStartRequestData } from "@spt/models/eft/hideout/IHideoutContinuousProductionStartRequestData";
+import { IHideoutImproveAreaRequestData } from "@spt/models/eft/hideout/IHideoutImproveAreaRequestData";
+import { IHideoutPutItemInRequestData } from "@spt/models/eft/hideout/IHideoutPutItemInRequestData";
+import { IHideoutScavCaseStartRequestData } from "@spt/models/eft/hideout/IHideoutScavCaseStartRequestData";
+import { IHideoutSingleProductionStartRequestData } from "@spt/models/eft/hideout/IHideoutSingleProductionStartRequestData";
+import { IHideoutTakeItemOutRequestData } from "@spt/models/eft/hideout/IHideoutTakeItemOutRequestData";
+import { IHideoutTakeProductionRequestData } from "@spt/models/eft/hideout/IHideoutTakeProductionRequestData";
+import { IHideoutToggleAreaRequestData } from "@spt/models/eft/hideout/IHideoutToggleAreaRequestData";
+import { IHideoutUpgradeCompleteRequestData } from "@spt/models/eft/hideout/IHideoutUpgradeCompleteRequestData";
+import { IHideoutUpgradeRequestData } from "@spt/models/eft/hideout/IHideoutUpgradeRequestData";
+import { IRecordShootingRangePoints } from "@spt/models/eft/hideout/IRecordShootingRangePoints";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig";
+import { ConfigServer } from "@spt/servers/ConfigServer";
 export declare class HideoutCallbacks implements OnUpdate {
     protected hideoutController: HideoutController;
     protected configServer: ConfigServer;
@@ -25,11 +26,11 @@ export declare class HideoutCallbacks implements OnUpdate {
     /**
      * Handle HideoutUpgrade event
      */
-    upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse;
+    upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse;
     /**
      * Handle HideoutUpgradeComplete event
      */
-    upgradeComplete(pmcData: IPmcData, body: IHideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse;
+    upgradeComplete(pmcData: IPmcData, body: IHideoutUpgradeCompleteRequestData, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse;
     /**
      * Handle HideoutPutItemsInAreaSlots
      */
@@ -61,15 +62,19 @@ export declare class HideoutCallbacks implements OnUpdate {
     /**
      * Handle HideoutQuickTimeEvent
      */
-    handleQTEEvent(pmcData: IPmcData, request: IHandleQTEEventRequestData, sessionId: string): IItemEventRouterResponse;
+    handleQTEEvent(pmcData: IPmcData, request: IHandleQTEEventRequestData, sessionId: string, output: IItemEventRouterResponse): IItemEventRouterResponse;
     /**
      * Handle client/game/profile/items/moving - RecordShootingRangePoints
      */
-    recordShootingRangePoints(pmcData: IPmcData, request: IRecordShootingRangePoints, sessionId: string): IItemEventRouterResponse;
+    recordShootingRangePoints(pmcData: IPmcData, request: IRecordShootingRangePoints, sessionId: string, output: IItemEventRouterResponse): IItemEventRouterResponse;
     /**
      * Handle client/game/profile/items/moving - RecordShootingRangePoints
      */
     improveArea(pmcData: IPmcData, request: IHideoutImproveAreaRequestData, sessionId: string): IItemEventRouterResponse;
+    /**
+     * Handle client/game/profile/items/moving - HideoutCancelProductionCommand
+     */
+    cancelProduction(pmcData: IPmcData, request: IHideoutCancelProductionRequestData, sessionId: string): IItemEventRouterResponse;
     onUpdate(timeSinceLastRun: number): Promise<boolean>;
     getRoute(): string;
 }

types/callbacks/HttpCallbacks.d.ts

@@ -1,5 +1,5 @@
-import { OnLoad } from "../di/OnLoad";
-import { HttpServer } from "../servers/HttpServer";
+import { OnLoad } from "@spt/di/OnLoad";
+import { HttpServer } from "@spt/servers/HttpServer";
 export declare class HttpCallbacks implements OnLoad {
     protected httpServer: HttpServer;
     constructor(httpServer: HttpServer);

types/callbacks/InraidCallbacks.d.ts

@@ -1,8 +1,10 @@
-import { InraidController } from "../controllers/InraidController";
-import { INullResponseData } from "../models/eft/httpResponse/INullResponseData";
-import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData";
-import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
+import { InraidController } from "@spt/controllers/InraidController";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
+import { IItemDeliveryRequestData } from "@spt/models/eft/inRaid/IItemDeliveryRequestData";
+import { IRegisterPlayerRequestData } from "@spt/models/eft/inRaid/IRegisterPlayerRequestData";
+import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRequestData";
+import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 /**
  * Handle client requests
  */
@@ -37,14 +39,25 @@ export declare class InraidCallbacks {
      * @returns JSON as string
      */
     getRaidMenuSettings(): string;
-    /**
-     * Handle singleplayer/settings/weapon/durability
-     * @returns
-     */
-    getWeaponDurability(): string;
     /**
      * Handle singleplayer/airdrop/config
      * @returns JSON as string
      */
     getAirdropConfig(): string;
+    /**
+     * Handle singleplayer/btr/config
+     * @returns JSON as string
+     */
+    getBTRConfig(): string;
+    /**
+     * Handle singleplayer/traderServices/getTraderServices
+     */
+    getTraderServices(url: string, info: IEmptyRequestData, sessionId: string): string;
+    /**
+     * Handle singleplayer/traderServices/itemDelivery
+     */
+    itemDelivery(url: string, request: IItemDeliveryRequestData, sessionId: string): INullResponseData;
+    getTraitorScavHostileChance(url: string, info: IEmptyRequestData, sessionId: string): string;
+    getSandboxMaxPatrolValue(url: string, info: IEmptyRequestData, sessionId: string): string;
+    getBossConvertSettings(url: string, info: IEmptyRequestData, sessionId: string): string;
 }

types/callbacks/InsuranceCallbacks.d.ts

@@ -1,15 +1,15 @@
-import { InsuranceController } from "../controllers/InsuranceController";
-import { OnUpdate } from "../di/OnUpdate";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData";
-import { IGetInsuranceCostResponseData } from "../models/eft/insurance/IGetInsuranceCostResponseData";
-import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { IInsuranceConfig } from "../models/spt/config/IInsuranceConfig";
-import { ConfigServer } from "../servers/ConfigServer";
-import { InsuranceService } from "../services/InsuranceService";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
+import { InsuranceController } from "@spt/controllers/InsuranceController";
+import { OnUpdate } from "@spt/di/OnUpdate";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { IGetInsuranceCostRequestData } from "@spt/models/eft/insurance/IGetInsuranceCostRequestData";
+import { IGetInsuranceCostResponseData } from "@spt/models/eft/insurance/IGetInsuranceCostResponseData";
+import { IInsureRequestData } from "@spt/models/eft/insurance/IInsureRequestData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IInsuranceConfig } from "@spt/models/spt/config/IInsuranceConfig";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { InsuranceService } from "@spt/services/InsuranceService";
+import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 export declare class InsuranceCallbacks implements OnUpdate {
     protected insuranceController: InsuranceController;
     protected insuranceService: InsuranceService;

types/callbacks/InventoryCallbacks.d.ts

@@ -1,45 +1,61 @@
-import { InventoryController } from "../controllers/InventoryController";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { IInventoryBindRequestData } from "../models/eft/inventory/IInventoryBindRequestData";
-import { IInventoryCreateMarkerRequestData } from "../models/eft/inventory/IInventoryCreateMarkerRequestData";
-import { IInventoryDeleteMarkerRequestData } from "../models/eft/inventory/IInventoryDeleteMarkerRequestData";
-import { IInventoryEditMarkerRequestData } from "../models/eft/inventory/IInventoryEditMarkerRequestData";
-import { IInventoryExamineRequestData } from "../models/eft/inventory/IInventoryExamineRequestData";
-import { IInventoryFoldRequestData } from "../models/eft/inventory/IInventoryFoldRequestData";
-import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData";
-import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData";
-import { IInventoryReadEncyclopediaRequestData } from "../models/eft/inventory/IInventoryReadEncyclopediaRequestData";
-import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData";
-import { IInventorySortRequestData } from "../models/eft/inventory/IInventorySortRequestData";
-import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData";
-import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwapRequestData";
-import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData";
-import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData";
-import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData";
-import { IOpenRandomLootContainerRequestData } from "../models/eft/inventory/IOpenRandomLootContainerRequestData";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
+import { InventoryController } from "@spt/controllers/InventoryController";
+import { QuestController } from "@spt/controllers/QuestController";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IInventoryBindRequestData } from "@spt/models/eft/inventory/IInventoryBindRequestData";
+import { IInventoryCreateMarkerRequestData } from "@spt/models/eft/inventory/IInventoryCreateMarkerRequestData";
+import { IInventoryDeleteMarkerRequestData } from "@spt/models/eft/inventory/IInventoryDeleteMarkerRequestData";
+import { IInventoryEditMarkerRequestData } from "@spt/models/eft/inventory/IInventoryEditMarkerRequestData";
+import { IInventoryExamineRequestData } from "@spt/models/eft/inventory/IInventoryExamineRequestData";
+import { IInventoryFoldRequestData } from "@spt/models/eft/inventory/IInventoryFoldRequestData";
+import { IInventoryMergeRequestData } from "@spt/models/eft/inventory/IInventoryMergeRequestData";
+import { IInventoryMoveRequestData } from "@spt/models/eft/inventory/IInventoryMoveRequestData";
+import { IInventoryReadEncyclopediaRequestData } from "@spt/models/eft/inventory/IInventoryReadEncyclopediaRequestData";
+import { IInventoryRemoveRequestData } from "@spt/models/eft/inventory/IInventoryRemoveRequestData";
+import { IInventorySortRequestData } from "@spt/models/eft/inventory/IInventorySortRequestData";
+import { IInventorySplitRequestData } from "@spt/models/eft/inventory/IInventorySplitRequestData";
+import { IInventorySwapRequestData } from "@spt/models/eft/inventory/IInventorySwapRequestData";
+import { IInventoryTagRequestData } from "@spt/models/eft/inventory/IInventoryTagRequestData";
+import { IInventoryToggleRequestData } from "@spt/models/eft/inventory/IInventoryToggleRequestData";
+import { IInventoryTransferRequestData } from "@spt/models/eft/inventory/IInventoryTransferRequestData";
+import { IOpenRandomLootContainerRequestData } from "@spt/models/eft/inventory/IOpenRandomLootContainerRequestData";
+import { IRedeemProfileRequestData } from "@spt/models/eft/inventory/IRedeemProfileRequestData";
+import { ISetFavoriteItems } from "@spt/models/eft/inventory/ISetFavoriteItems";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IFailQuestRequestData } from "@spt/models/eft/quests/IFailQuestRequestData";
 export declare class InventoryCallbacks {
     protected inventoryController: InventoryController;
-    constructor(inventoryController: InventoryController);
-    moveItem(pmcData: IPmcData, body: IInventoryMoveRequestData, sessionID: string): IItemEventRouterResponse;
-    removeItem(pmcData: IPmcData, body: IInventoryRemoveRequestData, sessionID: string): IItemEventRouterResponse;
-    splitItem(pmcData: IPmcData, body: IInventorySplitRequestData, sessionID: string): IItemEventRouterResponse;
-    mergeItem(pmcData: IPmcData, body: IInventoryMergeRequestData, sessionID: string): IItemEventRouterResponse;
-    transferItem(pmcData: IPmcData, body: IInventoryTransferRequestData, sessionID: string): IItemEventRouterResponse;
+    protected questController: QuestController;
+    constructor(inventoryController: InventoryController, questController: QuestController);
+    /** Handle client/game/profile/items/moving Move event */
+    moveItem(pmcData: IPmcData, body: IInventoryMoveRequestData, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse;
+    /** Handle Remove event */
+    removeItem(pmcData: IPmcData, body: IInventoryRemoveRequestData, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse;
+    /** Handle Split event */
+    splitItem(pmcData: IPmcData, body: IInventorySplitRequestData, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse;
+    mergeItem(pmcData: IPmcData, body: IInventoryMergeRequestData, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse;
+    transferItem(pmcData: IPmcData, request: IInventoryTransferRequestData, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse;
     /** Handle Swap */
     swapItem(pmcData: IPmcData, body: IInventorySwapRequestData, sessionID: string): IItemEventRouterResponse;
     foldItem(pmcData: IPmcData, body: IInventoryFoldRequestData, sessionID: string): IItemEventRouterResponse;
     toggleItem(pmcData: IPmcData, body: IInventoryToggleRequestData, sessionID: string): IItemEventRouterResponse;
     tagItem(pmcData: IPmcData, body: IInventoryTagRequestData, sessionID: string): IItemEventRouterResponse;
-    bindItem(pmcData: IPmcData, body: IInventoryBindRequestData, sessionID: string): IItemEventRouterResponse;
-    examineItem(pmcData: IPmcData, body: IInventoryExamineRequestData, sessionID: string): IItemEventRouterResponse;
+    bindItem(pmcData: IPmcData, body: IInventoryBindRequestData, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse;
+    unbindItem(pmcData: IPmcData, body: IInventoryBindRequestData, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse;
+    examineItem(pmcData: IPmcData, body: IInventoryExamineRequestData, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse;
     /** Handle ReadEncyclopedia */
     readEncyclopedia(pmcData: IPmcData, body: IInventoryReadEncyclopediaRequestData, sessionID: string): IItemEventRouterResponse;
     /** Handle ApplyInventoryChanges */
-    sortInventory(pmcData: IPmcData, body: IInventorySortRequestData, sessionID: string): IItemEventRouterResponse;
-    createMapMarker(pmcData: IPmcData, body: IInventoryCreateMarkerRequestData, sessionID: string): IItemEventRouterResponse;
-    deleteMapMarker(pmcData: IPmcData, body: IInventoryDeleteMarkerRequestData, sessionID: string): IItemEventRouterResponse;
-    editMapMarker(pmcData: IPmcData, body: IInventoryEditMarkerRequestData, sessionID: string): IItemEventRouterResponse;
+    sortInventory(pmcData: IPmcData, body: IInventorySortRequestData, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse;
+    createMapMarker(pmcData: IPmcData, body: IInventoryCreateMarkerRequestData, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse;
+    deleteMapMarker(pmcData: IPmcData, body: IInventoryDeleteMarkerRequestData, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse;
+    editMapMarker(pmcData: IPmcData, body: IInventoryEditMarkerRequestData, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse;
     /** Handle OpenRandomLootContainer */
-    openRandomLootContainer(pmcData: IPmcData, body: IOpenRandomLootContainerRequestData, sessionID: string): IItemEventRouterResponse;
+    openRandomLootContainer(pmcData: IPmcData, body: IOpenRandomLootContainerRequestData, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse;
+    redeemProfileReward(pmcData: IPmcData, body: IRedeemProfileRequestData, sessionId: string, output: IItemEventRouterResponse): IItemEventRouterResponse;
+    setFavoriteItem(pmcData: IPmcData, body: ISetFavoriteItems, sessionId: string, output: IItemEventRouterResponse): IItemEventRouterResponse;
+    /**
+     * TODO - MOVE INTO QUEST CODE
+     * Handle game/profile/items/moving - QuestFail
+     */
+    failQuest(pmcData: IPmcData, request: IFailQuestRequestData, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse;
 }

types/callbacks/ItemEventCallbacks.d.ts

@@ -1,13 +1,19 @@
-import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { Warning } from "../models/eft/itemEvent/IItemEventRouterBase";
-import { IItemEventRouterRequest } from "../models/eft/itemEvent/IItemEventRouterRequest";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { ItemEventRouter } from "../routers/ItemEventRouter";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { Warning } from "@spt/models/eft/itemEvent/IItemEventRouterBase";
+import { IItemEventRouterRequest } from "@spt/models/eft/itemEvent/IItemEventRouterRequest";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { ItemEventRouter } from "@spt/routers/ItemEventRouter";
+import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 export declare class ItemEventCallbacks {
     protected httpResponse: HttpResponseUtil;
     protected itemEventRouter: ItemEventRouter;
     constructor(httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter);
-    handleEvents(url: string, info: IItemEventRouterRequest, sessionID: string): IGetBodyResponseData<IItemEventRouterResponse>;
+    handleEvents(url: string, info: IItemEventRouterRequest, sessionID: string): Promise<IGetBodyResponseData<IItemEventRouterResponse>>;
+    /**
+     * Return true if the passed in list of warnings contains critical issues
+     * @param warnings The list of warnings to check for critical errors
+     * @returns
+     */
+    private isCriticalError;
     protected getErrorCode(warnings: Warning[]): number;
 }

types/callbacks/LauncherCallbacks.d.ts

@@ -1,13 +1,13 @@
-import { LauncherController } from "../controllers/LauncherController";
-import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { IChangeRequestData } from "../models/eft/launcher/IChangeRequestData";
-import { ILoginRequestData } from "../models/eft/launcher/ILoginRequestData";
-import { IRegisterData } from "../models/eft/launcher/IRegisterData";
-import { IRemoveProfileData } from "../models/eft/launcher/IRemoveProfileData";
-import { SaveServer } from "../servers/SaveServer";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
-import { Watermark } from "../utils/Watermark";
-declare class LauncherCallbacks {
+import { LauncherController } from "@spt/controllers/LauncherController";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IChangeRequestData } from "@spt/models/eft/launcher/IChangeRequestData";
+import { ILoginRequestData } from "@spt/models/eft/launcher/ILoginRequestData";
+import { IRegisterData } from "@spt/models/eft/launcher/IRegisterData";
+import { IRemoveProfileData } from "@spt/models/eft/launcher/IRemoveProfileData";
+import { SaveServer } from "@spt/servers/SaveServer";
+import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
+import { Watermark } from "@spt/utils/Watermark";
+export declare class LauncherCallbacks {
     protected httpResponse: HttpResponseUtil;
     protected launcherController: LauncherController;
     protected saveServer: SaveServer;
@@ -24,5 +24,6 @@ declare class LauncherCallbacks {
     ping(url: string, info: IEmptyRequestData, sessionID: string): string;
     removeProfile(url: string, info: IRemoveProfileData, sessionID: string): string;
     getCompatibleTarkovVersion(): string;
+    getLoadedServerMods(): string;
+    getServerModsProfileUsed(url: string, info: IEmptyRequestData, sessionId: string): string;
 }
-export { LauncherCallbacks };

types/callbacks/LocationCallbacks.d.ts

@@ -1,10 +1,10 @@
-import { LocationController } from "../controllers/LocationController";
-import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { ILocationBase } from "../models/eft/common/ILocationBase";
-import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSourceDestinationBase";
-import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { IGetLocationRequestData } from "../models/eft/location/IGetLocationRequestData";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
+import { LocationController } from "@spt/controllers/LocationController";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { ILocationBase } from "@spt/models/eft/common/ILocationBase";
+import { ILocationsGenerateAllResponse } from "@spt/models/eft/common/ILocationsSourceDestinationBase";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { IGetLocationRequestData } from "@spt/models/eft/location/IGetLocationRequestData";
+import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 export declare class LocationCallbacks {
     protected httpResponse: HttpResponseUtil;
     protected locationController: LocationController;

types/callbacks/MatchCallbacks.d.ts

@@ -1,73 +1,76 @@
-import { MatchController } from "../controllers/MatchController";
-import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { INullResponseData } from "../models/eft/httpResponse/INullResponseData";
-import { IAcceptGroupInviteRequest } from "../models/eft/match/IAcceptGroupInviteRequest";
-import { IAcceptGroupInviteResponse } from "../models/eft/match/IAcceptGroupInviteResponse";
-import { ICancelGroupInviteRequest } from "../models/eft/match/ICancelGroupInviteRequest";
-import { ICreateGroupRequestData } from "../models/eft/match/ICreateGroupRequestData";
-import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData";
-import { IGetGroupStatusRequestData } from "../models/eft/match/IGetGroupStatusRequestData";
-import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData";
-import { IGetRaidConfigurationRequestData } from "../models/eft/match/IGetRaidConfigurationRequestData";
-import { IJoinMatchRequestData } from "../models/eft/match/IJoinMatchRequestData";
-import { IJoinMatchResult } from "../models/eft/match/IJoinMatchResult";
-import { IPutMetricsRequestData } from "../models/eft/match/IPutMetricsRequestData";
-import { IRemovePlayerFromGroupRequest } from "../models/eft/match/IRemovePlayerFromGroupRequest";
-import { ISendGroupInviteRequest } from "../models/eft/match/ISendGroupInviteRequest";
-import { ITransferGroupRequest } from "../models/eft/match/ITransferGroupRequest";
-import { IUpdatePingRequestData } from "../models/eft/match/IUpdatePingRequestData";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
-import { JsonUtil } from "../utils/JsonUtil";
+import { MatchController } from "@spt/controllers/MatchController";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
+import { IEndOfflineRaidRequestData } from "@spt/models/eft/match/IEndOfflineRaidRequestData";
+import { IGetRaidConfigurationRequestData } from "@spt/models/eft/match/IGetRaidConfigurationRequestData";
+import { IGroupCharacter } from "@spt/models/eft/match/IGroupCharacter";
+import { IMatchGroupCurrentResponse } from "@spt/models/eft/match/IMatchGroupCurrentResponse";
+import { IMatchGroupInviteSendRequest } from "@spt/models/eft/match/IMatchGroupInviteSendRequest";
+import { IMatchGroupPlayerRemoveRequest } from "@spt/models/eft/match/IMatchGroupPlayerRemoveRequest";
+import { IMatchGroupStartGameRequest } from "@spt/models/eft/match/IMatchGroupStartGameRequest";
+import { IMatchGroupStatusRequest } from "@spt/models/eft/match/IMatchGroupStatusRequest";
+import { IMatchGroupStatusResponse } from "@spt/models/eft/match/IMatchGroupStatusResponse";
+import { IMatchGroupTransferRequest } from "@spt/models/eft/match/IMatchGroupTransferRequest";
+import { IProfileStatusResponse } from "@spt/models/eft/match/IProfileStatusResponse";
+import { IPutMetricsRequestData } from "@spt/models/eft/match/IPutMetricsRequestData";
+import { IRequestIdRequest } from "@spt/models/eft/match/IRequestIdRequest";
+import { IUpdatePingRequestData } from "@spt/models/eft/match/IUpdatePingRequestData";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
+import { JsonUtil } from "@spt/utils/JsonUtil";
 export declare class MatchCallbacks {
     protected httpResponse: HttpResponseUtil;
     protected jsonUtil: JsonUtil;
     protected matchController: MatchController;
-    protected databaseServer: DatabaseServer;
-    constructor(httpResponse: HttpResponseUtil, jsonUtil: JsonUtil, matchController: MatchController, databaseServer: DatabaseServer);
+    protected databaseService: DatabaseService;
+    constructor(httpResponse: HttpResponseUtil, jsonUtil: JsonUtil, matchController: MatchController, databaseService: DatabaseService);
     /** Handle client/match/updatePing */
     updatePing(url: string, info: IUpdatePingRequestData, sessionID: string): INullResponseData;
     exitMatch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData;
     /** Handle client/match/group/exit_from_menu */
     exitToMenu(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData;
+    groupCurrent(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IMatchGroupCurrentResponse>;
     startGroupSearch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData;
     stopGroupSearch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData;
     /** Handle client/match/group/invite/send */
-    sendGroupInvite(url: string, info: ISendGroupInviteRequest, sessionID: string): IGetBodyResponseData<string>;
+    sendGroupInvite(url: string, info: IMatchGroupInviteSendRequest, sessionID: string): IGetBodyResponseData<string>;
     /** Handle client/match/group/invite/accept */
-    acceptGroupInvite(url: string, info: IAcceptGroupInviteRequest, sessionID: string): IGetBodyResponseData<IAcceptGroupInviteResponse[]>;
+    acceptGroupInvite(url: string, info: IRequestIdRequest, sessionId: string): IGetBodyResponseData<IGroupCharacter[]>;
+    /** Handle client/match/group/invite/decline */
+    declineGroupInvite(url: string, info: IRequestIdRequest, sessionId: string): IGetBodyResponseData<boolean>;
     /** Handle client/match/group/invite/cancel */
-    cancelGroupInvite(url: string, info: ICancelGroupInviteRequest, sessionID: string): IGetBodyResponseData<boolean>;
+    cancelGroupInvite(url: string, info: IRequestIdRequest, sessionID: string): IGetBodyResponseData<boolean>;
     /** Handle client/match/group/transfer */
-    transferGroup(url: string, info: ITransferGroupRequest, sessionID: string): IGetBodyResponseData<boolean>;
+    transferGroup(url: string, info: IMatchGroupTransferRequest, sessionId: string): IGetBodyResponseData<boolean>;
     /** Handle client/match/group/invite/cancel-all */
-    cancelAllGroupInvite(url: string, info: any, sessionID: string): INullResponseData;
+    cancelAllGroupInvite(url: string, info: IEmptyRequestData, sessionId: string): IGetBodyResponseData<boolean>;
     /** @deprecated - not called on raid start/end or game start/exit */
-    putMetrics(url: string, info: IPutMetricsRequestData, sessionID: string): INullResponseData;
-    /** Handle raid/profile/list */
-    getProfile(url: string, info: IGetProfileRequestData, sessionID: string): IGetBodyResponseData<IPmcData[]>;
-    serverAvailable(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<boolean>;
+    putMetrics(url: string, info: IPutMetricsRequestData, sessionId: string): INullResponseData;
+    serverAvailable(url: string, info: IEmptyRequestData, sessionId: string): IGetBodyResponseData<boolean>;
     /** Handle match/group/start_game */
-    joinMatch(url: string, info: IJoinMatchRequestData, sessionID: string): IGetBodyResponseData<IJoinMatchResult>;
+    joinMatch(url: string, info: IMatchGroupStartGameRequest, sessionID: string): IGetBodyResponseData<IProfileStatusResponse>;
     /** Handle client/getMetricsConfig */
     getMetrics(url: string, info: any, sessionID: string): IGetBodyResponseData<string>;
     /**
-     * @deprecated - not called on raid start/end or game start/exit
+     * Called periodically while in a group
      * Handle client/match/group/status
      * @returns
      */
-    getGroupStatus(url: string, info: IGetGroupStatusRequestData, sessionID: string): IGetBodyResponseData<any>;
-    /** Handle client/match/group/create */
-    createGroup(url: string, info: ICreateGroupRequestData, sessionID: string): IGetBodyResponseData<any>;
+    getGroupStatus(url: string, info: IMatchGroupStatusRequest, sessionID: string): IGetBodyResponseData<IMatchGroupStatusResponse>;
     /** Handle client/match/group/delete */
-    deleteGroup(url: string, info: any, sessionID: string): INullResponseData;
+    deleteGroup(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<boolean>;
     leaveGroup(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<boolean>;
     /** Handle client/match/group/player/remove */
-    removePlayerFromGroup(url: string, info: IRemovePlayerFromGroupRequest, sessionID: string): INullResponseData;
+    removePlayerFromGroup(url: string, info: IMatchGroupPlayerRemoveRequest, sessionID: string): IGetBodyResponseData<boolean>;
     /** Handle client/match/offline/end */
     endOfflineRaid(url: string, info: IEndOfflineRaidRequestData, sessionID: string): INullResponseData;
     /** Handle client/raid/configuration */
     getRaidConfiguration(url: string, info: IGetRaidConfigurationRequestData, sessionID: string): INullResponseData;
+    /** Handle client/raid/configuration-by-profile */
+    getConfigurationByProfile(url: string, info: IGetRaidConfigurationRequestData, sessionID: string): INullResponseData;
+    /** Handle client/match/group/raid/ready */
+    raidReady(url: string, info: IEmptyRequestData, sessionId: string): IGetBodyResponseData<boolean>;
+    /** Handle client/match/group/raid/not-ready */
+    notRaidReady(url: string, info: IEmptyRequestData, sessionId: string): IGetBodyResponseData<boolean>;
 }

types/callbacks/ModCallbacks.d.ts

@@ -1,21 +1,20 @@
-import { OnLoad } from "../di/OnLoad";
-import { PostAkiModLoader } from "../loaders/PostAkiModLoader";
-import { IHttpConfig } from "../models/spt/config/IHttpConfig";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { ConfigServer } from "../servers/ConfigServer";
-import { LocalisationService } from "../services/LocalisationService";
-import { HttpFileUtil } from "../utils/HttpFileUtil";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
-declare class ModCallbacks implements OnLoad {
+import { OnLoad } from "@spt/di/OnLoad";
+import { PostSptModLoader } from "@spt/loaders/PostSptModLoader";
+import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { LocalisationService } from "@spt/services/LocalisationService";
+import { HttpFileUtil } from "@spt/utils/HttpFileUtil";
+import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
+export declare class ModCallbacks implements OnLoad {
     protected logger: ILogger;
     protected httpResponse: HttpResponseUtil;
     protected httpFileUtil: HttpFileUtil;
-    protected postAkiModLoader: PostAkiModLoader;
+    protected postSptModLoader: PostSptModLoader;
     protected localisationService: LocalisationService;
     protected configServer: ConfigServer;
     protected httpConfig: IHttpConfig;
-    constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpFileUtil: HttpFileUtil, postAkiModLoader: PostAkiModLoader, localisationService: LocalisationService, configServer: ConfigServer);
+    constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpFileUtil: HttpFileUtil, postSptModLoader: PostSptModLoader, localisationService: LocalisationService, configServer: ConfigServer);
     onLoad(): Promise<void>;
     getRoute(): string;
 }
-export { ModCallbacks };

types/callbacks/NoteCallbacks.d.ts

@@ -1,7 +1,7 @@
-import { NoteController } from "../controllers/NoteController";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { INoteActionData } from "../models/eft/notes/INoteActionData";
+import { NoteController } from "@spt/controllers/NoteController";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { INoteActionData } from "@spt/models/eft/notes/INoteActionData";
 export declare class NoteCallbacks {
     protected noteController: NoteController;
     constructor(noteController: NoteController);

types/callbacks/NotifierCallbacks.d.ts

@@ -1,16 +1,18 @@
-import { NotifierController } from "../controllers/NotifierController";
-import { HttpServerHelper } from "../helpers/HttpServerHelper";
-import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { INotifierChannel } from "../models/eft/notifier/INotifier";
-import { ISelectProfileRequestData } from "../models/eft/notifier/ISelectProfileRequestData";
-import { ISelectProfileResponse } from "../models/eft/notifier/ISelectProfileResponse";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
+import { NotifierController } from "@spt/controllers/NotifierController";
+import { HttpServerHelper } from "@spt/helpers/HttpServerHelper";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IUIDRequestData } from "@spt/models/eft/common/request/IUIDRequestData";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { INotifierChannel } from "@spt/models/eft/notifier/INotifier";
+import { ISelectProfileResponse } from "@spt/models/eft/notifier/ISelectProfileResponse";
+import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
+import { JsonUtil } from "@spt/utils/JsonUtil";
 export declare class NotifierCallbacks {
     protected httpServerHelper: HttpServerHelper;
     protected httpResponse: HttpResponseUtil;
+    protected jsonUtil: JsonUtil;
     protected notifierController: NotifierController;
-    constructor(httpServerHelper: HttpServerHelper, httpResponse: HttpResponseUtil, notifierController: NotifierController);
+    constructor(httpServerHelper: HttpServerHelper, httpResponse: HttpResponseUtil, jsonUtil: JsonUtil, notifierController: NotifierController);
     /**
      * If we don't have anything to send, it's ok to not send anything back
      * because notification requests can be long-polling. In fact, we SHOULD wait
@@ -27,6 +29,6 @@ export declare class NotifierCallbacks {
      * Handle client/game/profile/select
      * @returns ISelectProfileResponse
      */
-    selectProfile(url: string, info: ISelectProfileRequestData, sessionID: string): IGetBodyResponseData<ISelectProfileResponse>;
+    selectProfile(url: string, info: IUIDRequestData, sessionID: string): IGetBodyResponseData<ISelectProfileResponse>;
     notify(url: string, info: any, sessionID: string): string;
 }

types/callbacks/PresetBuildCallbacks.d.ts

@@ -1,19 +0,0 @@
-import { PresetBuildController } from "../controllers/PresetBuildController";
-import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { IPresetBuildActionRequestData } from "../models/eft/presetBuild/IPresetBuildActionRequestData";
-import { WeaponBuild } from "../models/eft/profile/IAkiProfile";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
-export declare class PresetBuildCallbacks {
-    protected httpResponse: HttpResponseUtil;
-    protected presetBuildController: PresetBuildController;
-    constructor(httpResponse: HttpResponseUtil, presetBuildController: PresetBuildController);
-    /** Handle client/handbook/builds/my/list */
-    getHandbookUserlist(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<WeaponBuild[]>;
-    /** Handle SaveBuild event */
-    saveBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse;
-    /** Handle RemoveBuild event*/
-    removeBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse;
-}

types/callbacks/PresetCallbacks.d.ts

@@ -1,5 +1,5 @@
-import { PresetController } from "../controllers/PresetController";
-import { OnLoad } from "../di/OnLoad";
+import { PresetController } from "@spt/controllers/PresetController";
+import { OnLoad } from "@spt/di/OnLoad";
 export declare class PresetCallbacks implements OnLoad {
     protected presetController: PresetController;
     constructor(presetController: PresetController);

types/callbacks/ProfileCallbacks.d.ts

@@ -1,29 +1,34 @@
-import { ProfileController } from "../controllers/ProfileController";
-import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { INullResponseData } from "../models/eft/httpResponse/INullResponseData";
-import { IGetMiniProfileRequestData } from "../models/eft/launcher/IGetMiniProfileRequestData";
-import { GetProfileStatusResponseData } from "../models/eft/profile/GetProfileStatusResponseData";
-import { IGetProfileSettingsRequest } from "../models/eft/profile/IGetProfileSettingsRequest";
-import { IProfileChangeNicknameRequestData } from "../models/eft/profile/IProfileChangeNicknameRequestData";
-import { IProfileChangeVoiceRequestData } from "../models/eft/profile/IProfileChangeVoiceRequestData";
-import { IProfileCreateRequestData } from "../models/eft/profile/IProfileCreateRequestData";
-import { ISearchFriendRequestData } from "../models/eft/profile/ISearchFriendRequestData";
-import { ISearchFriendResponse } from "../models/eft/profile/ISearchFriendResponse";
-import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
-import { TimeUtil } from "../utils/TimeUtil";
+import { ProfileController } from "@spt/controllers/ProfileController";
+import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
+import { IGetMiniProfileRequestData } from "@spt/models/eft/launcher/IGetMiniProfileRequestData";
+import { GetProfileStatusResponseData } from "@spt/models/eft/profile/GetProfileStatusResponseData";
+import { ICreateProfileResponse } from "@spt/models/eft/profile/ICreateProfileResponse";
+import { IGetOtherProfileRequest } from "@spt/models/eft/profile/IGetOtherProfileRequest";
+import { IGetOtherProfileResponse } from "@spt/models/eft/profile/IGetOtherProfileResponse";
+import { IGetProfileSettingsRequest } from "@spt/models/eft/profile/IGetProfileSettingsRequest";
+import { IProfileChangeNicknameRequestData } from "@spt/models/eft/profile/IProfileChangeNicknameRequestData";
+import { IProfileChangeVoiceRequestData } from "@spt/models/eft/profile/IProfileChangeVoiceRequestData";
+import { IProfileCreateRequestData } from "@spt/models/eft/profile/IProfileCreateRequestData";
+import { ISearchFriendRequestData } from "@spt/models/eft/profile/ISearchFriendRequestData";
+import { ISearchFriendResponse } from "@spt/models/eft/profile/ISearchFriendResponse";
+import { IValidateNicknameRequestData } from "@spt/models/eft/profile/IValidateNicknameRequestData";
+import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
+import { TimeUtil } from "@spt/utils/TimeUtil";
 /** Handle profile related client events */
 export declare class ProfileCallbacks {
     protected httpResponse: HttpResponseUtil;
     protected timeUtil: TimeUtil;
     protected profileController: ProfileController;
-    constructor(httpResponse: HttpResponseUtil, timeUtil: TimeUtil, profileController: ProfileController);
+    protected profileHelper: ProfileHelper;
+    constructor(httpResponse: HttpResponseUtil, timeUtil: TimeUtil, profileController: ProfileController, profileHelper: ProfileHelper);
     /**
      * Handle client/game/profile/create
      */
-    createProfile(url: string, info: IProfileCreateRequestData, sessionID: string): IGetBodyResponseData<any>;
+    createProfile(url: string, info: IProfileCreateRequestData, sessionID: string): IGetBodyResponseData<ICreateProfileResponse>;
     /**
      * Handle client/game/profile/list
      * Get the complete player profile (scav + pmc character)
@@ -61,10 +66,15 @@ export declare class ProfileCallbacks {
      * Called when creating a character when choosing a character face/voice
      */
     getProfileStatus(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<GetProfileStatusResponseData>;
+    /**
+     * Handle client/profile/view
+     * Called when viewing another players profile
+     */
+    getOtherProfile(url: string, request: IGetOtherProfileRequest, sessionID: string): IGetBodyResponseData<IGetOtherProfileResponse>;
     /**
      * Handle client/profile/settings
      */
-    getProfileSettings(url: string, info: IGetProfileSettingsRequest, sessionId: string): IGetBodyResponseData<string>;
+    getProfileSettings(url: string, info: IGetProfileSettingsRequest, sessionId: string): IGetBodyResponseData<boolean>;
     /**
      * Handle client/game/profile/search
      */

types/callbacks/QuestCallbacks.d.ts

@@ -1,17 +1,17 @@
-import { QuestController } from "../controllers/QuestController";
-import { RepeatableQuestController } from "../controllers/RepeatableQuestController";
-import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { IQuest } from "../models/eft/common/tables/IQuest";
-import { IPmcDataRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests";
-import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData";
-import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData";
-import { IHandoverQuestRequestData } from "../models/eft/quests/IHandoverQuestRequestData";
-import { IListQuestsRequestData } from "../models/eft/quests/IListQuestsRequestData";
-import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
+import { QuestController } from "@spt/controllers/QuestController";
+import { RepeatableQuestController } from "@spt/controllers/RepeatableQuestController";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IQuest } from "@spt/models/eft/common/tables/IQuest";
+import { IPmcDataRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IAcceptQuestRequestData } from "@spt/models/eft/quests/IAcceptQuestRequestData";
+import { ICompleteQuestRequestData } from "@spt/models/eft/quests/ICompleteQuestRequestData";
+import { IHandoverQuestRequestData } from "@spt/models/eft/quests/IHandoverQuestRequestData";
+import { IListQuestsRequestData } from "@spt/models/eft/quests/IListQuestsRequestData";
+import { IRepeatableQuestChangeRequest } from "@spt/models/eft/quests/IRepeatableQuestChangeRequest";
+import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 export declare class QuestCallbacks {
     protected httpResponse: HttpResponseUtil;
     protected questController: QuestController;

types/callbacks/RagfairCallbacks.d.ts

@@ -1,35 +1,38 @@
-import { OnLoad } from "../di/OnLoad";
-import { OnUpdate } from "../di/OnUpdate";
-import { RagfairController } from "../controllers/RagfairController";
-import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { INullResponseData } from "../models/eft/httpResponse/INullResponseData";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { IAddOfferRequestData } from "../models/eft/ragfair/IAddOfferRequestData";
-import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData";
-import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult";
-import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData";
-import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult";
-import { IRemoveOfferRequestData } from "../models/eft/ragfair/IRemoveOfferRequestData";
-import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData";
-import { ISendRagfairReportRequestData } from "../models/eft/ragfair/ISendRagfairReportRequestData";
-import { IRagfairConfig } from "../models/spt/config/IRagfairConfig";
-import { ConfigServer } from "../servers/ConfigServer";
-import { RagfairServer } from "../servers/RagfairServer";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
-import { JsonUtil } from "../utils/JsonUtil";
+import { RagfairController } from "@spt/controllers/RagfairController";
+import { OnLoad } from "@spt/di/OnLoad";
+import { OnUpdate } from "@spt/di/OnUpdate";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IAddOfferRequestData } from "@spt/models/eft/ragfair/IAddOfferRequestData";
+import { IExtendOfferRequestData } from "@spt/models/eft/ragfair/IExtendOfferRequestData";
+import { IGetItemPriceResult } from "@spt/models/eft/ragfair/IGetItemPriceResult";
+import { IGetMarketPriceRequestData } from "@spt/models/eft/ragfair/IGetMarketPriceRequestData";
+import { IGetOffersResult } from "@spt/models/eft/ragfair/IGetOffersResult";
+import { IGetRagfairOfferByIdRequest } from "@spt/models/eft/ragfair/IGetRagfairOfferByIdRequest";
+import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
+import { IRemoveOfferRequestData } from "@spt/models/eft/ragfair/IRemoveOfferRequestData";
+import { ISearchRequestData } from "@spt/models/eft/ragfair/ISearchRequestData";
+import { ISendRagfairReportRequestData } from "@spt/models/eft/ragfair/ISendRagfairReportRequestData";
+import { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData";
+import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { RagfairServer } from "@spt/servers/RagfairServer";
+import { RagfairTaxService } from "@spt/services/RagfairTaxService";
+import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 /**
  * Handle ragfair related callback events
  */
 export declare class RagfairCallbacks implements OnLoad, OnUpdate {
     protected httpResponse: HttpResponseUtil;
-    protected jsonUtil: JsonUtil;
     protected ragfairServer: RagfairServer;
     protected ragfairController: RagfairController;
+    protected ragfairTaxService: RagfairTaxService;
     protected configServer: ConfigServer;
     protected ragfairConfig: IRagfairConfig;
-    constructor(httpResponse: HttpResponseUtil, jsonUtil: JsonUtil, ragfairServer: RagfairServer, ragfairController: RagfairController, configServer: ConfigServer);
+    constructor(httpResponse: HttpResponseUtil, ragfairServer: RagfairServer, ragfairController: RagfairController, ragfairTaxService: RagfairTaxService, configServer: ConfigServer);
     onLoad(): Promise<void>;
     getRoute(): string;
     onUpdate(timeSinceLastRun: number): Promise<boolean>;
@@ -42,7 +45,7 @@ export declare class RagfairCallbacks implements OnLoad, OnUpdate {
     getMarketPrice(url: string, info: IGetMarketPriceRequestData, sessionID: string): IGetBodyResponseData<IGetItemPriceResult>;
     /** Handle RagFairAddOffer event */
     addOffer(pmcData: IPmcData, info: IAddOfferRequestData, sessionID: string): IItemEventRouterResponse;
-    /** \Handle RagFairRemoveOffer event */
+    /** Handle RagFairRemoveOffer event */
     removeOffer(pmcData: IPmcData, info: IRemoveOfferRequestData, sessionID: string): IItemEventRouterResponse;
     /** Handle RagFairRenewOffer event */
     extendOffer(pmcData: IPmcData, info: IExtendOfferRequestData, sessionID: string): IItemEventRouterResponse;
@@ -53,4 +56,7 @@ export declare class RagfairCallbacks implements OnLoad, OnUpdate {
     getFleaPrices(url: string, request: IEmptyRequestData, sessionID: string): IGetBodyResponseData<Record<string, number>>;
     /** Handle client/reports/ragfair/send */
     sendReport(url: string, info: ISendRagfairReportRequestData, sessionID: string): INullResponseData;
+    storePlayerOfferTaxAmount(url: string, request: IStorePlayerOfferTaxAmountRequestData, sessionId: string): INullResponseData;
+    /** Handle client/ragfair/offer/findbyid */
+    getFleaOfferById(url: string, request: IGetRagfairOfferByIdRequest, sessionID: string): IGetBodyResponseData<IRagfairOffer>;
 }

types/callbacks/RepairCallbacks.d.ts

@@ -1,8 +1,8 @@
-import { RepairController } from "../controllers/RepairController";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest";
-import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepairActionDataRequest";
+import { RepairController } from "@spt/controllers/RepairController";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IRepairActionDataRequest } from "@spt/models/eft/repair/IRepairActionDataRequest";
+import { ITraderRepairActionDataRequest } from "@spt/models/eft/repair/ITraderRepairActionDataRequest";
 export declare class RepairCallbacks {
     protected repairController: RepairController;
     constructor(repairController: RepairController);

types/callbacks/SaveCallbacks.d.ts

@@ -1,8 +1,8 @@
-import { OnLoad } from "../di/OnLoad";
-import { OnUpdate } from "../di/OnUpdate";
-import { ICoreConfig } from "../models/spt/config/ICoreConfig";
-import { ConfigServer } from "../servers/ConfigServer";
-import { SaveServer } from "../servers/SaveServer";
+import { OnLoad } from "@spt/di/OnLoad";
+import { OnUpdate } from "@spt/di/OnUpdate";
+import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { SaveServer } from "@spt/servers/SaveServer";
 export declare class SaveCallbacks implements OnLoad, OnUpdate {
     protected saveServer: SaveServer;
     protected configServer: ConfigServer;

types/callbacks/TradeCallbacks.d.ts

@@ -1,8 +1,9 @@
-import { TradeController } from "../controllers/TradeController";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData";
-import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData";
+import { TradeController } from "@spt/controllers/TradeController";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IProcessBaseTradeRequestData } from "@spt/models/eft/trade/IProcessBaseTradeRequestData";
+import { IProcessRagfairTradeRequestData } from "@spt/models/eft/trade/IProcessRagfairTradeRequestData";
+import { ISellScavItemsToFenceRequestData } from "@spt/models/eft/trade/ISellScavItemsToFenceRequestData";
 export declare class TradeCallbacks {
     protected tradeController: TradeController;
     constructor(tradeController: TradeController);
@@ -12,4 +13,6 @@ export declare class TradeCallbacks {
     processTrade(pmcData: IPmcData, body: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse;
     /** Handle RagFairBuyOffer event */
     processRagfairTrade(pmcData: IPmcData, body: IProcessRagfairTradeRequestData, sessionID: string): IItemEventRouterResponse;
+    /** Handle SellAllFromSavage event */
+    sellAllFromSavage(pmcData: IPmcData, body: ISellScavItemsToFenceRequestData, sessionID: string): IItemEventRouterResponse;
 }

types/callbacks/TraderCallbacks.d.ts

@@ -1,14 +1,15 @@
-import { OnLoad } from "../di/OnLoad";
-import { OnUpdate } from "../di/OnUpdate";
-import { TraderController } from "../controllers/TraderController";
-import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { ITraderAssort, ITraderBase } from "../models/eft/common/tables/ITrader";
-import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
+import { TraderController } from "@spt/controllers/TraderController";
+import { OnLoad } from "@spt/di/OnLoad";
+import { OnUpdate } from "@spt/di/OnUpdate";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { ITraderAssort, ITraderBase } from "@spt/models/eft/common/tables/ITrader";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 export declare class TraderCallbacks implements OnLoad, OnUpdate {
     protected httpResponse: HttpResponseUtil;
     protected traderController: TraderController;
-    constructor(httpResponse: HttpResponseUtil, traderController: TraderController);
+    constructor(httpResponse: HttpResponseUtil, // TODO: delay required
+    traderController: TraderController);
     onLoad(): Promise<void>;
     onUpdate(): Promise<boolean>;
     getRoute(): string;

types/callbacks/WeatherCallbacks.d.ts

@@ -1,8 +1,8 @@
-import { WeatherController } from "../controllers/WeatherController";
-import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { IWeatherData } from "../models/eft/weather/IWeatherData";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
+import { WeatherController } from "@spt/controllers/WeatherController";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { IWeatherData } from "@spt/models/eft/weather/IWeatherData";
+import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 export declare class WeatherCallbacks {
     protected httpResponse: HttpResponseUtil;
     protected weatherController: WeatherController;

types/callbacks/WishlistCallbacks.d.ts

@@ -1,7 +1,7 @@
-import { WishlistController } from "../controllers/WishlistController";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { IWishlistActionData } from "../models/eft/wishlist/IWishlistActionData";
+import { WishlistController } from "@spt/controllers/WishlistController";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IWishlistActionData } from "@spt/models/eft/wishlist/IWishlistActionData";
 export declare class WishlistCallbacks {
     protected wishlistController: WishlistController;
     constructor(wishlistController: WishlistController);

types/context/ApplicationContext.d.ts

@@ -1,20 +1,20 @@
-import { ContextVariable } from "./ContextVariable";
-import { ContextVariableType } from "./ContextVariableType";
+import { ContextVariable } from "@spt/context/ContextVariable";
+import { ContextVariableType } from "@spt/context/ContextVariableType";
 export declare class ApplicationContext {
     private variables;
     private static holderMaxSize;
     /**
      * Called like:
-     *
+     * ```
      * const registerPlayerInfo = this.applicationContext.getLatestValue(ContextVariableType.REGISTER_PLAYER_REQUEST).getValue<IRegisterPlayerRequestData>();
      *
      * const activePlayerSessionId = this.applicationContext.getLatestValue(ContextVariableType.SESSION_ID).getValue<string>();
      *
-     * const matchInfo = this.applicationContext.getLatestValue(ContextVariableType.MATCH_INFO).getValue<IStartOfflineRaidRequestData>();
-     * @param type
-     * @returns
+     * const matchInfo = this.applicationContext.getLatestValue(ContextVariableType.RAID_CONFIGURATION).getValue<IGetRaidConfigurationRequestData>();
+     * ```
      */
-    getLatestValue(type: ContextVariableType): ContextVariable;
-    getValues(type: ContextVariableType): ContextVariable[];
+    getLatestValue(type: ContextVariableType): ContextVariable | undefined;
+    getValues(type: ContextVariableType): ContextVariable[] | undefined;
     addValue(type: ContextVariableType, value: any): void;
+    clearValues(type: ContextVariableType): void;
 }

types/context/ContextVariable.d.ts

@@ -1,4 +1,4 @@
-import { ContextVariableType } from "./ContextVariableType";
+import { ContextVariableType } from "@spt/context/ContextVariableType";
 export declare class ContextVariable {
     private value;
     private timestamp;

types/context/ContextVariableType.d.ts

@@ -6,5 +6,6 @@ export declare enum ContextVariableType {
     /** Timestamp when client first connected */
     CLIENT_START_TIMESTAMP = 2,
     /** When player is loading into map and loot is requested */
-    REGISTER_PLAYER_REQUEST = 3
+    REGISTER_PLAYER_REQUEST = 3,
+    RAID_ADJUSTMENTS = 4
 }

types/controllers/AchievementController.d.ts

@@ -0,0 +1,23 @@
+import { ICompletedAchievementsResponse } from "@spt/models/eft/profile/ICompletedAchievementsResponse";
+import { IGetAchievementsResponse } from "@spt/models/eft/profile/IGetAchievementsResponse";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { DatabaseService } from "@spt/services/DatabaseService";
+/**
+ * Logic for handling In Raid callbacks
+ */
+export declare class AchievementController {
+    protected logger: ILogger;
+    protected databaseService: DatabaseService;
+    constructor(logger: ILogger, databaseService: DatabaseService);
+    /**
+     * Get base achievements
+     * @param sessionID Session id
+     */
+    getAchievements(sessionID: string): IGetAchievementsResponse;
+    /**
+     * Shows % of 'other' players who've completed each achievement
+     * @param sessionId Session id
+     * @returns ICompletedAchievementsResponse
+     */
+    getAchievementStatistics(sessionId: string): ICompletedAchievementsResponse;
+}

types/controllers/BotController.d.ts

@@ -1,65 +1,126 @@
-import { ApplicationContext } from "../context/ApplicationContext";
-import { BotGenerator } from "../generators/BotGenerator";
-import { BotDifficultyHelper } from "../helpers/BotDifficultyHelper";
-import { BotHelper } from "../helpers/BotHelper";
-import { ProfileHelper } from "../helpers/ProfileHelper";
-import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData";
-import { IBotBase } from "../models/eft/common/tables/IBotBase";
-import { IBotCore } from "../models/eft/common/tables/IBotCore";
-import { Difficulty } from "../models/eft/common/tables/IBotType";
-import { IBotConfig } from "../models/spt/config/IBotConfig";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { ConfigServer } from "../servers/ConfigServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { BotGenerationCacheService } from "../services/BotGenerationCacheService";
-import { LocalisationService } from "../services/LocalisationService";
-import { MatchBotDetailsCacheService } from "../services/MatchBotDetailsCacheService";
-import { JsonUtil } from "../utils/JsonUtil";
+import { ApplicationContext } from "@spt/context/ApplicationContext";
+import { BotGenerator } from "@spt/generators/BotGenerator";
+import { BotDifficultyHelper } from "@spt/helpers/BotDifficultyHelper";
+import { BotHelper } from "@spt/helpers/BotHelper";
+import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
+import { MinMax } from "@spt/models/common/MinMax";
+import { Condition, IGenerateBotsRequestData } from "@spt/models/eft/bot/IGenerateBotsRequestData";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IBotBase } from "@spt/models/eft/common/tables/IBotBase";
+import { IBotCore } from "@spt/models/eft/common/tables/IBotCore";
+import { Difficulty } from "@spt/models/eft/common/tables/IBotType";
+import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails";
+import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
+import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { BotGenerationCacheService } from "@spt/services/BotGenerationCacheService";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { LocalisationService } from "@spt/services/LocalisationService";
+import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService";
+import { SeasonalEventService } from "@spt/services/SeasonalEventService";
+import { RandomUtil } from "@spt/utils/RandomUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class BotController {
     protected logger: ILogger;
-    protected databaseServer: DatabaseServer;
+    protected databaseService: DatabaseService;
     protected botGenerator: BotGenerator;
     protected botHelper: BotHelper;
     protected botDifficultyHelper: BotDifficultyHelper;
+    protected weightedRandomHelper: WeightedRandomHelper;
     protected botGenerationCacheService: BotGenerationCacheService;
     protected matchBotDetailsCacheService: MatchBotDetailsCacheService;
     protected localisationService: LocalisationService;
+    protected seasonalEventService: SeasonalEventService;
     protected profileHelper: ProfileHelper;
     protected configServer: ConfigServer;
     protected applicationContext: ApplicationContext;
-    protected jsonUtil: JsonUtil;
+    protected randomUtil: RandomUtil;
+    protected cloner: ICloner;
     protected botConfig: IBotConfig;
-    static readonly pmcTypeLabel = "PMC";
-    constructor(logger: ILogger, databaseServer: DatabaseServer, botGenerator: BotGenerator, botHelper: BotHelper, botDifficultyHelper: BotDifficultyHelper, botGenerationCacheService: BotGenerationCacheService, matchBotDetailsCacheService: MatchBotDetailsCacheService, localisationService: LocalisationService, profileHelper: ProfileHelper, configServer: ConfigServer, applicationContext: ApplicationContext, jsonUtil: JsonUtil);
+    protected pmcConfig: IPmcConfig;
+    constructor(logger: ILogger, databaseService: DatabaseService, botGenerator: BotGenerator, botHelper: BotHelper, botDifficultyHelper: BotDifficultyHelper, weightedRandomHelper: WeightedRandomHelper, botGenerationCacheService: BotGenerationCacheService, matchBotDetailsCacheService: MatchBotDetailsCacheService, localisationService: LocalisationService, seasonalEventService: SeasonalEventService, profileHelper: ProfileHelper, configServer: ConfigServer, applicationContext: ApplicationContext, randomUtil: RandomUtil, cloner: ICloner);
     /**
-     * Return the number of bot loadout varieties to be generated
-     * @param type bot Type we want the loadout gen count for
+     * Return the number of bot load-out varieties to be generated
+     * @param type bot Type we want the load-out gen count for
      * @returns number of bots to generate
      */
     getBotPresetGenerationLimit(type: string): number;
     /**
      * Handle singleplayer/settings/bot/difficulty
-     * Get the core.json difficulty settings from database\bots
+     * Get the core.json difficulty settings from database/bots
      * @returns IBotCore
      */
     getBotCoreDifficulty(): IBotCore;
     /**
      * Get bot difficulty settings
-     * adjust PMC settings to ensure they engage the correct bot types
+     * Adjust PMC settings to ensure they engage the correct bot types
      * @param type what bot the server is requesting settings for
-     * @param difficulty difficulty level server requested settings for
+     * @param diffLevel difficulty level server requested settings for
+     * @param ignoreRaidSettings should raid settings chosen pre-raid be ignored
      * @returns Difficulty object
      */
-    getBotDifficulty(type: string, difficulty: string): Difficulty;
+    getBotDifficulty(type: string, diffLevel: string, ignoreRaidSettings?: boolean): Difficulty;
+    getAllBotDifficulties(): Record<string, any>;
     /**
      * Generate bot profiles and store in cache
      * @param sessionId Session id
      * @param info bot generation request info
      * @returns IBotBase array
      */
-    generate(sessionId: string, info: IGenerateBotsRequestData): IBotBase[];
+    generate(sessionId: string, info: IGenerateBotsRequestData): Promise<IBotBase[]>;
     /**
-     * Get the difficulty passed in, if its not "asoline", get selected difficulty from config
+     * On first bot generation bots are generated and stored inside a cache, ready to be used later
+     * @param request Bot generation request object
+     * @param pmcProfile Player profile
+     * @param sessionId Session id
+     * @returns
+     */
+    generateBotsFirstTime(request: IGenerateBotsRequestData, pmcProfile: IPmcData, sessionId: string): Promise<IBotBase[]>;
+    /**
+     * Create a BotGenerationDetails for the bot generator to use
+     * @param condition Client data defining bot type and difficulty
+     * @param pmcProfile Player who is generating bots
+     * @param allPmcsHaveSameNameAsPlayer Should all PMCs have same name as player
+     * @param pmcLevelRangeForMap Min/max levels for PMCs to generate within
+     * @param botCountToGenerate How many bots to generate
+     * @param generateAsPmc Force bot being generated a PMC
+     * @returns BotGenerationDetails
+     */
+    protected getBotGenerationDetailsForWave(condition: Condition, pmcProfile: IPmcData, allPmcsHaveSameNameAsPlayer: boolean, pmcLevelRangeForMap: MinMax, botCountToGenerate: number, generateAsPmc: boolean): BotGenerationDetails;
+    /**
+     * Get players profile level
+     * @param pmcProfile Profile to get level from
+     * @returns Level as number
+     */
+    protected getPlayerLevelFromProfile(pmcProfile: IPmcData): number;
+    /**
+     * Generate many bots and store then on the cache
+     * @param condition the condition details to generate the bots with
+     * @param botGenerationDetails the bot details to generate the bot with
+     * @param sessionId Session id
+     * @returns A promise for the bots to be done generating
+     */
+    protected generateWithBotDetails(condition: Condition, botGenerationDetails: BotGenerationDetails, sessionId: string): Promise<void>;
+    /**
+     * Generate a single bot and store in the cache
+     * @param botGenerationDetails the bot details to generate the bot with
+     * @param sessionId Session id
+     * @param cacheKey the cache key to store the bot with
+     * @returns A promise for the bot to be stored
+     */
+    protected generateSingleBotAndStoreInCache(botGenerationDetails: BotGenerationDetails, sessionId: string, cacheKey: string): Promise<void>;
+    /**
+     * Pull a single bot out of cache and return, if cache is empty add bots to it and then return
+     * @param sessionId Session id
+     * @param request Bot generation request object
+     * @returns Single IBotBase object
+     */
+    returnSingleBotFromCache(sessionId: string, request: IGenerateBotsRequestData): Promise<IBotBase[]>;
+    protected updateBotGenerationDetailsToRandomBoss(botGenerationDetails: BotGenerationDetails, possibleBossTypeWeights: Record<string, number>): void;
+    /**
+     * Get the difficulty passed in, if its not "asonline", get selected difficulty from config
      * @param requestedDifficulty
      * @returns
      */
@@ -67,8 +128,9 @@ export declare class BotController {
     /**
      * Get the max number of bots allowed on a map
      * Looks up location player is entering when getting cap value
+     * @param location The map location cap was requested for
      * @returns cap number
      */
-    getBotCap(): number;
-    getPmcBotTypes(): Record<string, Record<string, Record<string, number>>>;
+    getBotCap(location: string): number;
+    getAiBotBrainTypes(): any;
 }

types/controllers/BuildController.d.ts

@@ -0,0 +1,38 @@
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { ISetMagazineRequest } from "@spt/models/eft/builds/ISetMagazineRequest";
+import { IPresetBuildActionRequestData } from "@spt/models/eft/presetBuild/IPresetBuildActionRequestData";
+import { IRemoveBuildRequestData } from "@spt/models/eft/presetBuild/IRemoveBuildRequestData";
+import { IUserBuilds } from "@spt/models/eft/profile/ISptProfile";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
+import { SaveServer } from "@spt/servers/SaveServer";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { LocalisationService } from "@spt/services/LocalisationService";
+import { HashUtil } from "@spt/utils/HashUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
+export declare class BuildController {
+    protected logger: ILogger;
+    protected hashUtil: HashUtil;
+    protected eventOutputHolder: EventOutputHolder;
+    protected databaseService: DatabaseService;
+    protected profileHelper: ProfileHelper;
+    protected localisationService: LocalisationService;
+    protected itemHelper: ItemHelper;
+    protected saveServer: SaveServer;
+    protected cloner: ICloner;
+    constructor(logger: ILogger, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseService: DatabaseService, profileHelper: ProfileHelper, localisationService: LocalisationService, itemHelper: ItemHelper, saveServer: SaveServer, cloner: ICloner);
+    /** Handle client/handbook/builds/my/list */
+    getUserBuilds(sessionID: string): IUserBuilds;
+    /** Handle client/builds/weapon/save */
+    saveWeaponBuild(sessionId: string, body: IPresetBuildActionRequestData): void;
+    /** Handle client/builds/equipment/save event */
+    saveEquipmentBuild(sessionID: string, request: IPresetBuildActionRequestData): void;
+    /** Handle client/builds/delete */
+    removeBuild(sessionID: string, request: IRemoveBuildRequestData): void;
+    protected removePlayerBuild(idToRemove: string, sessionID: string): void;
+    /**
+     * Handle client/builds/magazine/save
+     */
+    createMagazineTemplate(sessionId: string, request: ISetMagazineRequest): void;
+}

types/controllers/ClientLogController.d.ts

@@ -0,0 +1,10 @@
+import { IClientLogRequest } from "@spt/models/spt/logging/IClientLogRequest";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+export declare class ClientLogController {
+    protected logger: ILogger;
+    constructor(logger: ILogger);
+    /**
+     * Handle /singleplayer/log
+     */
+    clientLog(logRequest: IClientLogRequest): void;
+}

types/controllers/CustomizationController.d.ts

@@ -1,18 +1,18 @@
-import { ProfileHelper } from "../helpers/ProfileHelper";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { ISuit } from "../models/eft/common/tables/ITrader";
-import { ClothingItem, IBuyClothingRequestData } from "../models/eft/customization/IBuyClothingRequestData";
-import { IWearClothingRequestData } from "../models/eft/customization/IWearClothingRequestData";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { EventOutputHolder } from "../routers/EventOutputHolder";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { SaveServer } from "../servers/SaveServer";
-import { LocalisationService } from "../services/LocalisationService";
+import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { ISuit } from "@spt/models/eft/common/tables/ITrader";
+import { ClothingItem, IBuyClothingRequestData } from "@spt/models/eft/customization/IBuyClothingRequestData";
+import { IWearClothingRequestData } from "@spt/models/eft/customization/IWearClothingRequestData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
+import { SaveServer } from "@spt/servers/SaveServer";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { LocalisationService } from "@spt/services/LocalisationService";
 export declare class CustomizationController {
     protected logger: ILogger;
     protected eventOutputHolder: EventOutputHolder;
-    protected databaseServer: DatabaseServer;
+    protected databaseService: DatabaseService;
     protected saveServer: SaveServer;
     protected localisationService: LocalisationService;
     protected profileHelper: ProfileHelper;
@@ -20,7 +20,7 @@ export declare class CustomizationController {
         lowerParentId: string;
         upperParentId: string;
     };
-    constructor(logger: ILogger, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, saveServer: SaveServer, localisationService: LocalisationService, profileHelper: ProfileHelper);
+    constructor(logger: ILogger, eventOutputHolder: EventOutputHolder, databaseService: DatabaseService, saveServer: SaveServer, localisationService: LocalisationService, profileHelper: ProfileHelper);
     /**
      * Get purchasable clothing items from trader that match players side (usec/bear)
      * @param traderID trader to look up clothing for

types/controllers/DialogueController.d.ts

@@ -1,30 +1,31 @@
-import { DialogueHelper } from "../helpers/DialogueHelper";
-import { ProfileHelper } from "../helpers/ProfileHelper";
-import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachmentsResponse";
-import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse";
-import { IGetMailDialogViewRequestData } from "../models/eft/dialog/IGetMailDialogViewRequestData";
-import { IGetMailDialogViewResponseData } from "../models/eft/dialog/IGetMailDialogViewResponseData";
-import { ISendMessageRequest } from "../models/eft/dialog/ISendMessageRequest";
-import { Dialogue, DialogueInfo, IAkiProfile, IUserDialogInfo, Message } from "../models/eft/profile/IAkiProfile";
-import { MessageType } from "../models/enums/MessageType";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { SaveServer } from "../servers/SaveServer";
-import { GiftService } from "../services/GiftService";
-import { MailSendService } from "../services/MailSendService";
-import { HashUtil } from "../utils/HashUtil";
-import { RandomUtil } from "../utils/RandomUtil";
-import { TimeUtil } from "../utils/TimeUtil";
+import { IDialogueChatBot } from "@spt/helpers/Dialogue/IDialogueChatBot";
+import { DialogueHelper } from "@spt/helpers/DialogueHelper";
+import { IFriendRequestData } from "@spt/models/eft/dialog/IFriendRequestData";
+import { IFriendRequestSendResponse } from "@spt/models/eft/dialog/IFriendRequestSendResponse";
+import { IGetAllAttachmentsResponse } from "@spt/models/eft/dialog/IGetAllAttachmentsResponse";
+import { IGetFriendListDataResponse } from "@spt/models/eft/dialog/IGetFriendListDataResponse";
+import { IGetMailDialogViewRequestData } from "@spt/models/eft/dialog/IGetMailDialogViewRequestData";
+import { IGetMailDialogViewResponseData } from "@spt/models/eft/dialog/IGetMailDialogViewResponseData";
+import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest";
+import { Dialogue, DialogueInfo, ISptProfile, IUserDialogInfo, Message } from "@spt/models/eft/profile/ISptProfile";
+import { MessageType } from "@spt/models/enums/MessageType";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { SaveServer } from "@spt/servers/SaveServer";
+import { LocalisationService } from "@spt/services/LocalisationService";
+import { MailSendService } from "@spt/services/MailSendService";
+import { TimeUtil } from "@spt/utils/TimeUtil";
 export declare class DialogueController {
     protected logger: ILogger;
     protected saveServer: SaveServer;
     protected timeUtil: TimeUtil;
     protected dialogueHelper: DialogueHelper;
-    protected profileHelper: ProfileHelper;
-    protected randomUtil: RandomUtil;
     protected mailSendService: MailSendService;
-    protected giftService: GiftService;
-    protected hashUtil: HashUtil;
-    constructor(logger: ILogger, saveServer: SaveServer, timeUtil: TimeUtil, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, randomUtil: RandomUtil, mailSendService: MailSendService, giftService: GiftService, hashUtil: HashUtil);
+    protected localisationService: LocalisationService;
+    protected configServer: ConfigServer;
+    protected dialogueChatBots: IDialogueChatBot[];
+    constructor(logger: ILogger, saveServer: SaveServer, timeUtil: TimeUtil, dialogueHelper: DialogueHelper, mailSendService: MailSendService, localisationService: LocalisationService, configServer: ConfigServer, dialogueChatBots: IDialogueChatBot[]);
+    registerChatBot(chatBot: IDialogueChatBot): void;
     /** Handle onUpdate spt event */
     update(): void;
     /**
@@ -54,7 +55,7 @@ export declare class DialogueController {
      * @param sessionID Player id
      * @returns IUserDialogInfo array
      */
-    getDialogueUsers(dialog: Dialogue, messageType: MessageType, sessionID: string): IUserDialogInfo[];
+    getDialogueUsers(dialog: Dialogue, messageType: MessageType, sessionID: string): IUserDialogInfo[] | undefined;
     /**
      * Handle client/mail/dialog/view
      * Handle player clicking 'messenger' and seeing all the messages they've recieved
@@ -71,14 +72,14 @@ export declare class DialogueController {
      * @param request get dialog request (params used when dialog doesnt exist in profile)
      * @returns Dialogue
      */
-    protected getDialogByIdFromProfile(profile: IAkiProfile, request: IGetMailDialogViewRequestData): Dialogue;
+    protected getDialogByIdFromProfile(profile: ISptProfile, request: IGetMailDialogViewRequestData): Dialogue;
     /**
      * Get the users involved in a mail between two entities
      * @param fullProfile Player profile
      * @param dialogUsers The participants of the mail
      * @returns IUserDialogInfo array
      */
-    protected getProfilesForMail(fullProfile: IAkiProfile, dialogUsers: IUserDialogInfo[]): IUserDialogInfo[];
+    protected getProfilesForMail(fullProfile: ISptProfile, dialogUsers?: IUserDialogInfo[]): IUserDialogInfo[];
     /**
      * Get a count of messages with attachments from a particular dialog
      * @param sessionID Session id
@@ -113,18 +114,11 @@ export declare class DialogueController {
      * Get all uncollected items attached to mail in a particular dialog
      * @param dialogueId Dialog to get mail attachments from
      * @param sessionId Session id
-     * @returns
+     * @returns IGetAllAttachmentsResponse
      */
-    getAllAttachments(dialogueId: string, sessionId: string): IGetAllAttachmentsResponse;
+    getAllAttachments(dialogueId: string, sessionId: string): IGetAllAttachmentsResponse | undefined;
     /** client/mail/msg/send */
     sendMessage(sessionId: string, request: ISendMessageRequest): string;
-    /**
-     * Send responses back to player when they communicate with SPT friend on friends list
-     * @param sessionId Session Id
-     * @param request send message request
-     */
-    protected handleChatWithSPTFriend(sessionId: string, request: ISendMessageRequest): void;
-    protected getSptFriendData(friendId?: string): IUserDialogInfo;
     /**
      * Get messages from a specific dialog that have items not expired
      * @param sessionId Session id
@@ -155,4 +149,6 @@ export declare class DialogueController {
      * @returns true or false
      */
     protected messageHasExpired(message: Message): boolean;
+    /** Handle client/friend/request/send  */
+    sendFriendRequest(sessionID: string, request: IFriendRequestData): IFriendRequestSendResponse;
 }

types/controllers/GameController.d.ts

@@ -1,43 +1,51 @@
-import { ApplicationContext } from "../context/ApplicationContext";
-import { HideoutHelper } from "../helpers/HideoutHelper";
-import { HttpServerHelper } from "../helpers/HttpServerHelper";
-import { ProfileHelper } from "../helpers/ProfileHelper";
-import { PreAkiModLoader } from "../loaders/PreAkiModLoader";
-import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { ICheckVersionResponse } from "../models/eft/game/ICheckVersionResponse";
-import { ICurrentGroupResponse } from "../models/eft/game/ICurrentGroupResponse";
-import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse";
-import { IGameKeepAliveResponse } from "../models/eft/game/IGameKeepAliveResponse";
-import { IServerDetails } from "../models/eft/game/IServerDetails";
-import { IAkiProfile } from "../models/eft/profile/IAkiProfile";
-import { IBotConfig } from "../models/spt/config/IBotConfig";
-import { ICoreConfig } from "../models/spt/config/ICoreConfig";
-import { IHttpConfig } from "../models/spt/config/IHttpConfig";
-import { ILocationConfig } from "../models/spt/config/ILocationConfig";
-import { IRagfairConfig } from "../models/spt/config/IRagfairConfig";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { ConfigServer } from "../servers/ConfigServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { CustomLocationWaveService } from "../services/CustomLocationWaveService";
-import { GiftService } from "../services/GiftService";
-import { LocalisationService } from "../services/LocalisationService";
-import { OpenZoneService } from "../services/OpenZoneService";
-import { ProfileFixerService } from "../services/ProfileFixerService";
-import { SeasonalEventService } from "../services/SeasonalEventService";
-import { EncodingUtil } from "../utils/EncodingUtil";
-import { JsonUtil } from "../utils/JsonUtil";
-import { RandomUtil } from "../utils/RandomUtil";
-import { TimeUtil } from "../utils/TimeUtil";
+import { ApplicationContext } from "@spt/context/ApplicationContext";
+import { HideoutHelper } from "@spt/helpers/HideoutHelper";
+import { HttpServerHelper } from "@spt/helpers/HttpServerHelper";
+import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { PreSptModLoader } from "@spt/loaders/PreSptModLoader";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { ICheckVersionResponse } from "@spt/models/eft/game/ICheckVersionResponse";
+import { ICurrentGroupResponse } from "@spt/models/eft/game/ICurrentGroupResponse";
+import { IGameConfigResponse } from "@spt/models/eft/game/IGameConfigResponse";
+import { IGameKeepAliveResponse } from "@spt/models/eft/game/IGameKeepAliveResponse";
+import { IGameModeRequestData } from "@spt/models/eft/game/IGameModeRequestData";
+import { IGetRaidTimeRequest } from "@spt/models/eft/game/IGetRaidTimeRequest";
+import { IGetRaidTimeResponse } from "@spt/models/eft/game/IGetRaidTimeResponse";
+import { IServerDetails } from "@spt/models/eft/game/IServerDetails";
+import { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
+import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
+import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig";
+import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig";
+import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig";
+import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig";
+import { ILootConfig } from "@spt/models/spt/config/ILootConfig";
+import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
+import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { CustomLocationWaveService } from "@spt/services/CustomLocationWaveService";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { GiftService } from "@spt/services/GiftService";
+import { ItemBaseClassService } from "@spt/services/ItemBaseClassService";
+import { LocalisationService } from "@spt/services/LocalisationService";
+import { OpenZoneService } from "@spt/services/OpenZoneService";
+import { ProfileActivityService } from "@spt/services/ProfileActivityService";
+import { ProfileFixerService } from "@spt/services/ProfileFixerService";
+import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService";
+import { SeasonalEventService } from "@spt/services/SeasonalEventService";
+import { HashUtil } from "@spt/utils/HashUtil";
+import { RandomUtil } from "@spt/utils/RandomUtil";
+import { TimeUtil } from "@spt/utils/TimeUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class GameController {
     protected logger: ILogger;
-    protected databaseServer: DatabaseServer;
-    protected jsonUtil: JsonUtil;
+    protected databaseService: DatabaseService;
     protected timeUtil: TimeUtil;
-    protected preAkiModLoader: PreAkiModLoader;
+    protected hashUtil: HashUtil;
+    protected preSptModLoader: PreSptModLoader;
     protected httpServerHelper: HttpServerHelper;
     protected randomUtil: RandomUtil;
-    protected encodingUtil: EncodingUtil;
     protected hideoutHelper: HideoutHelper;
     protected profileHelper: ProfileHelper;
     protected profileFixerService: ProfileFixerService;
@@ -45,26 +53,49 @@ export declare class GameController {
     protected customLocationWaveService: CustomLocationWaveService;
     protected openZoneService: OpenZoneService;
     protected seasonalEventService: SeasonalEventService;
+    protected itemBaseClassService: ItemBaseClassService;
     protected giftService: GiftService;
+    protected raidTimeAdjustmentService: RaidTimeAdjustmentService;
+    protected profileActivityService: ProfileActivityService;
     protected applicationContext: ApplicationContext;
     protected configServer: ConfigServer;
-    protected os: any;
+    protected cloner: ICloner;
     protected httpConfig: IHttpConfig;
     protected coreConfig: ICoreConfig;
     protected locationConfig: ILocationConfig;
     protected ragfairConfig: IRagfairConfig;
+    protected hideoutConfig: IHideoutConfig;
+    protected pmcConfig: IPmcConfig;
+    protected lootConfig: ILootConfig;
     protected botConfig: IBotConfig;
-    constructor(logger: ILogger, databaseServer: DatabaseServer, jsonUtil: JsonUtil, timeUtil: TimeUtil, preAkiModLoader: PreAkiModLoader, httpServerHelper: HttpServerHelper, randomUtil: RandomUtil, encodingUtil: EncodingUtil, hideoutHelper: HideoutHelper, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, localisationService: LocalisationService, customLocationWaveService: CustomLocationWaveService, openZoneService: OpenZoneService, seasonalEventService: SeasonalEventService, giftService: GiftService, applicationContext: ApplicationContext, configServer: ConfigServer);
+    constructor(logger: ILogger, databaseService: DatabaseService, timeUtil: TimeUtil, hashUtil: HashUtil, preSptModLoader: PreSptModLoader, httpServerHelper: HttpServerHelper, randomUtil: RandomUtil, hideoutHelper: HideoutHelper, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, localisationService: LocalisationService, customLocationWaveService: CustomLocationWaveService, openZoneService: OpenZoneService, seasonalEventService: SeasonalEventService, itemBaseClassService: ItemBaseClassService, giftService: GiftService, raidTimeAdjustmentService: RaidTimeAdjustmentService, profileActivityService: ProfileActivityService, applicationContext: ApplicationContext, configServer: ConfigServer, cloner: ICloner);
+    load(): void;
     /**
      * Handle client/game/start
      */
     gameStart(_url: string, _info: IEmptyRequestData, sessionID: string, startTimeStampMS: number): void;
+    protected adjustHideoutCraftTimes(overrideSeconds: number): void;
+    /**
+     * Adjust all hideout craft times to be no higher than the override
+     */
+    protected adjustHideoutBuildTimes(overrideSeconds: number): void;
+    protected adjustLocationBotValues(): void;
+    /**
+     * Out of date/incorrectly made trader mods forget this data
+     */
+    protected checkTraderRepairValuesExist(): void;
+    protected addCustomLooseLootPositions(): void;
+    protected adjustLooseLootSpawnProbabilities(): void;
     /** Apply custom limits on bot types as defined in configs/location.json/botTypeLimits */
     protected adjustMapBotLimits(): void;
     /**
      * Handle client/game/config
      */
     getGameConfig(sessionID: string): IGameConfigResponse;
+    /**
+     * Handle client/game/mode
+     */
+    getGameMode(sessionID: string, info: IGameModeRequestData): any;
     /**
      * Handle client/server/list
      */
@@ -81,6 +112,10 @@ export declare class GameController {
      * Handle client/game/keepalive
      */
     getKeepAlive(sessionId: string): IGameKeepAliveResponse;
+    /**
+     * Handle singleplayer/settings/getRaidTime
+     */
+    getRaidTime(sessionId: string, request: IGetRaidTimeRequest): IGetRaidTimeResponse;
     /**
      * BSG have two values for shotgun dispersion, we make sure both have the same value
      */
@@ -90,11 +125,10 @@ export declare class GameController {
      * @param pmcProfile Player profile
      */
     protected warnOnActiveBotReloadSkill(pmcProfile: IPmcData): void;
-    protected flagAllItemsInDbAsSellableOnFlea(): void;
+    protected setAllDbItemsAsSellableOnFlea(): void;
     /**
      * When player logs in, iterate over all active effects and reduce timer
-     * TODO - add body part HP regen
-     * @param pmcProfile
+     * @param pmcProfile Profile to adjust values for
      */
     protected updateProfileHealthValues(pmcProfile: IPmcData): void;
     /**
@@ -111,16 +145,17 @@ export declare class GameController {
      */
     protected sendPraporGiftsToNewProfiles(pmcProfile: IPmcData): void;
     /**
-     * Find and split waves with large numbers of bots into smaller waves - BSG appears to reduce the size of these waves to one bot when they're waiting to spawn for too long
+     * Find and split waves with large numbers of bots into smaller waves - BSG appears to reduce the size of these
+     * waves to one bot when they're waiting to spawn for too long
      */
     protected splitBotWavesIntoSingleWaves(): void;
     /**
      * Get a list of installed mods and save their details to the profile being used
      * @param fullProfile Profile to add mod details to
      */
-    protected saveActiveModsToProfile(fullProfile: IAkiProfile): void;
+    protected saveActiveModsToProfile(fullProfile: ISptProfile): void;
     /**
-     * Check for any missing assorts inside each traders assort.json data, checking against traders qeustassort.json
+     * Check for any missing assorts inside each traders assort.json data, checking against traders questassort.json
      */
     protected validateQuestAssortUnlocksExist(): void;
     /**
@@ -132,7 +167,7 @@ export declare class GameController {
      * Check for a dialog with the key 'undefined', and remove it
      * @param fullProfile Profile to check for dialog in
      */
-    protected checkForAndRemoveUndefinedDialogs(fullProfile: IAkiProfile): void;
+    protected checkForAndRemoveUndefinedDialogs(fullProfile: ISptProfile): void;
     /**
      * Blank out the "test" mail message from prapor
      */
@@ -141,5 +176,5 @@ export declare class GameController {
      * Make non-trigger-spawned raiders spawn earlier + always
      */
     protected adjustLabsRaiderSpawnRate(): void;
-    protected logProfileDetails(fullProfile: IAkiProfile): void;
+    protected logProfileDetails(fullProfile: ISptProfile): void;
 }

types/controllers/HandbookController.d.ts

@@ -1,5 +1,5 @@
-import { HandbookHelper } from "../helpers/HandbookHelper";
-import { DatabaseServer } from "../servers/DatabaseServer";
+import { HandbookHelper } from "@spt/helpers/HandbookHelper";
+import { DatabaseServer } from "@spt/servers/DatabaseServer";
 export declare class HandbookController {
     protected databaseServer: DatabaseServer;
     protected handbookHelper: HandbookHelper;

types/controllers/HealthController.d.ts

@@ -1,22 +1,21 @@
-import { HealthHelper } from "../helpers/HealthHelper";
-import { InventoryHelper } from "../helpers/InventoryHelper";
-import { ItemHelper } from "../helpers/ItemHelper";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { IHealthTreatmentRequestData } from "../models/eft/health/IHealthTreatmentRequestData";
-import { IOffraidEatRequestData } from "../models/eft/health/IOffraidEatRequestData";
-import { IOffraidHealRequestData } from "../models/eft/health/IOffraidHealRequestData";
-import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData";
-import { IWorkoutData } from "../models/eft/health/IWorkoutData";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { EventOutputHolder } from "../routers/EventOutputHolder";
-import { LocalisationService } from "../services/LocalisationService";
-import { PaymentService } from "../services/PaymentService";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
-import { JsonUtil } from "../utils/JsonUtil";
+import { HealthHelper } from "@spt/helpers/HealthHelper";
+import { InventoryHelper } from "@spt/helpers/InventoryHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IHealthTreatmentRequestData } from "@spt/models/eft/health/IHealthTreatmentRequestData";
+import { IOffraidEatRequestData } from "@spt/models/eft/health/IOffraidEatRequestData";
+import { IOffraidHealRequestData } from "@spt/models/eft/health/IOffraidHealRequestData";
+import { ISyncHealthRequestData } from "@spt/models/eft/health/ISyncHealthRequestData";
+import { IWorkoutData } from "@spt/models/eft/health/IWorkoutData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
+import { LocalisationService } from "@spt/services/LocalisationService";
+import { PaymentService } from "@spt/services/PaymentService";
+import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class HealthController {
     protected logger: ILogger;
-    protected jsonUtil: JsonUtil;
     protected eventOutputHolder: EventOutputHolder;
     protected itemHelper: ItemHelper;
     protected paymentService: PaymentService;
@@ -24,39 +23,41 @@ export declare class HealthController {
     protected localisationService: LocalisationService;
     protected httpResponse: HttpResponseUtil;
     protected healthHelper: HealthHelper;
-    constructor(logger: ILogger, jsonUtil: JsonUtil, eventOutputHolder: EventOutputHolder, itemHelper: ItemHelper, paymentService: PaymentService, inventoryHelper: InventoryHelper, localisationService: LocalisationService, httpResponse: HttpResponseUtil, healthHelper: HealthHelper);
+    protected cloner: ICloner;
+    constructor(logger: ILogger, eventOutputHolder: EventOutputHolder, itemHelper: ItemHelper, paymentService: PaymentService, inventoryHelper: InventoryHelper, localisationService: LocalisationService, httpResponse: HttpResponseUtil, healthHelper: HealthHelper, cloner: ICloner);
     /**
      * stores in-raid player health
      * @param pmcData Player profile
      * @param info Request data
-     * @param sessionID
+     * @param sessionID Player id
      * @param addEffects Should effects found be added or removed from profile
+     * @param deleteExistingEffects Should all prior effects be removed before apply new ones
      */
     saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string, addEffects?: boolean, deleteExistingEffects?: boolean): void;
     /**
      * When healing in menu
-     * @param pmcData
-     * @param body
-     * @param sessionID
-     * @returns
+     * @param pmcData Player profile
+     * @param request Healing request
+     * @param sessionID Player id
+     * @returns IItemEventRouterResponse
      */
-    offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse;
+    offraidHeal(pmcData: IPmcData, request: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse;
     /**
      * Handle Eat event
      * Consume food/water outside of a raid
      * @param pmcData Player profile
-     * @param body request Object
+     * @param request Eat request
      * @param sessionID Session id
      * @returns IItemEventRouterResponse
      */
-    offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): IItemEventRouterResponse;
+    offraidEat(pmcData: IPmcData, request: IOffraidEatRequestData, sessionID: string): IItemEventRouterResponse;
     /**
      * Handle RestoreHealth event
      * Occurs on post-raid healing page
      * @param pmcData player profile
      * @param healthTreatmentRequest Request data from client
      * @param sessionID Session id
-     * @returns
+     * @returns IItemEventRouterResponse
      */
     healthTreatment(pmcData: IPmcData, healthTreatmentRequest: IHealthTreatmentRequestData, sessionID: string): IItemEventRouterResponse;
     /**
@@ -66,12 +67,4 @@ export declare class HealthController {
      * @param sessionID
      */
     applyWorkoutChanges(pmcData: IPmcData, info: IWorkoutData, sessionId: string): void;
-    /**
-     * Iterate over treatment request diff and find effects to remove from player limbs
-     * @param sessionId
-     * @param profile Profile to update
-     * @param treatmentRequest client request
-     * @param output response to send to client
-     */
-    protected removeEffectsAfterPostRaidHeal(sessionId: string, profile: IPmcData, treatmentRequest: IHealthTreatmentRequestData, output: IItemEventRouterResponse): void;
 }

types/controllers/HideoutController.d.ts

@@ -1,47 +1,53 @@
-import { ScavCaseRewardGenerator } from "../generators/ScavCaseRewardGenerator";
-import { HideoutHelper } from "../helpers/HideoutHelper";
-import { InventoryHelper } from "../helpers/InventoryHelper";
-import { PaymentHelper } from "../helpers/PaymentHelper";
-import { PresetHelper } from "../helpers/PresetHelper";
-import { ProfileHelper } from "../helpers/ProfileHelper";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { HideoutArea, Product } from "../models/eft/common/tables/IBotBase";
-import { HideoutUpgradeCompleteRequestData } from "../models/eft/hideout/HideoutUpgradeCompleteRequestData";
-import { IHandleQTEEventRequestData } from "../models/eft/hideout/IHandleQTEEventRequestData";
-import { IHideoutContinuousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinuousProductionStartRequestData";
-import { IHideoutImproveAreaRequestData } from "../models/eft/hideout/IHideoutImproveAreaRequestData";
-import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction";
-import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData";
-import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData";
-import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData";
-import { IHideoutTakeItemOutRequestData } from "../models/eft/hideout/IHideoutTakeItemOutRequestData";
-import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData";
-import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutToggleAreaRequestData";
-import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData";
-import { IQteData } from "../models/eft/hideout/IQteData";
-import { IRecordShootingRangePoints } from "../models/eft/hideout/IRecordShootingRangePoints";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { IHideoutConfig } from "../models/spt/config/IHideoutConfig";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { EventOutputHolder } from "../routers/EventOutputHolder";
-import { ConfigServer } from "../servers/ConfigServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { SaveServer } from "../servers/SaveServer";
-import { FenceService } from "../services/FenceService";
-import { LocalisationService } from "../services/LocalisationService";
-import { PlayerService } from "../services/PlayerService";
-import { HashUtil } from "../utils/HashUtil";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
-import { JsonUtil } from "../utils/JsonUtil";
-import { RandomUtil } from "../utils/RandomUtil";
-import { TimeUtil } from "../utils/TimeUtil";
+import { ScavCaseRewardGenerator } from "@spt/generators/ScavCaseRewardGenerator";
+import { HideoutHelper } from "@spt/helpers/HideoutHelper";
+import { InventoryHelper } from "@spt/helpers/InventoryHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { PaymentHelper } from "@spt/helpers/PaymentHelper";
+import { PresetHelper } from "@spt/helpers/PresetHelper";
+import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { HideoutArea, ITaskConditionCounter, Product } from "@spt/models/eft/common/tables/IBotBase";
+import { HideoutUpgradeCompleteRequestData } from "@spt/models/eft/hideout/HideoutUpgradeCompleteRequestData";
+import { IHandleQTEEventRequestData } from "@spt/models/eft/hideout/IHandleQTEEventRequestData";
+import { IHideoutArea, Stage } from "@spt/models/eft/hideout/IHideoutArea";
+import { IHideoutCancelProductionRequestData } from "@spt/models/eft/hideout/IHideoutCancelProductionRequestData";
+import { IHideoutContinuousProductionStartRequestData } from "@spt/models/eft/hideout/IHideoutContinuousProductionStartRequestData";
+import { IHideoutImproveAreaRequestData } from "@spt/models/eft/hideout/IHideoutImproveAreaRequestData";
+import { IHideoutProduction } from "@spt/models/eft/hideout/IHideoutProduction";
+import { IHideoutPutItemInRequestData } from "@spt/models/eft/hideout/IHideoutPutItemInRequestData";
+import { IHideoutScavCaseStartRequestData } from "@spt/models/eft/hideout/IHideoutScavCaseStartRequestData";
+import { IHideoutSingleProductionStartRequestData } from "@spt/models/eft/hideout/IHideoutSingleProductionStartRequestData";
+import { IHideoutTakeItemOutRequestData } from "@spt/models/eft/hideout/IHideoutTakeItemOutRequestData";
+import { IHideoutTakeProductionRequestData } from "@spt/models/eft/hideout/IHideoutTakeProductionRequestData";
+import { IHideoutToggleAreaRequestData } from "@spt/models/eft/hideout/IHideoutToggleAreaRequestData";
+import { IHideoutUpgradeRequestData } from "@spt/models/eft/hideout/IHideoutUpgradeRequestData";
+import { IQteData } from "@spt/models/eft/hideout/IQteData";
+import { IRecordShootingRangePoints } from "@spt/models/eft/hideout/IRecordShootingRangePoints";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { HideoutAreas } from "@spt/models/enums/HideoutAreas";
+import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { SaveServer } from "@spt/servers/SaveServer";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { FenceService } from "@spt/services/FenceService";
+import { LocalisationService } from "@spt/services/LocalisationService";
+import { PlayerService } from "@spt/services/PlayerService";
+import { ProfileActivityService } from "@spt/services/ProfileActivityService";
+import { HashUtil } from "@spt/utils/HashUtil";
+import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
+import { RandomUtil } from "@spt/utils/RandomUtil";
+import { TimeUtil } from "@spt/utils/TimeUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class HideoutController {
     protected logger: ILogger;
     protected hashUtil: HashUtil;
     protected timeUtil: TimeUtil;
-    protected databaseServer: DatabaseServer;
+    protected databaseService: DatabaseService;
     protected randomUtil: RandomUtil;
     protected inventoryHelper: InventoryHelper;
+    protected itemHelper: ItemHelper;
     protected saveServer: SaveServer;
     protected playerService: PlayerService;
     protected presetHelper: PresetHelper;
@@ -52,30 +58,61 @@ export declare class HideoutController {
     protected hideoutHelper: HideoutHelper;
     protected scavCaseRewardGenerator: ScavCaseRewardGenerator;
     protected localisationService: LocalisationService;
+    protected profileActivityService: ProfileActivityService;
     protected configServer: ConfigServer;
-    protected jsonUtil: JsonUtil;
     protected fenceService: FenceService;
-    protected static nameBackendCountersCrafting: string;
+    protected cloner: ICloner;
+    /** Key used in TaskConditionCounters array */
+    protected static nameTaskConditionCountersCrafting: string;
     protected hideoutConfig: IHideoutConfig;
-    constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, scavCaseRewardGenerator: ScavCaseRewardGenerator, localisationService: LocalisationService, configServer: ConfigServer, jsonUtil: JsonUtil, fenceService: FenceService);
+    constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseService: DatabaseService, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, itemHelper: ItemHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, scavCaseRewardGenerator: ScavCaseRewardGenerator, localisationService: LocalisationService, profileActivityService: ProfileActivityService, configServer: ConfigServer, fenceService: FenceService, cloner: ICloner);
     /**
      * Handle HideoutUpgrade event
      * Start a hideout area upgrade
      * @param pmcData Player profile
      * @param request upgrade start request
      * @param sessionID Session id
-     * @returns IItemEventRouterResponse
+     * @param output Client response
      */
-    startUpgrade(pmcData: IPmcData, request: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse;
+    startUpgrade(pmcData: IPmcData, request: IHideoutUpgradeRequestData, sessionID: string, output: IItemEventRouterResponse): void;
     /**
      * Handle HideoutUpgradeComplete event
      * Complete a hideout area upgrade
      * @param pmcData Player profile
      * @param request Completed upgrade request
      * @param sessionID Session id
-     * @returns IItemEventRouterResponse
+     * @param output Client response
      */
-    upgradeComplete(pmcData: IPmcData, request: HideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse;
+    upgradeComplete(pmcData: IPmcData, request: HideoutUpgradeCompleteRequestData, sessionID: string, output: IItemEventRouterResponse): void;
+    /**
+     * Upgrade wall status to visible in profile if medstation/water collector are both level 1
+     * @param pmcData Player profile
+     */
+    protected checkAndUpgradeWall(pmcData: IPmcData): void;
+    /**
+     * @param pmcData Profile to edit
+     * @param output Object to send back to client
+     * @param sessionID Session/player id
+     * @param profileParentHideoutArea Current hideout area for profile
+     * @param dbHideoutArea Hideout area being upgraded
+     * @param hideoutStage Stage hideout area is being upgraded to
+     */
+    protected addContainerImprovementToProfile(output: IItemEventRouterResponse, sessionID: string, pmcData: IPmcData, profileParentHideoutArea: HideoutArea, dbHideoutArea: IHideoutArea, hideoutStage: Stage): void;
+    /**
+     * Add an inventory item to profile from a hideout area stage data
+     * @param pmcData Profile to update
+     * @param dbHideoutData Hideout area from db being upgraded
+     * @param hideoutStage Stage area upgraded to
+     */
+    protected addUpdateInventoryItemToProfile(pmcData: IPmcData, dbHideoutData: IHideoutArea, hideoutStage: Stage): void;
+    /**
+     * @param output Object to send to client
+     * @param sessionID Session/player id
+     * @param areaType Hideout area that had stash added
+     * @param hideoutDbData Hideout area that caused addition of stash
+     * @param hideoutStage Hideout area upgraded to this
+     */
+    protected addContainerUpgradeToClientOutput(output: IItemEventRouterResponse, sessionID: string, areaType: HideoutAreas, hideoutDbData: IHideoutArea, hideoutStage: Stage): void;
     /**
      * Handle HideoutPutItemsInAreaSlots
      * Create item in hideout slot item array, remove item from player inventory
@@ -170,32 +207,29 @@ export declare class HideoutController {
      * @param pmcData Player profile
      * @param request Remove production from area request
      * @param output Output object to update
-     * @returns IItemEventRouterResponse
      */
-    protected handleRecipe(sessionID: string, recipe: IHideoutProduction, pmcData: IPmcData, request: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse;
+    protected handleRecipe(sessionID: string, recipe: IHideoutProduction, pmcData: IPmcData, request: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): void;
     /**
-     * Handles giving rewards stored in player profile to player after clicking 'get rewards'
+     * Get the "CounterHoursCrafting" TaskConditionCounter from a profile
+     * @param pmcData Profile to get counter from
+     * @param recipe Recipe being crafted
+     * @returns ITaskConditionCounter
+     */
+    protected getHoursCraftingTaskConditionCounter(pmcData: IPmcData, recipe: IHideoutProduction): ITaskConditionCounter;
+    /**
+     * Handles generating case rewards and sending to player inventory
      * @param sessionID Session id
      * @param pmcData Player profile
      * @param request Get rewards from scavcase craft request
      * @param output Output object to update
-     * @returns IItemEventRouterResponse
      */
-    protected handleScavCase(sessionID: string, pmcData: IPmcData, request: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse;
-    /**
-     * Start area production for item by adding production to profiles' Hideout.Production array
-     * @param pmcData Player profile
-     * @param request Start production request
-     * @param sessionID Session id
-     * @returns IItemEventRouterResponse
-     */
-    registerProduction(pmcData: IPmcData, request: IHideoutSingleProductionStartRequestData | IHideoutContinuousProductionStartRequestData, sessionID: string): IItemEventRouterResponse;
+    protected handleScavCase(sessionID: string, pmcData: IPmcData, request: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): void;
     /**
      * Get quick time event list for hideout
      * // TODO - implement this
      * @param sessionId Session id
      * @returns IQteData array
-    */
+     */
     getQteList(sessionId: string): IQteData[];
     /**
      * Handle HideoutQuickTimeEvent on client/game/profile/items/moving
@@ -204,7 +238,7 @@ export declare class HideoutController {
      * @param pmcData Profile to adjust
      * @param request QTE result object
      */
-    handleQTEEventOutcome(sessionId: string, pmcData: IPmcData, request: IHandleQTEEventRequestData): IItemEventRouterResponse;
+    handleQTEEventOutcome(sessionId: string, pmcData: IPmcData, request: IHandleQTEEventRequestData, output: IItemEventRouterResponse): void;
     /**
      * Record a high score from the shooting range into a player profiles overallcounters
      * @param sessionId Session id
@@ -212,14 +246,22 @@ export declare class HideoutController {
      * @param request shooting range score request
      * @returns IItemEventRouterResponse
      */
-    recordShootingRangePoints(sessionId: string, pmcData: IPmcData, request: IRecordShootingRangePoints): IItemEventRouterResponse;
+    recordShootingRangePoints(sessionId: string, pmcData: IPmcData, request: IRecordShootingRangePoints): void;
     /**
      * Handle client/game/profile/items/moving - HideoutImproveArea
      * @param sessionId Session id
-     * @param pmcData profile to improve area in
-     * @param request improve area request data
+     * @param pmcData Profile to improve area in
+     * @param request Improve area request data
      */
     improveArea(sessionId: string, pmcData: IPmcData, request: IHideoutImproveAreaRequestData): IItemEventRouterResponse;
+    /**
+     * Handle client/game/profile/items/moving HideoutCancelProductionCommand
+     * @param sessionId Session id
+     * @param pmcData Profile with craft to cancel
+     * @param request Cancel production request data
+     * @returns IItemEventRouterResponse
+     */
+    cancelProduction(sessionId: string, pmcData: IPmcData, request: IHideoutCancelProductionRequestData): IItemEventRouterResponse;
     /**
      * Function called every x seconds as part of onUpdate event
      */

types/controllers/InraidController.d.ts

@@ -1,36 +1,45 @@
-import { ApplicationContext } from "../context/ApplicationContext";
-import { PlayerScavGenerator } from "../generators/PlayerScavGenerator";
-import { HealthHelper } from "../helpers/HealthHelper";
-import { InRaidHelper } from "../helpers/InRaidHelper";
-import { ItemHelper } from "../helpers/ItemHelper";
-import { ProfileHelper } from "../helpers/ProfileHelper";
-import { QuestHelper } from "../helpers/QuestHelper";
-import { TraderHelper } from "../helpers/TraderHelper";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { Item } from "../models/eft/common/tables/IItem";
-import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData";
-import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData";
-import { PlayerRaidEndState } from "../models/enums/PlayerRaidEndState";
-import { IAirdropConfig } from "../models/spt/config/IAirdropConfig";
-import { IInRaidConfig } from "../models/spt/config/IInRaidConfig";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { ConfigServer } from "../servers/ConfigServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { SaveServer } from "../servers/SaveServer";
-import { InsuranceService } from "../services/InsuranceService";
-import { MatchBotDetailsCacheService } from "../services/MatchBotDetailsCacheService";
-import { PmcChatResponseService } from "../services/PmcChatResponseService";
-import { JsonUtil } from "../utils/JsonUtil";
-import { TimeUtil } from "../utils/TimeUtil";
+import { ApplicationContext } from "@spt/context/ApplicationContext";
+import { PlayerScavGenerator } from "@spt/generators/PlayerScavGenerator";
+import { HealthHelper } from "@spt/helpers/HealthHelper";
+import { InRaidHelper } from "@spt/helpers/InRaidHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { QuestHelper } from "@spt/helpers/QuestHelper";
+import { TraderHelper } from "@spt/helpers/TraderHelper";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { Item } from "@spt/models/eft/common/tables/IItem";
+import { IRegisterPlayerRequestData } from "@spt/models/eft/inRaid/IRegisterPlayerRequestData";
+import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRequestData";
+import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState";
+import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig";
+import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig";
+import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
+import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig";
+import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig";
+import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig";
+import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
+import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig";
+import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { SaveServer } from "@spt/servers/SaveServer";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { InsuranceService } from "@spt/services/InsuranceService";
+import { LocalisationService } from "@spt/services/LocalisationService";
+import { MailSendService } from "@spt/services/MailSendService";
+import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService";
+import { PmcChatResponseService } from "@spt/services/PmcChatResponseService";
+import { TraderServicesService } from "@spt/services/TraderServicesService";
+import { RandomUtil } from "@spt/utils/RandomUtil";
+import { TimeUtil } from "@spt/utils/TimeUtil";
 /**
  * Logic for handling In Raid callbacks
  */
 export declare class InraidController {
     protected logger: ILogger;
     protected saveServer: SaveServer;
-    protected jsonUtil: JsonUtil;
     protected timeUtil: TimeUtil;
-    protected databaseServer: DatabaseServer;
+    protected databaseService: DatabaseService;
     protected pmcChatResponseService: PmcChatResponseService;
     protected matchBotDetailsCacheService: MatchBotDetailsCacheService;
     protected questHelper: QuestHelper;
@@ -39,13 +48,23 @@ export declare class InraidController {
     protected playerScavGenerator: PlayerScavGenerator;
     protected healthHelper: HealthHelper;
     protected traderHelper: TraderHelper;
+    protected traderServicesService: TraderServicesService;
+    protected localisationService: LocalisationService;
     protected insuranceService: InsuranceService;
     protected inRaidHelper: InRaidHelper;
     protected applicationContext: ApplicationContext;
     protected configServer: ConfigServer;
+    protected mailSendService: MailSendService;
+    protected randomUtil: RandomUtil;
     protected airdropConfig: IAirdropConfig;
-    protected inraidConfig: IInRaidConfig;
-    constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, pmcChatResponseService: PmcChatResponseService, matchBotDetailsCacheService: MatchBotDetailsCacheService, questHelper: QuestHelper, itemHelper: ItemHelper, profileHelper: ProfileHelper, playerScavGenerator: PlayerScavGenerator, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, applicationContext: ApplicationContext, configServer: ConfigServer);
+    protected btrConfig: IBTRConfig;
+    protected inRaidConfig: IInRaidConfig;
+    protected traderConfig: ITraderConfig;
+    protected locationConfig: ILocationConfig;
+    protected ragfairConfig: IRagfairConfig;
+    protected hideoutConfig: IHideoutConfig;
+    protected botConfig: IBotConfig;
+    constructor(logger: ILogger, saveServer: SaveServer, timeUtil: TimeUtil, databaseService: DatabaseService, pmcChatResponseService: PmcChatResponseService, matchBotDetailsCacheService: MatchBotDetailsCacheService, questHelper: QuestHelper, itemHelper: ItemHelper, profileHelper: ProfileHelper, playerScavGenerator: PlayerScavGenerator, healthHelper: HealthHelper, traderHelper: TraderHelper, traderServicesService: TraderServicesService, localisationService: LocalisationService, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, applicationContext: ApplicationContext, configServer: ConfigServer, mailSendService: MailSendService, randomUtil: RandomUtil);
     /**
      * Save locationId to active profiles inraid object AND app context
      * @param sessionID Session id
@@ -62,23 +81,21 @@ export declare class InraidController {
     savePostRaidProgress(offraidData: ISaveProgressRequestData, sessionID: string): void;
     /**
      * Handle updating player profile post-pmc raid
-     * @param sessionID session id
-     * @param offraidData post-raid data
+     * @param sessionID Session id
+     * @param postRaidRequest Post-raid data
      */
-    protected savePmcProgress(sessionID: string, offraidData: ISaveProgressRequestData): void;
+    protected savePmcProgress(sessionID: string, postRaidRequest: ISaveProgressRequestData): void;
     /**
-     * Make changes to pmc profile after they've died in raid,
-     * Alter bodypart hp, handle insurance, delete inventory items, remove carried quest items
+     * Make changes to PMC profile after they've died in raid,
+     * Alter body part hp, handle insurance, delete inventory items, remove carried quest items
      * @param postRaidSaveRequest Post-raid save request
      * @param pmcData Pmc profile
-     * @param insuranceEnabled Is insurance enabled
-     * @param preRaidGear Gear player had before raid
      * @param sessionID Session id
      * @returns Updated profile object
      */
-    protected performPostRaidActionsWhenDead(postRaidSaveRequest: ISaveProgressRequestData, pmcData: IPmcData, insuranceEnabled: boolean, preRaidGear: Item[], sessionID: string): IPmcData;
+    protected performPostRaidActionsWhenDead(postRaidSaveRequest: ISaveProgressRequestData, pmcData: IPmcData, sessionID: string): IPmcData;
     /**
-     * Adjust player characters bodypart hp post-raid
+     * Adjust player characters body part hp post-raid
      * @param postRaidSaveRequest post raid data
      * @param pmcData player profile
      */
@@ -86,15 +103,41 @@ export declare class InraidController {
     /**
      * Reduce body part hp to % of max
      * @param pmcData profile to edit
-     * @param multipler multipler to apply to max health
+     * @param multiplier multiplier to apply to max health
      */
-    protected reducePmcHealthToPercent(pmcData: IPmcData, multipler: number): void;
+    protected reducePmcHealthToPercent(pmcData: IPmcData, multiplier: number): void;
     /**
      * Handle updating the profile post-pscav raid
-     * @param sessionID session id
-     * @param offraidData post-raid data of raid
+     * @param sessionID Session id
+     * @param postRaidRequest Post-raid data of raid
      */
-    protected savePlayerScavProgress(sessionID: string, offraidData: ISaveProgressRequestData): void;
+    protected savePlayerScavProgress(sessionID: string, postRaidRequest: ISaveProgressRequestData): void;
+    /**
+     * merge two dictionaries together
+     * Prioritise pair that has true as a value
+     * @param primary main dictionary
+     * @param secondary Secondary dictionary
+     */
+    protected mergePmcAndScavEncyclopedias(primary: IPmcData, secondary: IPmcData): void;
+    /**
+     * Post-scav-raid any charisma increase must be propigated into PMC profile
+     * @param postRaidServerScavProfile Scav profile after adjustments made from raid
+     * @param postRaidServerPmcProfile Pmc profile after raid
+     * @param preRaidScavCharismaProgress charisma progress value pre-raid
+     */
+    protected updatePmcCharismaSkillPostScavRaid(postRaidServerScavProfile: IPmcData, postRaidServerPmcProfile: IPmcData, preRaidScavCharismaProgress: number): void;
+    /**
+     * Does provided profile contain any condition counters
+     * @param profile Profile to check for condition counters
+     * @returns Profile has condition counters
+     */
+    protected profileHasConditionCounters(profile: IPmcData): boolean;
+    /**
+     * Scav quest progress isnt transferred automatically from scav to pmc, we do this manually
+     * @param scavProfile Scav profile with quest progress post-raid
+     * @param pmcProfile Server pmc profile to copy scav quest progress into
+     */
+    protected migrateScavQuestProgressToPmcProfile(scavProfile: IPmcData, pmcProfile: IPmcData): void;
     /**
      * Is the player dead after a raid - dead is anything other than "survived" / "runner"
      * @param statusOnExit exit value from offraidData object
@@ -104,10 +147,8 @@ export declare class InraidController {
     /**
      * Mark inventory items as FiR if player survived raid, otherwise remove FiR from them
      * @param offraidData Save Progress Request
-     * @param pmcData player profile
-     * @param isPlayerScav Was the player a pScav
      */
-    protected markOrRemoveFoundInRaidItems(offraidData: ISaveProgressRequestData, pmcData: IPmcData, isPlayerScav: boolean): void;
+    protected markOrRemoveFoundInRaidItems(offraidData: ISaveProgressRequestData): void;
     /**
      * Update profile after player completes scav raid
      * @param scavData Scav profile
@@ -122,9 +163,8 @@ export declare class InraidController {
      * @param pmcData Pmc profile
      * @param offraidData Post-raid save request
      * @param scavData Scav profile
-     * @param sessionID Session id
      */
-    protected handlePostRaidPlayerScavKarmaChanges(pmcData: IPmcData, offraidData: ISaveProgressRequestData, scavData: IPmcData, sessionID: string): void;
+    protected handlePostRaidPlayerScavKarmaChanges(pmcData: IPmcData, offraidData: ISaveProgressRequestData, scavData: IPmcData): void;
     /**
      * Get the inraid config from configs/inraid.json
      * @returns InRaid Config
@@ -135,4 +175,21 @@ export declare class InraidController {
      * @returns Airdrop config
      */
     getAirdropConfig(): IAirdropConfig;
+    /**
+     * Get BTR config from configs/btr.json
+     * @returns Airdrop config
+     */
+    getBTRConfig(): IBTRConfig;
+    /**
+     * Handle singleplayer/traderServices/getTraderServices
+     * @returns Trader services data
+     */
+    getTraderServices(sessionId: string, traderId: string): ITraderServiceModel[];
+    /**
+     * Handle singleplayer/traderServices/itemDelivery
+     */
+    itemDelivery(sessionId: string, traderId: string, items: Item[]): void;
+    getTraitorScavHostileChance(url: string, sessionID: string): number;
+    getSandboxMaxPatrolValue(url: string, sessionID: string): number;
+    getBossConvertSettings(url: string, sessionId: string): string[];
 }

types/controllers/InsuranceController.d.ts

@@ -1,52 +1,194 @@
-import { DialogueHelper } from "../helpers/DialogueHelper";
-import { ItemHelper } from "../helpers/ItemHelper";
-import { ProfileHelper } from "../helpers/ProfileHelper";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { Item } from "../models/eft/common/tables/IItem";
-import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData";
-import { IGetInsuranceCostResponseData } from "../models/eft/insurance/IGetInsuranceCostResponseData";
-import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { IInsuranceConfig } from "../models/spt/config/IInsuranceConfig";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { EventOutputHolder } from "../routers/EventOutputHolder";
-import { ConfigServer } from "../servers/ConfigServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { SaveServer } from "../servers/SaveServer";
-import { InsuranceService } from "../services/InsuranceService";
-import { PaymentService } from "../services/PaymentService";
-import { RandomUtil } from "../utils/RandomUtil";
-import { TimeUtil } from "../utils/TimeUtil";
+import { DialogueHelper } from "@spt/helpers/DialogueHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { TraderHelper } from "@spt/helpers/TraderHelper";
+import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { Item } from "@spt/models/eft/common/tables/IItem";
+import { IGetInsuranceCostRequestData } from "@spt/models/eft/insurance/IGetInsuranceCostRequestData";
+import { IGetInsuranceCostResponseData } from "@spt/models/eft/insurance/IGetInsuranceCostResponseData";
+import { IInsureRequestData } from "@spt/models/eft/insurance/IInsureRequestData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { Insurance } from "@spt/models/eft/profile/ISptProfile";
+import { IInsuranceConfig } from "@spt/models/spt/config/IInsuranceConfig";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { SaveServer } from "@spt/servers/SaveServer";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { InsuranceService } from "@spt/services/InsuranceService";
+import { LocalisationService } from "@spt/services/LocalisationService";
+import { MailSendService } from "@spt/services/MailSendService";
+import { PaymentService } from "@spt/services/PaymentService";
+import { RagfairPriceService } from "@spt/services/RagfairPriceService";
+import { HashUtil } from "@spt/utils/HashUtil";
+import { MathUtil } from "@spt/utils/MathUtil";
+import { RandomUtil } from "@spt/utils/RandomUtil";
+import { TimeUtil } from "@spt/utils/TimeUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class InsuranceController {
     protected logger: ILogger;
     protected randomUtil: RandomUtil;
+    protected mathUtil: MathUtil;
+    protected hashUtil: HashUtil;
     protected eventOutputHolder: EventOutputHolder;
     protected timeUtil: TimeUtil;
     protected saveServer: SaveServer;
-    protected databaseServer: DatabaseServer;
+    protected databaseService: DatabaseService;
     protected itemHelper: ItemHelper;
     protected profileHelper: ProfileHelper;
     protected dialogueHelper: DialogueHelper;
+    protected weightedRandomHelper: WeightedRandomHelper;
+    protected traderHelper: TraderHelper;
     protected paymentService: PaymentService;
     protected insuranceService: InsuranceService;
+    protected mailSendService: MailSendService;
+    protected ragfairPriceService: RagfairPriceService;
+    protected localisationService: LocalisationService;
     protected configServer: ConfigServer;
+    protected cloner: ICloner;
     protected insuranceConfig: IInsuranceConfig;
-    constructor(logger: ILogger, randomUtil: RandomUtil, eventOutputHolder: EventOutputHolder, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileHelper: ProfileHelper, dialogueHelper: DialogueHelper, paymentService: PaymentService, insuranceService: InsuranceService, configServer: ConfigServer);
+    constructor(logger: ILogger, randomUtil: RandomUtil, mathUtil: MathUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, itemHelper: ItemHelper, profileHelper: ProfileHelper, dialogueHelper: DialogueHelper, weightedRandomHelper: WeightedRandomHelper, traderHelper: TraderHelper, paymentService: PaymentService, insuranceService: InsuranceService, mailSendService: MailSendService, ragfairPriceService: RagfairPriceService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner);
     /**
-     * Process insurance items prior to being given to player in mail
+     * Process insurance items of all profiles prior to being given back to the player through the mail service.
+     *
+     * @returns void
      */
     processReturn(): void;
     /**
-     * Should the passed in item be removed from player inventory
-     * @param insuredItem Insurued item to roll to lose
-     * @param traderId Trader the item was insured by
-     * @param itemsBeingDeleted All items to remove from player
-     * @returns True if item should be removed
+     * Process insurance items of a single profile prior to being given back to the player through the mail service.
+     *
+     * @returns void
      */
-    protected itemShouldBeLost(insuredItem: Item, traderId: string, itemsBeingDeleted: string[]): boolean;
+    processReturnByProfile(sessionID: string): void;
+    /**
+     * Get all insured items that are ready to be processed in a specific profile.
+     *
+     * @param sessionID Session ID of the profile to check.
+     * @param time The time to check ready status against. Current time by default.
+     * @returns All insured items that are ready to be processed.
+     */
+    protected filterInsuredItems(sessionID: string, time?: number): Insurance[];
+    /**
+     * This method orchestrates the processing of insured items in a profile.
+     *
+     * @param insuranceDetails The insured items to process.
+     * @param sessionID The session ID that should receive the processed items.
+     * @returns void
+     */
+    protected processInsuredItems(insuranceDetails: Insurance[], sessionID: string): void;
+    /**
+     * Count all items in all insurance packages.
+     * @param insurance
+     * @returns
+     */
+    protected countAllInsuranceItems(insurance: Insurance[]): number;
+    /**
+     * Remove an insurance package from a profile using the package's system data information.
+     *
+     * @param sessionID The session ID of the profile to remove the package from.
+     * @param index The array index of the insurance package to remove.
+     * @returns void
+     */
+    protected removeInsurancePackageFromProfile(sessionID: string, insPackage: Insurance): void;
+    /**
+     * Finds the items that should be deleted based on the given Insurance object.
+     *
+     * @param rootItemParentID - The ID that should be assigned to all "hideout"/root items.
+     * @param insured - The insurance object containing the items to evaluate for deletion.
+     * @returns A Set containing the IDs of items that should be deleted.
+     */
+    protected findItemsToDelete(rootItemParentID: string, insured: Insurance): Set<string>;
+    /**
+     * Initialize a Map object that holds main-parents to all of their attachments. Note that "main-parent" in this
+     * context refers to the parent item that an attachment is attached to. For example, a suppressor attached to a gun,
+     * not the backpack that the gun is located in (the gun's parent).
+     *
+     * @param rootItemParentID - The ID that should be assigned to all "hideout"/root items.
+     * @param insured - The insurance object containing the items to evaluate.
+     * @param itemsMap - A Map object for quick item look-up by item ID.
+     * @returns A Map object containing parent item IDs to arrays of their attachment items.
+     */
+    protected populateParentAttachmentsMap(rootItemParentID: string, insured: Insurance, itemsMap: Map<string, Item>): Map<string, Item[]>;
+    /**
+     * Remove attachments that can not be moddable in-raid from the parentAttachmentsMap. If no moddable attachments
+     * remain, the parent is removed from the map as well.
+     *
+     * @param parentAttachmentsMap - A Map object containing parent item IDs to arrays of their attachment items.
+     * @param itemsMap - A Map object for quick item look-up by item ID.
+     * @returns A Map object containing parent item IDs to arrays of their attachment items which are not moddable in-raid.
+     */
+    protected removeNonModdableAttachments(parentAttachmentsMap: Map<string, Item[]>, itemsMap: Map<string, Item>): Map<string, Item[]>;
+    /**
+     * Process "regular" insurance items. Any insured item that is not an attached, attachment is considered a "regular"
+     * item. This method iterates over them, preforming item deletion rolls to see if they should be deleted. If so,
+     * they (and their attached, attachments, if any) are marked for deletion in the toDelete Set.
+     *
+     * @param insured The insurance object containing the items to evaluate.
+     * @param toDelete A Set to keep track of items marked for deletion.
+     * @param parentAttachmentsMap A Map object containing parent item IDs to arrays of their attachment items.
+     * @returns void
+     */
+    protected processRegularItems(insured: Insurance, toDelete: Set<string>, parentAttachmentsMap: Map<string, Item[]>): void;
+    /**
+     * Process parent items and their attachments, updating the toDelete Set accordingly.
+     *
+     * @param mainParentToAttachmentsMap A Map object containing parent item IDs to arrays of their attachment items.
+     * @param itemsMap A Map object for quick item look-up by item ID.
+     * @param traderId The trader ID from the Insurance object.
+     * @param toDelete A Set object to keep track of items marked for deletion.
+     */
+    protected processAttachments(mainParentToAttachmentsMap: Map<string, Item[]>, itemsMap: Map<string, Item>, traderId: string, toDelete: Set<string>): void;
+    /**
+     * Takes an array of attachment items that belong to the same main-parent item, sorts them in descending order by
+     * their maximum price. For each attachment, a roll is made to determine if a deletion should be made. Once the
+     * number of deletions has been counted, the attachments are added to the toDelete Set, starting with the most
+     * valuable attachments first.
+     *
+     * @param attachments The array of attachment items to sort, filter, and roll.
+     * @param traderId The ID of the trader to that has ensured these items.
+     * @param toDelete The array that accumulates the IDs of the items to be deleted.
+     * @returns void
+     */
+    protected processAttachmentByParent(attachments: Item[], traderId: string, toDelete: Set<string>): void;
+    protected logAttachmentsBeingRemoved(attachmentIdsToRemove: string[], attachments: Item[], attachmentPrices: Record<string, number>): void;
+    protected weightAttachmentsByPrice(attachments: Item[]): Record<string, number>;
+    /**
+     * Get count of items to remove from weapon (take into account trader + price of attachment)
+     * @param weightedAttachmentByPrice Dict of item Tpls and thier rouble price
+     * @param traderId Trader attachment insured against
+     * @returns Attachment count to remove
+     */
+    protected getAttachmentCountToRemove(weightedAttachmentByPrice: Record<string, number>, traderId: string): number;
+    /**
+     * Remove items from the insured items that should not be returned to the player.
+     *
+     * @param insured The insured items to process.
+     * @param toDelete The items that should be deleted.
+     * @returns void
+     */
+    protected removeItemsFromInsurance(insured: Insurance, toDelete: Set<string>): void;
+    /**
+     * Handle sending the insurance message to the user that potentially contains the valid insurance items.
+     *
+     * @param sessionID The session ID that should receive the insurance message.
+     * @param insurance The context of insurance to use.
+     * @returns void
+     */
+    protected sendMail(sessionID: string, insurance: Insurance): void;
+    /**
+     * Determines whether an insured item should be removed from the player's inventory based on a random roll and
+     * trader-specific return chance.
+     *
+     * @param traderId The ID of the trader who insured the item.
+     * @param insuredItem Optional. The item to roll for. Only used for logging.
+     * @returns true if the insured item should be removed from inventory, false otherwise, or undefined on error.
+     */
+    protected rollForDelete(traderId: string, insuredItem?: Item): boolean | undefined;
     /**
      * Handle Insure event
      * Add insurance to an item
+     *
      * @param pmcData Player profile
      * @param body Insurance request
      * @param sessionID Session id
@@ -56,9 +198,10 @@ export declare class InsuranceController {
     /**
      * Handle client/insurance/items/list/cost
      * Calculate insurance cost
-     * @param info request object
+     *
+     * @param request request object
      * @param sessionID session id
      * @returns IGetInsuranceCostResponseData object to send to client
      */
-    cost(info: IGetInsuranceCostRequestData, sessionID: string): IGetInsuranceCostResponseData;
+    cost(request: IGetInsuranceCostRequestData, sessionID: string): IGetInsuranceCostResponseData;
 }

types/controllers/InventoryController.d.ts

@@ -1,109 +1,133 @@
-import { LootGenerator } from "../generators/LootGenerator";
-import { InventoryHelper } from "../helpers/InventoryHelper";
-import { ItemHelper } from "../helpers/ItemHelper";
-import { PaymentHelper } from "../helpers/PaymentHelper";
-import { PresetHelper } from "../helpers/PresetHelper";
-import { ProfileHelper } from "../helpers/ProfileHelper";
-import { QuestHelper } from "../helpers/QuestHelper";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { IInventoryBindRequestData } from "../models/eft/inventory/IInventoryBindRequestData";
-import { IInventoryCreateMarkerRequestData } from "../models/eft/inventory/IInventoryCreateMarkerRequestData";
-import { IInventoryDeleteMarkerRequestData } from "../models/eft/inventory/IInventoryDeleteMarkerRequestData";
-import { IInventoryEditMarkerRequestData } from "../models/eft/inventory/IInventoryEditMarkerRequestData";
-import { IInventoryExamineRequestData } from "../models/eft/inventory/IInventoryExamineRequestData";
-import { IInventoryFoldRequestData } from "../models/eft/inventory/IInventoryFoldRequestData";
-import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData";
-import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData";
-import { IInventoryReadEncyclopediaRequestData } from "../models/eft/inventory/IInventoryReadEncyclopediaRequestData";
-import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData";
-import { IInventorySortRequestData } from "../models/eft/inventory/IInventorySortRequestData";
-import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData";
-import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwapRequestData";
-import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData";
-import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData";
-import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData";
-import { IOpenRandomLootContainerRequestData } from "../models/eft/inventory/IOpenRandomLootContainerRequestData";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { EventOutputHolder } from "../routers/EventOutputHolder";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { FenceService } from "../services/FenceService";
-import { LocalisationService } from "../services/LocalisationService";
-import { RagfairOfferService } from "../services/RagfairOfferService";
-import { HashUtil } from "../utils/HashUtil";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
-import { JsonUtil } from "../utils/JsonUtil";
-import { RandomUtil } from "../utils/RandomUtil";
+import { LootGenerator } from "@spt/generators/LootGenerator";
+import { HideoutHelper } from "@spt/helpers/HideoutHelper";
+import { InventoryHelper } from "@spt/helpers/InventoryHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { PaymentHelper } from "@spt/helpers/PaymentHelper";
+import { PresetHelper } from "@spt/helpers/PresetHelper";
+import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { QuestHelper } from "@spt/helpers/QuestHelper";
+import { TraderHelper } from "@spt/helpers/TraderHelper";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IInventoryBindRequestData } from "@spt/models/eft/inventory/IInventoryBindRequestData";
+import { IInventoryCreateMarkerRequestData } from "@spt/models/eft/inventory/IInventoryCreateMarkerRequestData";
+import { IInventoryDeleteMarkerRequestData } from "@spt/models/eft/inventory/IInventoryDeleteMarkerRequestData";
+import { IInventoryEditMarkerRequestData } from "@spt/models/eft/inventory/IInventoryEditMarkerRequestData";
+import { IInventoryExamineRequestData } from "@spt/models/eft/inventory/IInventoryExamineRequestData";
+import { IInventoryFoldRequestData } from "@spt/models/eft/inventory/IInventoryFoldRequestData";
+import { IInventoryMergeRequestData } from "@spt/models/eft/inventory/IInventoryMergeRequestData";
+import { IInventoryMoveRequestData } from "@spt/models/eft/inventory/IInventoryMoveRequestData";
+import { IInventoryReadEncyclopediaRequestData } from "@spt/models/eft/inventory/IInventoryReadEncyclopediaRequestData";
+import { IInventoryRemoveRequestData } from "@spt/models/eft/inventory/IInventoryRemoveRequestData";
+import { IInventorySortRequestData } from "@spt/models/eft/inventory/IInventorySortRequestData";
+import { IInventorySplitRequestData } from "@spt/models/eft/inventory/IInventorySplitRequestData";
+import { IInventorySwapRequestData } from "@spt/models/eft/inventory/IInventorySwapRequestData";
+import { IInventoryTagRequestData } from "@spt/models/eft/inventory/IInventoryTagRequestData";
+import { IInventoryToggleRequestData } from "@spt/models/eft/inventory/IInventoryToggleRequestData";
+import { IInventoryTransferRequestData } from "@spt/models/eft/inventory/IInventoryTransferRequestData";
+import { IOpenRandomLootContainerRequestData } from "@spt/models/eft/inventory/IOpenRandomLootContainerRequestData";
+import { IRedeemProfileRequestData } from "@spt/models/eft/inventory/IRedeemProfileRequestData";
+import { ISetFavoriteItems } from "@spt/models/eft/inventory/ISetFavoriteItems";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { FenceService } from "@spt/services/FenceService";
+import { LocalisationService } from "@spt/services/LocalisationService";
+import { MapMarkerService } from "@spt/services/MapMarkerService";
+import { PlayerService } from "@spt/services/PlayerService";
+import { RagfairOfferService } from "@spt/services/RagfairOfferService";
+import { HashUtil } from "@spt/utils/HashUtil";
+import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
+import { RandomUtil } from "@spt/utils/RandomUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class InventoryController {
     protected logger: ILogger;
     protected hashUtil: HashUtil;
-    protected jsonUtil: JsonUtil;
     protected itemHelper: ItemHelper;
     protected randomUtil: RandomUtil;
-    protected databaseServer: DatabaseServer;
+    protected databaseService: DatabaseService;
     protected fenceService: FenceService;
     protected presetHelper: PresetHelper;
     protected inventoryHelper: InventoryHelper;
     protected questHelper: QuestHelper;
+    protected hideoutHelper: HideoutHelper;
     protected ragfairOfferService: RagfairOfferService;
+    protected mapMarkerService: MapMarkerService;
     protected profileHelper: ProfileHelper;
     protected paymentHelper: PaymentHelper;
+    protected traderHelper: TraderHelper;
     protected localisationService: LocalisationService;
+    protected playerService: PlayerService;
     protected lootGenerator: LootGenerator;
     protected eventOutputHolder: EventOutputHolder;
     protected httpResponseUtil: HttpResponseUtil;
-    constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, itemHelper: ItemHelper, randomUtil: RandomUtil, databaseServer: DatabaseServer, fenceService: FenceService, presetHelper: PresetHelper, inventoryHelper: InventoryHelper, questHelper: QuestHelper, ragfairOfferService: RagfairOfferService, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, lootGenerator: LootGenerator, eventOutputHolder: EventOutputHolder, httpResponseUtil: HttpResponseUtil);
+    protected cloner: ICloner;
+    constructor(logger: ILogger, hashUtil: HashUtil, itemHelper: ItemHelper, randomUtil: RandomUtil, databaseService: DatabaseService, fenceService: FenceService, presetHelper: PresetHelper, inventoryHelper: InventoryHelper, questHelper: QuestHelper, hideoutHelper: HideoutHelper, ragfairOfferService: RagfairOfferService, mapMarkerService: MapMarkerService, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, localisationService: LocalisationService, playerService: PlayerService, lootGenerator: LootGenerator, eventOutputHolder: EventOutputHolder, httpResponseUtil: HttpResponseUtil, cloner: ICloner);
     /**
-    * Move Item
-    * change location of item with parentId and slotId
-    * transfers items from one profile to another if fromOwner/toOwner is set in the body.
-    * otherwise, move is contained within the same profile_f.
+     * Move Item
+     * change location of item with parentId and slotId
+     * transfers items from one profile to another if fromOwner/toOwner is set in the body.
+     * otherwise, move is contained within the same profile_f.
      * @param pmcData Profile
      * @param moveRequest Move request data
      * @param sessionID Session id
-     * @returns IItemEventRouterResponse
+     * @param output Client response
      */
-    moveItem(pmcData: IPmcData, moveRequest: IInventoryMoveRequestData, sessionID: string): IItemEventRouterResponse;
+    moveItem(pmcData: IPmcData, moveRequest: IInventoryMoveRequestData, sessionID: string, output: IItemEventRouterResponse): void;
     /**
      * Get a event router response with inventory trader message
      * @param output Item event router response
      * @returns Item event router response
      */
-    protected getTraderExploitErrorResponse(output: IItemEventRouterResponse): IItemEventRouterResponse;
-    /**
-    * Remove Item from Profile
-    * Deep tree item deletion, also removes items from insurance list
-    */
-    removeItem(pmcData: IPmcData, itemId: string, sessionID: string, output?: IItemEventRouterResponse): IItemEventRouterResponse;
+    protected appendTraderExploitErrorResponse(output: IItemEventRouterResponse): void;
     /**
+     * Handle Remove event
      * Implements functionality "Discard" from Main menu (Stash etc.)
      * Removes item from PMC Profile
      */
-    discardItem(pmcData: IPmcData, body: IInventoryRemoveRequestData, sessionID: string): IItemEventRouterResponse;
+    discardItem(pmcData: IPmcData, request: IInventoryRemoveRequestData, sessionID: string, output: IItemEventRouterResponse): void;
     /**
-    * Split Item
-    * spliting 1 item-stack into 2 separate items ...
-    */
-    splitItem(pmcData: IPmcData, body: IInventorySplitRequestData, sessionID: string): IItemEventRouterResponse;
-    /**
-     * Merge Item
-     * merges 2 items into one, deletes item from `body.item` and adding number of stacks into `body.with`
+     * Split Item
+     * spliting 1 stack into 2
+     * @param pmcData Player profile (unused, getOwnerInventoryItems() gets profile)
+     * @param request Split request
+     * @param sessionID Session/player id
+     * @param output Client response
+     * @returns IItemEventRouterResponse
      */
-    mergeItem(pmcData: IPmcData, body: IInventoryMergeRequestData, sessionID: string): IItemEventRouterResponse;
+    splitItem(pmcData: IPmcData, request: IInventorySplitRequestData, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse;
     /**
-    * Transfer item
-    * Used to take items from scav inventory into stash or to insert ammo into mags (shotgun ones) and reloading weapon by clicking "Reload"
-    */
-    transferItem(pmcData: IPmcData, body: IInventoryTransferRequestData, sessionID: string): IItemEventRouterResponse;
+     * Fully merge 2 inventory stacks together into one stack (merging where both stacks remain is called 'transfer')
+     * Deletes item from `body.item` and adding number of stacks into `body.with`
+     * @param pmcData Player profile (unused, getOwnerInventoryItems() gets profile)
+     * @param body Merge request
+     * @param sessionID Player id
+     * @param output Client response
+     * @returns IItemEventRouterResponse
+     */
+    mergeItem(pmcData: IPmcData, body: IInventoryMergeRequestData, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse;
     /**
-    * Swap Item
-    * its used for "reload" if you have weapon in hands and magazine is somewhere else in rig or backpack in equipment
-    */
-    swapItem(pmcData: IPmcData, body: IInventorySwapRequestData, sessionID: string): IItemEventRouterResponse;
+     * TODO: Adds no data to output to send to client, is this by design?
+     * Transfer items from one stack into another while keeping original stack
+     * Used to take items from scav inventory into stash or to insert ammo into mags (shotgun ones) and reloading weapon by clicking "Reload"
+     * @param pmcData Player profile
+     * @param body Transfer request
+     * @param sessionID Session id
+     * @param output Client response
+     * @returns IItemEventRouterResponse
+     */
+    transferItem(pmcData: IPmcData, body: IInventoryTransferRequestData, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse;
+    /**
+     * Swap Item
+     * its used for "reload" if you have weapon in hands and magazine is somewhere else in rig or backpack in equipment
+     * Also used to swap items using quick selection on character screen
+     */
+    swapItem(pmcData: IPmcData, request: IInventorySwapRequestData, sessionID: string): IItemEventRouterResponse;
     /**
      * Handles folding of Weapons
      */
-    foldItem(pmcData: IPmcData, body: IInventoryFoldRequestData, sessionID: string): IItemEventRouterResponse;
+    foldItem(pmcData: IPmcData, request: IInventoryFoldRequestData, sessionID: string): IItemEventRouterResponse;
     /**
      * Toggles "Toggleable" items like night vision goggles and face shields.
      * @param pmcData player profile
@@ -122,26 +146,43 @@ export declare class InventoryController {
     tagItem(pmcData: IPmcData, body: IInventoryTagRequestData, sessionID: string): IItemEventRouterResponse;
     /**
      * Bind an inventory item to the quick access menu at bottom of player screen
+     * Handle bind event
      * @param pmcData Player profile
      * @param bindRequest Reqeust object
      * @param sessionID Session id
      * @returns IItemEventRouterResponse
      */
-    bindItem(pmcData: IPmcData, bindRequest: IInventoryBindRequestData, sessionID: string): IItemEventRouterResponse;
+    bindItem(pmcData: IPmcData, bindRequest: IInventoryBindRequestData, sessionID: string): void;
+    /**
+     * Unbind an inventory item from quick access menu at bottom of player screen
+     * Handle unbind event
+     * @param pmcData Player profile
+     * @param bindRequest Request object
+     * @param sessionID Session id
+     * @param output Client response
+     */
+    unbindItem(pmcData: IPmcData, request: IInventoryBindRequestData, sessionID: string, output: IItemEventRouterResponse): void;
     /**
      * Handles examining an item
      * @param pmcData player profile
      * @param body request object
      * @param sessionID session id
+     * @param output Client response
      * @returns response
      */
-    examineItem(pmcData: IPmcData, body: IInventoryExamineRequestData, sessionID: string): IItemEventRouterResponse;
+    examineItem(pmcData: IPmcData, body: IInventoryExamineRequestData, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse;
+    /**
+     * Flag an item as seen in profiles encyclopedia + add inspect xp to profile
+     * @param itemTpls Inspected item tpls
+     * @param fullProfile Profile to add xp to
+     */
+    protected flagItemsAsInspectedAndRewardXp(itemTpls: string[], fullProfile: ISptProfile): void;
     /**
      * Get the tplid of an item from the examine request object
-     * @param body response request
-     * @returns tplid
+     * @param request Response request
+     * @returns tplId
      */
-    protected getExaminedItemTpl(body: IInventoryExamineRequestData): string;
+    protected getExaminedItemTpl(request: IInventoryExamineRequestData): string;
     readEncyclopedia(pmcData: IPmcData, body: IInventoryReadEncyclopediaRequestData, sessionID: string): IItemEventRouterResponse;
     /**
      * Handle ApplyInventoryChanges
@@ -149,46 +190,42 @@ export declare class InventoryController {
      * @param pmcData Player profile
      * @param request sort request
      * @param sessionID Session id
-     * @returns IItemEventRouterResponse
      */
-    sortInventory(pmcData: IPmcData, request: IInventorySortRequestData, sessionID: string): IItemEventRouterResponse;
+    sortInventory(pmcData: IPmcData, request: IInventorySortRequestData, sessionID: string): void;
     /**
      * Add note to a map
      * @param pmcData Player profile
      * @param request Add marker request
      * @param sessionID Session id
+     * @param output Client response
      * @returns IItemEventRouterResponse
      */
-    createMapMarker(pmcData: IPmcData, request: IInventoryCreateMarkerRequestData, sessionID: string): IItemEventRouterResponse;
+    createMapMarker(pmcData: IPmcData, request: IInventoryCreateMarkerRequestData, sessionID: string, output: IItemEventRouterResponse): void;
     /**
      * Delete a map marker
      * @param pmcData Player profile
      * @param request Delete marker request
      * @param sessionID Session id
-     * @returns IItemEventRouterResponse
+     * @param output Client response
      */
-    deleteMapMarker(pmcData: IPmcData, request: IInventoryDeleteMarkerRequestData, sessionID: string): IItemEventRouterResponse;
+    deleteMapMarker(pmcData: IPmcData, request: IInventoryDeleteMarkerRequestData, sessionID: string, output: IItemEventRouterResponse): void;
     /**
      * Edit an existing map marker
      * @param pmcData Player profile
      * @param request Edit marker request
      * @param sessionID Session id
-     * @returns IItemEventRouterResponse
+     * @param output Client response
      */
-    editMapMarker(pmcData: IPmcData, request: IInventoryEditMarkerRequestData, sessionID: string): IItemEventRouterResponse;
-    /**
-     * Strip out characters from note string that are not: letter/numbers/unicode/spaces
-     * @param mapNoteText Marker text to sanitise
-     * @returns Sanitised map marker text
-     */
-    protected sanitiseMapMarkerText(mapNoteText: string): string;
+    editMapMarker(pmcData: IPmcData, request: IInventoryEditMarkerRequestData, sessionID: string, output: IItemEventRouterResponse): void;
     /**
      * Handle OpenRandomLootContainer event
      * Handle event fired when a container is unpacked (currently only the halloween pumpkin)
      * @param pmcData Profile data
-     * @param body open loot container request data
+     * @param body Open loot container request data
      * @param sessionID Session id
-     * @returns IItemEventRouterResponse
+     * @param output Client response
      */
-    openRandomLootContainer(pmcData: IPmcData, body: IOpenRandomLootContainerRequestData, sessionID: string): IItemEventRouterResponse;
+    openRandomLootContainer(pmcData: IPmcData, body: IOpenRandomLootContainerRequestData, sessionID: string, output: IItemEventRouterResponse): void;
+    redeemProfileReward(pmcData: IPmcData, request: IRedeemProfileRequestData, sessionId: string): void;
+    setFavoriteItem(pmcData: IPmcData, request: ISetFavoriteItems, sessionId: string): void;
 }

types/controllers/LauncherController.d.ts

@@ -1,36 +1,65 @@
-import { HttpServerHelper } from "../helpers/HttpServerHelper";
-import { IChangeRequestData } from "../models/eft/launcher/IChangeRequestData";
-import { ILoginRequestData } from "../models/eft/launcher/ILoginRequestData";
-import { IRegisterData } from "../models/eft/launcher/IRegisterData";
-import { Info } from "../models/eft/profile/IAkiProfile";
-import { IConnectResponse } from "../models/eft/profile/IConnectResponse";
-import { ICoreConfig } from "../models/spt/config/ICoreConfig";
-import { ConfigServer } from "../servers/ConfigServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { SaveServer } from "../servers/SaveServer";
-import { LocalisationService } from "../services/LocalisationService";
-import { HashUtil } from "../utils/HashUtil";
+import { HttpServerHelper } from "@spt/helpers/HttpServerHelper";
+import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { PreSptModLoader } from "@spt/loaders/PreSptModLoader";
+import { IChangeRequestData } from "@spt/models/eft/launcher/IChangeRequestData";
+import { ILoginRequestData } from "@spt/models/eft/launcher/ILoginRequestData";
+import { IRegisterData } from "@spt/models/eft/launcher/IRegisterData";
+import { IConnectResponse } from "@spt/models/eft/profile/IConnectResponse";
+import { Info, ModDetails } from "@spt/models/eft/profile/ISptProfile";
+import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig";
+import { IPackageJsonData } from "@spt/models/spt/mod/IPackageJsonData";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { SaveServer } from "@spt/servers/SaveServer";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { LocalisationService } from "@spt/services/LocalisationService";
+import { HashUtil } from "@spt/utils/HashUtil";
+import { RandomUtil } from "@spt/utils/RandomUtil";
+import { TimeUtil } from "@spt/utils/TimeUtil";
 export declare class LauncherController {
+    protected logger: ILogger;
     protected hashUtil: HashUtil;
+    protected timeUtil: TimeUtil;
+    protected randomUtil: RandomUtil;
     protected saveServer: SaveServer;
     protected httpServerHelper: HttpServerHelper;
-    protected databaseServer: DatabaseServer;
+    protected profileHelper: ProfileHelper;
+    protected databaseService: DatabaseService;
     protected localisationService: LocalisationService;
+    protected preSptModLoader: PreSptModLoader;
     protected configServer: ConfigServer;
     protected coreConfig: ICoreConfig;
-    constructor(hashUtil: HashUtil, saveServer: SaveServer, httpServerHelper: HttpServerHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer);
+    constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, randomUtil: RandomUtil, saveServer: SaveServer, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, databaseService: DatabaseService, localisationService: LocalisationService, preSptModLoader: PreSptModLoader, configServer: ConfigServer);
     connect(): IConnectResponse;
     /**
-     * Get descriptive text for each of the profile edtions a player can choose
-     * @returns
+     * Get descriptive text for each of the profile edtions a player can choose, keyed by profile.json profile type e.g. "Edge Of Darkness"
+     * @returns Dictionary of profile types with related descriptive text
      */
     protected getProfileDescriptions(): Record<string, string>;
-    find(sessionIdKey: string): Info;
+    find(sessionId: string): Info;
     login(info: ILoginRequestData): string;
     register(info: IRegisterData): string;
     protected createAccount(info: IRegisterData): string;
+    protected generateProfileId(): string;
+    protected formatID(timeStamp: number, counter: number): string;
     changeUsername(info: IChangeRequestData): string;
     changePassword(info: IChangeRequestData): string;
+    /**
+     * Handle launcher requesting profile be wiped
+     * @param info IRegisterData
+     * @returns Session id
+     */
     wipe(info: IRegisterData): string;
     getCompatibleTarkovVersion(): string;
+    /**
+     * Get the mods the server has currently loaded
+     * @returns Dictionary of mod name and mod details
+     */
+    getLoadedServerMods(): Record<string, IPackageJsonData>;
+    /**
+     * Get the mods a profile has ever loaded into game with
+     * @param sessionId Player id
+     * @returns Array of mod details
+     */
+    getServerModsProfileUsed(sessionId: string): ModDetails[];
 }

types/controllers/LocationController.d.ts

@@ -1,41 +1,53 @@
-import { LocationGenerator } from "../generators/LocationGenerator";
-import { LootGenerator } from "../generators/LootGenerator";
-import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper";
-import { ILocationBase } from "../models/eft/common/ILocationBase";
-import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSourceDestinationBase";
-import { IAirdropLootResult } from "../models/eft/location/IAirdropLootResult";
-import { AirdropTypeEnum } from "../models/enums/AirdropType";
-import { IAirdropConfig } from "../models/spt/config/IAirdropConfig";
-import { LootRequest } from "../models/spt/services/LootRequest";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { ConfigServer } from "../servers/ConfigServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { LocalisationService } from "../services/LocalisationService";
-import { HashUtil } from "../utils/HashUtil";
-import { JsonUtil } from "../utils/JsonUtil";
-import { TimeUtil } from "../utils/TimeUtil";
+import { ApplicationContext } from "@spt/context/ApplicationContext";
+import { LocationGenerator } from "@spt/generators/LocationGenerator";
+import { LootGenerator } from "@spt/generators/LootGenerator";
+import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
+import { ILocationBase } from "@spt/models/eft/common/ILocationBase";
+import { ILocationsGenerateAllResponse } from "@spt/models/eft/common/ILocationsSourceDestinationBase";
+import { IAirdropLootResult } from "@spt/models/eft/location/IAirdropLootResult";
+import { IGetLocationRequestData } from "@spt/models/eft/location/IGetLocationRequestData";
+import { AirdropTypeEnum } from "@spt/models/enums/AirdropType";
+import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig";
+import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig";
+import { LootRequest } from "@spt/models/spt/services/LootRequest";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { ItemFilterService } from "@spt/services/ItemFilterService";
+import { LocalisationService } from "@spt/services/LocalisationService";
+import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService";
+import { HashUtil } from "@spt/utils/HashUtil";
+import { RandomUtil } from "@spt/utils/RandomUtil";
+import { TimeUtil } from "@spt/utils/TimeUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class LocationController {
-    protected jsonUtil: JsonUtil;
     protected hashUtil: HashUtil;
+    protected randomUtil: RandomUtil;
     protected weightedRandomHelper: WeightedRandomHelper;
     protected logger: ILogger;
     protected locationGenerator: LocationGenerator;
     protected localisationService: LocalisationService;
+    protected raidTimeAdjustmentService: RaidTimeAdjustmentService;
+    protected itemFilterService: ItemFilterService;
     protected lootGenerator: LootGenerator;
-    protected databaseServer: DatabaseServer;
+    protected databaseService: DatabaseService;
     protected timeUtil: TimeUtil;
     protected configServer: ConfigServer;
+    protected applicationContext: ApplicationContext;
+    protected cloner: ICloner;
     protected airdropConfig: IAirdropConfig;
-    constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, weightedRandomHelper: WeightedRandomHelper, logger: ILogger, locationGenerator: LocationGenerator, localisationService: LocalisationService, lootGenerator: LootGenerator, databaseServer: DatabaseServer, timeUtil: TimeUtil, configServer: ConfigServer);
+    protected locationConfig: ILocationConfig;
+    constructor(hashUtil: HashUtil, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, logger: ILogger, locationGenerator: LocationGenerator, localisationService: LocalisationService, raidTimeAdjustmentService: RaidTimeAdjustmentService, itemFilterService: ItemFilterService, lootGenerator: LootGenerator, databaseService: DatabaseService, timeUtil: TimeUtil, configServer: ConfigServer, applicationContext: ApplicationContext, cloner: ICloner);
     /**
      * Handle client/location/getLocalloot
      * Get a location (map) with generated loot data
-     * @param location Map to generate loot for
+     * @param sessionId Player id
+     * @param request Map request to generate
      * @returns ILocationBase
      */
-    get(location: string): ILocationBase;
+    get(sessionId: string, request: IGetLocationRequestData): ILocationBase;
     /**
-     * Generate a maps base location without loot
+     * Generate a maps base location and loot
      * @param name Map name
      * @returns ILocationBase
      */
@@ -49,7 +61,7 @@ export declare class LocationController {
     generateAll(sessionId: string): ILocationsGenerateAllResponse;
     /**
      * Handle client/location/getAirdropLoot
-     * Get loot for an airdop container
+     * Get loot for an airdrop container
      * Generates it randomly based on config/airdrop.json values
      * @returns Array of LootItem objects
      */

types/controllers/MatchController.d.ts

@@ -1,27 +1,35 @@
-import { ApplicationContext } from "../context/ApplicationContext";
-import { ProfileHelper } from "../helpers/ProfileHelper";
-import { TraderHelper } from "../helpers/TraderHelper";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { ICreateGroupRequestData } from "../models/eft/match/ICreateGroupRequestData";
-import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData";
-import { IGetGroupStatusRequestData } from "../models/eft/match/IGetGroupStatusRequestData";
-import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData";
-import { IGetRaidConfigurationRequestData } from "../models/eft/match/IGetRaidConfigurationRequestData";
-import { IJoinMatchRequestData } from "../models/eft/match/IJoinMatchRequestData";
-import { IJoinMatchResult } from "../models/eft/match/IJoinMatchResult";
-import { IBotConfig } from "../models/spt/config/IBotConfig";
-import { IInRaidConfig } from "../models/spt/config/IInRaidConfig";
-import { IMatchConfig } from "../models/spt/config/IMatchConfig";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { ConfigServer } from "../servers/ConfigServer";
-import { SaveServer } from "../servers/SaveServer";
-import { BotGenerationCacheService } from "../services/BotGenerationCacheService";
-import { BotLootCacheService } from "../services/BotLootCacheService";
-import { MatchLocationService } from "../services/MatchLocationService";
-import { ProfileSnapshotService } from "../services/ProfileSnapshotService";
+import { ApplicationContext } from "@spt/context/ApplicationContext";
+import { LootGenerator } from "@spt/generators/LootGenerator";
+import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { TraderHelper } from "@spt/helpers/TraderHelper";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IEndOfflineRaidRequestData } from "@spt/models/eft/match/IEndOfflineRaidRequestData";
+import { IGetRaidConfigurationRequestData } from "@spt/models/eft/match/IGetRaidConfigurationRequestData";
+import { IMatchGroupStartGameRequest } from "@spt/models/eft/match/IMatchGroupStartGameRequest";
+import { IMatchGroupStatusRequest } from "@spt/models/eft/match/IMatchGroupStatusRequest";
+import { IMatchGroupStatusResponse } from "@spt/models/eft/match/IMatchGroupStatusResponse";
+import { IProfileStatusResponse } from "@spt/models/eft/match/IProfileStatusResponse";
+import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig";
+import { IMatchConfig } from "@spt/models/spt/config/IMatchConfig";
+import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
+import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { SaveServer } from "@spt/servers/SaveServer";
+import { BotGenerationCacheService } from "@spt/services/BotGenerationCacheService";
+import { BotLootCacheService } from "@spt/services/BotLootCacheService";
+import { MailSendService } from "@spt/services/MailSendService";
+import { MatchLocationService } from "@spt/services/MatchLocationService";
+import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService";
+import { HashUtil } from "@spt/utils/HashUtil";
+import { RandomUtil } from "@spt/utils/RandomUtil";
+import { TimeUtil } from "@spt/utils/TimeUtil";
 export declare class MatchController {
     protected logger: ILogger;
     protected saveServer: SaveServer;
+    protected timeUtil: TimeUtil;
+    protected randomUtil: RandomUtil;
+    protected hashUtil: HashUtil;
     protected profileHelper: ProfileHelper;
     protected matchLocationService: MatchLocationService;
     protected traderHelper: TraderHelper;
@@ -29,22 +37,21 @@ export declare class MatchController {
     protected configServer: ConfigServer;
     protected profileSnapshotService: ProfileSnapshotService;
     protected botGenerationCacheService: BotGenerationCacheService;
+    protected mailSendService: MailSendService;
+    protected lootGenerator: LootGenerator;
     protected applicationContext: ApplicationContext;
     protected matchConfig: IMatchConfig;
-    protected inraidConfig: IInRaidConfig;
-    protected botConfig: IBotConfig;
-    constructor(logger: ILogger, saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer, profileSnapshotService: ProfileSnapshotService, botGenerationCacheService: BotGenerationCacheService, applicationContext: ApplicationContext);
+    protected inRaidConfig: IInRaidConfig;
+    protected traderConfig: ITraderConfig;
+    protected pmcConfig: IPmcConfig;
+    constructor(logger: ILogger, saveServer: SaveServer, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer, profileSnapshotService: ProfileSnapshotService, botGenerationCacheService: BotGenerationCacheService, mailSendService: MailSendService, lootGenerator: LootGenerator, applicationContext: ApplicationContext);
     getEnabled(): boolean;
-    /** Handle raid/profile/list */
-    getProfile(info: IGetProfileRequestData): IPmcData[];
-    /** Handle client/match/group/create */
-    createGroup(sessionID: string, info: ICreateGroupRequestData): any;
     /** Handle client/match/group/delete */
     deleteGroup(info: any): void;
     /** Handle match/group/start_game */
-    joinMatch(info: IJoinMatchRequestData, sessionId: string): IJoinMatchResult;
+    joinMatch(info: IMatchGroupStartGameRequest, sessionId: string): IProfileStatusResponse;
     /** Handle client/match/group/status */
-    getGroupStatus(info: IGetGroupStatusRequestData): any;
+    getGroupStatus(info: IMatchGroupStatusRequest): IMatchGroupStatusResponse;
     /**
      * Handle /client/raid/configuration
      * @param request Raid config request
@@ -59,6 +66,20 @@ export declare class MatchController {
     protected convertDifficultyDropdownIntoBotDifficulty(botDifficulty: string): string;
     /** Handle client/match/offline/end */
     endOfflineRaid(info: IEndOfflineRaidRequestData, sessionId: string): void;
+    /**
+     * Did player take a COOP extract
+     * @param extractName Name of extract player took
+     * @returns True if coop extract
+     */
+    protected extractWasViaCoop(extractName: string): boolean;
+    protected sendCoopTakenFenceMessage(sessionId: string): void;
+    /**
+     * Handle when a player extracts using a coop extract - add rep to fence
+     * @param sessionId Session/player id
+     * @param pmcData Profile
+     * @param extractName Name of extract taken
+     */
+    protected handleCoopExtract(sessionId: string, pmcData: IPmcData, extractName: string): void;
     /**
      * Was extract by car
      * @param extractName name of extract
@@ -73,10 +94,11 @@ export declare class MatchController {
      */
     protected handleCarExtract(extractName: string, pmcData: IPmcData, sessionId: string): void;
     /**
-     * Update players fence trader standing value in profile
-     * @param pmcData Player profile
-     * @param fenceId Id of fence trader
-     * @param extractName Name of extract used
+     * Get the fence rep gain from using a car or coop extract
+     * @param pmcData Profile
+     * @param baseGain amount gained for the first extract
+     * @param extractCount Number of times extract was taken
+     * @returns Fence standing after taking extract
      */
-    protected updateFenceStandingInProfile(pmcData: IPmcData, fenceId: string, extractName: string): void;
+    protected getFenceStandingAfterExtract(pmcData: IPmcData, baseGain: number, extractCount: number): number;
 }

types/controllers/NoteController.d.ts

@@ -1,7 +1,7 @@
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { INoteActionData } from "../models/eft/notes/INoteActionData";
-import { EventOutputHolder } from "../routers/EventOutputHolder";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { INoteActionData } from "@spt/models/eft/notes/INoteActionData";
+import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
 export declare class NoteController {
     protected eventOutputHolder: EventOutputHolder;
     constructor(eventOutputHolder: EventOutputHolder);

types/controllers/NotifierController.d.ts

@@ -1,7 +1,7 @@
-import { NotifierHelper } from "../helpers/NotifierHelper";
-import { NotificationService } from "../services/NotificationService";
-import { INotifierChannel } from "../models/eft/notifier/INotifier";
-import { HttpServerHelper } from "../helpers/HttpServerHelper";
+import { HttpServerHelper } from "@spt/helpers/HttpServerHelper";
+import { NotifierHelper } from "@spt/helpers/NotifierHelper";
+import { INotifierChannel } from "@spt/models/eft/notifier/INotifier";
+import { NotificationService } from "@spt/services/NotificationService";
 export declare class NotifierController {
     protected notifierHelper: NotifierHelper;
     protected httpServerHelper: HttpServerHelper;

types/controllers/PresetBuildController.d.ts

@@ -1,21 +0,0 @@
-import { ItemHelper } from "../helpers/ItemHelper";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { IPresetBuildActionRequestData } from "../models/eft/presetBuild/IPresetBuildActionRequestData";
-import { WeaponBuild } from "../models/eft/profile/IAkiProfile";
-import { EventOutputHolder } from "../routers/EventOutputHolder";
-import { SaveServer } from "../servers/SaveServer";
-import { HashUtil } from "../utils/HashUtil";
-export declare class PresetBuildController {
-    protected hashUtil: HashUtil;
-    protected eventOutputHolder: EventOutputHolder;
-    protected itemHelper: ItemHelper;
-    protected saveServer: SaveServer;
-    constructor(hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, itemHelper: ItemHelper, saveServer: SaveServer);
-    /** Handle client/handbook/builds/my/list */
-    getUserBuilds(sessionID: string): WeaponBuild[];
-    /** Handle SaveBuild event */
-    saveBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse;
-    /** Handle RemoveBuild event*/
-    removeBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse;
-}

types/controllers/PresetController.d.ts

@@ -1,8 +1,10 @@
-import { PresetHelper } from "../helpers/PresetHelper";
-import { DatabaseServer } from "../servers/DatabaseServer";
+import { PresetHelper } from "@spt/helpers/PresetHelper";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { DatabaseService } from "@spt/services/DatabaseService";
 export declare class PresetController {
+    protected logger: ILogger;
     protected presetHelper: PresetHelper;
-    protected databaseServer: DatabaseServer;
-    constructor(presetHelper: PresetHelper, databaseServer: DatabaseServer);
+    protected databaseService: DatabaseService;
+    constructor(logger: ILogger, presetHelper: PresetHelper, databaseService: DatabaseService);
     initialize(): void;
 }

types/controllers/ProfileController.d.ts

@@ -1,37 +1,45 @@
-import { PlayerScavGenerator } from "../generators/PlayerScavGenerator";
-import { DialogueHelper } from "../helpers/DialogueHelper";
-import { ItemHelper } from "../helpers/ItemHelper";
-import { ProfileHelper } from "../helpers/ProfileHelper";
-import { QuestHelper } from "../helpers/QuestHelper";
-import { TraderHelper } from "../helpers/TraderHelper";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { IMiniProfile } from "../models/eft/launcher/IMiniProfile";
-import { IAkiProfile } from "../models/eft/profile/IAkiProfile";
-import { IProfileChangeNicknameRequestData } from "../models/eft/profile/IProfileChangeNicknameRequestData";
-import { IProfileChangeVoiceRequestData } from "../models/eft/profile/IProfileChangeVoiceRequestData";
-import { IProfileCreateRequestData } from "../models/eft/profile/IProfileCreateRequestData";
-import { ISearchFriendRequestData } from "../models/eft/profile/ISearchFriendRequestData";
-import { ISearchFriendResponse } from "../models/eft/profile/ISearchFriendResponse";
-import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { EventOutputHolder } from "../routers/EventOutputHolder";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { SaveServer } from "../servers/SaveServer";
-import { LocalisationService } from "../services/LocalisationService";
-import { MailSendService } from "../services/MailSendService";
-import { ProfileFixerService } from "../services/ProfileFixerService";
-import { HashUtil } from "../utils/HashUtil";
-import { TimeUtil } from "../utils/TimeUtil";
+import { PlayerScavGenerator } from "@spt/generators/PlayerScavGenerator";
+import { DialogueHelper } from "@spt/helpers/DialogueHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { QuestHelper } from "@spt/helpers/QuestHelper";
+import { TraderHelper } from "@spt/helpers/TraderHelper";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IMiniProfile } from "@spt/models/eft/launcher/IMiniProfile";
+import { GetProfileStatusResponseData } from "@spt/models/eft/profile/GetProfileStatusResponseData";
+import { IGetOtherProfileRequest } from "@spt/models/eft/profile/IGetOtherProfileRequest";
+import { IGetOtherProfileResponse } from "@spt/models/eft/profile/IGetOtherProfileResponse";
+import { IGetProfileSettingsRequest } from "@spt/models/eft/profile/IGetProfileSettingsRequest";
+import { IProfileChangeNicknameRequestData } from "@spt/models/eft/profile/IProfileChangeNicknameRequestData";
+import { IProfileChangeVoiceRequestData } from "@spt/models/eft/profile/IProfileChangeVoiceRequestData";
+import { IProfileCreateRequestData } from "@spt/models/eft/profile/IProfileCreateRequestData";
+import { ISearchFriendRequestData } from "@spt/models/eft/profile/ISearchFriendRequestData";
+import { ISearchFriendResponse } from "@spt/models/eft/profile/ISearchFriendResponse";
+import { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
+import { IValidateNicknameRequestData } from "@spt/models/eft/profile/IValidateNicknameRequestData";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
+import { SaveServer } from "@spt/servers/SaveServer";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { LocalisationService } from "@spt/services/LocalisationService";
+import { MailSendService } from "@spt/services/MailSendService";
+import { ProfileFixerService } from "@spt/services/ProfileFixerService";
+import { SeasonalEventService } from "@spt/services/SeasonalEventService";
+import { HashUtil } from "@spt/utils/HashUtil";
+import { TimeUtil } from "@spt/utils/TimeUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class ProfileController {
     protected logger: ILogger;
     protected hashUtil: HashUtil;
+    protected cloner: ICloner;
     protected timeUtil: TimeUtil;
     protected saveServer: SaveServer;
-    protected databaseServer: DatabaseServer;
+    protected databaseService: DatabaseService;
     protected itemHelper: ItemHelper;
     protected profileFixerService: ProfileFixerService;
     protected localisationService: LocalisationService;
+    protected seasonalEventService: SeasonalEventService;
     protected mailSendService: MailSendService;
     protected playerScavGenerator: PlayerScavGenerator;
     protected eventOutputHolder: EventOutputHolder;
@@ -39,7 +47,7 @@ export declare class ProfileController {
     protected dialogueHelper: DialogueHelper;
     protected questHelper: QuestHelper;
     protected profileHelper: ProfileHelper;
-    constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileFixerService: ProfileFixerService, localisationService: LocalisationService, mailSendService: MailSendService, playerScavGenerator: PlayerScavGenerator, eventOutputHolder: EventOutputHolder, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, questHelper: QuestHelper, profileHelper: ProfileHelper);
+    constructor(logger: ILogger, hashUtil: HashUtil, cloner: ICloner, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, itemHelper: ItemHelper, profileFixerService: ProfileFixerService, localisationService: LocalisationService, seasonalEventService: SeasonalEventService, mailSendService: MailSendService, playerScavGenerator: PlayerScavGenerator, eventOutputHolder: EventOutputHolder, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, questHelper: QuestHelper, profileHelper: ProfileHelper);
     /**
      * Handle /launcher/profiles
      */
@@ -47,15 +55,23 @@ export declare class ProfileController {
     /**
      * Handle launcher/profile/info
      */
-    getMiniProfile(sessionID: string): any;
+    getMiniProfile(sessionID: string): IMiniProfile;
     /**
      * Handle client/game/profile/list
      */
     getCompleteProfile(sessionID: string): IPmcData[];
     /**
      * Handle client/game/profile/create
+     * @param info Client reqeust object
+     * @param sessionID Player id
+     * @returns Profiles _id value
      */
-    createProfile(info: IProfileCreateRequestData, sessionID: string): void;
+    createProfile(info: IProfileCreateRequestData, sessionID: string): string;
+    /**
+     * make profiles pmcData.Inventory.equipment unique
+     * @param pmcData Profile to update
+     */
+    protected updateInventoryEquipmentId(pmcData: IPmcData): void;
     /**
      * Delete a profile
      * @param sessionID Id of profile to delete
@@ -68,12 +84,12 @@ export declare class ProfileController {
      * @param sessionID Session id
      * @param response Event router response
      */
-    protected givePlayerStartingQuestRewards(profileDetails: IAkiProfile, sessionID: string, response: IItemEventRouterResponse): void;
+    protected givePlayerStartingQuestRewards(profileDetails: ISptProfile, sessionID: string, response: IItemEventRouterResponse): void;
     /**
      * For each trader reset their state to what a level 1 player would see
-     * @param sessionID Session id of profile to reset
+     * @param sessionId Session id of profile to reset
      */
-    protected resetAllTradersInProfile(sessionID: string): void;
+    protected resetAllTradersInProfile(sessionId: string): void;
     /**
      * Generate a player scav object
      * PMC profile MUST exist first before pscav can be generated
@@ -98,4 +114,13 @@ export declare class ProfileController {
      * Handle client/game/profile/search
      */
     getFriends(info: ISearchFriendRequestData, sessionID: string): ISearchFriendResponse[];
+    /**
+     * Handle client/profile/status
+     */
+    getProfileStatus(sessionId: string): GetProfileStatusResponseData;
+    getOtherProfile(sessionId: string, request: IGetOtherProfileRequest): IGetOtherProfileResponse;
+    /**
+     * Handle client/profile/settings
+     */
+    setChosenProfileIcon(sessionId: string, request: IGetProfileSettingsRequest): boolean;
 }

types/controllers/QuestController.d.ts

@@ -1,35 +1,37 @@
-import { DialogueHelper } from "../helpers/DialogueHelper";
-import { ItemHelper } from "../helpers/ItemHelper";
-import { ProfileHelper } from "../helpers/ProfileHelper";
-import { QuestConditionHelper } from "../helpers/QuestConditionHelper";
-import { QuestHelper } from "../helpers/QuestHelper";
-import { TraderHelper } from "../helpers/TraderHelper";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { Item } from "../models/eft/common/tables/IItem";
-import { AvailableForConditions, IQuest, Reward } from "../models/eft/common/tables/IQuest";
-import { IRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData";
-import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData";
-import { IHandoverQuestRequestData } from "../models/eft/quests/IHandoverQuestRequestData";
-import { IQuestConfig } from "../models/spt/config/IQuestConfig";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { EventOutputHolder } from "../routers/EventOutputHolder";
-import { ConfigServer } from "../servers/ConfigServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { LocaleService } from "../services/LocaleService";
-import { LocalisationService } from "../services/LocalisationService";
-import { MailSendService } from "../services/MailSendService";
-import { PlayerService } from "../services/PlayerService";
-import { SeasonalEventService } from "../services/SeasonalEventService";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
-import { TimeUtil } from "../utils/TimeUtil";
+import { DialogueHelper } from "@spt/helpers/DialogueHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { QuestConditionHelper } from "@spt/helpers/QuestConditionHelper";
+import { QuestHelper } from "@spt/helpers/QuestHelper";
+import { TraderHelper } from "@spt/helpers/TraderHelper";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IQuestStatus } from "@spt/models/eft/common/tables/IBotBase";
+import { Item } from "@spt/models/eft/common/tables/IItem";
+import { IQuest, IQuestCondition } from "@spt/models/eft/common/tables/IQuest";
+import { IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IAcceptQuestRequestData } from "@spt/models/eft/quests/IAcceptQuestRequestData";
+import { ICompleteQuestRequestData } from "@spt/models/eft/quests/ICompleteQuestRequestData";
+import { IFailQuestRequestData } from "@spt/models/eft/quests/IFailQuestRequestData";
+import { IHandoverQuestRequestData } from "@spt/models/eft/quests/IHandoverQuestRequestData";
+import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { LocaleService } from "@spt/services/LocaleService";
+import { LocalisationService } from "@spt/services/LocalisationService";
+import { MailSendService } from "@spt/services/MailSendService";
+import { PlayerService } from "@spt/services/PlayerService";
+import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
+import { TimeUtil } from "@spt/utils/TimeUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class QuestController {
     protected logger: ILogger;
     protected timeUtil: TimeUtil;
     protected httpResponseUtil: HttpResponseUtil;
     protected eventOutputHolder: EventOutputHolder;
-    protected databaseServer: DatabaseServer;
+    protected databaseService: DatabaseService;
     protected itemHelper: ItemHelper;
     protected dialogueHelper: DialogueHelper;
     protected mailSendService: MailSendService;
@@ -39,11 +41,11 @@ export declare class QuestController {
     protected questConditionHelper: QuestConditionHelper;
     protected playerService: PlayerService;
     protected localeService: LocaleService;
-    protected seasonalEventService: SeasonalEventService;
     protected localisationService: LocalisationService;
     protected configServer: ConfigServer;
+    protected cloner: ICloner;
     protected questConfig: IQuestConfig;
-    constructor(logger: ILogger, timeUtil: TimeUtil, httpResponseUtil: HttpResponseUtil, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, mailSendService: MailSendService, profileHelper: ProfileHelper, traderHelper: TraderHelper, questHelper: QuestHelper, questConditionHelper: QuestConditionHelper, playerService: PlayerService, localeService: LocaleService, seasonalEventService: SeasonalEventService, localisationService: LocalisationService, configServer: ConfigServer);
+    constructor(logger: ILogger, timeUtil: TimeUtil, httpResponseUtil: HttpResponseUtil, eventOutputHolder: EventOutputHolder, databaseService: DatabaseService, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, mailSendService: MailSendService, profileHelper: ProfileHelper, traderHelper: TraderHelper, questHelper: QuestHelper, questConditionHelper: QuestConditionHelper, playerService: PlayerService, localeService: LocaleService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner);
     /**
      * Handle client/quest/list
      * Get all quests visible to player
@@ -58,19 +60,7 @@ export declare class QuestController {
      * @param playerLevel level of player to test against quest
      * @returns true if quest can be seen/accepted by player of defined level
      */
-    protected playerLevelFulfillsQuestRequrement(quest: IQuest, playerLevel: number): boolean;
-    /**
-     * Should a quest be shown to the player in trader quest screen
-     * @param questId Quest to check
-     * @returns true = show to player
-     */
-    protected showEventQuestToPlayer(questId: string): boolean;
-    /**
-     * Is the quest for the opposite side the player is on
-     * @param playerSide Player side (usec/bear)
-     * @param questId QuestId to check
-     */
-    protected questIsForOtherSide(playerSide: string, questId: string): boolean;
+    protected playerLevelFulfillsQuestRequirement(quest: IQuest, playerLevel: number): boolean;
     /**
      * Handle QuestAccept event
      * Handle the client accepting a quest and starting it
@@ -79,7 +69,7 @@ export declare class QuestController {
      * @param pmcData Profile to update
      * @param acceptedQuest Quest accepted
      * @param sessionID Session id
-     * @returns client response
+     * @returns Client response
      */
     acceptQuest(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse;
     /**
@@ -92,6 +82,7 @@ export declare class QuestController {
      * @returns IItemEventRouterResponse
      */
     acceptRepeatableQuest(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse;
+    protected createAcceptedQuestClientResponse(sessionID: string, pmcData: IPmcData, repeatableQuestProfile: IRepeatableQuest): IItemEventRouterResponse;
     /**
      * Look for an accepted quest inside player profile, return matching
      * @param pmcData Profile to search through
@@ -110,6 +101,25 @@ export declare class QuestController {
      * @returns ItemEvent client response
      */
     completeQuest(pmcData: IPmcData, body: ICompleteQuestRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Return a list of quests that would fail when supplied quest is completed
+     * @param completedQuestId quest completed id
+     * @returns array of IQuest objects
+     */
+    protected getQuestsFailedByCompletingQuest(completedQuestId: string, pmcProfile: IPmcData): IQuest[];
+    /**
+     * Remove a quest entirely from a profile
+     * @param sessionId Player id
+     * @param questIdToRemove Qid of quest to remove
+     */
+    protected removeQuestFromScavProfile(sessionId: string, questIdToRemove: string): void;
+    /**
+     * Return quests that have different statuses
+     * @param preQuestStatusus Quests before
+     * @param postQuestStatuses Quests after
+     * @returns QuestStatusChange array
+     */
+    protected getQuestsWithDifferentStatuses(preQuestStatusus: IQuestStatus[], postQuestStatuses: IQuestStatus[]): IQuestStatus[] | undefined;
     /**
      * Send a popup to player on successful completion of a quest
      * @param sessionID session id
@@ -117,7 +127,7 @@ export declare class QuestController {
      * @param completedQuestId Completed quest id
      * @param questRewards Rewards given to player
      */
-    protected sendSuccessDialogMessageOnQuestComplete(sessionID: string, pmcData: IPmcData, completedQuestId: string, questRewards: Reward[]): void;
+    protected sendSuccessDialogMessageOnQuestComplete(sessionID: string, pmcData: IPmcData, completedQuestId: string, questRewards: Item[]): void;
     /**
      * Look for newly available quests after completing a quest with a requirement to wait x minutes (time-locked) before being available and add data to profile
      * @param pmcData Player profile to update
@@ -125,20 +135,15 @@ export declare class QuestController {
      * @param completedQuestId Quest just completed
      */
     protected addTimeLockedQuestsToProfile(pmcData: IPmcData, quests: IQuest[], completedQuestId: string): void;
-    /**
-     * Returns a list of quests that should be failed when a quest is completed
-     * @param completedQuestId quest completed id
-     * @returns array of quests
-     */
-    protected getQuestsFailedByCompletingQuest(completedQuestId: string): IQuest[];
     /**
      * Fail the provided quests
      * Update quest in profile, otherwise add fresh quest object with failed status
      * @param sessionID session id
      * @param pmcData player profile
      * @param questsToFail quests to fail
+     * @param output Client output
      */
-    protected failQuests(sessionID: string, pmcData: IPmcData, questsToFail: IQuest[]): void;
+    protected failQuests(sessionID: string, pmcData: IPmcData, questsToFail: IQuest[], output: IItemEventRouterResponse): void;
     /**
      * Handle QuestHandover event
      * @param pmcData Player profile
@@ -162,7 +167,7 @@ export declare class QuestController {
      * @param output Response to send to user
      * @returns IItemEventRouterResponse
      */
-    protected showQuestItemHandoverMatchError(handoverQuestRequest: IHandoverQuestRequestData, itemHandedOver: Item, handoverRequirements: AvailableForConditions, output: IItemEventRouterResponse): IItemEventRouterResponse;
+    protected showQuestItemHandoverMatchError(handoverQuestRequest: IHandoverQuestRequestData, itemHandedOver: Item, handoverRequirements: IQuestCondition, output: IItemEventRouterResponse): IItemEventRouterResponse;
     /**
      * Increment a backend counter stored value by an amount,
      * Create counter if it does not exist
@@ -171,5 +176,13 @@ export declare class QuestController {
      * @param questId quest id counter is associated with
      * @param counterValue value to increment the backend counter with
      */
-    protected updateProfileBackendCounterValue(pmcData: IPmcData, conditionId: string, questId: string, counterValue: number): void;
+    protected updateProfileTaskConditionCounterValue(pmcData: IPmcData, conditionId: string, questId: string, counterValue: number): void;
+    /**
+     * Handle /client/game/profile/items/moving - QuestFail
+     * @param pmcData Pmc profile
+     * @param request Fail qeust request
+     * @param sessionID Session id
+     * @returns IItemEventRouterResponse
+     */
+    failQuest(pmcData: IPmcData, request: IFailQuestRequestData, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse;
 }

types/controllers/RagfairController.d.ts

@@ -1,41 +1,45 @@
-import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator";
-import { HandbookHelper } from "../helpers/HandbookHelper";
-import { InventoryHelper } from "../helpers/InventoryHelper";
-import { ItemHelper } from "../helpers/ItemHelper";
-import { PaymentHelper } from "../helpers/PaymentHelper";
-import { ProfileHelper } from "../helpers/ProfileHelper";
-import { RagfairHelper } from "../helpers/RagfairHelper";
-import { RagfairOfferHelper } from "../helpers/RagfairOfferHelper";
-import { RagfairSellHelper } from "../helpers/RagfairSellHelper";
-import { RagfairSortHelper } from "../helpers/RagfairSortHelper";
-import { RagfairTaxHelper } from "../helpers/RagfairTaxHelper";
-import { TraderHelper } from "../helpers/TraderHelper";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { Item } from "../models/eft/common/tables/IItem";
-import { ITraderAssort } from "../models/eft/common/tables/ITrader";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { IAkiProfile } from "../models/eft/profile/IAkiProfile";
-import { IAddOfferRequestData, Requirement } from "../models/eft/ragfair/IAddOfferRequestData";
-import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData";
-import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult";
-import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData";
-import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult";
-import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer";
-import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData";
-import { IRagfairConfig } from "../models/spt/config/IRagfairConfig";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { EventOutputHolder } from "../routers/EventOutputHolder";
-import { ConfigServer } from "../servers/ConfigServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { RagfairServer } from "../servers/RagfairServer";
-import { SaveServer } from "../servers/SaveServer";
-import { LocalisationService } from "../services/LocalisationService";
-import { PaymentService } from "../services/PaymentService";
-import { RagfairOfferService } from "../services/RagfairOfferService";
-import { RagfairPriceService } from "../services/RagfairPriceService";
-import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
-import { TimeUtil } from "../utils/TimeUtil";
+import { RagfairOfferGenerator } from "@spt/generators/RagfairOfferGenerator";
+import { HandbookHelper } from "@spt/helpers/HandbookHelper";
+import { InventoryHelper } from "@spt/helpers/InventoryHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { PaymentHelper } from "@spt/helpers/PaymentHelper";
+import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { RagfairHelper } from "@spt/helpers/RagfairHelper";
+import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper";
+import { RagfairSellHelper } from "@spt/helpers/RagfairSellHelper";
+import { RagfairSortHelper } from "@spt/helpers/RagfairSortHelper";
+import { TraderHelper } from "@spt/helpers/TraderHelper";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { Item } from "@spt/models/eft/common/tables/IItem";
+import { ITraderAssort } from "@spt/models/eft/common/tables/ITrader";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
+import { IAddOfferRequestData, Requirement } from "@spt/models/eft/ragfair/IAddOfferRequestData";
+import { IExtendOfferRequestData } from "@spt/models/eft/ragfair/IExtendOfferRequestData";
+import { IGetItemPriceResult } from "@spt/models/eft/ragfair/IGetItemPriceResult";
+import { IGetMarketPriceRequestData } from "@spt/models/eft/ragfair/IGetMarketPriceRequestData";
+import { IGetOffersResult } from "@spt/models/eft/ragfair/IGetOffersResult";
+import { IGetRagfairOfferByIdRequest } from "@spt/models/eft/ragfair/IGetRagfairOfferByIdRequest";
+import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
+import { IRemoveOfferRequestData } from "@spt/models/eft/ragfair/IRemoveOfferRequestData";
+import { ISearchRequestData } from "@spt/models/eft/ragfair/ISearchRequestData";
+import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData";
+import { FleaOfferType } from "@spt/models/enums/FleaOfferType";
+import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { RagfairServer } from "@spt/servers/RagfairServer";
+import { SaveServer } from "@spt/servers/SaveServer";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { LocalisationService } from "@spt/services/LocalisationService";
+import { PaymentService } from "@spt/services/PaymentService";
+import { RagfairOfferService } from "@spt/services/RagfairOfferService";
+import { RagfairPriceService } from "@spt/services/RagfairPriceService";
+import { RagfairRequiredItemsService } from "@spt/services/RagfairRequiredItemsService";
+import { RagfairTaxService } from "@spt/services/RagfairTaxService";
+import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
+import { TimeUtil } from "@spt/utils/TimeUtil";
 /**
  * Handle RagfairCallback events
  */
@@ -46,11 +50,11 @@ export declare class RagfairController {
     protected eventOutputHolder: EventOutputHolder;
     protected ragfairServer: RagfairServer;
     protected ragfairPriceService: RagfairPriceService;
-    protected databaseServer: DatabaseServer;
+    protected databaseService: DatabaseService;
     protected itemHelper: ItemHelper;
     protected saveServer: SaveServer;
     protected ragfairSellHelper: RagfairSellHelper;
-    protected ragfairTaxHelper: RagfairTaxHelper;
+    protected ragfairTaxService: RagfairTaxService;
     protected ragfairSortHelper: RagfairSortHelper;
     protected ragfairOfferHelper: RagfairOfferHelper;
     protected profileHelper: ProfileHelper;
@@ -66,12 +70,27 @@ export declare class RagfairController {
     protected localisationService: LocalisationService;
     protected configServer: ConfigServer;
     protected ragfairConfig: IRagfairConfig;
-    constructor(logger: ILogger, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, eventOutputHolder: EventOutputHolder, ragfairServer: RagfairServer, ragfairPriceService: RagfairPriceService, databaseServer: DatabaseServer, itemHelper: ItemHelper, saveServer: SaveServer, ragfairSellHelper: RagfairSellHelper, ragfairTaxHelper: RagfairTaxHelper, ragfairSortHelper: RagfairSortHelper, ragfairOfferHelper: RagfairOfferHelper, profileHelper: ProfileHelper, paymentService: PaymentService, handbookHelper: HandbookHelper, paymentHelper: PaymentHelper, inventoryHelper: InventoryHelper, traderHelper: TraderHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, ragfairOfferGenerator: RagfairOfferGenerator, localisationService: LocalisationService, configServer: ConfigServer);
+    constructor(logger: ILogger, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, eventOutputHolder: EventOutputHolder, ragfairServer: RagfairServer, ragfairPriceService: RagfairPriceService, databaseService: DatabaseService, itemHelper: ItemHelper, saveServer: SaveServer, ragfairSellHelper: RagfairSellHelper, ragfairTaxService: RagfairTaxService, ragfairSortHelper: RagfairSortHelper, ragfairOfferHelper: RagfairOfferHelper, profileHelper: ProfileHelper, paymentService: PaymentService, handbookHelper: HandbookHelper, paymentHelper: PaymentHelper, inventoryHelper: InventoryHelper, traderHelper: TraderHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, ragfairOfferGenerator: RagfairOfferGenerator, localisationService: LocalisationService, configServer: ConfigServer);
+    /**
+     * Handles client/ragfair/find
+     * Returns flea offers that match required search parameters
+     * @param sessionID Player id
+     * @param searchRequest Search request data
+     * @returns IGetOffersResult
+     */
     getOffers(sessionID: string, searchRequest: ISearchRequestData): IGetOffersResult;
+    /**
+     * Handle client/ragfair/offer/findbyid
+     * Occurs when searching for `#x` on flea
+     * @param sessionId Player id
+     * @param request Request data
+     * @returns IRagfairOffer
+     */
+    getOfferById(sessionId: string, request: IGetRagfairOfferByIdRequest): IRagfairOffer;
     /**
      * Get offers for the client based on type of search being performed
      * @param searchRequest Client search request data
-     * @param itemsToAdd
+     * @param itemsToAdd Comes from ragfairHelper.filterCategories()
      * @param traderAssorts Trader assorts
      * @param pmcProfile Player profile
      * @returns array of offers
@@ -80,18 +99,10 @@ export declare class RagfairController {
     /**
      * Get categories for the type of search being performed, linked/required/all
      * @param searchRequest Client search request data
-     * @param offers ragfair offers to get categories for
-     * @returns record with tpls + counts
+     * @param offers Ragfair offers to get categories for
+     * @returns record with templates + counts
      */
-    protected getSpecificCategories(searchRequest: ISearchRequestData, offers: IRagfairOffer[]): Record<string, number>;
-    /**
-     * Add Required offers to offers result
-     * @param searchRequest Client search request data
-     * @param assorts
-     * @param pmcProfile Player profile
-     * @param result Result object being sent back to client
-     */
-    protected addRequiredOffersToResult(searchRequest: ISearchRequestData, assorts: Record<string, ITraderAssort>, pmcProfile: IPmcData, result: IGetOffersResult): void;
+    protected getSpecificCategories(pmcProfile: IPmcData, searchRequest: ISearchRequestData, offers: IRagfairOffer[]): Record<string, number>;
     /**
      * Add index to all offers passed in (0-indexed)
      * @param offers Offers to add index value to
@@ -99,17 +110,30 @@ export declare class RagfairController {
     protected addIndexValueToOffers(offers: IRagfairOffer[]): void;
     /**
      * Update a trader flea offer with buy restrictions stored in the traders assort
-     * @param offer flea offer to update
-     * @param profile full profile of player
+     * @param offer Flea offer to update
+     * @param fullProfile Players full profile
      */
-    protected setTraderOfferPurchaseLimits(offer: IRagfairOffer, profile: IAkiProfile): void;
+    protected setTraderOfferPurchaseLimits(offer: IRagfairOffer, fullProfile: ISptProfile): void;
     /**
      * Adjust ragfair offer stack count to match same value as traders assort stack count
-     * @param offer Flea offer to adjust
+     * @param offer Flea offer to adjust stack size of
      */
     protected setTraderOfferStackSize(offer: IRagfairOffer): void;
+    /**
+     * Is the flea search being performed a 'linked' search type
+     * @param info Search request
+     * @returns True if it is a 'linked' search type
+     */
     protected isLinkedSearch(info: ISearchRequestData): boolean;
+    /**
+     * Is the flea search being performed a 'required' search type
+     * @param info Search request
+     * @returns True if it is a 'required' search type
+     */
     protected isRequiredSearch(info: ISearchRequestData): boolean;
+    /**
+     * Check all profiles and sell player offers / send player money for listing if it sold
+     */
     update(): void;
     /**
      * Called when creating an offer on flea, fills values in top right corner
@@ -125,6 +149,57 @@ export declare class RagfairController {
      * @returns IItemEventRouterResponse
      */
     addPlayerOffer(pmcData: IPmcData, offerRequest: IAddOfferRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Create a flea offer for a single item - uncludes an item with > 1 sized stack
+     * e.g. 1 ammo stack of 30 cartridges
+     * @param sessionID Session id
+     * @param offerRequest Offer request from client
+     * @param fullProfile Full profile of player
+     * @param output Response to send to client
+     * @returns IItemEventRouterResponse
+     */
+    protected createSingleOffer(sessionID: string, offerRequest: IAddOfferRequestData, fullProfile: ISptProfile, output: IItemEventRouterResponse): IItemEventRouterResponse;
+    /**
+     * Create a flea offer for multiples of the same item, can be single items or items with multiple in the stack
+     * e.g. 2 ammo stacks of 30 cartridges each
+     * Each item can be purchsed individually
+     * @param sessionID Session id
+     * @param offerRequest Offer request from client
+     * @param fullProfile Full profile of player
+     * @param output Response to send to client
+     * @returns IItemEventRouterResponse
+     */
+    protected createMultiOffer(sessionID: string, offerRequest: IAddOfferRequestData, fullProfile: ISptProfile, output: IItemEventRouterResponse): IItemEventRouterResponse;
+    /**
+     * Create a flea offer for multiple items, can be single items or items with multiple in the stack
+     * e.g. 2 ammo stacks of 30 cartridges each
+     * The entire package must be purchased in one go
+     * @param sessionID Session id
+     * @param offerRequest Offer request from client
+     * @param fullProfile Full profile of player
+     * @param output Response to send to client
+     * @returns IItemEventRouterResponse
+     */
+    protected createPackOffer(sessionID: string, offerRequest: IAddOfferRequestData, fullProfile: ISptProfile, output: IItemEventRouterResponse): IItemEventRouterResponse;
+    /**
+     * Given a client request, determine what type of offer is being created
+     * single/multi/pack
+     * @param offerRequest Client request
+     * @returns FleaOfferType
+     */
+    protected getOfferType(offerRequest: IAddOfferRequestData): FleaOfferType;
+    /**
+     * Charge player a listing fee for using flea, pulls charge from data previously sent by client
+     * @param sessionID Player id
+     * @param rootItem Base item being listed (used when client tax cost not found and must be done on server)
+     * @param pmcData Player profile
+     * @param requirementsPriceInRub Rouble cost player chose for listing (used when client tax cost not found and must be done on server)
+     * @param itemStackCount How many items were listed by player (used when client tax cost not found and must be done on server)
+     * @param offerRequest Add offer request object from client
+     * @param output IItemEventRouterResponse
+     * @returns True if charging tax to player failed
+     */
+    protected chargePlayerTaxFee(sessionID: string, rootItem: Item, pmcData: IPmcData, requirementsPriceInRub: number, itemStackCount: number, offerRequest: IAddOfferRequestData, output: IItemEventRouterResponse): boolean;
     /**
      * Is the item to be listed on the flea valid
      * @param offerRequest Client offer request
@@ -139,16 +214,38 @@ export declare class RagfairController {
      */
     protected calculateRequirementsPriceInRub(requirements: Requirement[]): number;
     /**
-     * Using item ids from flea offer request, find corrispnding items from player inventory and return as array
+     * Using item ids from flea offer request, find corresponding items from player inventory and return as array
      * @param pmcData Player profile
      * @param itemIdsFromFleaOfferRequest Ids from request
-     * @param errorMessage if item is not found, add error message to this parameter
      * @returns Array of items from player inventory
      */
-    protected getItemsToListOnFleaFromInventory(pmcData: IPmcData, itemIdsFromFleaOfferRequest: string[], errorMessage: string): Item[];
-    createPlayerOffer(profile: IAkiProfile, requirements: Requirement[], items: Item[], sellInOnePiece: boolean, amountToSend: number): IRagfairOffer;
+    protected getItemsToListOnFleaFromInventory(pmcData: IPmcData, itemIdsFromFleaOfferRequest: string[]): {
+        items: Item[][] | undefined;
+        errorMessage: string | undefined;
+    };
+    createPlayerOffer(sessionId: string, requirements: Requirement[], items: Item[], sellInOnePiece: boolean): IRagfairOffer;
     getAllFleaPrices(): Record<string, number>;
     getStaticPrices(): Record<string, number>;
-    removeOffer(offerId: string, sessionID: string): IItemEventRouterResponse;
-    extendOffer(info: IExtendOfferRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * User requested removal of the offer, actually reduces the time to 71 seconds,
+     * allowing for the possibility of extending the auction before it's end time
+     * @param removeRequest Remove offer request
+     * @param sessionId Players id
+     * @returns IItemEventRouterResponse
+     */
+    removeOffer(removeRequest: IRemoveOfferRequestData, sessionId: string): IItemEventRouterResponse;
+    /**
+     * Extend a ragfair offers listing time
+     * @param extendRequest Extend offer request
+     * @param sessionId Players id
+     * @returns IItemEventRouterResponse
+     */
+    extendOffer(extendRequest: IExtendOfferRequestData, sessionId: string): IItemEventRouterResponse;
+    /**
+     * Create a basic trader request object with price and currency type
+     * @param currency What currency: RUB, EURO, USD
+     * @param value Amount of currency
+     * @returns IProcessBuyTradeRequestData
+     */
+    protected createBuyTradeRequestObject(currency: string, value: number): IProcessBuyTradeRequestData;
 }

types/controllers/RepairController.d.ts

@@ -1,27 +1,29 @@
-import { QuestHelper } from "../helpers/QuestHelper";
-import { RepairHelper } from "../helpers/RepairHelper";
-import { TraderHelper } from "../helpers/TraderHelper";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest";
-import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepairActionDataRequest";
-import { IRepairConfig } from "../models/spt/config/IRepairConfig";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { EventOutputHolder } from "../routers/EventOutputHolder";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { PaymentService } from "../services/PaymentService";
-import { RepairService } from "../services/RepairService";
+import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { QuestHelper } from "@spt/helpers/QuestHelper";
+import { RepairHelper } from "@spt/helpers/RepairHelper";
+import { TraderHelper } from "@spt/helpers/TraderHelper";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IRepairActionDataRequest } from "@spt/models/eft/repair/IRepairActionDataRequest";
+import { ITraderRepairActionDataRequest } from "@spt/models/eft/repair/ITraderRepairActionDataRequest";
+import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { PaymentService } from "@spt/services/PaymentService";
+import { RepairService } from "@spt/services/RepairService";
 export declare class RepairController {
     protected logger: ILogger;
     protected eventOutputHolder: EventOutputHolder;
-    protected databaseServer: DatabaseServer;
+    protected databaseService: DatabaseService;
     protected questHelper: QuestHelper;
     protected traderHelper: TraderHelper;
     protected paymentService: PaymentService;
     protected repairHelper: RepairHelper;
     protected repairService: RepairService;
+    protected profileHelper: ProfileHelper;
     protected repairConfig: IRepairConfig;
-    constructor(logger: ILogger, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, questHelper: QuestHelper, traderHelper: TraderHelper, paymentService: PaymentService, repairHelper: RepairHelper, repairService: RepairService);
+    constructor(logger: ILogger, eventOutputHolder: EventOutputHolder, databaseService: DatabaseService, questHelper: QuestHelper, traderHelper: TraderHelper, paymentService: PaymentService, repairHelper: RepairHelper, repairService: RepairService, profileHelper: ProfileHelper);
     /**
      * Handle TraderRepair event
      * Repair with trader

types/controllers/RepeatableQuestController.d.ts

@@ -1,81 +1,47 @@
-import { HandbookHelper } from "../helpers/HandbookHelper";
-import { ItemHelper } from "../helpers/ItemHelper";
-import { PresetHelper } from "../helpers/PresetHelper";
-import { ProfileHelper } from "../helpers/ProfileHelper";
-import { RagfairServerHelper } from "../helpers/RagfairServerHelper";
-import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { Exit } from "../models/eft/common/ILocationBase";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { TraderInfo } from "../models/eft/common/tables/IBotBase";
-import { ICompletion, ICompletionAvailableFor, IElimination, IEliminationCondition, IExploration, IExplorationCondition, IPmcDataRepeatableQuest, IRepeatableQuest, IReward, IRewards } from "../models/eft/common/tables/IRepeatableQuests";
-import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest";
-import { ELocationName } from "../models/enums/ELocationName";
-import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "../models/spt/config/IQuestConfig";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { EventOutputHolder } from "../routers/EventOutputHolder";
-import { ConfigServer } from "../servers/ConfigServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { ItemFilterService } from "../services/ItemFilterService";
-import { LocalisationService } from "../services/LocalisationService";
-import { PaymentService } from "../services/PaymentService";
-import { ProfileFixerService } from "../services/ProfileFixerService";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
-import { JsonUtil } from "../utils/JsonUtil";
-import { MathUtil } from "../utils/MathUtil";
-import { ObjectId } from "../utils/ObjectId";
-import { ProbabilityObject, ProbabilityObjectArray, RandomUtil } from "../utils/RandomUtil";
-import { TimeUtil } from "../utils/TimeUtil";
-export interface IQuestTypePool {
-    types: string[];
-    pool: IQuestPool;
-}
-export interface IQuestPool {
-    Exploration: IExplorationPool;
-    Elimination: IEliminationPool;
-}
-export interface IExplorationPool {
-    locations: Partial<Record<ELocationName, string[]>>;
-}
-export interface IEliminationPool {
-    targets: IEliminationTargetPool;
-}
-export interface IEliminationTargetPool {
-    Savage?: ITargetLocation;
-    AnyPmc?: ITargetLocation;
-    bossBully?: ITargetLocation;
-    bossGluhar?: ITargetLocation;
-    bossKilla?: ITargetLocation;
-    bossSanitar?: ITargetLocation;
-    bossTagilla?: ITargetLocation;
-    bossKojaniy?: ITargetLocation;
-}
-export interface ITargetLocation {
-    locations: string[];
-}
+import { RepeatableQuestGenerator } from "@spt/generators/RepeatableQuestGenerator";
+import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { QuestHelper } from "@spt/helpers/QuestHelper";
+import { RepeatableQuestHelper } from "@spt/helpers/RepeatableQuestHelper";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
+import { IRepeatableQuestChangeRequest } from "@spt/models/eft/quests/IRepeatableQuestChangeRequest";
+import { ELocationName } from "@spt/models/enums/ELocationName";
+import { IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig";
+import { IGetRepeatableByIdResult } from "@spt/models/spt/quests/IGetRepeatableByIdResult";
+import { IQuestTypePool } from "@spt/models/spt/repeatable/IQuestTypePool";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { LocalisationService } from "@spt/services/LocalisationService";
+import { PaymentService } from "@spt/services/PaymentService";
+import { ProfileFixerService } from "@spt/services/ProfileFixerService";
+import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
+import { ObjectId } from "@spt/utils/ObjectId";
+import { RandomUtil } from "@spt/utils/RandomUtil";
+import { TimeUtil } from "@spt/utils/TimeUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class RepeatableQuestController {
-    protected timeUtil: TimeUtil;
     protected logger: ILogger;
+    protected databaseService: DatabaseService;
+    protected timeUtil: TimeUtil;
     protected randomUtil: RandomUtil;
     protected httpResponse: HttpResponseUtil;
-    protected mathUtil: MathUtil;
-    protected jsonUtil: JsonUtil;
-    protected databaseServer: DatabaseServer;
-    protected itemHelper: ItemHelper;
-    protected presetHelper: PresetHelper;
     protected profileHelper: ProfileHelper;
     protected profileFixerService: ProfileFixerService;
-    protected handbookHelper: HandbookHelper;
-    protected ragfairServerHelper: RagfairServerHelper;
-    protected eventOutputHolder: EventOutputHolder;
     protected localisationService: LocalisationService;
+    protected eventOutputHolder: EventOutputHolder;
     protected paymentService: PaymentService;
     protected objectId: ObjectId;
-    protected itemFilterService: ItemFilterService;
+    protected repeatableQuestGenerator: RepeatableQuestGenerator;
+    protected repeatableQuestHelper: RepeatableQuestHelper;
+    protected questHelper: QuestHelper;
     protected configServer: ConfigServer;
+    protected cloner: ICloner;
     protected questConfig: IQuestConfig;
-    constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, httpResponse: HttpResponseUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, handbookHelper: HandbookHelper, ragfairServerHelper: RagfairServerHelper, eventOutputHolder: EventOutputHolder, localisationService: LocalisationService, paymentService: PaymentService, objectId: ObjectId, itemFilterService: ItemFilterService, configServer: ConfigServer);
+    constructor(logger: ILogger, databaseService: DatabaseService, timeUtil: TimeUtil, randomUtil: RandomUtil, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, localisationService: LocalisationService, eventOutputHolder: EventOutputHolder, paymentService: PaymentService, objectId: ObjectId, repeatableQuestGenerator: RepeatableQuestGenerator, repeatableQuestHelper: RepeatableQuestHelper, questHelper: QuestHelper, configServer: ConfigServer, cloner: ICloner);
     /**
      * Handle client/repeatalbeQuests/activityPeriods
      * Returns an array of objects in the format of repeatable quests to the client.
@@ -97,11 +63,44 @@ export declare class RepeatableQuestController {
      * (if the are on "Succeed" but not "Completed" we keep them, to allow the player to complete them and get the rewards)
      * The new quests generated are again persisted in profile.RepeatableQuests
      *
+     * @param   {string}    sessionID   Player's session id
      *
-     * @param   {string}    sessionId       Player's session id
-     * @returns  {array}                    array of "repeatableQuestObjects" as descibed above
+     * @returns  {array}                Array of "repeatableQuestObjects" as described above
      */
-    getClientRepeatableQuests(_info: IEmptyRequestData, sessionID: string): IPmcDataRepeatableQuest[];
+    getClientRepeatableQuests(sessionID: string): IPmcDataRepeatableQuest[];
+    /**
+     * Expire quests and replace expired quests with ready-to-hand-in quests inside generatedRepeatables.activeQuests
+     * @param generatedRepeatables Repeatables to process (daily/weekly)
+     * @param pmcData Player profile
+     */
+    protected processExpiredQuests(generatedRepeatables: IPmcDataRepeatableQuest, pmcData: IPmcData): void;
+    /**
+     * Check if a repeatable quest type (daily/weekly) is active for the given profile
+     * @param repeatableConfig Repeatable quest config
+     * @param pmcData Player profile
+     * @returns True if profile is allowed to access dailies
+     */
+    protected canProfileAccessRepeatableQuests(repeatableConfig: IRepeatableQuestConfig, pmcData: IPmcData): boolean;
+    /**
+     * Does player have daily scav quests unlocked
+     * @param pmcData Player profile to check
+     * @returns True if unlocked
+     */
+    protected playerHasDailyScavQuestsUnlocked(pmcData: IPmcData): boolean;
+    /**
+     * Does player have daily pmc quests unlocked
+     * @param pmcData Player profile to check
+     * @param repeatableConfig Config of daily type to check
+     * @returns True if unlocked
+     */
+    protected playerHasDailyPmcQuestsUnlocked(pmcData: IPmcData, repeatableConfig: IRepeatableQuestConfig): boolean;
+    /**
+     * Get the number of quests to generate - takes into account charisma state of player
+     * @param repeatableConfig Config
+     * @param pmcData Player profile
+     * @returns Quest count
+     */
+    protected getQuestCount(repeatableConfig: IRepeatableQuestConfig, pmcData: IPmcData): number;
     /**
      * Get repeatable quest data from profile from name (daily/weekly), creates base repeatable quest object if none exists
      * @param repeatableConfig daily/weekly config
@@ -109,103 +108,10 @@ export declare class RepeatableQuestController {
      * @returns IPmcDataRepeatableQuest
      */
     protected getRepeatableQuestSubTypeFromProfile(repeatableConfig: IRepeatableQuestConfig, pmcData: IPmcData): IPmcDataRepeatableQuest;
-    /**
-     * This method is called by GetClientRepeatableQuests and creates one element of quest type format (see assets/database/templates/repeatableQuests.json).
-     * It randomly draws a quest type (currently Elimination, Completion or Exploration) as well as a trader who is providing the quest
-     */
-    protected generateRepeatableQuest(pmcLevel: number, pmcTraderInfo: Record<string, TraderInfo>, questTypePool: IQuestTypePool, repeatableConfig: IRepeatableQuestConfig): IRepeatableQuest;
     /**
      * Just for debug reasons. Draws dailies a random assort of dailies extracted from dumps
      */
     generateDebugDailies(dailiesPool: any, factory: any, number: number): any;
-    /**
-     * Generates the base object of quest type format given as templates in assets/database/templates/repeatableQuests.json
-     * The templates include Elimination, Completion and Extraction quest types
-     *
-     * @param   {string}    type            quest type: "Elimination", "Completion" or "Extraction"
-     * @param   {string}    traderId        trader from which the quest will be provided
-     * @param   {string}    side            scav daily or pmc daily/weekly quest
-     * @returns {object}                    a object which contains the base elements for repeatable quests of the requests type
-     *                                      (needs to be filled with reward and conditions by called to make a valid quest)
-     */
-    protected generateRepeatableTemplate(type: string, traderId: string, side: string): IRepeatableQuest;
-    /**
-     * Generates a valid Exploration quest
-     *
-     * @param   {integer}   pmcLevel            player's level for reward generation
-     * @param   {string}    traderId            trader from which the quest will be provided
-     * @param   {object}    questTypePool       Pools for quests (used to avoid redundant quests)
-     * @param   {object}    repeatableConfig    The configuration for the repeatably kind (daily, weekly) as configured in QuestConfig for the requestd quest
-     * @returns {object}                        object of quest type format for "Exploration" (see assets/database/templates/repeatableQuests.json)
-     */
-    protected generateExplorationQuest(pmcLevel: number, traderId: string, questTypePool: IQuestTypePool, repeatableConfig: IRepeatableQuestConfig): IExploration;
-    /**
-     * Generates a valid Completion quest
-     *
-     * @param   {integer}   pmcLevel            player's level for requested items and reward generation
-     * @param   {string}    traderId            trader from which the quest will be provided
-     * @param   {object}    repeatableConfig    The configuration for the repeatably kind (daily, weekly) as configured in QuestConfig for the requestd quest
-     * @returns {object}                        object of quest type format for "Completion" (see assets/database/templates/repeatableQuests.json)
-     */
-    protected generateCompletionQuest(pmcLevel: number, traderId: string, repeatableConfig: IRepeatableQuestConfig): ICompletion;
-    /**
-     * Generates a valid Elimination quest
-     *
-     * @param   {integer}   pmcLevel            player's level for requested items and reward generation
-     * @param   {string}    traderId            trader from which the quest will be provided
-     * @param   {object}    questTypePool       Pools for quests (used to avoid redundant quests)
-     * @param   {object}    repeatableConfig    The configuration for the repeatably kind (daily, weekly) as configured in QuestConfig for the requestd quest
-     * @returns {object}                        object of quest type format for "Elimination" (see assets/database/templates/repeatableQuests.json)
-     */
-    protected generateEliminationQuest(pmcLevel: number, traderId: string, questTypePool: IQuestTypePool, repeatableConfig: IRepeatableQuestConfig): IElimination;
-    /**
-     * Get the relevant elimination config based on the current players PMC level
-     * @param pmcLevel Level of PMC character
-     * @param repeatableConfig Main repeatable config
-     * @returns IEliminationConfig
-     */
-    protected getEliminationConfigByPmcLevel(pmcLevel: number, repeatableConfig: IRepeatableQuestConfig): IEliminationConfig;
-    /**
-     * Convert a location into an quest code can read (e.g. factory4_day into 55f2d3fd4bdc2d5f408b4567)
-     * @param locationKey e.g factory4_day
-     * @returns guid
-     */
-    protected getQuestLocationByMapId(locationKey: string): string;
-    /**
-     * Exploration repeatable quests can specify a required extraction point.
-     * This method creates the according object which will be appended to the conditions array
-     *
-     * @param   {string}        exit                The exit name to generate the condition for
-     * @returns {object}                            Exit condition
-     */
-    protected generateExplorationExitCondition(exit: Exit): IExplorationCondition;
-    /**
-     * A repeatable quest, besides some more or less static components, exists of reward and condition (see assets/database/templates/repeatableQuests.json)
-     * This is a helper method for GenerateCompletionQuest to create a completion condition (of which a completion quest theoretically can have many)
-     *
-     * @param   {string}    targetItemId    id of the item to request
-     * @param   {integer}   value           amount of items of this specific type to request
-     * @returns {object}                    object of "Completion"-condition
-     */
-    protected generateCompletionAvailableForFinish(targetItemId: string, value: number): ICompletionAvailableFor;
-    /**
-     * A repeatable quest, besides some more or less static components, exists of reward and condition (see assets/database/templates/repeatableQuests.json)
-     * This is a helper method for GenerateEliminationQuest to create a location condition.
-     *
-     * @param   {string}    location        the location on which to fulfill the elimination quest
-     * @returns {object}                    object of "Elimination"-location-subcondition
-     */
-    protected generateEliminationLocation(location: string[]): IEliminationCondition;
-    /**
-     * A repeatable quest, besides some more or less static components, exists of reward and condition (see assets/database/templates/repeatableQuests.json)
-     * This is a helper method for GenerateEliminationQuest to create a kill condition.
-     *
-     * @param   {string}    target          array of target npcs e.g. "AnyPmc", "Savage"
-     * @param   {array}     bodyParts       array of body parts with which to kill e.g. ["stomach", "thorax"]
-     * @param   {number}    distance        distance from which to kill (currently only >= supported)
-     * @returns {object}                    object of "Elimination"-kill-subcondition
-     */
-    protected generateEliminationCondition(target: string, bodyPart: string[], distance: number): IEliminationCondition;
     /**
      * Used to create a quest pool during each cycle of repeatable quest generation. The pool will be subsequently
      * narrowed down during quest generation to avoid duplicate quests. Like duplicate extractions or elimination quests
@@ -215,53 +121,47 @@ export declare class RepeatableQuestController {
      * @returns IQuestTypePool
      */
     protected generateQuestPool(repeatableConfig: IRepeatableQuestConfig, pmcLevel: number): IQuestTypePool;
+    protected createBaseQuestPool(repeatableConfig: IRepeatableQuestConfig): IQuestTypePool;
     /**
-     * Generate the reward for a mission. A reward can consist of
-     * - Experience
-     * - Money
-     * - Items
-     * - Trader Reputation
-     *
-     * The reward is dependent on the player level as given by the wiki. The exact mapping of pmcLevel to
-     * experience / money / items / trader reputation can be defined in QuestConfig.js
-     *
-     * There's also a random variation of the reward the spread of which can be also defined in the config.
-     *
-     * Additonaly, a scaling factor w.r.t. quest difficulty going from 0.2...1 can be used
-     *
-     * @param   {integer}   pmcLevel            player's level
-     * @param   {number}    difficulty          a reward scaling factor goint from 0.2 to 1
-     * @param   {string}    traderId            the trader for reputation gain (and possible in the future filtering of reward item type based on trader)
-     * @param   {object}    repeatableConfig    The configuration for the repeatably kind (daily, weekly) as configured in QuestConfig for the requestd quest
-     * @returns {object}                        object of "Reward"-type that can be given for a repeatable mission
+     * Return the locations this PMC is allowed to get daily quests for based on their level
+     * @param locations The original list of locations
+     * @param pmcLevel The players level
+     * @returns A filtered list of locations that allow the player PMC level to access it
      */
-    protected generateReward(pmcLevel: number, difficulty: number, traderId: string, repeatableConfig: IRepeatableQuestConfig): IRewards;
+    protected getAllowedLocationsForPmcLevel(locations: Record<ELocationName, string[]>, pmcLevel: number): Partial<Record<ELocationName, string[]>>;
     /**
-     * Helper to create a reward item structured as required by the client
-     *
-     * @param   {string}    tpl             itemId of the rewarded item
-     * @param   {integer}   value           amount of items to give
-     * @param   {integer}   index           all rewards will be appended to a list, for unkown reasons the client wants the index
-     * @returns {object}                    object of "Reward"-item-type
+     * Return true if the given pmcLevel is allowed on the given location
+     * @param location The location name to check
+     * @param pmcLevel The level of the pmc
+     * @returns True if the given pmc level is allowed to access the given location
      */
-    protected generateRewardItem(tpl: string, value: number, index: number, preset?: any): IReward;
+    protected isPmcLevelAllowedOnLocation(location: string, pmcLevel: number): boolean;
     debugLogRepeatableQuestIds(pmcData: IPmcData): void;
-    protected probabilityObjectArray<K, V>(configArrayInput: ProbabilityObject<K, V>[]): ProbabilityObjectArray<K, V>;
     /**
      * Handle RepeatableQuestChange event
+     *
+     * Replace a players repeatable quest
+     * @param pmcData Player profile
+     * @param changeRequest Request object
+     * @param sessionID Session id
+     * @returns IItemEventRouterResponse
      */
-    changeRepeatableQuest(pmcData: IPmcData, body: IRepeatableQuestChangeRequest, sessionID: string): IItemEventRouterResponse;
+    changeRepeatableQuest(pmcData: IPmcData, changeRequest: IRepeatableQuestChangeRequest, sessionID: string): IItemEventRouterResponse;
     /**
-    * Picks rewardable items from items.json. This means they need to fit into the inventory and they shouldn't be keys (debatable)
-     * @param repeatableQuestConfig config file
-     * @returns a list of rewardable items [[_tpl, itemTemplate],...]
+     * Find a repeatable (daily/weekly/scav) from a players profile by its id
+     * @param questId Id of quest to find
+     * @param pmcData Profile that contains quests to look through
+     * @returns IGetRepeatableByIdResult
      */
-    protected getRewardableItems(repeatableQuestConfig: IRepeatableQuestConfig): [string, ITemplateItem][];
+    protected getRepeatableById(questId: string, pmcData: IPmcData): IGetRepeatableByIdResult;
+    protected attemptToGenerateRepeatableQuest(pmcData: IPmcData, questTypePool: IQuestTypePool, repeatableConfig: IRepeatableQuestConfig): IRepeatableQuest;
     /**
-     * Checks if an id is a valid item. Valid meaning that it's an item that may be a reward
-     * or content of bot loot. Items that are tested as valid may be in a player backpack or stash.
-     * @param {string} tpl template id of item to check
-     * @returns boolean: true if item is valid reward
+     * Some accounts have access to free repeatable quest refreshes
+     * Track the usage of them inside players profile
+     * @param fullProfile Player profile
+     * @param repeatableSubType Can be daily / weekly / scav repeatable
+     * @param repeatableTypeName Subtype of repeatable quest: daily / weekly / scav
+     * @returns Is the repeatable being replaced for free
      */
-    protected isValidRewardItem(tpl: string, repeatableQuestConfig: IRepeatableQuestConfig): boolean;
+    protected useFreeRefreshIfAvailable(fullProfile: ISptProfile, repeatableSubType: IPmcDataRepeatableQuest, repeatableTypeName: string): boolean;
 }

types/controllers/TradeController.d.ts

@@ -1,36 +1,105 @@
-import { ItemHelper } from "../helpers/ItemHelper";
-import { ProfileHelper } from "../helpers/ProfileHelper";
-import { TradeHelper } from "../helpers/TradeHelper";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { Upd } from "../models/eft/common/tables/IItem";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData";
-import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData";
-import { IRagfairConfig } from "../models/spt/config/IRagfairConfig";
-import { ITraderConfig } from "../models/spt/config/ITraderConfig";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { EventOutputHolder } from "../routers/EventOutputHolder";
-import { ConfigServer } from "../servers/ConfigServer";
-import { RagfairServer } from "../servers/RagfairServer";
-import { LocalisationService } from "../services/LocalisationService";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
-declare class TradeController {
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper";
+import { TradeHelper } from "@spt/helpers/TradeHelper";
+import { TraderHelper } from "@spt/helpers/TraderHelper";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { Item } from "@spt/models/eft/common/tables/IItem";
+import { ITraderBase } from "@spt/models/eft/common/tables/ITrader";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
+import { IProcessBaseTradeRequestData } from "@spt/models/eft/trade/IProcessBaseTradeRequestData";
+import { IOfferRequest, IProcessRagfairTradeRequestData } from "@spt/models/eft/trade/IProcessRagfairTradeRequestData";
+import { ISellScavItemsToFenceRequestData } from "@spt/models/eft/trade/ISellScavItemsToFenceRequestData";
+import { Traders } from "@spt/models/enums/Traders";
+import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
+import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { RagfairServer } from "@spt/servers/RagfairServer";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { LocalisationService } from "@spt/services/LocalisationService";
+import { MailSendService } from "@spt/services/MailSendService";
+import { RagfairPriceService } from "@spt/services/RagfairPriceService";
+import { HashUtil } from "@spt/utils/HashUtil";
+import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
+import { RandomUtil } from "@spt/utils/RandomUtil";
+import { TimeUtil } from "@spt/utils/TimeUtil";
+export declare class TradeController {
     protected logger: ILogger;
+    protected databaseService: DatabaseService;
     protected eventOutputHolder: EventOutputHolder;
     protected tradeHelper: TradeHelper;
+    protected timeUtil: TimeUtil;
+    protected randomUtil: RandomUtil;
+    protected hashUtil: HashUtil;
     protected itemHelper: ItemHelper;
     protected profileHelper: ProfileHelper;
+    protected ragfairOfferHelper: RagfairOfferHelper;
+    protected traderHelper: TraderHelper;
     protected ragfairServer: RagfairServer;
     protected httpResponse: HttpResponseUtil;
     protected localisationService: LocalisationService;
+    protected ragfairPriceService: RagfairPriceService;
+    protected mailSendService: MailSendService;
     protected configServer: ConfigServer;
     protected ragfairConfig: IRagfairConfig;
     protected traderConfig: ITraderConfig;
-    constructor(logger: ILogger, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer);
+    constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairOfferHelper: RagfairOfferHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer);
     /** Handle TradingConfirm event */
     confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse;
     /** Handle RagFairBuyOffer event */
-    confirmRagfairTrading(pmcData: IPmcData, body: IProcessRagfairTradeRequestData, sessionID: string): IItemEventRouterResponse;
-    protected confirmTradingInternal(pmcData: IPmcData, body: IProcessBaseTradeRequestData, sessionID: string, foundInRaid?: boolean, upd?: Upd): IItemEventRouterResponse;
+    confirmRagfairTrading(pmcData: IPmcData, request: IProcessRagfairTradeRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Buy an item off the flea sold by a trader
+     * @param sessionId Session id
+     * @param pmcData Player profile
+     * @param fleaOffer Offer being purchased
+     * @param requestOffer request data from client
+     * @param output Output to send back to client
+     */
+    protected buyTraderItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void;
+    /**
+     * Buy an item off the flea sold by a PMC
+     * @param sessionId Session id
+     * @param pmcData Player profile
+     * @param fleaOffer Offer being purchased
+     * @param requestOffer Request data from client
+     * @param output Output to send back to client
+     */
+    protected buyPmcItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void;
+    /**
+     * Is the provided offerid and ownerid from a player made offer
+     * @param offerId Id of the offer
+     * @param offerOwnerId Owner id
+     * @returns true if offer was made by a player
+     */
+    protected isPlayerOffer(offerId: string, offerOwnerId: string): boolean;
+    /**
+     * Does Player have necessary trader loyalty to purchase flea offer
+     * @param sellerIsTrader is seller trader
+     * @param fleaOffer Flea offer being bought
+     * @param pmcData Player profile
+     * @returns True if player can buy offer
+     */
+    protected playerLacksTraderLoyaltyLevelToBuyOffer(fleaOffer: IRagfairOffer, pmcData: IPmcData): boolean;
+    /** Handle SellAllFromSavage event */
+    sellScavItemsToFence(pmcData: IPmcData, request: ISellScavItemsToFenceRequestData, sessionId: string): IItemEventRouterResponse;
+    /**
+     * Send the specified rouble total to player as mail
+     * @param sessionId Session id
+     * @param trader Trader to sell items to
+     * @param output IItemEventRouterResponse
+     */
+    protected mailMoneyToPlayer(sessionId: string, roublesToSend: number, trader: Traders): void;
+    /**
+     * Looks up an items children and gets total handbook price for them
+     * @param parentItemId parent item that has children we want to sum price of
+     * @param items All items (parent + children)
+     * @param handbookPrices Prices of items from handbook
+     * @param traderDetails Trader being sold to to perform buy category check against
+     * @returns Rouble price
+     */
+    protected getPriceOfItemAndChildren(parentItemId: string, items: Item[], handbookPrices: Record<string, number>, traderDetails: ITraderBase): number;
 }
-export { TradeController };

types/controllers/TraderController.d.ts

@@ -1,17 +1,21 @@
-import { FenceBaseAssortGenerator } from "../generators/FenceBaseAssortGenerator";
-import { ProfileHelper } from "../helpers/ProfileHelper";
-import { TraderAssortHelper } from "../helpers/TraderAssortHelper";
-import { TraderHelper } from "../helpers/TraderHelper";
-import { ITraderAssort, ITraderBase } from "../models/eft/common/tables/ITrader";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { FenceService } from "../services/FenceService";
-import { TraderAssortService } from "../services/TraderAssortService";
-import { TraderPurchasePersisterService } from "../services/TraderPurchasePersisterService";
-import { JsonUtil } from "../utils/JsonUtil";
+import { FenceBaseAssortGenerator } from "@spt/generators/FenceBaseAssortGenerator";
+import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { TraderAssortHelper } from "@spt/helpers/TraderAssortHelper";
+import { TraderHelper } from "@spt/helpers/TraderHelper";
+import { ITraderAssort, ITraderBase } from "@spt/models/eft/common/tables/ITrader";
+import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { FenceService } from "@spt/services/FenceService";
+import { TraderAssortService } from "@spt/services/TraderAssortService";
+import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService";
+import { TimeUtil } from "@spt/utils/TimeUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class TraderController {
     protected logger: ILogger;
-    protected databaseServer: DatabaseServer;
+    protected timeUtil: TimeUtil;
+    protected databaseService: DatabaseService;
     protected traderAssortHelper: TraderAssortHelper;
     protected profileHelper: ProfileHelper;
     protected traderHelper: TraderHelper;
@@ -19,11 +23,13 @@ export declare class TraderController {
     protected traderPurchasePersisterService: TraderPurchasePersisterService;
     protected fenceService: FenceService;
     protected fenceBaseAssortGenerator: FenceBaseAssortGenerator;
-    protected jsonUtil: JsonUtil;
-    constructor(logger: ILogger, databaseServer: DatabaseServer, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, traderAssortService: TraderAssortService, traderPurchasePersisterService: TraderPurchasePersisterService, fenceService: FenceService, fenceBaseAssortGenerator: FenceBaseAssortGenerator, jsonUtil: JsonUtil);
+    protected configServer: ConfigServer;
+    protected cloner: ICloner;
+    protected traderConfig: ITraderConfig;
+    constructor(logger: ILogger, timeUtil: TimeUtil, databaseService: DatabaseService, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, traderAssortService: TraderAssortService, traderPurchasePersisterService: TraderPurchasePersisterService, fenceService: FenceService, fenceBaseAssortGenerator: FenceBaseAssortGenerator, configServer: ConfigServer, cloner: ICloner);
     /**
      * Runs when onLoad event is fired
-     * Iterate over traders, ensure an unmolested copy of their assorts is stored in traderAssortService
+     * Iterate over traders, ensure a pristine copy of their assorts is stored in traderAssortService
      * Store timestamp of next assort refresh in nextResupply property of traders .base object
      */
     load(): void;

types/controllers/WeatherController.d.ts

@@ -1,8 +1,8 @@
-import { WeatherGenerator } from "../generators/WeatherGenerator";
-import { IWeatherData } from "../models/eft/weather/IWeatherData";
-import { IWeatherConfig } from "../models/spt/config/IWeatherConfig";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { ConfigServer } from "../servers/ConfigServer";
+import { WeatherGenerator } from "@spt/generators/WeatherGenerator";
+import { IWeatherData } from "@spt/models/eft/weather/IWeatherData";
+import { IWeatherConfig } from "@spt/models/spt/config/IWeatherConfig";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { ConfigServer } from "@spt/servers/ConfigServer";
 export declare class WeatherController {
     protected weatherGenerator: WeatherGenerator;
     protected logger: ILogger;

types/controllers/WishlistController.d.ts

@@ -1,7 +1,7 @@
-import { EventOutputHolder } from "../routers/EventOutputHolder";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { IWishlistActionData } from "../models/eft/wishlist/IWishlistActionData";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IWishlistActionData } from "@spt/models/eft/wishlist/IWishlistActionData";
+import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
 export declare class WishlistController {
     protected eventOutputHolder: EventOutputHolder;
     constructor(eventOutputHolder: EventOutputHolder);

types/di/Container.d.ts

@@ -5,6 +5,7 @@ import { DependencyContainer } from "tsyringe";
 export declare class Container {
     static registerPostLoadTypes(container: DependencyContainer, childContainer: DependencyContainer): void;
     static registerTypes(depContainer: DependencyContainer): void;
+    static registerPrimaryDependencies(depContainer: DependencyContainer): void;
     static registerListTypes(depContainer: DependencyContainer): void;
     private static registerUtils;
     private static registerRouters;

types/di/Router.d.ts

@@ -1,6 +1,6 @@
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { IAkiProfile } from "../models/eft/profile/IAkiProfile";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
 export declare class Router {
     protected handledRoutes: HandledRoute[];
     getTopLevelRoute(): string;
@@ -11,22 +11,20 @@ export declare class Router {
 export declare class StaticRouter extends Router {
     private routes;
     constructor(routes: RouteAction[]);
-    handleStatic(url: string, info: any, sessionID: string, output: string): any;
+    handleStatic(url: string, info: any, sessionID: string, output: string): Promise<any>;
     getHandledRoutes(): HandledRoute[];
 }
 export declare class DynamicRouter extends Router {
     private routes;
     constructor(routes: RouteAction[]);
-    handleDynamic(url: string, info: any, sessionID: string, output: string): any;
+    handleDynamic(url: string, info: any, sessionID: string, output: string): Promise<any>;
     getHandledRoutes(): HandledRoute[];
 }
 export declare class ItemEventRouterDefinition extends Router {
-    constructor();
-    handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse;
+    handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string, output: IItemEventRouterResponse): Promise<any>;
 }
 export declare class SaveLoadRouter extends Router {
-    constructor();
-    handleLoad(profile: IAkiProfile): IAkiProfile;
+    handleLoad(profile: ISptProfile): ISptProfile;
 }
 export declare class HandledRoute {
     route: string;
@@ -35,6 +33,6 @@ export declare class HandledRoute {
 }
 export declare class RouteAction {
     url: string;
-    action: (url: string, info: any, sessionID: string, output: string) => any;
-    constructor(url: string, action: (url: string, info: any, sessionID: string, output: string) => any);
+    action: (url: string, info: any, sessionID: string, output: string) => Promise<any>;
+    constructor(url: string, action: (url: string, info: any, sessionID: string, output: string) => Promise<any>);
 }

types/di/Serializer.d.ts

@@ -1,5 +1,4 @@
-/// <reference types="node" />
-import { IncomingMessage, ServerResponse } from "http";
+import { IncomingMessage, ServerResponse } from "node:http";
 export declare class Serializer {
     serialize(sessionID: string, req: IncomingMessage, resp: ServerResponse, body: any): void;
     canHandle(something: string): boolean;

types/generators/BotEquipmentModGenerator.d.ts

@@ -1,80 +1,95 @@
-import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper";
-import { BotHelper } from "../helpers/BotHelper";
-import { BotWeaponGeneratorHelper } from "../helpers/BotWeaponGeneratorHelper";
-import { ItemHelper } from "../helpers/ItemHelper";
-import { ProbabilityHelper } from "../helpers/ProbabilityHelper";
-import { ProfileHelper } from "../helpers/ProfileHelper";
-import { Mods, ModsChances } from "../models/eft/common/tables/IBotType";
-import { Item } from "../models/eft/common/tables/IItem";
-import { ITemplateItem, Slot } from "../models/eft/common/tables/ITemplateItem";
-import { EquipmentFilterDetails, IBotConfig } from "../models/spt/config/IBotConfig";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { ConfigServer } from "../servers/ConfigServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { BotEquipmentFilterService } from "../services/BotEquipmentFilterService";
-import { BotEquipmentModPoolService } from "../services/BotEquipmentModPoolService";
-import { BotModLimits, BotWeaponModLimitService } from "../services/BotWeaponModLimitService";
-import { ItemBaseClassService } from "../services/ItemBaseClassService";
-import { ItemFilterService } from "../services/ItemFilterService";
-import { LocalisationService } from "../services/LocalisationService";
-import { HashUtil } from "../utils/HashUtil";
-import { JsonUtil } from "../utils/JsonUtil";
-import { RandomUtil } from "../utils/RandomUtil";
+import { BotGeneratorHelper } from "@spt/helpers/BotGeneratorHelper";
+import { BotHelper } from "@spt/helpers/BotHelper";
+import { BotWeaponGeneratorHelper } from "@spt/helpers/BotWeaponGeneratorHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { PresetHelper } from "@spt/helpers/PresetHelper";
+import { ProbabilityHelper } from "@spt/helpers/ProbabilityHelper";
+import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
+import { IPreset } from "@spt/models/eft/common/IGlobals";
+import { Mods, ModsChances } from "@spt/models/eft/common/tables/IBotType";
+import { Item } from "@spt/models/eft/common/tables/IItem";
+import { ITemplateItem, Slot } from "@spt/models/eft/common/tables/ITemplateItem";
+import { ModSpawn } from "@spt/models/enums/ModSpawn";
+import { IChooseRandomCompatibleModResult } from "@spt/models/spt/bots/IChooseRandomCompatibleModResult";
+import { IFilterPlateModsForSlotByLevelResult } from "@spt/models/spt/bots/IFilterPlateModsForSlotByLevelResult";
+import { IGenerateEquipmentProperties } from "@spt/models/spt/bots/IGenerateEquipmentProperties";
+import { IGenerateWeaponRequest } from "@spt/models/spt/bots/IGenerateWeaponRequest";
+import { IModToSpawnRequest } from "@spt/models/spt/bots/IModToSpawnRequest";
+import { EquipmentFilterDetails, EquipmentFilters, IBotConfig } from "@spt/models/spt/config/IBotConfig";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { BotEquipmentFilterService } from "@spt/services/BotEquipmentFilterService";
+import { BotEquipmentModPoolService } from "@spt/services/BotEquipmentModPoolService";
+import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { ItemFilterService } from "@spt/services/ItemFilterService";
+import { LocalisationService } from "@spt/services/LocalisationService";
+import { HashUtil } from "@spt/utils/HashUtil";
+import { RandomUtil } from "@spt/utils/RandomUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class BotEquipmentModGenerator {
     protected logger: ILogger;
-    protected jsonUtil: JsonUtil;
     protected hashUtil: HashUtil;
     protected randomUtil: RandomUtil;
     protected probabilityHelper: ProbabilityHelper;
-    protected databaseServer: DatabaseServer;
+    protected databaseService: DatabaseService;
     protected itemHelper: ItemHelper;
     protected botEquipmentFilterService: BotEquipmentFilterService;
-    protected itemBaseClassService: ItemBaseClassService;
     protected itemFilterService: ItemFilterService;
     protected profileHelper: ProfileHelper;
     protected botWeaponModLimitService: BotWeaponModLimitService;
     protected botHelper: BotHelper;
     protected botGeneratorHelper: BotGeneratorHelper;
     protected botWeaponGeneratorHelper: BotWeaponGeneratorHelper;
+    protected weightedRandomHelper: WeightedRandomHelper;
+    protected presetHelper: PresetHelper;
     protected localisationService: LocalisationService;
     protected botEquipmentModPoolService: BotEquipmentModPoolService;
     protected configServer: ConfigServer;
+    protected cloner: ICloner;
     protected botConfig: IBotConfig;
-    constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, probabilityHelper: ProbabilityHelper, databaseServer: DatabaseServer, itemHelper: ItemHelper, botEquipmentFilterService: BotEquipmentFilterService, itemBaseClassService: ItemBaseClassService, itemFilterService: ItemFilterService, profileHelper: ProfileHelper, botWeaponModLimitService: BotWeaponModLimitService, botHelper: BotHelper, botGeneratorHelper: BotGeneratorHelper, botWeaponGeneratorHelper: BotWeaponGeneratorHelper, localisationService: LocalisationService, botEquipmentModPoolService: BotEquipmentModPoolService, configServer: ConfigServer);
+    constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, probabilityHelper: ProbabilityHelper, databaseService: DatabaseService, itemHelper: ItemHelper, botEquipmentFilterService: BotEquipmentFilterService, itemFilterService: ItemFilterService, profileHelper: ProfileHelper, botWeaponModLimitService: BotWeaponModLimitService, botHelper: BotHelper, botGeneratorHelper: BotGeneratorHelper, botWeaponGeneratorHelper: BotWeaponGeneratorHelper, weightedRandomHelper: WeightedRandomHelper, presetHelper: PresetHelper, localisationService: LocalisationService, botEquipmentModPoolService: BotEquipmentModPoolService, configServer: ConfigServer, cloner: ICloner);
     /**
      * Check mods are compatible and add to array
      * @param equipment Equipment item to add mods to
      * @param modPool Mod list to choose frm
      * @param parentId parentid of item to add mod to
      * @param parentTemplate template objet of item to add mods to
-     * @param modSpawnChances dictionary of mod items and their chance to spawn for this bot type
-     * @param botRole the bot role being generated for
      * @param forceSpawn should this mod be forced to spawn
      * @returns Item + compatible mods as an array
      */
-    generateModsForEquipment(equipment: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances, botRole: string, forceSpawn?: boolean): Item[];
+    generateModsForEquipment(equipment: Item[], parentId: string, parentTemplate: ITemplateItem, settings: IGenerateEquipmentProperties, shouldForceSpawn?: boolean): Item[];
+    /**
+     * Filter a bots plate pool based on its current level
+     * @param settings Bot equipment generation settings
+     * @param modSlot Armor slot being filtered
+     * @param existingPlateTplPool Plates tpls to choose from
+     * @param armorItem The armor items db template
+     * @returns Array of plate tpls to choose from
+     */
+    protected filterPlateModsForSlotByLevel(settings: IGenerateEquipmentProperties, modSlot: string, existingPlateTplPool: string[], armorItem: ITemplateItem): IFilterPlateModsForSlotByLevelResult;
     /**
      * Add mods to a weapon using the provided mod pool
-     * @param sessionId session id
-     * @param weapon Weapon to add mods to
-     * @param modPool Pool of compatible mods to attach to weapon
-     * @param weaponParentId parentId of weapon
-     * @param parentTemplate Weapon which mods will be generated on
-     * @param modSpawnChances Mod spawn chances
-     * @param ammoTpl Ammo tpl to use when generating magazines/cartridges
-     * @param botRole Role of bot weapon is generated for
-     * @param botLevel lvel of the bot weapon is being generated for
-     * @param modLimits limits placed on certian mod types per gun
-     * @param botEquipmentRole role of bot when accessing bot.json equipment config settings
+     * @param sessionId Session id
+     * @param request Data used to generate the weapon
      * @returns Weapon + mods array
      */
-    generateModsForWeapon(sessionId: string, weapon: Item[], modPool: Mods, weaponParentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances, ammoTpl: string, botRole: string, botLevel: number, modLimits: BotModLimits, botEquipmentRole: string): Item[];
+    generateModsForWeapon(sessionId: string, request: IGenerateWeaponRequest): Item[];
+    /**
+     * Should the provided bot have its stock chance values altered to 100%
+     * @param modSlot Slot to check
+     * @param botEquipConfig Bots equipment config/chance values
+     * @param modToAddTemplate Mod being added to bots weapon
+     * @returns True if it should
+     */
+    protected shouldForceSubStockSlots(modSlot: string, botEquipConfig: EquipmentFilters, modToAddTemplate: ITemplateItem): boolean;
     /**
      * Is this modslot a front or rear sight
      * @param modSlot Slot to check
      * @returns true if it's a front/rear sight
      */
-    protected modIsFrontOrRearSight(modSlot: string): boolean;
+    protected modIsFrontOrRearSight(modSlot: string, tpl: string): boolean;
     /**
      * Does the provided mod details show the mod can hold a scope
      * @param modSlot e.g. mod_scope, mod_mount
@@ -83,47 +98,92 @@ export declare class BotEquipmentModGenerator {
      */
     protected modSlotCanHoldScope(modSlot: string, modsParentId: string): boolean;
     /**
-     * Set all scope mod chances to 100%
-     * @param modSpawnChances Chances objet to update
+     * Set mod spawn chances to defined amount
+     * @param modSpawnChances Chance dictionary to update
      */
-    protected setScopeSpawnChancesToFull(modSpawnChances: ModsChances): void;
-    protected sortModKeys(unsortedKeys: string[]): string[];
+    protected adjustSlotSpawnChances(modSpawnChances: ModsChances, modSlotsToAdjust: string[], newChancePercent: number): void;
+    /**
+     * Does the provided modSlot allow muzzle-related items
+     * @param modSlot Slot id to check
+     * @param modsParentId OPTIONAL: parent id of modslot being checked
+     * @returns True if modSlot can have muzzle-related items
+     */
+    protected modSlotCanHoldMuzzleDevices(modSlot: string, modsParentId?: string): boolean;
+    /**
+     * Sort mod slots into an ordering that maximises chance of a successful weapon generation
+     * @param unsortedSlotKeys Array of mod slot strings to sort
+     * @returns Sorted array
+     */
+    protected sortModKeys(unsortedSlotKeys: string[]): string[];
     /**
      * Get a Slot property for an item (chamber/cartridge/slot)
      * @param modSlot e.g patron_in_weapon
      * @param parentTemplate item template
      * @returns Slot item
      */
-    protected getModItemSlot(modSlot: string, parentTemplate: ITemplateItem): Slot;
+    protected getModItemSlotFromDb(modSlot: string, parentTemplate: ITemplateItem): Slot;
     /**
      * Randomly choose if a mod should be spawned, 100% for required mods OR mod is ammo slot
-     * never return true for an item that has 0% spawn chance
      * @param itemSlot slot the item sits in
      * @param modSlot slot the mod sits in
      * @param modSpawnChances Chances for various mod spawns
-     * @returns boolean true if it should spawn
+     * @param botEquipConfig Various config settings for generating this type of bot
+     * @returns ModSpawn.SPAWN when mod should be spawned, ModSpawn.DEFAULT_MOD when default mod should spawn, ModSpawn.SKIP when mod is skipped
      */
-    protected shouldModBeSpawned(itemSlot: Slot, modSlot: string, modSpawnChances: ModsChances): boolean;
+    protected shouldModBeSpawned(itemSlot: Slot, modSlot: string, modSpawnChances: ModsChances, botEquipConfig: EquipmentFilters): ModSpawn;
+    /**
+     * Choose a mod to fit into the desired slot
+     * @param request Data used to choose an appropriate mod with
+     * @returns itemHelper.getItem() result
+     */
+    protected chooseModToPutIntoSlot(request: IModToSpawnRequest): [boolean, ITemplateItem] | undefined;
     /**
      *
-     * @param modSlot Slot mod will fit into
-     * @param isRandomisableSlot Will generate a randomised mod pool if true
-     * @param modsParent Parent slot the item will be a part of
-     * @param botEquipBlacklist Blacklist to prevent mods from being picked
-     * @param itemModPool Pool of items to pick from
-     * @param weapon array with only weapon tpl in it, ready for mods to be added
-     * @param ammoTpl ammo tpl to use if slot requires a cartridge to be added (e.g. mod_magazine)
-     * @param parentTemplate Parent item the mod will go into
-     * @returns ITemplateItem
+     * @param modPool Pool of mods that can be picked from
+     * @param parentSlot Slot the picked mod will have as a parent
+     * @param choiceTypeEnum How should chosen tpl be treated: DEFAULT_MOD/SPAWN/SKIP
+     * @param weapon Array of weapon items chosen item will be added to
+     * @param modSlotName Name of slot picked mod will be placed into
+     * @returns Chosen weapon details
      */
-    protected chooseModToPutIntoSlot(modSlot: string, isRandomisableSlot: boolean, botWeaponSightWhitelist: Record<string, string[]>, botEquipBlacklist: EquipmentFilterDetails, itemModPool: Record<string, string[]>, weapon: Item[], ammoTpl: string, parentTemplate: ITemplateItem): [boolean, ITemplateItem];
+    protected pickWeaponModTplForSlotFromPool(modPool: string[], parentSlot: Slot, choiceTypeEnum: ModSpawn, weapon: Item[], modSlotName: string): IChooseRandomCompatibleModResult;
     /**
-     * Create a mod item with parameters as properties
+     * Filter mod pool down based on various criteria:
+     * Is slot flagged as randomisable
+     * Is slot required
+     * Is slot flagged as default mod only
+     * @param itemModPool Existing pool of mods to choose
+     * @param itemSpawnCategory How should slot be handled
+     * @param parentTemplate Mods parent
+     * @param weaponTemplate Mods root parent (weapon/equipment)
+     * @param modSlot name of mod slot to choose for
+     * @param botEquipBlacklist A blacklist of items not allowed to be picked
+     * @param isRandomisableSlot Slot is flagged as a randomisable slot
+     * @returns Array of mod tpls
+     */
+    protected getModPoolForSlot(itemModPool: Record<string, string[]>, itemSpawnCategory: ModSpawn, parentTemplate: ITemplateItem, weaponTemplate: ITemplateItem, modSlot: string, botEquipBlacklist: EquipmentFilterDetails, isRandomisableSlot: boolean): string[];
+    /**
+     * Get default preset for weapon OR get specific weapon presets for edge cases (mp5/silenced dvl)
+     * @param weaponTemplate Weapons db template
+     * @param parentItemTpl Tpl of the parent item
+     * @returns Default preset found
+     */
+    protected getMatchingPreset(weaponTemplate: ITemplateItem, parentItemTpl: string): IPreset | undefined;
+    /**
+     * Temp fix to prevent certain combinations of weapons with mods that are known to be incompatible
+     * @param weapon Array of items that make up a weapon
+     * @param modTpl Mod to check compatibility with weapon
+     * @returns True if incompatible
+     */
+    protected weaponModComboIsIncompatible(weapon: Item[], modTpl: string): boolean;
+    /**
+     * Create a mod item with provided parameters as properties + add upd property
      * @param modId _id
      * @param modTpl _tpl
      * @param parentId parentId
      * @param modSlot slotId
-     * @param modTemplate Used to add additional properites in the upd object
+     * @param modTemplate Used to add additional properties in the upd object
+     * @param botRole The bots role mod is being created for
      * @returns Item object
      */
     protected createModItem(modId: string, modTpl: string, parentId: string, modSlot: string, modTemplate: ITemplateItem, botRole: string): Item;
@@ -135,42 +195,44 @@ export declare class BotEquipmentModGenerator {
     protected getAmmoContainers(): string[];
     /**
      * Get a random mod from an items compatible mods Filter array
-     * @param modTpl ???? default value to return if nothing found
-     * @param parentSlot item mod will go into, used to get combatible items
+     * @param fallbackModTpl Default value to return if parentSlot Filter is empty
+     * @param parentSlot Item mod will go into, used to get compatible items
      * @param modSlot Slot to get mod to fill
-     * @param items items to ensure picked mod is compatible with
-     * @returns item tpl
+     * @param items Items to ensure picked mod is compatible with
+     * @returns Item tpl
      */
-    protected getModTplFromItemDb(modTpl: string, parentSlot: Slot, modSlot: string, items: Item[]): string;
+    protected getRandomModTplFromItemDb(fallbackModTpl: string, parentSlot: Slot, modSlot: string, items: Item[]): string | undefined;
     /**
-     * Log errors if mod is not compatible with slot
-     * @param modToAdd template of mod to check
-     * @param itemSlot slot the item will be placed in
-     * @param modSlot slot the mod will fill
-     * @param parentTemplate template of the mods parent item
-     * @returns true if valid
+     * Check if mod exists in db + is for a required slot
+     * @param modToAdd Db template of mod to check
+     * @param slotAddedToTemplate Slot object the item will be placed as child into
+     * @param modSlot Slot the mod will fill
+     * @param parentTemplate Db template of the mods being added
+     * @param botRole Bots wildspawntype (assault/pmcBot/exUsec etc)
+     * @returns True if valid for slot
      */
-    protected isModValidForSlot(modToAdd: [boolean, ITemplateItem], itemSlot: Slot, modSlot: string, parentTemplate: ITemplateItem): boolean;
+    protected isModValidForSlot(modToAdd: [boolean, ITemplateItem], slotAddedToTemplate: Slot, modSlot: string, parentTemplate: ITemplateItem, botRole: string): boolean;
     /**
      * Find mod tpls of a provided type and add to modPool
-     * @param desiredSlotName slot to look up and add we are adding tpls for (e.g mod_scope)
+     * @param desiredSlotName Slot to look up and add we are adding tpls for (e.g mod_scope)
      * @param modTemplate db object for modItem we get compatible mods from
      * @param modPool Pool of mods we are adding to
+     * @param botEquipBlacklist A blacklist of items that cannot be picked
      */
     protected addCompatibleModsForProvidedMod(desiredSlotName: string, modTemplate: ITemplateItem, modPool: Mods, botEquipBlacklist: EquipmentFilterDetails): void;
     /**
      * Get the possible items that fit a slot
      * @param parentItemId item tpl to get compatible items for
      * @param modSlot Slot item should fit in
-     * @param botEquipBlacklist equipment that should not be picked
-     * @returns array of compatible items for that slot
+     * @param botEquipBlacklist Equipment that should not be picked
+     * @returns Array of compatible items for that slot
      */
     protected getDynamicModPool(parentItemId: string, modSlot: string, botEquipBlacklist: EquipmentFilterDetails): string[];
     /**
      * Take a list of tpls and filter out blacklisted values using itemFilterService + botEquipmentBlacklist
-     * @param allowedMods base mods to filter
-     * @param botEquipBlacklist equipment blacklist
-     * @param modSlot slot mods belong to
+     * @param allowedMods Base mods to filter
+     * @param botEquipBlacklist Equipment blacklist
+     * @param modSlot Slot mods belong to
      * @returns Filtered array of mod tpls
      */
     protected filterWeaponModsByBlacklist(allowedMods: string[], botEquipBlacklist: EquipmentFilterDetails, modSlot: string): string[];
@@ -180,23 +242,25 @@ export declare class BotEquipmentModGenerator {
      * Ammo is not put into the magazine directly but assigned to the magazine's slots: The "camora_xxx" slots.
      * This function is a helper called by generateModsForItem for mods with parent type "CylinderMagazine"
      * @param items The items where the CylinderMagazine's camora are appended to
-     * @param modPool modPool which should include available cartrigdes
-     * @param parentId The CylinderMagazine's UID
-     * @param parentTemplate The CylinderMagazine's template
+     * @param modPool ModPool which should include available cartridges
+     * @param cylinderMagParentId The CylinderMagazine's UID
+     * @param cylinderMagTemplate The CylinderMagazine's template
      */
-    protected fillCamora(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem): void;
+    protected fillCamora(items: Item[], modPool: Mods, cylinderMagParentId: string, cylinderMagTemplate: ITemplateItem): void;
     /**
-     * Take a record of camoras and merge the compatable shells into one array
-     * @param camorasWithShells camoras we want to merge into one array
-     * @returns string array of shells fro luitple camora sources
+     * Take a record of camoras and merge the compatible shells into one array
+     * @param camorasWithShells Dictionary of camoras we want to merge into one array
+     * @returns String array of shells for multiple camora sources
      */
-    protected mergeCamoraPoolsTogether(camorasWithShells: Record<string, string[]>): string[];
+    protected mergeCamoraPools(camorasWithShells: Record<string, string[]>): string[];
     /**
      * Filter out non-whitelisted weapon scopes
+     * Controlled by bot.json weaponSightWhitelist
+     * e.g. filter out rifle scopes from SMGs
      * @param weapon Weapon scopes will be added to
      * @param scopes Full scope pool
-     * @param botWeaponSightWhitelist whitelist of scope types by weapon base type
-     * @returns array of scope tpls that have been filtered
+     * @param botWeaponSightWhitelist Whitelist of scope types by weapon base type
+     * @returns Array of scope tpls that have been filtered to just ones allowed for that weapon type
      */
     protected filterSightsByWeaponType(weapon: Item, scopes: string[], botWeaponSightWhitelist: Record<string, string[]>): string[];
 }

types/generators/BotGenerator.d.ts

@@ -1,31 +1,32 @@
-import { BotDifficultyHelper } from "../helpers/BotDifficultyHelper";
-import { BotHelper } from "../helpers/BotHelper";
-import { ProfileHelper } from "../helpers/ProfileHelper";
-import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper";
-import { IBaseJsonSkills, IBaseSkill, IBotBase, Info, Health as PmcHealth, Skills as botSkills } from "../models/eft/common/tables/IBotBase";
-import { Health, IBotType } from "../models/eft/common/tables/IBotType";
-import { BotGenerationDetails } from "../models/spt/bots/BotGenerationDetails";
-import { IBotConfig } from "../models/spt/config/IBotConfig";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { ConfigServer } from "../servers/ConfigServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { BotEquipmentFilterService } from "../services/BotEquipmentFilterService";
-import { LocalisationService } from "../services/LocalisationService";
-import { SeasonalEventService } from "../services/SeasonalEventService";
-import { HashUtil } from "../utils/HashUtil";
-import { JsonUtil } from "../utils/JsonUtil";
-import { RandomUtil } from "../utils/RandomUtil";
-import { TimeUtil } from "../utils/TimeUtil";
-import { BotInventoryGenerator } from "./BotInventoryGenerator";
-import { BotLevelGenerator } from "./BotLevelGenerator";
+import { BotInventoryGenerator } from "@spt/generators/BotInventoryGenerator";
+import { BotLevelGenerator } from "@spt/generators/BotLevelGenerator";
+import { BotDifficultyHelper } from "@spt/helpers/BotDifficultyHelper";
+import { BotHelper } from "@spt/helpers/BotHelper";
+import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
+import { IBaseJsonSkills, IBaseSkill, IBotBase, Info, Health as PmcHealth, Skills as botSkills } from "@spt/models/eft/common/tables/IBotBase";
+import { Appearance, Health, IBotType, Inventory } from "@spt/models/eft/common/tables/IBotType";
+import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails";
+import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
+import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { BotEquipmentFilterService } from "@spt/services/BotEquipmentFilterService";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { ItemFilterService } from "@spt/services/ItemFilterService";
+import { LocalisationService } from "@spt/services/LocalisationService";
+import { SeasonalEventService } from "@spt/services/SeasonalEventService";
+import { HashUtil } from "@spt/utils/HashUtil";
+import { RandomUtil } from "@spt/utils/RandomUtil";
+import { TimeUtil } from "@spt/utils/TimeUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class BotGenerator {
     protected logger: ILogger;
     protected hashUtil: HashUtil;
     protected randomUtil: RandomUtil;
     protected timeUtil: TimeUtil;
-    protected jsonUtil: JsonUtil;
     protected profileHelper: ProfileHelper;
-    protected databaseServer: DatabaseServer;
+    protected databaseService: DatabaseService;
     protected botInventoryGenerator: BotInventoryGenerator;
     protected botLevelGenerator: BotLevelGenerator;
     protected botEquipmentFilterService: BotEquipmentFilterService;
@@ -34,9 +35,12 @@ export declare class BotGenerator {
     protected botDifficultyHelper: BotDifficultyHelper;
     protected seasonalEventService: SeasonalEventService;
     protected localisationService: LocalisationService;
+    protected itemFilterService: ItemFilterService;
     protected configServer: ConfigServer;
+    protected cloner: ICloner;
     protected botConfig: IBotConfig;
-    constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, timeUtil: TimeUtil, jsonUtil: JsonUtil, profileHelper: ProfileHelper, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botLevelGenerator: BotLevelGenerator, botEquipmentFilterService: BotEquipmentFilterService, weightedRandomHelper: WeightedRandomHelper, botHelper: BotHelper, botDifficultyHelper: BotDifficultyHelper, seasonalEventService: SeasonalEventService, localisationService: LocalisationService, configServer: ConfigServer);
+    protected pmcConfig: IPmcConfig;
+    constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, timeUtil: TimeUtil, profileHelper: ProfileHelper, databaseService: DatabaseService, botInventoryGenerator: BotInventoryGenerator, botLevelGenerator: BotLevelGenerator, botEquipmentFilterService: BotEquipmentFilterService, weightedRandomHelper: WeightedRandomHelper, botHelper: BotHelper, botDifficultyHelper: BotDifficultyHelper, seasonalEventService: SeasonalEventService, localisationService: LocalisationService, itemFilterService: ItemFilterService, configServer: ConfigServer, cloner: ICloner);
     /**
      * Generate a player scav bot object
      * @param role e.g. assault / pmcbot
@@ -46,12 +50,20 @@ export declare class BotGenerator {
      */
     generatePlayerScav(sessionId: string, role: string, difficulty: string, botTemplate: IBotType): IBotBase;
     /**
-     * Create x number of bots of the type/side/difficulty defined in botGenerationDetails
+     * Create 1  bots of the type/side/difficulty defined in botGenerationDetails
      * @param sessionId Session id
      * @param botGenerationDetails details on how to generate bots
-     * @returns array of bots
+     * @returns constructed bot
      */
-    prepareAndGenerateBots(sessionId: string, botGenerationDetails: BotGenerationDetails): IBotBase[];
+    prepareAndGenerateBot(sessionId: string, botGenerationDetails: BotGenerationDetails): IBotBase;
+    /**
+     * Get a clone of the default bot base object and adjust its role/side/difficulty values
+     * @param botRole Role bot should have
+     * @param botSide Side bot should have
+     * @param difficulty Difficult bot should have
+     * @returns Cloned bot base
+     */
+    protected getPreparedBotBase(botRole: string, botSide: string, difficulty: string): IBotBase;
     /**
      * Get a clone of the database\bots\base.json file
      * @returns IBotBase object
@@ -60,20 +72,36 @@ export declare class BotGenerator {
     /**
      * Create a IBotBase object with equipment/loot/exp etc
      * @param sessionId Session id
-     * @param bot bots base file
+     * @param bot Bots base file
      * @param botJsonTemplate Bot template from db/bots/x.json
      * @param botGenerationDetails details on how to generate the bot
      * @returns IBotBase object
      */
     protected generateBot(sessionId: string, bot: IBotBase, botJsonTemplate: IBotType, botGenerationDetails: BotGenerationDetails): IBotBase;
+    protected addAdditionalPocketLootWeightsForUnheardBot(botJsonTemplate: IBotType): void;
+    /**
+     * Remove items from item.json/lootableItemBlacklist from bots inventory
+     * @param botInventory Bot to filter
+     */
+    protected removeBlacklistedLootFromBotTemplate(botInventory: Inventory): void;
+    /**
+     * Choose various appearance settings for a bot using weights: head/body/feet/hands
+     * @param bot Bot to adjust
+     * @param appearance Appearance settings to choose from
+     * @param botGenerationDetails Generation details
+     */
+    protected setBotAppearance(bot: IBotBase, appearance: Appearance, botGenerationDetails: BotGenerationDetails): void;
     /**
      * Create a bot nickname
      * @param botJsonTemplate x.json from database
-     * @param isPlayerScav Will bot be player scav
+     * @param botGenerationDetails
      * @param botRole role of bot e.g. assault
+     * @param sessionId OPTIONAL: profile session id
      * @returns Nickname for bot
      */
-    protected generateBotNickname(botJsonTemplate: IBotType, isPlayerScav: boolean, botRole: string, sessionId: string): string;
+    protected generateBotNickname(botJsonTemplate: IBotType, botGenerationDetails: BotGenerationDetails, botRole: string, sessionId?: string): string;
+    protected shouldSimulatePlayerScavName(botRole: string, isPlayerScav: boolean): boolean;
+    protected addPlayerScavNameSimulationSuffix(nickname: string): string;
     /**
      * Log the number of PMCs generated to the debug console
      * @param output Generated bot array, ready to send to client
@@ -100,23 +128,41 @@ export declare class BotGenerator {
      */
     protected getSkillsWithRandomisedProgressValue(skills: Record<string, IBaseSkill>, isCommonSkills: boolean): IBaseSkill[];
     /**
-     * Generate a random Id for a bot and apply to bots _id and aid value
+     * Generate an id+aid for a bot and apply
      * @param bot bot to update
      * @returns updated IBotBase object
      */
-    protected generateId(bot: IBotBase): IBotBase;
-    protected generateInventoryID(profile: IBotBase): IBotBase;
+    protected addIdsToBot(bot: IBotBase): void;
+    /**
+     * Update a profiles profile.Inventory.equipment value with a freshly generated one
+     * Update all inventory items that make use of this value too
+     * @param profile Profile to update
+     */
+    protected generateInventoryId(profile: IBotBase): void;
     /**
      * Randomise a bots game version and account category
      * Chooses from all the game versions (standard, eod etc)
      * Chooses account type (default, Sherpa, etc)
      * @param botInfo bot info object to update
+     * @returns Chosen game version
      */
-    protected getRandomisedGameVersionAndCategory(botInfo: Info): void;
+    protected setRandomisedGameVersionAndCategory(botInfo: Info): string;
     /**
      * Add a side-specific (usec/bear) dogtag item to a bots inventory
      * @param bot bot to add dogtag to
      * @returns Bot with dogtag added
      */
-    protected generateDogtag(bot: IBotBase): IBotBase;
+    protected addDogtagToBot(bot: IBotBase): void;
+    /**
+     * Get a dogtag tpl that matches the bots game version and side
+     * @param side Usec/Bear
+     * @param gameVersion edge_of_darkness / standard
+     * @returns item tpl
+     */
+    protected getDogtagTplByGameVersionAndSide(side: string, gameVersion: string): string;
+    /**
+     * Adjust a PMCs pocket tpl to UHD if necessary, otherwise do nothing
+     * @param bot Pmc object to adjust
+     */
+    protected setPmcPocketsByGameVersion(bot: IBotBase): void;
 }

types/generators/BotInventoryGenerator.d.ts

@@ -1,36 +1,39 @@
-import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper";
-import { BotHelper } from "../helpers/BotHelper";
-import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper";
-import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase";
-import { Chances, Generation, IBotType, Inventory, Mods } from "../models/eft/common/tables/IBotType";
-import { EquipmentSlots } from "../models/enums/EquipmentSlots";
-import { EquipmentFilterDetails, IBotConfig, RandomisationDetails } from "../models/spt/config/IBotConfig";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { ConfigServer } from "../servers/ConfigServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { BotEquipmentModPoolService } from "../services/BotEquipmentModPoolService";
-import { LocalisationService } from "../services/LocalisationService";
-import { HashUtil } from "../utils/HashUtil";
-import { RandomUtil } from "../utils/RandomUtil";
-import { BotEquipmentModGenerator } from "./BotEquipmentModGenerator";
-import { BotLootGenerator } from "./BotLootGenerator";
-import { BotWeaponGenerator } from "./BotWeaponGenerator";
+import { BotEquipmentModGenerator } from "@spt/generators/BotEquipmentModGenerator";
+import { BotLootGenerator } from "@spt/generators/BotLootGenerator";
+import { BotWeaponGenerator } from "@spt/generators/BotWeaponGenerator";
+import { BotGeneratorHelper } from "@spt/helpers/BotGeneratorHelper";
+import { BotHelper } from "@spt/helpers/BotHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
+import { Inventory as PmcInventory } from "@spt/models/eft/common/tables/IBotBase";
+import { Chances, Equipment, Generation, IBotType, Inventory } from "@spt/models/eft/common/tables/IBotType";
+import { EquipmentSlots } from "@spt/models/enums/EquipmentSlots";
+import { IGenerateEquipmentProperties } from "@spt/models/spt/bots/IGenerateEquipmentProperties";
+import { EquipmentFilterDetails, IBotConfig } from "@spt/models/spt/config/IBotConfig";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { BotEquipmentModPoolService } from "@spt/services/BotEquipmentModPoolService";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { LocalisationService } from "@spt/services/LocalisationService";
+import { HashUtil } from "@spt/utils/HashUtil";
+import { RandomUtil } from "@spt/utils/RandomUtil";
 export declare class BotInventoryGenerator {
     protected logger: ILogger;
     protected hashUtil: HashUtil;
     protected randomUtil: RandomUtil;
-    protected databaseServer: DatabaseServer;
+    protected databaseService: DatabaseService;
     protected botWeaponGenerator: BotWeaponGenerator;
     protected botLootGenerator: BotLootGenerator;
     protected botGeneratorHelper: BotGeneratorHelper;
     protected botHelper: BotHelper;
     protected weightedRandomHelper: WeightedRandomHelper;
+    protected itemHelper: ItemHelper;
     protected localisationService: LocalisationService;
     protected botEquipmentModPoolService: BotEquipmentModPoolService;
     protected botEquipmentModGenerator: BotEquipmentModGenerator;
     protected configServer: ConfigServer;
     protected botConfig: IBotConfig;
-    constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, botWeaponGenerator: BotWeaponGenerator, botLootGenerator: BotLootGenerator, botGeneratorHelper: BotGeneratorHelper, botHelper: BotHelper, weightedRandomHelper: WeightedRandomHelper, localisationService: LocalisationService, botEquipmentModPoolService: BotEquipmentModPoolService, botEquipmentModGenerator: BotEquipmentModGenerator, configServer: ConfigServer);
+    constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseService: DatabaseService, botWeaponGenerator: BotWeaponGenerator, botLootGenerator: BotLootGenerator, botGeneratorHelper: BotGeneratorHelper, botHelper: BotHelper, weightedRandomHelper: WeightedRandomHelper, itemHelper: ItemHelper, localisationService: LocalisationService, botEquipmentModPoolService: BotEquipmentModPoolService, botEquipmentModGenerator: BotEquipmentModGenerator, configServer: ConfigServer);
     /**
      * Add equipment/weapons/loot to bot
      * @param sessionId Session id
@@ -38,9 +41,10 @@ export declare class BotInventoryGenerator {
      * @param botRole Role bot has (assault/pmcBot)
      * @param isPmc Is bot being converted into a pmc
      * @param botLevel Level of bot being generated
+     * @param chosenGameVersion Game version for bot, only really applies for PMCs
      * @returns PmcInventory object with equipment/weapons/loot
      */
-    generateInventory(sessionId: string, botJsonTemplate: IBotType, botRole: string, isPmc: boolean, botLevel: number): PmcInventory;
+    generateInventory(sessionId: string, botJsonTemplate: IBotType, botRole: string, isPmc: boolean, botLevel: number, chosenGameVersion: string): PmcInventory;
     /**
      * Create a pmcInventory object with all the base/generic items needed
      * @returns PmcInventory object
@@ -49,26 +53,32 @@ export declare class BotInventoryGenerator {
     /**
      * Add equipment to a bot
      * @param templateInventory bot/x.json data from db
-     * @param equipmentChances Chances items will be added to bot
+     * @param wornItemChances Chances items will be added to bot
      * @param botRole Role bot has (assault/pmcBot)
      * @param botInventory Inventory to add equipment to
      * @param botLevel Level of bot
+     * @param chosenGameVersion Game version for bot, only really applies for PMCs
      */
-    protected generateAndAddEquipmentToBot(templateInventory: Inventory, equipmentChances: Chances, botRole: string, botInventory: PmcInventory, botLevel: number): void;
+    protected generateAndAddEquipmentToBot(templateInventory: Inventory, wornItemChances: Chances, botRole: string, botInventory: PmcInventory, botLevel: number, chosenGameVersion: string): void;
+    /**
+     * Remove non-armored rigs from parameter data
+     * @param templateEquipment Equpiment to filter TacticalVest of
+     */
+    protected filterRigsToThoseWithProtection(templateEquipment: Equipment): void;
+    /**
+     * Remove armored rigs from parameter data
+     * @param templateEquipment Equpiment to filter TacticalVest of
+     */
+    protected filterRigsToThoseWithoutProtection(templateEquipment: Equipment): void;
     /**
      * Add a piece of equipment with mods to inventory from the provided pools
-     * @param equipmentSlot Slot to select an item for
-     * @param equipmentPool Possible items to choose from
-     * @param modPool Possible mods to apply to item chosen
-     * @param spawnChances Chances items will be chosen to be added
-     * @param botRole Role of bot e.g. assault
-     * @param inventory Inventory to add item into
-     * @param randomisationDetails settings from bot.json to adjust how item is generated
+     * @param settings Values to adjust how item is chosen and added to bot
+     * @returns true when item added
      */
-    protected generateEquipment(equipmentSlot: string, equipmentPool: Record<string, number>, modPool: Mods, spawnChances: Chances, botRole: string, inventory: PmcInventory, randomisationDetails: RandomisationDetails): void;
+    protected generateEquipment(settings: IGenerateEquipmentProperties): boolean;
     /**
      * Get all possible mods for item and filter down based on equipment blacklist from bot.json config
-     * @param itemTpl Item mod pool is being retreived and filtered
+     * @param itemTpl Item mod pool is being retrieved and filtered
      * @param equipmentBlacklist blacklist to filter mod pool with
      * @returns Filtered pool of mods
      */
@@ -81,8 +91,8 @@ export declare class BotInventoryGenerator {
      * @param botInventory Inventory to add weapons to
      * @param botRole assault/pmcBot/bossTagilla etc
      * @param isPmc Is the bot being generated as a pmc
-     * @param botLevel level of bot having weapon generated
      * @param itemGenerationLimitsMinMax Limits for items the bot can have
+     * @param botLevel level of bot having weapon generated
      */
     protected generateAndAddWeaponsToBot(templateInventory: Inventory, equipmentChances: Chances, sessionId: string, botInventory: PmcInventory, botRole: string, isPmc: boolean, itemGenerationLimitsMinMax: Generation, botLevel: number): void;
     /**
@@ -103,10 +113,10 @@ export declare class BotInventoryGenerator {
      * @param equipmentChances Chances bot can have equipment equipped
      * @param botRole assault/pmcBot/bossTagilla etc
      * @param isPmc Is the bot being generated as a pmc
-     * @param itemGenerationLimitsMinMax
+     * @param itemGenerationWeights
      */
     protected addWeaponAndMagazinesToInventory(sessionId: string, weaponSlot: {
         slot: EquipmentSlots;
         shouldSpawn: boolean;
-    }, templateInventory: Inventory, botInventory: PmcInventory, equipmentChances: Chances, botRole: string, isPmc: boolean, itemGenerationLimitsMinMax: Generation, botLevel: number): void;
+    }, templateInventory: Inventory, botInventory: PmcInventory, equipmentChances: Chances, botRole: string, isPmc: boolean, itemGenerationWeights: Generation, botLevel: number): void;
 }

types/generators/BotLevelGenerator.d.ts

@@ -1,29 +1,32 @@
-import { MinMax } from "../models/common/MinMax";
-import { IRandomisedBotLevelResult } from "../models/eft/bot/IRandomisedBotLevelResult";
-import { IExpTable } from "../models/eft/common/IGlobals";
-import { IBotBase } from "../models/eft/common/tables/IBotBase";
-import { BotGenerationDetails } from "../models/spt/bots/BotGenerationDetails";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { RandomUtil } from "../utils/RandomUtil";
+import { MinMax } from "@spt/models/common/MinMax";
+import { IRandomisedBotLevelResult } from "@spt/models/eft/bot/IRandomisedBotLevelResult";
+import { IBotBase } from "@spt/models/eft/common/tables/IBotBase";
+import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { MathUtil } from "@spt/utils/MathUtil";
+import { RandomUtil } from "@spt/utils/RandomUtil";
 export declare class BotLevelGenerator {
     protected logger: ILogger;
     protected randomUtil: RandomUtil;
-    protected databaseServer: DatabaseServer;
-    constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer);
+    protected databaseService: DatabaseService;
+    protected mathUtil: MathUtil;
+    constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, mathUtil: MathUtil);
     /**
      * Return a randomised bot level and exp value
-     * @param levelDetails min and max of level for bot
-     * @param botGenerationDetails Deatils to help generate a bot
-     * @param bot being level is being generated for
+     * @param levelDetails Min and max of level for bot
+     * @param botGenerationDetails Details to help generate a bot
+     * @param bot Bot the level is being generated for
      * @returns IRandomisedBotLevelResult object
      */
     generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult;
+    protected chooseBotLevel(min: number, max: number, shift: number, number: number): number;
     /**
-     * Get the highest level a bot can be relative to the players level, but no futher than the max size from globals.exp_table
-     * @param playerLevel Players current level
-     * @param relativeDeltaMax max delta above player level to go
-     * @returns highest level possible for bot
+     * Return the min and max bot level based on a relative delta from the PMC level
+     * @param botGenerationDetails Details to help generate a bot
+     * @param levelDetails
+     * @param maxlevel Max level allowed
+     * @returns A MinMax of the lowest and highest level to generate the bots
      */
-    protected getHighestRelativeBotLevel(playerLevel: number, relativeDeltaMax: number, levelDetails: MinMax, expTable: IExpTable[]): number;
+    protected getRelativeBotLevelRange(botGenerationDetails: BotGenerationDetails, levelDetails: MinMax, maxAvailableLevel: number): MinMax;
 }

types/generators/BotLootGenerator.d.ts

@@ -1,35 +1,46 @@
-import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper";
-import { BotWeaponGeneratorHelper } from "../helpers/BotWeaponGeneratorHelper";
-import { HandbookHelper } from "../helpers/HandbookHelper";
-import { ItemHelper } from "../helpers/ItemHelper";
-import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase";
-import { IBotType, Inventory, ModsChances } from "../models/eft/common/tables/IBotType";
-import { Item } from "../models/eft/common/tables/IItem";
-import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem";
-import { IBotConfig } from "../models/spt/config/IBotConfig";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { ConfigServer } from "../servers/ConfigServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { BotLootCacheService } from "../services/BotLootCacheService";
-import { LocalisationService } from "../services/LocalisationService";
-import { HashUtil } from "../utils/HashUtil";
-import { RandomUtil } from "../utils/RandomUtil";
-import { BotWeaponGenerator } from "./BotWeaponGenerator";
+import { BotWeaponGenerator } from "@spt/generators/BotWeaponGenerator";
+import { BotGeneratorHelper } from "@spt/helpers/BotGeneratorHelper";
+import { BotHelper } from "@spt/helpers/BotHelper";
+import { HandbookHelper } from "@spt/helpers/HandbookHelper";
+import { InventoryHelper } from "@spt/helpers/InventoryHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
+import { Inventory as PmcInventory } from "@spt/models/eft/common/tables/IBotBase";
+import { IBotType, Inventory, ModsChances } from "@spt/models/eft/common/tables/IBotType";
+import { Item } from "@spt/models/eft/common/tables/IItem";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { EquipmentSlots } from "@spt/models/enums/EquipmentSlots";
+import { IItemSpawnLimitSettings } from "@spt/models/spt/bots/IItemSpawnLimitSettings";
+import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
+import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { BotLootCacheService } from "@spt/services/BotLootCacheService";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { LocalisationService } from "@spt/services/LocalisationService";
+import { HashUtil } from "@spt/utils/HashUtil";
+import { RandomUtil } from "@spt/utils/RandomUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class BotLootGenerator {
     protected logger: ILogger;
     protected hashUtil: HashUtil;
     protected randomUtil: RandomUtil;
     protected itemHelper: ItemHelper;
-    protected databaseServer: DatabaseServer;
+    protected inventoryHelper: InventoryHelper;
+    protected databaseService: DatabaseService;
     protected handbookHelper: HandbookHelper;
     protected botGeneratorHelper: BotGeneratorHelper;
     protected botWeaponGenerator: BotWeaponGenerator;
-    protected botWeaponGeneratorHelper: BotWeaponGeneratorHelper;
+    protected weightedRandomHelper: WeightedRandomHelper;
+    protected botHelper: BotHelper;
     protected botLootCacheService: BotLootCacheService;
     protected localisationService: LocalisationService;
     protected configServer: ConfigServer;
+    protected cloner: ICloner;
     protected botConfig: IBotConfig;
-    constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, itemHelper: ItemHelper, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, botWeaponGenerator: BotWeaponGenerator, botWeaponGeneratorHelper: BotWeaponGeneratorHelper, botLootCacheService: BotLootCacheService, localisationService: LocalisationService, configServer: ConfigServer);
+    protected pmcConfig: IPmcConfig;
+    constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, databaseService: DatabaseService, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, botWeaponGenerator: BotWeaponGenerator, weightedRandomHelper: WeightedRandomHelper, botHelper: BotHelper, botLootCacheService: BotLootCacheService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner);
+    protected getItemSpawnLimitsForBot(botRole: string): IItemSpawnLimitSettings;
     /**
      * Add loot to bots containers
      * @param sessionId Session id
@@ -40,103 +51,93 @@ export declare class BotLootGenerator {
      * @param botLevel Level of bot
      */
     generateLoot(sessionId: string, botJsonTemplate: IBotType, isPmc: boolean, botRole: string, botInventory: PmcInventory, botLevel: number): void;
+    /**
+     * Get an array of the containers a bot has on them (pockets/backpack/vest)
+     * @param botInventory Bot to check
+     * @returns Array of available slots
+     */
+    protected getAvailableContainersBotCanStoreItemsIn(botInventory: PmcInventory): EquipmentSlots[];
     /**
      * Force healing items onto bot to ensure they can heal in-raid
      * @param botInventory Inventory to add items to
-     * @param botRole Role of bot (sptBear/sptUsec)
+     * @param botRole Role of bot (pmcBEAR/pmcUSEC)
      */
     protected addForcedMedicalItemsToPmcSecure(botInventory: PmcInventory, botRole: string): void;
+    /**
+     * Get a biased random number
+     * @param min Smallest size
+     * @param max Biggest size
+     * @param nValue Value to bias choice
+     * @returns Chosen number
+     */
     protected getRandomisedCount(min: number, max: number, nValue: number): number;
     /**
-     * Take random items from a pool and add to an inventory until totalItemCount or totalValueLimit is reached
-     * @param pool pool of items to pick from
-     * @param equipmentSlots What equality slot will the loot items be added to
+     * Take random items from a pool and add to an inventory until totalItemCount or totalValueLimit or space limit is reached
+     * @param pool Pool of items to pick from with weight
+     * @param equipmentSlots What equipment slot will the loot items be added to
      * @param totalItemCount Max count of items to add
-     * @param inventoryToAddItemsTo bot inventory loot will be added to
-     * @param botRole role of the bot loot is being generated for (assault/pmcbot)
-     * @param useLimits should item limit counts be used as defined in config/bot.json
-     * @param totalValueLimitRub total value of loot allowed in roubles
-     * @param isPmc is the bot being generated for a pmc
+     * @param inventoryToAddItemsTo Bot inventory loot will be added to
+     * @param botRole Role of the bot loot is being generated for (assault/pmcbot)
+     * @param itemSpawnLimits Item spawn limits the bot must adhere to
+     * @param totalValueLimitRub Total value of loot allowed in roubles
+     * @param isPmc Is bot being generated for a pmc
      */
-    protected addLootFromPool(pool: ITemplateItem[], equipmentSlots: string[], totalItemCount: number, inventoryToAddItemsTo: PmcInventory, botRole: string, useLimits?: boolean, totalValueLimitRub?: number, isPmc?: boolean): void;
+    protected addLootFromPool(pool: Record<string, number>, equipmentSlots: string[], totalItemCount: number, inventoryToAddItemsTo: PmcInventory, botRole: string, itemSpawnLimits?: IItemSpawnLimitSettings, totalValueLimitRub?: number, isPmc?: boolean, containersIdFull?: Set<string>): void;
+    protected createWalletLoot(walletId: string): Item[][];
+    /**
+     * Some items need child items to function, add them to the itemToAddChildrenTo array
+     * @param itemToAddTemplate Db template of item to check
+     * @param itemToAddChildrenTo Item to add children to
+     * @param isPmc Is the item being generated for a pmc (affects money/ammo stack sizes)
+     * @param botRole role bot has that owns item
+     */
+    protected addRequiredChildItemsToParent(itemToAddTemplate: ITemplateItem, itemToAddChildrenTo: Item[], isPmc: boolean, botRole: string): void;
     /**
      * Add generated weapons to inventory as loot
      * @param botInventory inventory to add preset to
      * @param equipmentSlot slot to place the preset in (backpack)
      * @param templateInventory bots template, assault.json
      * @param modChances chances for mods to spawn on weapon
-     * @param botRole bots role, .e.g. pmcBot
+     * @param botRole bots role .e.g. pmcBot
      * @param isPmc are we generating for a pmc
      */
-    protected addLooseWeaponsToInventorySlot(sessionId: string, botInventory: PmcInventory, equipmentSlot: string, templateInventory: Inventory, modChances: ModsChances, botRole: string, isPmc: boolean, botLevel: number): void;
+    protected addLooseWeaponsToInventorySlot(sessionId: string, botInventory: PmcInventory, equipmentSlot: string, templateInventory: Inventory, modChances: ModsChances, botRole: string, isPmc: boolean, botLevel: number, containersIdFull?: Set<string>): void;
     /**
-     * @deprecated replaced by getRandomItemFromPoolByRole()
-     * Get a random item from the pool parameter using the biasedRandomNumber system
-     * @param pool pool of items to pick an item from
-     * @param isPmc is the bot being created a pmc
-     * @returns ITemplateItem object
-     */
-    protected getRandomItemFromPool(pool: ITemplateItem[], isPmc: boolean): ITemplateItem;
-    /**
-     * Get a random item from the pool parameter using the biasedRandomNumber system
-     * @param pool pool of items to pick an item from
-     * @param isPmc is the bot being created a pmc
-     * @returns ITemplateItem object
-     */
-    protected getRandomItemFromPoolByRole(pool: ITemplateItem[], botRole: string): ITemplateItem;
-    /**
-     * @deprecated Replaced by getBotLootNValueByRole()
-     * Get the loot nvalue from botconfig
-     * @param isPmc if true the pmc nvalue is returned
-     * @returns nvalue as number
-     */
-    protected getBotLootNValue(isPmc: boolean): number;
-    /**
-     * Get the loot nvalue from botconfig
-     * @param botRole role of bot e.g. assault/sptBear
-     * @returns nvalue as number
-     */
-    protected getBotLootNValueByRole(botRole: string): number;
-    /**
-     * Update item limit array to contain items that have a limit
+     * Hydrate item limit array to contain items that have a limit for a specific bot type
      * All values are set to 0
-     * @param isPmc is the bot a pmc
-     * @param botRole role the bot has
+     * @param botRole Role the bot has
      * @param limitCount
      */
-    protected initItemLimitArray(isPmc: boolean, botRole: string, limitCount: Record<string, number>): void;
+    protected initItemLimitArray(botRole: string, limitCount: Record<string, number>): void;
     /**
      * Check if an item has reached its bot-specific spawn limit
      * @param itemTemplate Item we check to see if its reached spawn limit
      * @param botRole Bot type
-     * @param isPmc Is bot we're working with a pmc
-     * @param limitCount spawn limits for items on bot
-     * @param itemSpawnLimits the limits this bot is allowed to have
+     * @param itemSpawnLimits
      * @returns true if item has reached spawn limit
      */
-    protected itemHasReachedSpawnLimit(itemTemplate: ITemplateItem, botRole: string, isPmc: boolean, limitCount: Record<string, number>, itemSpawnLimits: Record<string, number>): boolean;
+    protected itemHasReachedSpawnLimit(itemTemplate: ITemplateItem, botRole: string, itemSpawnLimits: IItemSpawnLimitSettings): boolean;
     /**
      * Randomise the stack size of a money object, uses different values for pmc or scavs
-     * @param isPmc is this a PMC
-     * @param itemTemplate item details
-     * @param moneyItem Money stack to randomise
+     * @param botRole Role bot has that has money stack
+     * @param itemTemplate item details from db
+     * @param moneyItem Money item to randomise
      */
-    protected randomiseMoneyStackSize(isPmc: boolean, itemTemplate: ITemplateItem, moneyItem: Item): void;
+    protected randomiseMoneyStackSize(botRole: string, itemTemplate: ITemplateItem, moneyItem: Item): void;
     /**
      * Randomise the size of an ammo stack
-     * @param isPmc is this a PMC
-     * @param itemTemplate item details
-     * @param ammoItem Ammo stack to randomise
+     * @param isPmc Is ammo on a PMC bot
+     * @param itemTemplate item details from db
+     * @param ammoItem Ammo item to randomise
      */
     protected randomiseAmmoStackSize(isPmc: boolean, itemTemplate: ITemplateItem, ammoItem: Item): void;
     /**
      * Get spawn limits for a specific bot type from bot.json config
      * If no limit found for a non pmc bot, fall back to defaults
-     * @param isPmc is the bot we want limits for a pmc
      * @param botRole what role does the bot have
      * @returns Dictionary of tplIds and limit
      */
-    protected getItemSpawnLimitsForBotType(isPmc: boolean, botRole: string): Record<string, number>;
+    protected getItemSpawnLimitsForBotType(botRole: string): Record<string, number>;
     /**
      * Get the parentId or tplId of item inside spawnLimits object if it exists
      * @param itemTemplate item we want to look for in spawn limits

types/generators/BotWeaponGenerator.d.ts

@@ -1,29 +1,30 @@
-import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper";
-import { BotWeaponGeneratorHelper } from "../helpers/BotWeaponGeneratorHelper";
-import { ItemHelper } from "../helpers/ItemHelper";
-import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper";
-import { MinMax } from "../models/common/MinMax";
-import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase";
-import { Inventory, ModsChances } from "../models/eft/common/tables/IBotType";
-import { Item } from "../models/eft/common/tables/IItem";
-import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem";
-import { GenerateWeaponResult } from "../models/spt/bots/GenerateWeaponResult";
-import { IBotConfig } from "../models/spt/config/IBotConfig";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { ConfigServer } from "../servers/ConfigServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { BotWeaponModLimitService } from "../services/BotWeaponModLimitService";
-import { LocalisationService } from "../services/LocalisationService";
-import { HashUtil } from "../utils/HashUtil";
-import { JsonUtil } from "../utils/JsonUtil";
-import { RandomUtil } from "../utils/RandomUtil";
-import { BotEquipmentModGenerator } from "./BotEquipmentModGenerator";
-import { IInventoryMagGen } from "./weapongen/IInventoryMagGen";
+import { BotEquipmentModGenerator } from "@spt/generators/BotEquipmentModGenerator";
+import { IInventoryMagGen } from "@spt/generators/weapongen/IInventoryMagGen";
+import { BotGeneratorHelper } from "@spt/helpers/BotGeneratorHelper";
+import { BotWeaponGeneratorHelper } from "@spt/helpers/BotWeaponGeneratorHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
+import { Inventory as PmcInventory } from "@spt/models/eft/common/tables/IBotBase";
+import { GenerationData, Inventory, ModsChances } from "@spt/models/eft/common/tables/IBotType";
+import { Item } from "@spt/models/eft/common/tables/IItem";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { GenerateWeaponResult } from "@spt/models/spt/bots/GenerateWeaponResult";
+import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
+import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
+import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { LocalisationService } from "@spt/services/LocalisationService";
+import { RepairService } from "@spt/services/RepairService";
+import { HashUtil } from "@spt/utils/HashUtil";
+import { RandomUtil } from "@spt/utils/RandomUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class BotWeaponGenerator {
-    protected jsonUtil: JsonUtil;
     protected logger: ILogger;
     protected hashUtil: HashUtil;
-    protected databaseServer: DatabaseServer;
+    protected databaseService: DatabaseService;
     protected itemHelper: ItemHelper;
     protected weightedRandomHelper: WeightedRandomHelper;
     protected botGeneratorHelper: BotGeneratorHelper;
@@ -33,10 +34,14 @@ export declare class BotWeaponGenerator {
     protected botWeaponModLimitService: BotWeaponModLimitService;
     protected botEquipmentModGenerator: BotEquipmentModGenerator;
     protected localisationService: LocalisationService;
+    protected repairService: RepairService;
     protected inventoryMagGenComponents: IInventoryMagGen[];
+    protected cloner: ICloner;
     protected readonly modMagazineSlotId = "mod_magazine";
     protected botConfig: IBotConfig;
-    constructor(jsonUtil: JsonUtil, logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil, configServer: ConfigServer, botWeaponGeneratorHelper: BotWeaponGeneratorHelper, botWeaponModLimitService: BotWeaponModLimitService, botEquipmentModGenerator: BotEquipmentModGenerator, localisationService: LocalisationService, inventoryMagGenComponents: IInventoryMagGen[]);
+    protected pmcConfig: IPmcConfig;
+    protected repairConfig: IRepairConfig;
+    constructor(logger: ILogger, hashUtil: HashUtil, databaseService: DatabaseService, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil, configServer: ConfigServer, botWeaponGeneratorHelper: BotWeaponGeneratorHelper, botWeaponModLimitService: BotWeaponModLimitService, botEquipmentModGenerator: BotEquipmentModGenerator, localisationService: LocalisationService, repairService: RepairService, inventoryMagGenComponents: IInventoryMagGen[], cloner: ICloner);
     /**
      * Pick a random weapon based on weightings and generate a functional weapon
      * @param equipmentSlot Primary/secondary/holster
@@ -63,17 +68,18 @@ export declare class BotWeaponGenerator {
      * @param weaponParentId ParentId of the weapon being generated
      * @param modChances Dictionary of item types and % chance weapon will have that mod
      * @param botRole e.g. assault/exusec
-     * @param isPmc
+     * @param isPmc Is weapon being generated for a pmc
      * @returns GenerateWeaponResult object
      */
     generateWeaponByTpl(sessionId: string, weaponTpl: string, equipmentSlot: string, botTemplateInventory: Inventory, weaponParentId: string, modChances: ModsChances, botRole: string, isPmc: boolean, botLevel: number): GenerateWeaponResult;
     /**
-     * Insert a cartridge into a weapon
+     * Insert a cartridge(s) into a weapon
+     * Handles all chambers - patron_in_weapon, patron_in_weapon_000 etc
      * @param weaponWithModsArray Weapon and mods
      * @param ammoTpl Cartridge to add to weapon
-     * @param desiredSlotId name of slot, e.g. patron_in_weapon
+     * @param chamberSlotIds name of slots to create or add ammo to
      */
-    protected addCartridgeToChamber(weaponWithModsArray: Item[], ammoTpl: string, desiredSlotId: string): void;
+    protected addCartridgeToChamber(weaponWithModsArray: Item[], ammoTpl: string, chamberSlotIds: string[]): void;
     /**
      * Create array with weapon base as only element and
      * add additional properties based on weapon type
@@ -104,11 +110,11 @@ export declare class BotWeaponGenerator {
      * Generates extra magazines or bullets (if magazine is internal) and adds them to TacticalVest and Pockets.
      * Additionally, adds extra bullets to SecuredContainer
      * @param generatedWeaponResult object with properties for generated weapon (weapon mods pool / weapon template / ammo tpl)
-     * @param magCounts Magazine count to add to inventory
+     * @param magWeights Magazine weights for count to add to inventory
      * @param inventory Inventory to add magazines to
      * @param botRole The bot type we're getting generating extra mags for
      */
-    addExtraMagazinesToInventory(generatedWeaponResult: GenerateWeaponResult, magCounts: MinMax, inventory: PmcInventory, botRole: string): void;
+    addExtraMagazinesToInventory(generatedWeaponResult: GenerateWeaponResult, magWeights: GenerationData, inventory: PmcInventory, botRole: string): void;
     /**
      * Add Grendaes for UBGL to bots vest and secure container
      * @param weaponMods Weapon array with mods

types/generators/FenceBaseAssortGenerator.d.ts

@@ -1,26 +1,53 @@
-import { HandbookHelper } from "../helpers/HandbookHelper";
-import { ItemHelper } from "../helpers/ItemHelper";
-import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem";
-import { ITraderConfig } from "../models/spt/config/ITraderConfig";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { ConfigServer } from "../servers/ConfigServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { ItemFilterService } from "../services/ItemFilterService";
-import { SeasonalEventService } from "../services/SeasonalEventService";
+import { HandbookHelper } from "@spt/helpers/HandbookHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { PresetHelper } from "@spt/helpers/PresetHelper";
+import { Item } from "@spt/models/eft/common/tables/IItem";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { FenceService } from "@spt/services/FenceService";
+import { ItemFilterService } from "@spt/services/ItemFilterService";
+import { LocalisationService } from "@spt/services/LocalisationService";
+import { SeasonalEventService } from "@spt/services/SeasonalEventService";
+import { HashUtil } from "@spt/utils/HashUtil";
 export declare class FenceBaseAssortGenerator {
     protected logger: ILogger;
-    protected databaseServer: DatabaseServer;
+    protected hashUtil: HashUtil;
+    protected databaseService: DatabaseService;
     protected handbookHelper: HandbookHelper;
     protected itemHelper: ItemHelper;
+    protected presetHelper: PresetHelper;
     protected itemFilterService: ItemFilterService;
     protected seasonalEventService: SeasonalEventService;
+    protected localisationService: LocalisationService;
     protected configServer: ConfigServer;
+    protected fenceService: FenceService;
     protected traderConfig: ITraderConfig;
-    constructor(logger: ILogger, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, itemHelper: ItemHelper, itemFilterService: ItemFilterService, seasonalEventService: SeasonalEventService, configServer: ConfigServer);
+    constructor(logger: ILogger, hashUtil: HashUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, itemHelper: ItemHelper, presetHelper: PresetHelper, itemFilterService: ItemFilterService, seasonalEventService: SeasonalEventService, localisationService: LocalisationService, configServer: ConfigServer, fenceService: FenceService);
     /**
-     * Create base fence assorts dynamically and store in db
+     * Create base fence assorts dynamically and store in memory
      */
     generateFenceBaseAssorts(): void;
+    /**
+     * Check ammo in boxes + loose ammos has a penetration value above the configured value in trader.json / ammoMaxPenLimit
+     * @param rootItemDb Ammo box or ammo item from items.db
+     * @returns True if penetration value is above limit set in config
+     */
+    protected isAmmoAbovePenetrationLimit(rootItemDb: ITemplateItem): boolean;
+    /**
+     * Get the penetration power value of an ammo, works with ammo boxes and raw ammos
+     * @param rootItemDb Ammo box or ammo item from items.db
+     * @returns Penetration power of passed in item, undefined if it doesnt have a power
+     */
+    protected getAmmoPenetrationPower(rootItemDb: ITemplateItem): number | undefined;
+    /**
+     * Add soft inserts + armor plates to an armor
+     * @param armor Armor item array to add mods into
+     * @param itemDbDetails Armor items db template
+     */
+    protected addChildrenToArmorModSlots(armor: Item[], itemDbDetails: ITemplateItem): void;
     /**
      * Check if item is valid for being added to fence assorts
      * @param item Item to check

types/generators/LocationGenerator.d.ts

@@ -1,39 +1,80 @@
-import { ContainerHelper } from "../helpers/ContainerHelper";
-import { ItemHelper } from "../helpers/ItemHelper";
-import { PresetHelper } from "../helpers/PresetHelper";
-import { RagfairServerHelper } from "../helpers/RagfairServerHelper";
-import { ILooseLoot, Spawnpoint, SpawnpointTemplate, SpawnpointsForced } from "../models/eft/common/ILooseLoot";
-import { Item } from "../models/eft/common/tables/IItem";
-import { IStaticAmmoDetails, IStaticContainerProps, IStaticForcedProps, IStaticLootDetails } from "../models/eft/common/tables/ILootBase";
-import { ILocationConfig } from "../models/spt/config/ILocationConfig";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { ConfigServer } from "../servers/ConfigServer";
-import { LocalisationService } from "../services/LocalisationService";
-import { SeasonalEventService } from "../services/SeasonalEventService";
-import { JsonUtil } from "../utils/JsonUtil";
-import { MathUtil } from "../utils/MathUtil";
-import { ObjectId } from "../utils/ObjectId";
-import { ProbabilityObjectArray, RandomUtil } from "../utils/RandomUtil";
+import { ContainerHelper } from "@spt/helpers/ContainerHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { PresetHelper } from "@spt/helpers/PresetHelper";
+import { IContainerMinMax, IStaticAmmoDetails, IStaticContainer, IStaticContainerData, IStaticForcedProps, IStaticLootDetails } from "@spt/models/eft/common/ILocation";
+import { ILocationBase } from "@spt/models/eft/common/ILocationBase";
+import { ILooseLoot, Spawnpoint, SpawnpointTemplate, SpawnpointsForced } from "@spt/models/eft/common/ILooseLoot";
+import { Item } from "@spt/models/eft/common/tables/IItem";
+import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { ItemFilterService } from "@spt/services/ItemFilterService";
+import { LocalisationService } from "@spt/services/LocalisationService";
+import { SeasonalEventService } from "@spt/services/SeasonalEventService";
+import { MathUtil } from "@spt/utils/MathUtil";
+import { ObjectId } from "@spt/utils/ObjectId";
+import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export interface IContainerItem {
     items: Item[];
     width: number;
     height: number;
 }
+export interface IContainerGroupCount {
+    /** Containers this group has + probabilty to spawn */
+    containerIdsWithProbability: Record<string, number>;
+    /** How many containers the map should spawn with this group id */
+    chosenCount: number;
+}
 export declare class LocationGenerator {
     protected logger: ILogger;
-    protected jsonUtil: JsonUtil;
+    protected databaseService: DatabaseService;
     protected objectId: ObjectId;
     protected randomUtil: RandomUtil;
-    protected ragfairServerHelper: RagfairServerHelper;
     protected itemHelper: ItemHelper;
     protected mathUtil: MathUtil;
     protected seasonalEventService: SeasonalEventService;
     protected containerHelper: ContainerHelper;
     protected presetHelper: PresetHelper;
     protected localisationService: LocalisationService;
+    protected itemFilterService: ItemFilterService;
     protected configServer: ConfigServer;
+    protected cloner: ICloner;
     protected locationConfig: ILocationConfig;
-    constructor(logger: ILogger, jsonUtil: JsonUtil, objectId: ObjectId, randomUtil: RandomUtil, ragfairServerHelper: RagfairServerHelper, itemHelper: ItemHelper, mathUtil: MathUtil, seasonalEventService: SeasonalEventService, containerHelper: ContainerHelper, presetHelper: PresetHelper, localisationService: LocalisationService, configServer: ConfigServer);
+    constructor(logger: ILogger, databaseService: DatabaseService, objectId: ObjectId, randomUtil: RandomUtil, itemHelper: ItemHelper, mathUtil: MathUtil, seasonalEventService: SeasonalEventService, containerHelper: ContainerHelper, presetHelper: PresetHelper, localisationService: LocalisationService, itemFilterService: ItemFilterService, configServer: ConfigServer, cloner: ICloner);
+    /**
+     * Create an array of container objects with randomised loot
+     * @param locationBase Map base to generate containers for
+     * @param staticAmmoDist Static ammo distribution
+     * @returns Array of container objects
+     */
+    generateStaticContainers(locationBase: ILocationBase, staticAmmoDist: Record<string, IStaticAmmoDetails[]>): SpawnpointTemplate[];
+    /**
+     * Get containers with a non-100% chance to spawn OR are NOT on the container type randomistion blacklist
+     * @param staticContainers
+     * @returns IStaticContainerData array
+     */
+    protected getRandomisableContainersOnMap(staticContainers: IStaticContainerData[]): IStaticContainerData[];
+    /**
+     * Get containers with 100% spawn rate or have a type on the randomistion ignore list
+     * @param staticContainersOnMap
+     * @returns IStaticContainerData array
+     */
+    protected getGuaranteedContainers(staticContainersOnMap: IStaticContainerData[]): IStaticContainerData[];
+    /**
+     * Choose a number of containers based on their probabilty value to fulfil the desired count in containerData.chosenCount
+     * @param groupId Name of the group the containers are being collected for
+     * @param containerData Containers and probability values for a groupId
+     * @returns List of chosen container Ids
+     */
+    protected getContainersByProbabilty(groupId: string, containerData: IContainerGroupCount): string[];
+    /**
+     * Get a mapping of each groupid and the containers in that group + count of containers to spawn on map
+     * @param containersGroups Container group values
+     * @returns dictionary keyed by groupId
+     */
+    protected getGroupIdToContainerMappings(staticContainerGroupData: IStaticContainer | Record<string, IContainerMinMax>, staticContainersOnMap: IStaticContainerData[]): Record<string, IContainerGroupCount>;
     /**
      * Choose loot to put into a static container based on weighting
      * Handle forced items + seasonal item removal when not in season
@@ -44,7 +85,7 @@ export declare class LocationGenerator {
      * @param locationName Name of the map to generate static loot for
      * @returns IStaticContainerProps
      */
-    generateContainerLoot(staticContainer: IStaticContainerProps, staticForced: IStaticForcedProps[], staticLootDist: Record<string, IStaticLootDetails>, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, locationName: string): IStaticContainerProps;
+    protected addLootToContainer(staticContainer: IStaticContainerData, staticForced: IStaticForcedProps[], staticLootDist: Record<string, IStaticLootDetails>, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, locationName: string): IStaticContainerData;
     /**
      * Get a 2d grid of a containers item slots
      * @param containerTpl Tpl id of the container
@@ -79,18 +120,19 @@ export declare class LocationGenerator {
     generateDynamicLoot(dynamicLootDist: ILooseLoot, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, locationName: string): SpawnpointTemplate[];
     /**
      * Add forced spawn point loot into loot parameter array
-     * @param loot array to add forced loot to
-     * @param forcedSpawnPoints forced loot to add
-     * @param name of map currently generating forced loot for
+     * @param lootLocationTemplates array to add forced loot spawn locations to
+     * @param forcedSpawnPoints forced Forced loot locations that must be added
+     * @param locationName Name of map currently having force loot created for
      */
-    protected addForcedLoot(loot: SpawnpointTemplate[], forcedSpawnPoints: SpawnpointsForced[], locationName: string): void;
+    protected addForcedLoot(lootLocationTemplates: SpawnpointTemplate[], forcedSpawnPoints: SpawnpointsForced[], locationName: string): void;
     /**
      * Create array of item (with child items) and return
      * @param chosenComposedKey Key we want to look up items for
      * @param spawnPoint Dynamic spawn point item we want will be placed in
+     * @param staticAmmoDist ammo distributions
      * @returns IContainerItem
      */
-    protected createDynamicLootItem(chosenComposedKey: string, spawnPoint: Spawnpoint): IContainerItem;
+    protected createDynamicLootItem(chosenComposedKey: string, spawnPoint: Spawnpoint, staticAmmoDist: Record<string, IStaticAmmoDetails[]>): IContainerItem;
     /**
      * Replace the _id value for base item + all children items parentid value
      * @param itemWithChildren Item with mods to update
@@ -103,6 +145,6 @@ export declare class LocationGenerator {
      * @param chosenTpl Tpl we want to get item with
      * @returns Item object
      */
-    protected getItemInArray(items: Item[], chosenTpl: string): Item;
-    protected createStaticLootItem(tpl: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, parentId?: string): IContainerItem;
+    protected getItemInArray(items: Item[], chosenTpl: string): Item | undefined;
+    protected createStaticLootItem(chosenTpl: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, parentId?: string): IContainerItem;
 }

types/generators/LootGenerator.d.ts

@@ -1,20 +1,20 @@
-import { InventoryHelper } from "../helpers/InventoryHelper";
-import { ItemHelper } from "../helpers/ItemHelper";
-import { PresetHelper } from "../helpers/PresetHelper";
-import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper";
-import { IPreset } from "../models/eft/common/IGlobals";
-import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem";
-import { AddItem } from "../models/eft/inventory/IAddItemRequestData";
-import { ISealedAirdropContainerSettings, RewardDetails } from "../models/spt/config/IInventoryConfig";
-import { LootItem } from "../models/spt/services/LootItem";
-import { LootRequest } from "../models/spt/services/LootRequest";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { ItemFilterService } from "../services/ItemFilterService";
-import { LocalisationService } from "../services/LocalisationService";
-import { RagfairLinkedItemService } from "../services/RagfairLinkedItemService";
-import { HashUtil } from "../utils/HashUtil";
-import { RandomUtil } from "../utils/RandomUtil";
+import { InventoryHelper } from "@spt/helpers/InventoryHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { PresetHelper } from "@spt/helpers/PresetHelper";
+import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
+import { IPreset } from "@spt/models/eft/common/IGlobals";
+import { Item } from "@spt/models/eft/common/tables/IItem";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { ISealedAirdropContainerSettings, RewardDetails } from "@spt/models/spt/config/IInventoryConfig";
+import { LootItem } from "@spt/models/spt/services/LootItem";
+import { LootRequest } from "@spt/models/spt/services/LootRequest";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { ItemFilterService } from "@spt/services/ItemFilterService";
+import { LocalisationService } from "@spt/services/LocalisationService";
+import { RagfairLinkedItemService } from "@spt/services/RagfairLinkedItemService";
+import { HashUtil } from "@spt/utils/HashUtil";
+import { RandomUtil } from "@spt/utils/RandomUtil";
 type ItemLimit = {
     current: number;
     max: number;
@@ -22,7 +22,7 @@ type ItemLimit = {
 export declare class LootGenerator {
     protected logger: ILogger;
     protected hashUtil: HashUtil;
-    protected databaseServer: DatabaseServer;
+    protected databaseService: DatabaseService;
     protected randomUtil: RandomUtil;
     protected itemHelper: ItemHelper;
     protected presetHelper: PresetHelper;
@@ -31,13 +31,20 @@ export declare class LootGenerator {
     protected localisationService: LocalisationService;
     protected ragfairLinkedItemService: RagfairLinkedItemService;
     protected itemFilterService: ItemFilterService;
-    constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, itemHelper: ItemHelper, presetHelper: PresetHelper, inventoryHelper: InventoryHelper, weightedRandomHelper: WeightedRandomHelper, localisationService: LocalisationService, ragfairLinkedItemService: RagfairLinkedItemService, itemFilterService: ItemFilterService);
+    constructor(logger: ILogger, hashUtil: HashUtil, databaseService: DatabaseService, randomUtil: RandomUtil, itemHelper: ItemHelper, presetHelper: PresetHelper, inventoryHelper: InventoryHelper, weightedRandomHelper: WeightedRandomHelper, localisationService: LocalisationService, ragfairLinkedItemService: RagfairLinkedItemService, itemFilterService: ItemFilterService);
     /**
      * Generate a list of items based on configuration options parameter
      * @param options parameters to adjust how loot is generated
      * @returns An array of loot items
      */
     createRandomLoot(options: LootRequest): LootItem[];
+    /**
+     * Filter armor items by their front plates protection level - top if its a helmet
+     * @param armor Armor preset to check
+     * @param options Loot request options - armor level etc
+     * @returns True if item has desired armor level
+     */
+    protected isArmorOfDesiredProtectionLevel(armor: IPreset, options: LootRequest): boolean;
     /**
      * Construct item limit record to hold max and current item count for each item type
      * @param limits limits as defined in config
@@ -65,49 +72,42 @@ export declare class LootGenerator {
     protected getRandomisedStackCount(item: ITemplateItem, options: LootRequest): number;
     /**
      * Find a random item in items.json and add to result array
-     * @param globalDefaultPresets presets to choose from
-     * @param itemTypeCounts item limit counts
-     * @param itemBlacklist items to skip
-     * @param result array to add found preset to
+     * @param presetPool Presets to choose from
+     * @param itemTypeCounts Item limit counts
+     * @param itemBlacklist Items to skip
+     * @param result Array to add chosen preset to
      * @returns true if preset was valid and added to pool
      */
-    protected findAndAddRandomPresetToLoot(globalDefaultPresets: [string, IPreset][], itemTypeCounts: Record<string, {
+    protected findAndAddRandomPresetToLoot(presetPool: IPreset[], itemTypeCounts: Record<string, {
         current: number;
         max: number;
     }>, itemBlacklist: string[], result: LootItem[]): boolean;
     /**
      * Sealed weapon containers have a weapon + associated mods inside them + assortment of other things (food/meds)
      * @param containerSettings sealed weapon container settings
-     * @returns Array of items to add to player inventory
+     * @returns Array of item with children arrays
      */
-    getSealedWeaponCaseLoot(containerSettings: ISealedAirdropContainerSettings): AddItem[];
+    getSealedWeaponCaseLoot(containerSettings: ISealedAirdropContainerSettings): Item[][];
     /**
      * Get non-weapon mod rewards for a sealed container
      * @param containerSettings Sealed weapon container settings
      * @param weaponDetailsDb Details for the weapon to reward player
-     * @returns AddItem array
+     * @returns Array of item with children arrays
      */
-    protected getSealedContainerNonWeaponModRewards(containerSettings: ISealedAirdropContainerSettings, weaponDetailsDb: ITemplateItem): AddItem[];
+    protected getSealedContainerNonWeaponModRewards(containerSettings: ISealedAirdropContainerSettings, weaponDetailsDb: ITemplateItem): Item[][];
     /**
      * Iterate over the container weaponModRewardLimits settings and create an array of weapon mods to reward player
      * @param containerSettings Sealed weapon container settings
      * @param linkedItemsToWeapon All items that can be attached/inserted into weapon
      * @param chosenWeaponPreset The weapon preset given to player as reward
-     * @returns AddItem array
+     * @returns Array of item with children arrays
      */
-    protected getSealedContainerWeaponModRewards(containerSettings: ISealedAirdropContainerSettings, linkedItemsToWeapon: ITemplateItem[], chosenWeaponPreset: IPreset): AddItem[];
+    protected getSealedContainerWeaponModRewards(containerSettings: ISealedAirdropContainerSettings, linkedItemsToWeapon: ITemplateItem[], chosenWeaponPreset: IPreset): Item[][];
     /**
      * Handle event-related loot containers - currently just the halloween jack-o-lanterns that give food rewards
      * @param rewardContainerDetails
-     * @returns AddItem array
+     * @returns Array of item with children arrays
      */
-    getRandomLootContainerLoot(rewardContainerDetails: RewardDetails): AddItem[];
-    /**
-     * A bug in inventoryHelper.addItem() means you cannot add the same item to the array twice with a count of 1, it causes duplication
-     * Default adds 1, or increments count
-     * @param itemTplToAdd items tpl we want to add to array
-     * @param resultsArray Array to add item tpl to
-     */
-    protected addOrIncrementItemToArray(itemTplToAdd: string, resultsArray: AddItem[]): void;
+    getRandomLootContainerLoot(rewardContainerDetails: RewardDetails): Item[][];
 }
 export {};

types/generators/PMCLootGenerator.d.ts

@@ -1,37 +1,48 @@
-import { ItemHelper } from "../helpers/ItemHelper";
-import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem";
-import { IBotConfig } from "../models/spt/config/IBotConfig";
-import { ConfigServer } from "../servers/ConfigServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { ItemFilterService } from "../services/ItemFilterService";
-import { SeasonalEventService } from "../services/SeasonalEventService";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { ItemFilterService } from "@spt/services/ItemFilterService";
+import { RagfairPriceService } from "@spt/services/RagfairPriceService";
+import { SeasonalEventService } from "@spt/services/SeasonalEventService";
 /**
  * Handle the generation of dynamic PMC loot in pockets and backpacks
  * and the removal of blacklisted items
  */
 export declare class PMCLootGenerator {
     protected itemHelper: ItemHelper;
-    protected databaseServer: DatabaseServer;
+    protected databaseService: DatabaseService;
     protected configServer: ConfigServer;
     protected itemFilterService: ItemFilterService;
+    protected ragfairPriceService: RagfairPriceService;
     protected seasonalEventService: SeasonalEventService;
-    protected pocketLootPool: string[];
-    protected vestLootPool: string[];
-    protected backpackLootPool: string[];
-    protected botConfig: IBotConfig;
-    constructor(itemHelper: ItemHelper, databaseServer: DatabaseServer, configServer: ConfigServer, itemFilterService: ItemFilterService, seasonalEventService: SeasonalEventService);
+    protected weightedRandomHelper: WeightedRandomHelper;
+    protected pocketLootPool: Record<string, number>;
+    protected vestLootPool: Record<string, number>;
+    protected backpackLootPool: Record<string, number>;
+    protected pmcConfig: IPmcConfig;
+    constructor(itemHelper: ItemHelper, databaseService: DatabaseService, configServer: ConfigServer, itemFilterService: ItemFilterService, ragfairPriceService: RagfairPriceService, seasonalEventService: SeasonalEventService, weightedRandomHelper: WeightedRandomHelper);
     /**
      * Create an array of loot items a PMC can have in their pockets
      * @returns string array of tpls
      */
-    generatePMCPocketLootPool(): string[];
+    generatePMCPocketLootPool(botRole: string): Record<string, number>;
     /**
      * Create an array of loot items a PMC can have in their vests
      * @returns string array of tpls
      */
-    generatePMCVestLootPool(): string[];
+    generatePMCVestLootPool(botRole: string): Record<string, number>;
     /**
-     * Check if item has a width/height that lets it fit into a 1x2/2x1 slot
+     * Check if item has a width/height that lets it fit into a 2x2 slot
+     * 1x1 / 1x2 / 2x1 / 2x2
+     * @param item Item to check size of
+     * @returns true if it fits
+     */
+    protected itemFitsInto2By2Slot(item: ITemplateItem): boolean;
+    /**
+     * Check if item has a width/height that lets it fit into a 1x2 slot
      * 1x1 / 1x2 / 2x1
      * @param item Item to check size of
      * @returns true if it fits
@@ -41,5 +52,5 @@ export declare class PMCLootGenerator {
      * Create an array of loot items a PMC can have in their backpack
      * @returns string array of tpls
      */
-    generatePMCBackpackLootPool(): string[];
+    generatePMCBackpackLootPool(botRole: string): Record<string, number>;
 }

types/generators/PlayerScavGenerator.d.ts

@@ -1,48 +1,53 @@
-import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper";
-import { BotHelper } from "../helpers/BotHelper";
-import { BotWeaponGeneratorHelper } from "../helpers/BotWeaponGeneratorHelper";
-import { ItemHelper } from "../helpers/ItemHelper";
-import { ProfileHelper } from "../helpers/ProfileHelper";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { Skills, Stats } from "../models/eft/common/tables/IBotBase";
-import { IBotType } from "../models/eft/common/tables/IBotType";
-import { IPlayerScavConfig, KarmaLevel } from "../models/spt/config/IPlayerScavConfig";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { ConfigServer } from "../servers/ConfigServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { SaveServer } from "../servers/SaveServer";
-import { BotLootCacheService } from "../services/BotLootCacheService";
-import { FenceService } from "../services/FenceService";
-import { LocalisationService } from "../services/LocalisationService";
-import { HashUtil } from "../utils/HashUtil";
-import { JsonUtil } from "../utils/JsonUtil";
-import { RandomUtil } from "../utils/RandomUtil";
-import { BotGenerator } from "./BotGenerator";
+import { BotGenerator } from "@spt/generators/BotGenerator";
+import { BotGeneratorHelper } from "@spt/helpers/BotGeneratorHelper";
+import { BotHelper } from "@spt/helpers/BotHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IBotBase, Skills, Stats } from "@spt/models/eft/common/tables/IBotBase";
+import { IBotType } from "@spt/models/eft/common/tables/IBotType";
+import { IPlayerScavConfig, KarmaLevel } from "@spt/models/spt/config/IPlayerScavConfig";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { SaveServer } from "@spt/servers/SaveServer";
+import { BotLootCacheService } from "@spt/services/BotLootCacheService";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { FenceService } from "@spt/services/FenceService";
+import { LocalisationService } from "@spt/services/LocalisationService";
+import { HashUtil } from "@spt/utils/HashUtil";
+import { RandomUtil } from "@spt/utils/RandomUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class PlayerScavGenerator {
     protected logger: ILogger;
     protected randomUtil: RandomUtil;
-    protected databaseServer: DatabaseServer;
+    protected databaseService: DatabaseService;
     protected hashUtil: HashUtil;
     protected itemHelper: ItemHelper;
-    protected botWeaponGeneratorHelper: BotWeaponGeneratorHelper;
     protected botGeneratorHelper: BotGeneratorHelper;
     protected saveServer: SaveServer;
     protected profileHelper: ProfileHelper;
     protected botHelper: BotHelper;
-    protected jsonUtil: JsonUtil;
     protected fenceService: FenceService;
     protected botLootCacheService: BotLootCacheService;
     protected localisationService: LocalisationService;
     protected botGenerator: BotGenerator;
     protected configServer: ConfigServer;
+    protected cloner: ICloner;
     protected playerScavConfig: IPlayerScavConfig;
-    constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, hashUtil: HashUtil, itemHelper: ItemHelper, botWeaponGeneratorHelper: BotWeaponGeneratorHelper, botGeneratorHelper: BotGeneratorHelper, saveServer: SaveServer, profileHelper: ProfileHelper, botHelper: BotHelper, jsonUtil: JsonUtil, fenceService: FenceService, botLootCacheService: BotLootCacheService, localisationService: LocalisationService, botGenerator: BotGenerator, configServer: ConfigServer);
+    constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, hashUtil: HashUtil, itemHelper: ItemHelper, botGeneratorHelper: BotGeneratorHelper, saveServer: SaveServer, profileHelper: ProfileHelper, botHelper: BotHelper, fenceService: FenceService, botLootCacheService: BotLootCacheService, localisationService: LocalisationService, botGenerator: BotGenerator, configServer: ConfigServer, cloner: ICloner);
     /**
      * Update a player profile to include a new player scav profile
      * @param sessionID session id to specify what profile is updated
      * @returns profile object
      */
     generate(sessionID: string): IPmcData;
+    /**
+     * Add items picked from `playerscav.lootItemsToAddChancePercent`
+     * @param possibleItemsToAdd dict of tpl + % chance to be added
+     * @param scavData
+     * @param containersToAddTo Possible slotIds to add loot to
+     */
+    protected addAdditionalLootToPlayerScavContainers(possibleItemsToAdd: Record<string, number>, scavData: IBotBase, containersToAddTo: string[]): void;
     /**
      * Get the scav karama level for a profile
      * Is also the fence trader rep level

types/generators/RagfairAssortGenerator.d.ts

@@ -1,52 +1,50 @@
-import { ItemHelper } from "../helpers/ItemHelper";
-import { IPreset } from "../models/eft/common/IGlobals";
-import { Item } from "../models/eft/common/tables/IItem";
-import { IRagfairConfig } from "../models/spt/config/IRagfairConfig";
-import { ConfigServer } from "../servers/ConfigServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { SeasonalEventService } from "../services/SeasonalEventService";
-import { HashUtil } from "../utils/HashUtil";
-import { JsonUtil } from "../utils/JsonUtil";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { PresetHelper } from "@spt/helpers/PresetHelper";
+import { IPreset } from "@spt/models/eft/common/IGlobals";
+import { Item } from "@spt/models/eft/common/tables/IItem";
+import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { DatabaseServer } from "@spt/servers/DatabaseServer";
+import { SeasonalEventService } from "@spt/services/SeasonalEventService";
+import { HashUtil } from "@spt/utils/HashUtil";
 export declare class RagfairAssortGenerator {
-    protected jsonUtil: JsonUtil;
     protected hashUtil: HashUtil;
     protected itemHelper: ItemHelper;
+    protected presetHelper: PresetHelper;
     protected databaseServer: DatabaseServer;
     protected seasonalEventService: SeasonalEventService;
     protected configServer: ConfigServer;
-    protected generatedAssortItems: Item[];
+    protected generatedAssortItems: Item[][];
     protected ragfairConfig: IRagfairConfig;
-    constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseServer: DatabaseServer, seasonalEventService: SeasonalEventService, configServer: ConfigServer);
+    protected ragfairItemInvalidBaseTypes: string[];
+    constructor(hashUtil: HashUtil, itemHelper: ItemHelper, presetHelper: PresetHelper, databaseServer: DatabaseServer, seasonalEventService: SeasonalEventService, configServer: ConfigServer);
     /**
-     * Get an array of unique items that can be sold on the flea
-     * @returns array of unique items
+     * Get an array of arrays that can be sold on the flea
+     * Each sub array contains item + children (if any)
+     * @returns array of arrays
      */
-    getAssortItems(): Item[];
+    getAssortItems(): Item[][];
     /**
      * Check internal generatedAssortItems array has objects
      * @returns true if array has objects
      */
     protected assortsAreGenerated(): boolean;
     /**
-     * Generate an array of items the flea can sell
-     * @returns array of unique items
+     * Generate an array of arrays (item + children) the flea can sell
+     * @returns array of arrays (item + children)
      */
-    protected generateRagfairAssortItems(): Item[];
+    protected generateRagfairAssortItems(): Item[][];
     /**
-     * Get presets from globals.json
-     * @returns Preset object array
+     * Get presets from globals to add to flea
+     * ragfairConfig.dynamic.showDefaultPresetsOnly decides if its all presets or just defaults
+     * @returns IPreset array
      */
-    protected getPresets(): IPreset[];
-    /**
-     * Get default presets from globals.json
-     * @returns Preset object array
-     */
-    protected getDefaultPresets(): IPreset[];
+    protected getPresetsToAdd(): IPreset[];
     /**
      * Create a base assort item and return it with populated values + 999999 stack count + unlimited count = true
      * @param tplId tplid to add to item
      * @param id id to add to item
-     * @returns hydrated Item object
+     * @returns Hydrated Item object
      */
-    protected createRagfairAssortItem(tplId: string, id?: string): Item;
+    protected createRagfairAssortRootItem(tplId: string, id?: string): Item;
 }

types/generators/RagfairOfferGenerator.d.ts

@@ -1,36 +1,38 @@
-import { HandbookHelper } from "../helpers/HandbookHelper";
-import { ItemHelper } from "../helpers/ItemHelper";
-import { PaymentHelper } from "../helpers/PaymentHelper";
-import { PresetHelper } from "../helpers/PresetHelper";
-import { RagfairServerHelper } from "../helpers/RagfairServerHelper";
-import { Item } from "../models/eft/common/tables/IItem";
-import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem";
-import { IBarterScheme } from "../models/eft/common/tables/ITrader";
-import { IRagfairOffer, OfferRequirement } from "../models/eft/ragfair/IRagfairOffer";
-import { Dynamic, IRagfairConfig } from "../models/spt/config/IRagfairConfig";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { ConfigServer } from "../servers/ConfigServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { SaveServer } from "../servers/SaveServer";
-import { FenceService } from "../services/FenceService";
-import { LocalisationService } from "../services/LocalisationService";
-import { RagfairCategoriesService } from "../services/RagfairCategoriesService";
-import { RagfairOfferService } from "../services/RagfairOfferService";
-import { RagfairPriceService } from "../services/RagfairPriceService";
-import { HashUtil } from "../utils/HashUtil";
-import { JsonUtil } from "../utils/JsonUtil";
-import { RandomUtil } from "../utils/RandomUtil";
-import { TimeUtil } from "../utils/TimeUtil";
-import { RagfairAssortGenerator } from "./RagfairAssortGenerator";
+import { RagfairAssortGenerator } from "@spt/generators/RagfairAssortGenerator";
+import { BotHelper } from "@spt/helpers/BotHelper";
+import { HandbookHelper } from "@spt/helpers/HandbookHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { PaymentHelper } from "@spt/helpers/PaymentHelper";
+import { PresetHelper } from "@spt/helpers/PresetHelper";
+import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { RagfairServerHelper } from "@spt/helpers/RagfairServerHelper";
+import { Item } from "@spt/models/eft/common/tables/IItem";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { IBarterScheme } from "@spt/models/eft/common/tables/ITrader";
+import { IRagfairOffer, IRagfairOfferUser, OfferRequirement } from "@spt/models/eft/ragfair/IRagfairOffer";
+import { Dynamic, IArmorPlateBlacklistSettings, IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { SaveServer } from "@spt/servers/SaveServer";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { FenceService } from "@spt/services/FenceService";
+import { LocalisationService } from "@spt/services/LocalisationService";
+import { RagfairOfferService } from "@spt/services/RagfairOfferService";
+import { RagfairPriceService } from "@spt/services/RagfairPriceService";
+import { HashUtil } from "@spt/utils/HashUtil";
+import { RandomUtil } from "@spt/utils/RandomUtil";
+import { TimeUtil } from "@spt/utils/TimeUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class RagfairOfferGenerator {
     protected logger: ILogger;
-    protected jsonUtil: JsonUtil;
     protected hashUtil: HashUtil;
     protected randomUtil: RandomUtil;
     protected timeUtil: TimeUtil;
-    protected databaseServer: DatabaseServer;
+    protected databaseService: DatabaseService;
     protected ragfairServerHelper: RagfairServerHelper;
+    protected profileHelper: ProfileHelper;
     protected handbookHelper: HandbookHelper;
+    protected botHelper: BotHelper;
     protected saveServer: SaveServer;
     protected presetHelper: PresetHelper;
     protected ragfairAssortGenerator: RagfairAssortGenerator;
@@ -38,16 +40,18 @@ export declare class RagfairOfferGenerator {
     protected ragfairPriceService: RagfairPriceService;
     protected localisationService: LocalisationService;
     protected paymentHelper: PaymentHelper;
-    protected ragfairCategoriesService: RagfairCategoriesService;
     protected fenceService: FenceService;
     protected itemHelper: ItemHelper;
     protected configServer: ConfigServer;
+    protected cloner: ICloner;
     protected ragfairConfig: IRagfairConfig;
     protected allowedFleaPriceItemsForBarter: {
         tpl: string;
         price: number;
     }[];
-    constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, handbookHelper: HandbookHelper, saveServer: SaveServer, presetHelper: PresetHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferService: RagfairOfferService, ragfairPriceService: RagfairPriceService, localisationService: LocalisationService, paymentHelper: PaymentHelper, ragfairCategoriesService: RagfairCategoriesService, fenceService: FenceService, itemHelper: ItemHelper, configServer: ConfigServer);
+    /** Internal counter to ensure each offer created has a unique value for its intId property */
+    protected offerCounter: number;
+    constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, timeUtil: TimeUtil, databaseService: DatabaseService, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, botHelper: BotHelper, saveServer: SaveServer, presetHelper: PresetHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferService: RagfairOfferService, ragfairPriceService: RagfairPriceService, localisationService: LocalisationService, paymentHelper: PaymentHelper, fenceService: FenceService, itemHelper: ItemHelper, configServer: ConfigServer, cloner: ICloner);
     /**
      * Create a flea offer and store it in the Ragfair server offers array
      * @param userID Owner of the offer
@@ -55,11 +59,10 @@ export declare class RagfairOfferGenerator {
      * @param items Items in the offer
      * @param barterScheme Cost of item (currency or barter)
      * @param loyalLevel Loyalty level needed to buy item
-     * @param price Price of offer
-     * @param sellInOnePiece Set StackObjectsCount to 1
-     * @returns IRagfairOffer
+     * @param sellInOnePiece Flags sellInOnePiece to be true
+     * @returns Created flea offer
      */
-    createFleaOffer(userID: string, time: number, items: Item[], barterScheme: IBarterScheme[], loyalLevel: number, price: number, sellInOnePiece?: boolean): IRagfairOffer;
+    createAndAddFleaOffer(userID: string, time: number, items: Item[], barterScheme: IBarterScheme[], loyalLevel: number, sellInOnePiece?: boolean): IRagfairOffer;
     /**
      * Create an offer object ready to send to ragfairOfferService.addOffer()
      * @param userID Owner of the offer
@@ -67,17 +70,23 @@ export declare class RagfairOfferGenerator {
      * @param items Items in the offer
      * @param barterScheme Cost of item (currency or barter)
      * @param loyalLevel Loyalty level needed to buy item
-     * @param price Price of offer
-     * @param sellInOnePiece Set StackObjectsCount to 1
+     * @param isPackOffer Is offer being created flaged as a pack
      * @returns IRagfairOffer
      */
-    protected createOffer(userID: string, time: number, items: Item[], barterScheme: IBarterScheme[], loyalLevel: number, price: number, sellInOnePiece?: boolean): IRagfairOffer;
+    protected createOffer(userID: string, time: number, items: Item[], barterScheme: IBarterScheme[], loyalLevel: number, isPackOffer?: boolean): IRagfairOffer;
+    /**
+     * Create the user object stored inside each flea offer object
+     * @param userID user creating the offer
+     * @param isTrader Is the user creating the offer a trader
+     * @returns IRagfairOfferUser
+     */
+    createUserDataForFleaOffer(userID: string, isTrader: boolean): IRagfairOfferUser;
     /**
      * Calculate the offer price that's listed on the flea listing
      * @param offerRequirements barter requirements for offer
      * @returns rouble cost of offer
      */
-    protected calculateOfferListingPrice(offerRequirements: OfferRequirement[]): number;
+    protected convertOfferRequirementsIntoRoubles(offerRequirements: OfferRequirement[]): number;
     /**
      * Get avatar url from trader table in db
      * @param isTrader Is user we're getting avatar for a trader
@@ -121,23 +130,28 @@ export declare class RagfairOfferGenerator {
      * Create multiple offers for items by using a unique list of items we've generated previously
      * @param expiredOffers optional, expired offers to regenerate
      */
-    generateDynamicOffers(expiredOffers?: Item[]): Promise<void>;
+    generateDynamicOffers(expiredOffers?: Item[][]): Promise<void>;
     /**
-     *
-     * @param assortItemIndex Index of assort item
-     * @param assortItemsToProcess Item array containing index
-     * @param expiredOffers Currently expired offers on flea
+     * @param assortItemWithChildren Item with its children to process into offers
+     * @param isExpiredOffer is an expired offer
      * @param config Ragfair dynamic config
      */
-    protected createOffersForItems(assortItemIndex: string, assortItemsToProcess: Item[], expiredOffers: Item[], config: Dynamic): Promise<void>;
+    protected createOffersFromAssort(assortItemWithChildren: Item[], isExpiredOffer: boolean, config: Dynamic): Promise<void>;
+    /**
+     * iterate over an items chidren and look for plates above desired level and remove them
+     * @param presetWithChildren preset to check for plates
+     * @param plateSettings Settings
+     * @returns True if plate removed
+     */
+    protected removeBannedPlatesFromPreset(presetWithChildren: Item[], plateSettings: IArmorPlateBlacklistSettings): boolean;
     /**
      * Create one flea offer for a specific item
-     * @param items Item to create offer for
+     * @param itemWithChildren Item to create offer for
      * @param isPreset Is item a weapon preset
      * @param itemDetails raw db item details
      * @returns Item array
      */
-    protected createSingleOfferForItem(items: Item[], isPreset: boolean, itemDetails: [boolean, ITemplateItem]): Promise<Item[]>;
+    protected createSingleOfferForItem(itemWithChildren: Item[], isPreset: boolean, itemDetails: [boolean, ITemplateItem]): Promise<void>;
     /**
      * Generate trader offers on flea using the traders assort data
      * @param traderID Trader to generate offers for
@@ -147,44 +161,51 @@ export declare class RagfairOfferGenerator {
      * Get array of an item with its mods + condition properties (e.g durability)
      * Apply randomisation adjustments to condition if item base is found in ragfair.json/dynamic/condition
      * @param userID id of owner of item
-     * @param itemWithMods Item and mods, get condition of first item (only first array item is used)
+     * @param itemWithMods Item and mods, get condition of first item (only first array item is modified)
      * @param itemDetails db details of first item
-     * @returns
      */
-    protected getItemCondition(userID: string, itemWithMods: Item[], itemDetails: ITemplateItem): Item[];
+    protected randomiseOfferItemUpdProperties(userID: string, itemWithMods: Item[], itemDetails: ITemplateItem): void;
     /**
      * Get the relevant condition id if item tpl matches in ragfair.json/condition
      * @param tpl Item to look for matching condition object
      * @returns condition id
      */
-    protected getDynamicConditionIdForTpl(tpl: string): string;
+    protected getDynamicConditionIdForTpl(tpl: string): string | undefined;
     /**
      * Alter an items condition based on its item base type
      * @param conditionSettingsId also the parentId of item being altered
-     * @param item Item to adjust condition details of
+     * @param itemWithMods Item to adjust condition details of
      * @param itemDetails db item details of first item in array
      */
-    protected randomiseItemCondition(conditionSettingsId: string, item: Item, itemDetails: ITemplateItem): void;
+    protected randomiseItemCondition(conditionSettingsId: string, itemWithMods: Item[], itemDetails: ITemplateItem): void;
     /**
      * Adjust an items durability/maxDurability value
-     * @param item item (weapon/armor) to adjust
-     * @param multiplier Value to multiple durability by
+     * @param item item (weapon/armor) to Adjust
+     * @param itemDbDetails Weapon details from db
+     * @param maxMultiplier Value to multiply max durability by
+     * @param currentMultiplier Value to multiply current durability by
      */
-    protected randomiseDurabilityValues(item: Item, multiplier: number): void;
+    protected randomiseWeaponDurability(item: Item, itemDbDetails: ITemplateItem, maxMultiplier: number, currentMultiplier: number): void;
+    /**
+     * Randomise the durabiltiy values for an armors plates and soft inserts
+     * @param armorWithMods Armor item with its child mods
+     * @param currentMultiplier Chosen multipler to use for current durability value
+     * @param maxMultiplier Chosen multipler to use for max durability value
+     */
+    protected randomiseArmorDurabilityValues(armorWithMods: Item[], currentMultiplier: number, maxMultiplier: number): void;
     /**
      * Add missing conditions to an item if needed
      * Durabiltiy for repairable items
      * HpResource for medical items
      * @param item item to add conditions to
-     * @returns Item with conditions added
      */
-    protected addMissingConditions(item: Item): Item;
+    protected addMissingConditions(item: Item): void;
     /**
      * Create a barter-based barter scheme, if not possible, fall back to making barter scheme currency based
      * @param offerItems Items for sale in offer
      * @returns Barter scheme
      */
-    protected createBarterRequirement(offerItems: Item[]): IBarterScheme[];
+    protected createBarterBarterScheme(offerItems: Item[]): IBarterScheme[];
     /**
      * Get an array of flea prices + item tpl, cached in generator class inside `allowedFleaPriceItemsForBarter`
      * @returns array with tpl/price values
@@ -195,8 +216,10 @@ export declare class RagfairOfferGenerator {
     }[];
     /**
      * Create a random currency-based barter scheme for an array of items
-     * @param offerItems Items on offer
+     * @param offerWithChildren Items on offer
+     * @param isPackOffer Is the barter scheme being created for a pack offer
+     * @param multipler What to multiply the resulting price by
      * @returns Barter scheme for offer
      */
-    protected createCurrencyRequirement(offerItems: Item[]): IBarterScheme[];
+    protected createCurrencyBarterScheme(offerWithChildren: Item[], isPackOffer: boolean, multipler?: number): IBarterScheme[];
 }

types/generators/RepeatableQuestGenerator.d.ts

@@ -0,0 +1,139 @@
+import { RepeatableQuestRewardGenerator } from "@spt/generators/RepeatableQuestRewardGenerator";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { RepeatableQuestHelper } from "@spt/helpers/RepeatableQuestHelper";
+import { Exit } from "@spt/models/eft/common/ILocationBase";
+import { TraderInfo } from "@spt/models/eft/common/tables/IBotBase";
+import { IQuestCondition, IQuestConditionCounterCondition } from "@spt/models/eft/common/tables/IQuest";
+import { IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests";
+import { IBossInfo, IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig";
+import { IQuestTypePool } from "@spt/models/spt/repeatable/IQuestTypePool";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { LocalisationService } from "@spt/services/LocalisationService";
+import { MathUtil } from "@spt/utils/MathUtil";
+import { ObjectId } from "@spt/utils/ObjectId";
+import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
+export declare class RepeatableQuestGenerator {
+    protected logger: ILogger;
+    protected randomUtil: RandomUtil;
+    protected mathUtil: MathUtil;
+    protected databaseService: DatabaseService;
+    protected itemHelper: ItemHelper;
+    protected localisationService: LocalisationService;
+    protected objectId: ObjectId;
+    protected repeatableQuestHelper: RepeatableQuestHelper;
+    protected repeatableQuestRewardGenerator: RepeatableQuestRewardGenerator;
+    protected configServer: ConfigServer;
+    protected cloner: ICloner;
+    protected questConfig: IQuestConfig;
+    protected maxRandomNumberAttempts: number;
+    constructor(logger: ILogger, randomUtil: RandomUtil, mathUtil: MathUtil, databaseService: DatabaseService, itemHelper: ItemHelper, localisationService: LocalisationService, objectId: ObjectId, repeatableQuestHelper: RepeatableQuestHelper, repeatableQuestRewardGenerator: RepeatableQuestRewardGenerator, configServer: ConfigServer, cloner: ICloner);
+    /**
+     * This method is called by /GetClientRepeatableQuests/ and creates one element of quest type format (see assets/database/templates/repeatableQuests.json).
+     * It randomly draws a quest type (currently Elimination, Completion or Exploration) as well as a trader who is providing the quest
+     * @param pmcLevel Player's level for requested items and reward generation
+     * @param pmcTraderInfo Players traper standing/rep levels
+     * @param questTypePool Possible quest types pool
+     * @param repeatableConfig Repeatable quest config
+     * @returns IRepeatableQuest
+     */
+    generateRepeatableQuest(pmcLevel: number, pmcTraderInfo: Record<string, TraderInfo>, questTypePool: IQuestTypePool, repeatableConfig: IRepeatableQuestConfig): IRepeatableQuest;
+    /**
+     * Generate a randomised Elimination quest
+     * @param pmcLevel Player's level for requested items and reward generation
+     * @param traderId Trader from which the quest will be provided
+     * @param questTypePool Pools for quests (used to avoid redundant quests)
+     * @param repeatableConfig The configuration for the repeatably kind (daily, weekly) as configured in QuestConfig for the requestd quest
+     * @returns Object of quest type format for "Elimination" (see assets/database/templates/repeatableQuests.json)
+     */
+    protected generateEliminationQuest(pmcLevel: number, traderId: string, questTypePool: IQuestTypePool, repeatableConfig: IRepeatableQuestConfig): IRepeatableQuest;
+    /**
+     * Get a number of kills neded to complete elimination quest
+     * @param targetKey Target type desired e.g. anyPmc/bossBully/Savage
+     * @param targetsConfig Config
+     * @param eliminationConfig Config
+     * @returns Number of AI to kill
+     */
+    protected getEliminationKillCount(targetKey: string, targetsConfig: ProbabilityObjectArray<string, IBossInfo>, eliminationConfig: IEliminationConfig): number;
+    /**
+     * A repeatable quest, besides some more or less static components, exists of reward and condition (see assets/database/templates/repeatableQuests.json)
+     * This is a helper method for GenerateEliminationQuest to create a location condition.
+     *
+     * @param   {string}    location        the location on which to fulfill the elimination quest
+     * @returns {IEliminationCondition}     object of "Elimination"-location-subcondition
+     */
+    protected generateEliminationLocation(location: string[]): IQuestConditionCounterCondition;
+    /**
+     * Create kill condition for an elimination quest
+     * @param target Bot type target of elimination quest e.g. "AnyPmc", "Savage"
+     * @param targetedBodyParts Body parts player must hit
+     * @param distance Distance from which to kill (currently only >= supported
+     * @param allowedWeapon What weapon must be used - undefined = any
+     * @param allowedWeaponCategory What category of weapon must be used - undefined = any
+     * @returns IEliminationCondition object
+     */
+    protected generateEliminationCondition(target: string, targetedBodyParts: string[], distance: number, allowedWeapon: string, allowedWeaponCategory: string): IQuestConditionCounterCondition;
+    /**
+     * Generates a valid Completion quest
+     *
+     * @param   {integer}   pmcLevel            player's level for requested items and reward generation
+     * @param   {string}    traderId            trader from which the quest will be provided
+     * @param   {object}    repeatableConfig    The configuration for the repeatably kind (daily, weekly) as configured in QuestConfig for the requestd quest
+     * @returns {object}                        object of quest type format for "Completion" (see assets/database/templates/repeatableQuests.json)
+     */
+    protected generateCompletionQuest(pmcLevel: number, traderId: string, repeatableConfig: IRepeatableQuestConfig): IRepeatableQuest;
+    /**
+     * A repeatable quest, besides some more or less static components, exists of reward and condition (see assets/database/templates/repeatableQuests.json)
+     * This is a helper method for GenerateCompletionQuest to create a completion condition (of which a completion quest theoretically can have many)
+     *
+     * @param   {string}    itemTpl    id of the item to request
+     * @param   {integer}   value           amount of items of this specific type to request
+     * @returns {object}                    object of "Completion"-condition
+     */
+    protected generateCompletionAvailableForFinish(itemTpl: string, value: number): IQuestCondition;
+    /**
+     * Generates a valid Exploration quest
+     *
+     * @param   {integer}   pmcLevel            player's level for reward generation
+     * @param   {string}    traderId            trader from which the quest will be provided
+     * @param   {object}    questTypePool       Pools for quests (used to avoid redundant quests)
+     * @param   {object}    repeatableConfig    The configuration for the repeatably kind (daily, weekly) as configured in QuestConfig for the requestd quest
+     * @returns {object}                        object of quest type format for "Exploration" (see assets/database/templates/repeatableQuests.json)
+     */
+    protected generateExplorationQuest(pmcLevel: number, traderId: string, questTypePool: IQuestTypePool, repeatableConfig: IRepeatableQuestConfig): IRepeatableQuest;
+    /**
+     * Filter a maps exits to just those for the desired side
+     * @param locationKey Map id (e.g. factory4_day)
+     * @param playerSide Scav/Pmc
+     * @returns Array of Exit objects
+     */
+    protected getLocationExitsForSide(locationKey: string, playerSide: string): Exit[];
+    protected generatePickupQuest(pmcLevel: number, traderId: string, questTypePool: IQuestTypePool, repeatableConfig: IRepeatableQuestConfig): IRepeatableQuest;
+    /**
+     * Convert a location into an quest code can read (e.g. factory4_day into 55f2d3fd4bdc2d5f408b4567)
+     * @param locationKey e.g factory4_day
+     * @returns guid
+     */
+    protected getQuestLocationByMapId(locationKey: string): string;
+    /**
+     * Exploration repeatable quests can specify a required extraction point.
+     * This method creates the according object which will be appended to the conditions array
+     *
+     * @param   {string}        exit                The exit name to generate the condition for
+     * @returns {object}                            Exit condition
+     */
+    protected generateExplorationExitCondition(exit: Exit): IQuestConditionCounterCondition;
+    /**
+     * Generates the base object of quest type format given as templates in assets/database/templates/repeatableQuests.json
+     * The templates include Elimination, Completion and Extraction quest types
+     *
+     * @param   {string}    type            Quest type: "Elimination", "Completion" or "Extraction"
+     * @param   {string}    traderId        Trader from which the quest will be provided
+     * @param   {string}    side            Scav daily or pmc daily/weekly quest
+     * @returns {object}                    Object which contains the base elements for repeatable quests of the requests type
+     *                                      (needs to be filled with reward and conditions by called to make a valid quest)
+     */
+    protected generateRepeatableTemplate(type: string, traderId: string, side: string): IRepeatableQuest;
+}

types/generators/RepeatableQuestRewardGenerator.d.ts

@@ -0,0 +1,156 @@
+import { HandbookHelper } from "@spt/helpers/HandbookHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { PresetHelper } from "@spt/helpers/PresetHelper";
+import { Item } from "@spt/models/eft/common/tables/IItem";
+import { IQuestReward, IQuestRewards } from "@spt/models/eft/common/tables/IQuest";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { IBaseQuestConfig, IQuestConfig, IRepeatableQuestConfig, IRewardScaling } from "@spt/models/spt/config/IQuestConfig";
+import { IQuestRewardValues } from "@spt/models/spt/repeatable/IQuestRewardValues";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { ItemFilterService } from "@spt/services/ItemFilterService";
+import { LocalisationService } from "@spt/services/LocalisationService";
+import { SeasonalEventService } from "@spt/services/SeasonalEventService";
+import { MathUtil } from "@spt/utils/MathUtil";
+import { ObjectId } from "@spt/utils/ObjectId";
+import { RandomUtil } from "@spt/utils/RandomUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
+export declare class RepeatableQuestRewardGenerator {
+    protected logger: ILogger;
+    protected randomUtil: RandomUtil;
+    protected mathUtil: MathUtil;
+    protected databaseService: DatabaseService;
+    protected itemHelper: ItemHelper;
+    protected presetHelper: PresetHelper;
+    protected handbookHelper: HandbookHelper;
+    protected localisationService: LocalisationService;
+    protected objectId: ObjectId;
+    protected itemFilterService: ItemFilterService;
+    protected seasonalEventService: SeasonalEventService;
+    protected configServer: ConfigServer;
+    protected cloner: ICloner;
+    protected questConfig: IQuestConfig;
+    constructor(logger: ILogger, randomUtil: RandomUtil, mathUtil: MathUtil, databaseService: DatabaseService, itemHelper: ItemHelper, presetHelper: PresetHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, objectId: ObjectId, itemFilterService: ItemFilterService, seasonalEventService: SeasonalEventService, configServer: ConfigServer, cloner: ICloner);
+    /**
+     * Generate the reward for a mission. A reward can consist of
+     * - Experience
+     * - Money
+     * - Items
+     * - Trader Reputation
+     *
+     * The reward is dependent on the player level as given by the wiki. The exact mapping of pmcLevel to
+     * experience / money / items / trader reputation can be defined in QuestConfig.js
+     *
+     * There's also a random variation of the reward the spread of which can be also defined in the config.
+     *
+     * Additionally, a scaling factor w.r.t. quest difficulty going from 0.2...1 can be used
+     *
+     * @param   {integer}   pmcLevel            player's level
+     * @param   {number}    difficulty          a reward scaling factor from 0.2 to 1
+     * @param   {string}    traderId            the trader for reputation gain (and possible in the future filtering of reward item type based on trader)
+     * @param   {object}    repeatableConfig    The configuration for the repeatable kind (daily, weekly) as configured in QuestConfig for the requested quest
+     * @returns {object}                        object of "Reward"-type that can be given for a repeatable mission
+     */
+    generateReward(pmcLevel: number, difficulty: number, traderId: string, repeatableConfig: IRepeatableQuestConfig, questConfig: IBaseQuestConfig): IQuestRewards;
+    protected getQuestRewardValues(rewardScaling: IRewardScaling, difficulty: number, pmcLevel: number): IQuestRewardValues;
+    /**
+     * Get an array of items + stack size to give to player as reward that fit inside of a rouble budget
+     * @param itemPool All possible items to choose rewards from
+     * @param maxItemCount Total number of items to reward
+     * @param itemRewardBudget Rouble buget all item rewards must fit in
+     * @param repeatableConfig config for quest type
+     * @returns Items and stack size
+     */
+    protected getRewardableItemsFromPoolWithinBudget(itemPool: ITemplateItem[], maxItemCount: number, itemRewardBudget: number, repeatableConfig: IRepeatableQuestConfig): {
+        item: ITemplateItem;
+        stackSize: number;
+    }[];
+    /**
+     * Choose a random Weapon preset that fits inside of a rouble amount limit
+     * @param roublesBudget
+     * @param rewardIndex
+     * @returns IQuestReward
+     */
+    protected getRandomWeaponPresetWithinBudget(roublesBudget: number, rewardIndex: number): {
+        weapon: IQuestReward;
+        price: number;
+    } | undefined;
+    /**
+     * @param rewardItems List of reward items to filter
+     * @param roublesBudget The budget remaining for rewards
+     * @param minPrice The minimum priced item to include
+     * @returns True if any items remain in `rewardItems`, false otherwise
+     */
+    protected filterRewardPoolWithinBudget(rewardItems: ITemplateItem[], roublesBudget: number, minPrice: number): ITemplateItem[];
+    /**
+     * Get a randomised number a reward items stack size should be based on its handbook price
+     * @param item Reward item to get stack size for
+     * @returns matching stack size for the passed in items price
+     */
+    protected getRandomisedRewardItemStackSizeByPrice(item: ITemplateItem): number;
+    /**
+     * Should reward item have stack size increased (25% chance)
+     * @param item Item to increase reward stack size of
+     * @param maxRoublePriceToStack Maximum rouble price an item can be to still be chosen for stacking
+     * @param randomChanceToPass Additional randomised chance of passing
+     * @returns True if items stack size can be increased
+     */
+    protected canIncreaseRewardItemStackSize(item: ITemplateItem, maxRoublePriceToStack: number, randomChanceToPass?: number): boolean;
+    /**
+     * Get a count of cartridges that fits the rouble budget amount provided
+     * e.g. how many M80s for 50,000 roubles
+     * @param itemSelected Cartridge
+     * @param roublesBudget Rouble budget
+     * @param rewardNumItems
+     * @returns Count that fits budget (min 1)
+     */
+    protected calculateAmmoStackSizeThatFitsBudget(itemSelected: ITemplateItem, roublesBudget: number, rewardNumItems: number): number;
+    /**
+     * Select a number of items that have a colelctive value of the passed in parameter
+     * @param repeatableConfig Config
+     * @param roublesBudget Total value of items to return
+     * @param traderId Id of the trader who will give player reward
+     * @returns Array of reward items that fit budget
+     */
+    protected chooseRewardItemsWithinBudget(repeatableConfig: IRepeatableQuestConfig, roublesBudget: number, traderId: string): ITemplateItem[];
+    /**
+     * Helper to create a reward item structured as required by the client
+     *
+     * @param   {string}    tpl             ItemId of the rewarded item
+     * @param   {integer}   count           Amount of items to give
+     * @param   {integer}   index           All rewards will be appended to a list, for unknown reasons the client wants the index
+     * @param preset Optional array of preset items
+     * @returns {object}                    Object of "Reward"-item-type
+     */
+    protected generateItemReward(tpl: string, count: number, index: number): IQuestReward;
+    /**
+     * Helper to create a reward item structured as required by the client
+     *
+     * @param   {string}    tpl             ItemId of the rewarded item
+     * @param   {integer}   count           Amount of items to give
+     * @param   {integer}   index           All rewards will be appended to a list, for unknown reasons the client wants the index
+     * @param preset Optional array of preset items
+     * @returns {object}                    Object of "Reward"-item-type
+     */
+    protected generatePresetReward(tpl: string, count: number, index: number, preset?: Item[]): IQuestReward;
+    /**
+     * Picks rewardable items from items.json
+     * This means they must:
+     * - Fit into the inventory
+     * - Shouldn't be keys
+     * - Have a price greater than 0
+     * @param repeatableQuestConfig Config file
+     * @param traderId Id of trader who will give reward to player
+     * @returns List of rewardable items [[_tpl, itemTemplate],...]
+     */
+    getRewardableItems(repeatableQuestConfig: IRepeatableQuestConfig, traderId: string): [string, ITemplateItem][];
+    /**
+     * Checks if an id is a valid item. Valid meaning that it's an item that may be a reward
+     * or content of bot loot. Items that are tested as valid may be in a player backpack or stash.
+     * @param {string} tpl template id of item to check
+     * @returns True if item is valid reward
+     */
+    protected isValidRewardItem(tpl: string, repeatableQuestConfig: IRepeatableQuestConfig, itemBaseWhitelist: string[]): boolean;
+    protected getMoneyReward(traderId: string, rewardRoubles: number, rewardIndex: number): IQuestReward;
+}

types/generators/ScavCaseRewardGenerator.d.ts

@@ -1,17 +1,18 @@
-import { ItemHelper } from "../helpers/ItemHelper";
-import { Product } from "../models/eft/common/tables/IBotBase";
-import { Upd } from "../models/eft/common/tables/IItem";
-import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem";
-import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase";
-import { IScavCaseConfig } from "../models/spt/config/IScavCaseConfig";
-import { RewardCountAndPriceDetails, ScavCaseRewardCountsAndPrices } from "../models/spt/hideout/ScavCaseRewardCountsAndPrices";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { ConfigServer } from "../servers/ConfigServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { ItemFilterService } from "../services/ItemFilterService";
-import { RagfairPriceService } from "../services/RagfairPriceService";
-import { HashUtil } from "../utils/HashUtil";
-import { RandomUtil } from "../utils/RandomUtil";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { PresetHelper } from "@spt/helpers/PresetHelper";
+import { Item } from "@spt/models/eft/common/tables/IItem";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
+import { IScavCaseConfig } from "@spt/models/spt/config/IScavCaseConfig";
+import { RewardCountAndPriceDetails, ScavCaseRewardCountsAndPrices } from "@spt/models/spt/hideout/ScavCaseRewardCountsAndPrices";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { DatabaseService } from "@spt/services/DatabaseService";
+import { ItemFilterService } from "@spt/services/ItemFilterService";
+import { RagfairPriceService } from "@spt/services/RagfairPriceService";
+import { SeasonalEventService } from "@spt/services/SeasonalEventService";
+import { HashUtil } from "@spt/utils/HashUtil";
+import { RandomUtil } from "@spt/utils/RandomUtil";
 /**
  * Handle the creation of randomised scav case rewards
  */
@@ -20,25 +21,29 @@ export declare class ScavCaseRewardGenerator {
     protected randomUtil: RandomUtil;
     protected hashUtil: HashUtil;
     protected itemHelper: ItemHelper;
-    protected databaseServer: DatabaseServer;
+    protected presetHelper: PresetHelper;
+    protected databaseService: DatabaseService;
     protected ragfairPriceService: RagfairPriceService;
+    protected seasonalEventService: SeasonalEventService;
     protected itemFilterService: ItemFilterService;
     protected configServer: ConfigServer;
     protected scavCaseConfig: IScavCaseConfig;
-    constructor(logger: ILogger, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemFilterService: ItemFilterService, configServer: ConfigServer);
+    protected dbItemsCache: ITemplateItem[];
+    protected dbAmmoItemsCache: ITemplateItem[];
+    constructor(logger: ILogger, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, presetHelper: PresetHelper, databaseService: DatabaseService, ragfairPriceService: RagfairPriceService, seasonalEventService: SeasonalEventService, itemFilterService: ItemFilterService, configServer: ConfigServer);
     /**
      * Create an array of rewards that will be given to the player upon completing their scav case build
      * @param recipeId recipe of the scav case craft
      * @returns Product array
      */
-    generate(recipeId: string): Product[];
+    generate(recipeId: string): Item[][];
     /**
-     * Get all db items that are not blacklisted in scavcase config
-     * @returns filtered array of db items
+     * Get all db items that are not blacklisted in scavcase config or global blacklist
+     * Store in class field
      */
-    protected getDbItems(): ITemplateItem[];
+    protected cacheDbItems(): void;
     /**
-     * Pick a number of items to be rewards, the count is defined by the values in
+     * Pick a number of items to be rewards, the count is defined by the values in `itemFilters` param
      * @param items item pool to pick rewards from
      * @param itemFilters how the rewards should be filtered down (by item count)
      * @returns
@@ -70,19 +75,8 @@ export declare class ScavCaseRewardGenerator {
      * @param rewardItems items to convert
      * @returns Product array
      */
-    protected randomiseContainerItemRewards(rewardItems: ITemplateItem[], rarity: string): Product[];
+    protected randomiseContainerItemRewards(rewardItems: ITemplateItem[], rarity: string): Item[][];
     /**
-     * Add a randomised stack count to ammo or money items
-     * @param item money or ammo item
-     * @param resultItem money or ammo item with a randomise stack size
-     */
-    protected addStackCountToAmmoAndMoney(item: ITemplateItem, resultItem: {
-        _id: string;
-        _tpl: string;
-        upd: Upd;
-    }, rarity: string): void;
-    /**
-     *
      * @param dbItems all items from the items.json
      * @param itemFilters controls how the dbItems will be filtered and returned (handbook price)
      * @returns filtered dbItems array

types/generators/WeatherGenerator.d.ts

@@ -1,21 +1,24 @@
-import { ApplicationContext } from "../context/ApplicationContext";
-import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper";
-import { IWeather, IWeatherData } from "../models/eft/weather/IWeatherData";
-import { WindDirection } from "../models/enums/WindDirection";
-import { IWeatherConfig } from "../models/spt/config/IWeatherConfig";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { ConfigServer } from "../servers/ConfigServer";
-import { RandomUtil } from "../utils/RandomUtil";
-import { TimeUtil } from "../utils/TimeUtil";
+import { ApplicationContext } from "@spt/context/ApplicationContext";
+import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
+import { IWeather, IWeatherData } from "@spt/models/eft/weather/IWeatherData";
+import { WindDirection } from "@spt/models/enums/WindDirection";
+import { IWeatherConfig } from "@spt/models/spt/config/IWeatherConfig";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { ConfigServer } from "@spt/servers/ConfigServer";
+import { SeasonalEventService } from "@spt/services/SeasonalEventService";
+import { RandomUtil } from "@spt/utils/RandomUtil";
+import { TimeUtil } from "@spt/utils/TimeUtil";
 export declare class WeatherGenerator {
     protected weightedRandomHelper: WeightedRandomHelper;
     protected logger: ILogger;
     protected randomUtil: RandomUtil;
     protected timeUtil: TimeUtil;
+    protected seasonalEventService: SeasonalEventService;
     protected applicationContext: ApplicationContext;
     protected configServer: ConfigServer;
     protected weatherConfig: IWeatherConfig;
-    constructor(weightedRandomHelper: WeightedRandomHelper, logger: ILogger, randomUtil: RandomUtil, timeUtil: TimeUtil, applicationContext: ApplicationContext, configServer: ConfigServer);
+    private serverStartTimestampMS;
+    constructor(weightedRandomHelper: WeightedRandomHelper, logger: ILogger, randomUtil: RandomUtil, timeUtil: TimeUtil, seasonalEventService: SeasonalEventService, applicationContext: ApplicationContext, configServer: ConfigServer);
     /**
      * Get current + raid datetime and format into correct BSG format and return
      * @param data Weather data
@@ -28,13 +31,13 @@ export declare class WeatherGenerator {
      * @param currentDate current date
      * @returns formatted time
      */
-    protected getBsgFormattedInRaidTime(currentDate: Date): string;
+    protected getBsgFormattedInRaidTime(): string;
     /**
      * Get the current in-raid time
      * @param currentDate (new Date())
      * @returns Date object of current in-raid time
      */
-    getInRaidTime(currentDate: Date): Date;
+    getInRaidTime(): Date;
     /**
      * Get current time formatted to fit BSGs requirement
      * @param date date to format into bsg style
@@ -52,6 +55,7 @@ export declare class WeatherGenerator {
      */
     protected setCurrentDateTime(weather: IWeather): void;
     protected getWeightedWindDirection(): WindDirection;
+    protected getWeightedClouds(): number;
     protected getWeightedWindSpeed(): number;
     protected getWeightedFog(): number;
     protected getWeightedRain(): number;

types/generators/weapongen/IInventoryMagGen.d.ts

@@ -1,4 +1,4 @@
-import { InventoryMagGen } from "./InventoryMagGen";
+import { InventoryMagGen } from "@spt/generators/weapongen/InventoryMagGen";
 export interface IInventoryMagGen {
     getPriority(): number;
     canHandleInventoryMagGen(inventoryMagGen: InventoryMagGen): boolean;