diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/bepInEx/plugins/Faupi-MunitionsExpert.dll b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/bepInEx/plugins/Faupi-MunitionsExpert.dll new file mode 100644 index 0000000..55d8326 Binary files /dev/null and b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/bepInEx/plugins/Faupi-MunitionsExpert.dll differ diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/LICENSE b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/LICENSE similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/LICENSE rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/LICENSE diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/package.json b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/package.json similarity index 95% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/package.json rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/package.json index f9a5628..2e4e92f 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/package.json +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/package.json @@ -1,10 +1,10 @@ { "name": "MunitionsExpert", "author": "Faupi", - "version": "1.4.1", + "version": "1.6.0", "license": "NCSA Open Source", "main": "./src/MunitionsExpert.js", - "akiVersion": "2.3.1", + "akiVersion": "3.1.1", "updatedBy": "CWX", "scripts": { "setup:environment": "npm i", diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/res/armorDamage.png b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/res/armorDamage.png similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/res/armorDamage.png rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/res/armorDamage.png diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/res/ricochet.png b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/res/ricochet.png similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/res/ricochet.png rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/res/ricochet.png diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/res/translations.json b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/res/translations.json similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/res/translations.json rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/res/translations.json diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/src/MunitionsExpert.js b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/src/MunitionsExpert.js new file mode 100644 index 0000000..3066dd2 --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/src/MunitionsExpert.js @@ -0,0 +1,66 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +class MunitionsExpert { + preAkiLoad(container) { + this.router = container.resolve("DynamicRouterModService"); + this.logger = container.resolve("WinstonLogger"); + this.json = container.resolve("JsonUtil"); + this.mod = require("../package.json"); + this.translations = require("../res/translations.json"); + this.logger.info(`Loading: ${this.mod.author}: ${this.mod.name} ${this.mod.version}`); + this.path = require("path"); + this.cfg = require("./config.json"); + this.hookRoutes(); + } + postAkiLoad(container) { + this.modLoader = container.resolve("PreAkiModLoader"); + this.database = container.resolve("DatabaseServer"); + this.table = this.database.getTables(); + this.globalLocale = this.table.locales.global; + this.items = this.table.templates.items; + this.updateLocalization(); + this.changeBulletColour(); + } + updateLocalization() { + for (const language in this.translations) { + if (!(language in this.globalLocale)) { + continue; + } + const attrKvPair = this.translations[language]; + for (const attrKey in attrKvPair) { + const attrValue = attrKvPair[attrKey]; + this.globalLocale[language].interface[attrKey] = attrValue; + } + } + } + hookRoutes() { + this.router.registerDynamicRouter("MunitionsExpert", [ + { + url: "/MunitionsExpert/GetInfo", + action: (url, info, sessionId, output) => { + return this.json.serialize(this.path.resolve(this.modLoader.getModPath("Faupi-MunitionsExpert 1.6.0"))); + } + } + ], "MunitionsExpert"); + } + changeBulletColour() { + if (this.cfg.BulletBackgroundColours === true) { + for (const i in this.items) { + const item = this.items[i]; + //set baground colour of ammo depending on pen + if (item._parent === "5485a8684bdc2da71d8b4567") { + const pen = item._props.PenetrationPower; + let colour = ""; + pen > 60 ? colour = "red" : //SuperHighPen + pen > 50 ? colour = "yellow" : //HighPen + pen > 40 ? colour = "violet" : //MedHighPen + pen > 30 ? colour = "blue" : //MedPen + pen > 20 ? colour = "green" : //LowMedPen + colour = "grey"; //LowPen + item._props.BackgroundColor = colour; + } + } + } + } +} +module.exports = { mod: new MunitionsExpert() }; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/src/MunitionsExpert.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/src/MunitionsExpert.ts similarity index 79% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/src/MunitionsExpert.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/src/MunitionsExpert.ts index 1de2312..a8a3529 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/src/MunitionsExpert.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/src/MunitionsExpert.ts @@ -1,19 +1,20 @@ import type { DependencyContainer } from "tsyringe"; -import { IMod } from "@spt-aki/models/external/mod"; +import { IPreAkiLoadMod } from "@spt-aki/models/external/IPreAkiLoadMod"; +import { IPostAkiLoadMod } from "@spt-aki/models/external/IPostAkiLoadMod"; import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; import { DynamicRouterModService } from "@spt-aki/services/mod/dynamicRouter/DynamicRouterModService" import { DatabaseServer } from "@spt-aki/servers/DatabaseServer" import { JsonUtil } from "@spt-aki/utils/JsonUtil" -import { InitialModLoader } from "@spt-aki/loaders/InitialModLoader" import { IDatabaseTables } from "@spt-aki/models/spt/server/IDatabaseTables"; +import { PreAkiModLoader } from "@spt-aki/loaders/PreAkiModLoader"; -class MunitionsExpert implements IMod +class MunitionsExpert implements IPreAkiLoadMod, IPostAkiLoadMod { private logger: ILogger; private database: DatabaseServer; private router: DynamicRouterModService; private json: JsonUtil; - private modLoader: InitialModLoader; + private modLoader: PreAkiModLoader; private table: IDatabaseTables; private globalLocale: { [x: string]: { interface: { [x: string]: any; }; }; }; private mod: { name: string; version: any; author: any;}; @@ -22,22 +23,22 @@ class MunitionsExpert implements IMod private path: { resolve: (arg0: string) => any; }; private cfg: { BulletBackgroundColours: boolean; }; - public load(container: DependencyContainer) + public preAkiLoad(container: DependencyContainer) { this.router = container.resolve("DynamicRouterModService"); this.logger = container.resolve("WinstonLogger"); this.json = container.resolve("JsonUtil"); this.mod = require("../package.json"); this.translations = require("../res/translations.json"); - this.logger.info(`Loading: ${this.mod.author}: ${this.mod.name} - ${this.mod.version}`); + this.logger.info(`Loading: ${this.mod.author}: ${this.mod.name} ${this.mod.version}`); this.path = require("path"); this.cfg = require("./config.json"); this.hookRoutes(); } - public delayedLoad(container: DependencyContainer) + public postAkiLoad(container: DependencyContainer) { - this.modLoader = container.resolve("InitialModLoader"); + this.modLoader = container.resolve("PreAkiModLoader"); this.database = container.resolve("DatabaseServer"); this.table = this.database.getTables(); this.globalLocale = this.table.locales.global; @@ -74,7 +75,7 @@ class MunitionsExpert implements IMod url: "/MunitionsExpert/GetInfo", action: (url, info, sessionId, output) => { - return this.getModInfo(url, info, sessionId, output) + return this.json.serialize(this.path.resolve(this.modLoader.getModPath("Faupi-MunitionsExpert 1.6.0"))); } } ], @@ -82,19 +83,6 @@ class MunitionsExpert implements IMod ) } - getModInfo(url: string, info: any, sessionID: string, output: string) - { - const modOutput = { - status: 1, - data: {} - }; - - modOutput.data = {...this.mod, ...{path: this.path.resolve(this.modLoader.getModPath(this.mod.name))}}; - modOutput.status = 0; - - return this.json.serialize(modOutput); - } - changeBulletColour() { if (this.cfg.BulletBackgroundColours === true) @@ -122,4 +110,5 @@ class MunitionsExpert implements IMod } } -module.exports = { mod: new MunitionsExpert() }; \ No newline at end of file +module.exports = { mod: new MunitionsExpert() }; + diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/src/config.json b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/src/config.json similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/src/config.json rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/src/config.json diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/Program.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/Program.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/Program.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/Program.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/TYPES.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/TYPES.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/TYPES.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/TYPES.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/Utils.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/Utils.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/Utils.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/Utils.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/BotCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/BotCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/BotCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/BotCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/BundleCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/BundleCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/BundleCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/BundleCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/CustomizationCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/CustomizationCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/CustomizationCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/CustomizationCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/DataCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/DataCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/DataCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/DataCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/DialogueCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/DialogueCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/DialogueCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/DialogueCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/GameCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/GameCallbacks.d.ts similarity index 90% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/GameCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/GameCallbacks.d.ts index d5cad76..06da1b5 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/GameCallbacks.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/GameCallbacks.d.ts @@ -2,6 +2,7 @@ import { GameController } from "../controllers/GameController"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; import { IGameEmptyCrcRequestData } from "../models/eft/game/IGameEmptyCrcRequestData"; +import { IReportNicknameRequestData } from "../models/eft/game/IReportNicknameRequestData"; import { IVersionValidateRequestData } from "../models/eft/game/IVersionValidateRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; @@ -20,5 +21,6 @@ declare class GameCallbacks { validateGameVersion(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; gameKeepalive(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getVersion(url: string, info: IEmptyRequestData, sessionID: string): string; + reportNickname(url: string, info: IReportNicknameRequestData, sessionID: string): INullResponseData; } export { GameCallbacks }; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/HandbookCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/HandbookCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/HandbookCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/HandbookCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/HealthCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/HealthCallbacks.d.ts similarity index 85% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/HealthCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/HealthCallbacks.d.ts index 8f7b89d..8672be7 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/HealthCallbacks.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/HealthCallbacks.d.ts @@ -13,6 +13,13 @@ export declare class HealthCallbacks { protected profileHelper: ProfileHelper; protected healthController: HealthController; constructor(httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, healthController: HealthController); + /** + * Custom aki server request found in modules/HealthSynchronizer.cs + * @param url + * @param info HealthListener.Instance.CurrentHealth class + * @param sessionID session id + * @returns empty response, no data sent back to client + */ syncHealth(url: string, info: ISyncHealthRequestData, sessionID: string): IGetBodyResponseData; offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): IItemEventRouterResponse; offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/HideoutCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/HideoutCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/HideoutCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/HideoutCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/HttpCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/HttpCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/HttpCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/HttpCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/InraidCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/InraidCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/InraidCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/InraidCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/InsuranceCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/InsuranceCallbacks.d.ts similarity index 89% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/InsuranceCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/InsuranceCallbacks.d.ts index 520d0eb..6819960 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/InsuranceCallbacks.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/InsuranceCallbacks.d.ts @@ -3,6 +3,7 @@ import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; 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"; @@ -17,7 +18,7 @@ export declare class InsuranceCallbacks extends OnLoadOnUpdate { protected insuranceConfig: IInsuranceConfig; constructor(insuranceController: InsuranceController, insuranceService: InsuranceService, httpResponse: HttpResponseUtil, configServer: ConfigServer); onLoad(): void; - getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): IGetBodyResponseData; + getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): IGetBodyResponseData; insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse; onUpdate(secondsSinceLastRun: number): boolean; getRoute(): string; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/InventoryCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/InventoryCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/InventoryCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/InventoryCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/ItemEventCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/ItemEventCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/ItemEventCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/ItemEventCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/LauncherCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/LauncherCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/LauncherCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/LauncherCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/LocationCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/LocationCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/LocationCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/LocationCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/MatchCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/MatchCallbacks.d.ts similarity index 52% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/MatchCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/MatchCallbacks.d.ts index 083c1f5..2a92ef5 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/MatchCallbacks.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/MatchCallbacks.d.ts @@ -1,10 +1,17 @@ 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 { 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 { IJoinMatchRequestData } from "../models/eft/match/IJoinMatchRequestData"; +import { IJoinMatchResult } from "../models/eft/match/IJoinMatchResult"; +import { IPutMetricsRequestData } from "../models/eft/match/IPutMetricsRequestData"; import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { IUpdatePingRequestData } from "../models/eft/match/IUpdatePingRequestData"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; @@ -14,21 +21,21 @@ export declare class MatchCallbacks { protected matchController: MatchController; protected databaseServer: DatabaseServer; constructor(httpResponse: HttpResponseUtil, jsonUtil: JsonUtil, matchController: MatchController, databaseServer: DatabaseServer); - updatePing(url: string, info: any, sessionID: string): INullResponseData; - exitMatch(url: string, info: any, sessionID: string): INullResponseData; - exitToMenu(url: string, info: any, sessionID: string): INullResponseData; - startGroupSearch(url: string, info: any, sessionID: string): INullResponseData; - stopGroupSearch(url: string, info: any, sessionID: string): INullResponseData; + updatePing(url: string, info: IUpdatePingRequestData, sessionID: string): INullResponseData; + exitMatch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; + exitToMenu(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; + startGroupSearch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; + stopGroupSearch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; sendGroupInvite(url: string, info: any, sessionID: string): INullResponseData; acceptGroupInvite(url: string, info: any, sessionID: string): INullResponseData; cancelGroupInvite(url: string, info: any, sessionID: string): INullResponseData; - putMetrics(url: string, info: any, sessionID: string): INullResponseData; + putMetrics(url: string, info: IPutMetricsRequestData, sessionID: string): INullResponseData; getProfile(url: string, info: IGetProfileRequestData, sessionID: string): IGetBodyResponseData; - serverAvailable(url: string, info: any, sessionID: string): IGetBodyResponseData | IGetBodyResponseData; - joinMatch(url: string, info: any, sessionID: string): IGetBodyResponseData; + serverAvailable(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData | IGetBodyResponseData; + joinMatch(url: string, info: IJoinMatchRequestData, sessionID: string): IGetBodyResponseData; getMetrics(url: string, info: any, sessionID: string): IGetBodyResponseData; - getGroupStatus(url: string, info: any, sessionID: string): IGetBodyResponseData; - createGroup(url: string, info: any, sessionID: string): IGetBodyResponseData; + getGroupStatus(url: string, info: IGetGroupStatusRequestData, sessionID: string): IGetBodyResponseData; + createGroup(url: string, info: ICreateGroupRequestData, sessionID: string): IGetBodyResponseData; deleteGroup(url: string, info: any, sessionID: string): INullResponseData; startOfflineRaid(url: string, info: IStartOfflineRaidRequestData, sessionID: string): INullResponseData; endOfflineRaid(url: string, info: IEndOfflineRaidRequestData, sessionID: string): INullResponseData; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/ModCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/ModCallbacks.d.ts similarity index 81% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/ModCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/ModCallbacks.d.ts index 866abf7..58342dc 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/ModCallbacks.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/ModCallbacks.d.ts @@ -1,5 +1,5 @@ import { OnLoad } from "../di/OnLoad"; -import { DelayedModLoader } from "../loaders/DelayedModLoader"; +import { PostAkiModLoader } from "../loaders/PostAkiModLoader"; import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { IHttpServer } from "../models/spt/server/IHttpServer"; import { ILogger } from "../models/spt/utils/ILogger"; @@ -9,10 +9,10 @@ declare class ModCallbacks extends OnLoad { protected logger: ILogger; protected httpResponse: HttpResponseUtil; protected httpServer: IHttpServer; - protected modLoader: DelayedModLoader; + protected postAkiModLoader: PostAkiModLoader; protected configServer: ConfigServer; protected httpConfig: IHttpConfig; - constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, modLoader: DelayedModLoader, configServer: ConfigServer); + constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, postAkiModLoader: PostAkiModLoader, configServer: ConfigServer); onLoad(): void; getRoute(): string; sendBundle(sessionID: string, req: any, resp: any, body: any): void; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/NoteCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/NoteCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/NoteCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/NoteCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/NotifierCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/NotifierCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/NotifierCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/NotifierCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/PresetBuildCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/PresetBuildCallbacks.d.ts similarity index 84% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/PresetBuildCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/PresetBuildCallbacks.d.ts index 8a0c155..541715a 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/PresetBuildCallbacks.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/PresetBuildCallbacks.d.ts @@ -1,4 +1,5 @@ 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"; @@ -9,7 +10,7 @@ export declare class PresetBuildCallbacks { protected httpResponse: HttpResponseUtil; protected presetBuildController: PresetBuildController; constructor(httpResponse: HttpResponseUtil, presetBuildController: PresetBuildController); - getHandbookUserlist(url: string, info: any, sessionID: string): IGetBodyResponseData; + getHandbookUserlist(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; saveBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse; removeBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/PresetCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/PresetCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/PresetCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/PresetCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/ProfileCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/ProfileCallbacks.d.ts similarity index 87% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/ProfileCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/ProfileCallbacks.d.ts index 116e7c5..6a86fc0 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/ProfileCallbacks.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/ProfileCallbacks.d.ts @@ -3,6 +3,7 @@ import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; 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 { IProfileChangeNicknameRequestData } from "../models/eft/profile/IProfileChangeNicknameRequestData"; import { IProfileChangeVoiceRequestData } from "../models/eft/profile/IProfileChangeVoiceRequestData"; import { IProfileCreateRequestData } from "../models/eft/profile/IProfileCreateRequestData"; @@ -23,7 +24,14 @@ export declare class ProfileCallbacks { changeNickname(url: string, info: IProfileChangeNicknameRequestData, sessionID: string): IGetBodyResponseData; validateNickname(url: string, info: IValidateNicknameRequestData, sessionID: string): IGetBodyResponseData; getReservedNickname(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; - getProfileStatus(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; + /** + * Called when creating a character, when you choose a character face/voice + * @param url + * @param info response (empty) + * @param sessionID + * @returns + */ + getProfileStatus(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; searchFriend(url: string, info: ISearchFriendRequestData, sessionID: string): IGetBodyResponseData; getMiniProfile(url: string, info: IGetMiniProfileRequestData, sessionID: string): string; getAllMiniProfiles(url: string, info: any, sessionID: string): string; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/QuestCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/QuestCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/QuestCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/QuestCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/RagfairCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/RagfairCallbacks.d.ts similarity index 89% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/RagfairCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/RagfairCallbacks.d.ts index d5bab8b..3a405c9 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/RagfairCallbacks.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/RagfairCallbacks.d.ts @@ -9,8 +9,10 @@ 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 { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; @@ -28,12 +30,12 @@ export declare class RagfairCallbacks extends OnLoadOnUpdate { constructor(httpResponse: HttpResponseUtil, logger: ILogger, jsonUtil: JsonUtil, ragfairServer: RagfairServer, ragfairController: RagfairController, configServer: ConfigServer); onLoad(): void; getRoute(): string; - search(url: string, info: ISearchRequestData, sessionID: string): IGetBodyResponseData; + search(url: string, info: ISearchRequestData, sessionID: string): IGetBodyResponseData; getMarketPrice(url: string, info: IGetMarketPriceRequestData, sessionID: string): IGetBodyResponseData; getItemPrices(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; addOffer(pmcData: IPmcData, info: IAddOfferRequestData, sessionID: string): IItemEventRouterResponse; removeOffer(pmcData: IPmcData, info: IRemoveOfferRequestData, sessionID: string): IItemEventRouterResponse; extendOffer(pmcData: IPmcData, info: IExtendOfferRequestData, sessionID: string): IItemEventRouterResponse; onUpdate(timeSinceLastRun: number): boolean; - sendReport(url: string, info: any, sessionID: string): INullResponseData; + sendReport(url: string, info: ISendRagfairReportRequestData, sessionID: string): INullResponseData; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/RepairCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/RepairCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/RepairCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/RepairCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/SaveCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/SaveCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/SaveCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/SaveCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/TradeCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/TradeCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/TradeCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/TradeCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/TraderCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/TraderCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/TraderCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/TraderCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/WeatherCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/WeatherCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/WeatherCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/WeatherCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/WishlistCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/WishlistCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/WishlistCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/callbacks/WishlistCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/BotController.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/BotController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/BotController.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/BotController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/CustomizationController.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/CustomizationController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/CustomizationController.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/CustomizationController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/DialogueController.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/DialogueController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/DialogueController.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/DialogueController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/GameController.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/GameController.d.ts similarity index 53% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/GameController.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/GameController.d.ts index b9067fa..85ec418 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/GameController.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/GameController.d.ts @@ -1,32 +1,28 @@ import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IPmcDataRepeatableQuest, IRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { ICoreConfig } from "../models/spt/config/ICoreConfig"; import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; +import { LocaleService } from "../services/LocaleService"; +import { ProfileFixerService } from "../services/ProfileFixerService"; import { Watermark } from "../utils/Watermark"; export declare class GameController { protected logger: ILogger; protected watermark: Watermark; protected httpServerHelper: HttpServerHelper; + protected localeService: LocaleService; protected profileHelper: ProfileHelper; + protected profileFixerService: ProfileFixerService; protected configServer: ConfigServer; protected httpConfig: IHttpConfig; - constructor(logger: ILogger, watermark: Watermark, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); + protected coreConfig: ICoreConfig; + constructor(logger: ILogger, watermark: Watermark, httpServerHelper: HttpServerHelper, localeService: LocaleService, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, configServer: ConfigServer); gameStart(_url: string, _info: IEmptyRequestData, sessionID: string): void; - protected addMissingBonusesProperty(pmcProfile: IPmcData): void; - protected addMissingRepeatableQuestsProperty(pmcProfile: IPmcData): void; - protected addMissingWeaponRepairSkill(pmcProfile: IPmcData): void; - protected addMissingAkiVersionTagToProfile(fullProfile: IAkiProfile): void; - protected addMissingArmorRepairSkill(pmcProfile: IPmcData): void; - protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; - protected removeDanglingConditionCounters(pmcProfile: IPmcData): void; - protected removeDanglingBackendCounters(pmcProfile: IPmcData): void; + protected logProfileDetails(fullProfile: IAkiProfile): void; getGameConfig(sessionID: string): IGameConfigResponse; getServer(): any[]; - protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/HandbookController.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/HandbookController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/HandbookController.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/HandbookController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/HealthController.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/HealthController.d.ts similarity index 74% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/HealthController.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/HealthController.d.ts index aafb8df..cc13603 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/HealthController.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/HealthController.d.ts @@ -18,8 +18,29 @@ export declare class HealthController { protected inventoryHelper: InventoryHelper; protected healthHelper: HealthHelper; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, itemHelper: ItemHelper, paymentService: PaymentService, inventoryHelper: InventoryHelper, healthHelper: HealthHelper); - saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string): void; + /** + * stores in-raid player health + * @param pmcData Player profile + * @param info Request data + * @param sessionID + * @param addEffects Should effects found be added or removed from profile + */ + saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string, addEffects?: boolean): void; + /** + * When healing in menu + * @param pmcData + * @param body + * @param sessionID + * @returns + */ offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse; offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Occurs on post-raid healing page + * @param pmcData player profile + * @param info Request data from client + * @param sessionID Session id + * @returns + */ healthTreatment(pmcData: IPmcData, info: IHealthTreatmentRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/HideoutController.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/HideoutController.d.ts similarity index 81% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/HideoutController.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/HideoutController.d.ts index a8bf229..f2930ff 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/HideoutController.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/HideoutController.d.ts @@ -3,10 +3,12 @@ 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, IPmcData, Product } from "../models/eft/common/IPmcData"; import { HideoutUpgradeCompleteRequestData } from "../models/eft/hideout/HideoutUpgradeCompleteRequestData"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; +import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction"; import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData"; +import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; import { IHideoutTakeItemOutRequestData } from "../models/eft/hideout/IHideoutTakeItemOutRequestData"; @@ -47,11 +49,20 @@ export declare class HideoutController { upgradeComplete(pmcData: IPmcData, body: HideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse; putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; takeItemsFromAreaSlots(pmcData: IPmcData, body: IHideoutTakeItemOutRequestData, sessionID: string): IItemEventRouterResponse; + protected removeItemFromGenerator(sessionID: string, pmcData: IPmcData, body: IHideoutTakeItemOutRequestData, output: IItemEventRouterResponse, hideoutArea: HideoutArea): IItemEventRouterResponse; toggleArea(pmcData: IPmcData, body: IHideoutToggleAreaRequestData, sessionID: string): IItemEventRouterResponse; singleProductionStart(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData, sessionID: string): IItemEventRouterResponse; scavCaseProductionStart(pmcData: IPmcData, body: IHideoutScavCaseStartRequestData, sessionID: string): IItemEventRouterResponse; + protected getRandomisedItemRarityCounter(recipe: IHideoutScavCase): { + [x: string]: number; + }; + protected getRandomisedScavRewards(rarityItemCounter: { + [x: string]: number; + }): Product[]; continuousProductionStart(pmcData: IPmcData, body: IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; takeProduction(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; + protected handleRecipie(sessionID: string, recipe: IHideoutProduction, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; + protected handleScavCase(sessionID: string, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; update(): void; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/InraidController.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/InraidController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/InraidController.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/InraidController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/InsuranceController.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/InsuranceController.d.ts similarity index 88% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/InsuranceController.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/InsuranceController.d.ts index db2c567..af45442 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/InsuranceController.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/InsuranceController.d.ts @@ -3,6 +3,7 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; 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"; @@ -33,6 +34,12 @@ export declare class InsuranceController { insuranceService: InsuranceService, configServer: ConfigServer); processReturn(): void; insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse; - cost(info: IGetInsuranceCostRequestData, sessionID: string): any; + /** + * Calculate insurance cost + * @param info request object + * @param sessionID session id + * @returns response object to send to client + */ + cost(info: IGetInsuranceCostRequestData, sessionID: string): IGetInsuranceCostResponseData; doAbsolutelyNothing(): void; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/InventoryController.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/InventoryController.d.ts similarity index 87% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/InventoryController.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/InventoryController.d.ts index b732aa9..f57f731 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/InventoryController.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/InventoryController.d.ts @@ -24,6 +24,8 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { FenceService } from "../services/FenceService"; +import { RagfairOfferService } from "../services/RagfairOfferService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class InventoryController { @@ -31,12 +33,14 @@ export declare class InventoryController { protected hashUtil: HashUtil; protected jsonUtil: JsonUtil; protected databaseServer: DatabaseServer; + protected fenceService: FenceService; protected presetHelper: PresetHelper; protected inventoryHelper: InventoryHelper; + protected ragfairOfferService: RagfairOfferService; protected profileHelper: ProfileHelper; protected paymentHelper: PaymentHelper; protected itemEventRouter: ItemEventRouter; - constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, presetHelper: PresetHelper, inventoryHelper: InventoryHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter); + constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, fenceService: FenceService, presetHelper: PresetHelper, inventoryHelper: InventoryHelper, ragfairOfferService: RagfairOfferService, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter); /** * Move Item * change location of item with parentId and slotId @@ -93,9 +97,19 @@ export declare class InventoryController { tagItem(pmcData: IPmcData, body: IInventoryTagRequestData, sessionID: string): IItemEventRouterResponse; bindItem(pmcData: IPmcData, body: IInventoryBindRequestData, sessionID: string): IItemEventRouterResponse; /** - * Handles examining of the item * + * Handles examining an item + * @param pmcData player profile + * @param body request object + * @param sessionID session id + * @returns response */ examineItem(pmcData: IPmcData, body: IInventoryExamineRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Get the tplid of an item from the examine request object + * @param body response request + * @returns tplid + */ + protected getExaminedItemTpl(body: IInventoryExamineRequestData): string; readEncyclopedia(pmcData: IPmcData, body: IInventoryReadEncyclopediaRequestData, sessionID: string): IItemEventRouterResponse; /** * Handles sorting of Inventory. diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/LauncherController.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/LauncherController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/LauncherController.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/LauncherController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/LocationController.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/LocationController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/LocationController.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/LocationController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/MatchController.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/MatchController.d.ts similarity index 65% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/MatchController.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/MatchController.d.ts index c322d96..0851ab0 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/MatchController.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/MatchController.d.ts @@ -1,30 +1,36 @@ 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 { IJoinMatchRequestData } from "../models/eft/match/IJoinMatchRequestData"; +import { IJoinMatchResult } from "../models/eft/match/IJoinMatchResult"; import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; import { IInRaidConfig } from "../models/spt/config/IInRaidConfig"; import { IMatchConfig } from "../models/spt/config/IMatchConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { SaveServer } from "../servers/SaveServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; import { MatchLocationService } from "../services/MatchLocationService"; export declare class MatchController { protected saveServer: SaveServer; protected profileHelper: ProfileHelper; protected matchLocationService: MatchLocationService; protected traderHelper: TraderHelper; + protected botLootCacheService: BotLootCacheService; protected configServer: ConfigServer; protected matchConfig: IMatchConfig; protected inraidConfig: IInRaidConfig; - constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, configServer: ConfigServer); + constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer); getEnabled(): boolean; getProfile(info: IGetProfileRequestData): IPmcData[]; - protected getMatch(location: any): any; - createGroup(sessionID: string, info: any): any; + createGroup(sessionID: string, info: ICreateGroupRequestData): any; deleteGroup(info: any): void; - joinMatch(info: any, sessionID: string): any[]; - getGroupStatus(info: any): any; + joinMatch(info: IJoinMatchRequestData, sessionID: string): IJoinMatchResult[]; + protected getMatch(location: string): any; + getGroupStatus(info: IGetGroupStatusRequestData): any; startOfflineRaid(info: IStartOfflineRaidRequestData, sessionID: string): void; endOfflineRaid(info: IEndOfflineRaidRequestData, sessionID: string): void; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/NoteController.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/NoteController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/NoteController.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/NoteController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/NotifierController.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/NotifierController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/NotifierController.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/NotifierController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/PresetBuildController.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/PresetBuildController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/PresetBuildController.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/PresetBuildController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/PresetController.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/PresetController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/PresetController.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/PresetController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/ProfileController.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/ProfileController.d.ts similarity index 83% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/ProfileController.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/ProfileController.d.ts index 9b7a6d5..b40bb7d 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/ProfileController.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/ProfileController.d.ts @@ -11,6 +11,7 @@ import { ISearchFriendResponse } from "../models/eft/profile/ISearchFriendRespon import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { ProfileFixerService } from "../services/ProfileFixerService"; import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class ProfileController { @@ -19,13 +20,20 @@ export declare class ProfileController { protected saveServer: SaveServer; protected databaseServer: DatabaseServer; protected itemHelper: ItemHelper; + protected profileFixerService: ProfileFixerService; protected traderHelper: TraderHelper; protected extendedProfileHelper: ExtendedProfileHelper; - constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, traderHelper: TraderHelper, extendedProfileHelper: ExtendedProfileHelper); + constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileFixerService: ProfileFixerService, traderHelper: TraderHelper, extendedProfileHelper: ExtendedProfileHelper); getMiniProfiles(): IMiniProfile[]; getMiniProfile(sessionID: string): any; getCompleteProfile(sessionID: string): IPmcData[]; createProfile(info: IProfileCreateRequestData, sessionID: string): void; + /** + * Generate a player scav object + * pmc profile MUST exist first before pscav can be generated + * @param sessionID + * @returns IPmcData object + */ generatePlayerScav(sessionID: string): IPmcData; validateNickname(info: IValidateNicknameRequestData, sessionID: string): string; changeNickname(info: IProfileChangeNicknameRequestData, sessionID: string): string; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/QuestController.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/QuestController.d.ts similarity index 59% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/QuestController.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/QuestController.d.ts index e588de0..2cbccfb 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/QuestController.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/QuestController.d.ts @@ -4,7 +4,7 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { QuestConditionHelper } from "../helpers/QuestConditionHelper"; import { QuestHelper } from "../helpers/QuestHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IQuest } from "../models/eft/common/tables/IQuest"; +import { IQuest, Reward } from "../models/eft/common/tables/IQuest"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; @@ -14,6 +14,7 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { LocaleService } from "../services/LocaleService"; import { PlayerService } from "../services/PlayerService"; import { TimeUtil } from "../utils/TimeUtil"; export declare class QuestController { @@ -27,12 +28,49 @@ export declare class QuestController { protected questHelper: QuestHelper; protected questConditionHelper: QuestConditionHelper; protected playerService: PlayerService; + protected localeService: LocaleService; protected configServer: ConfigServer; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, questConditionHelper: QuestConditionHelper, playerService: PlayerService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, questConditionHelper: QuestConditionHelper, playerService: PlayerService, localeService: LocaleService, configServer: ConfigServer); + /** + * Get all quests visible to player + * Exclude quests with incomplete preconditions (level/loyalty) + * @param sessionID session id + * @returns array of IQuest + */ getClientQuests(sessionID: string): IQuest[]; acceptQuest(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse; acceptRepeatableQuest(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Remove completed quest from profile + * Add newly unlocked quests to profile + * Also recalculate thier level due to exp rewards + * @param pmcData Player profile + * @param body completed quest request + * @param sessionID session id + * @returns ItemEvent response + */ completeQuest(pmcData: IPmcData, body: ICompleteQuestRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Send a popup to player on completion of a quest + * @param sessionID session id + * @param pmcData player profile + * @param completedQuestId completed quest id + * @param questRewards rewards given to player + */ + protected sendDialogMessageOnQuestComplete(sessionID: string, pmcData: IPmcData, completedQuestId: string, questRewards: Reward[]): 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 quests provided + * @param sessionID session id + * @param pmcData player profile + * @param questsToFail quests to fail + */ + protected failQuests(sessionID: string, pmcData: IPmcData, questsToFail: IQuest[]): void; handoverQuest(pmcData: IPmcData, body: IHandoverQuestRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/RagfairController.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/RagfairController.d.ts similarity index 97% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/RagfairController.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/RagfairController.d.ts index c758593..c4ffc15 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/RagfairController.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/RagfairController.d.ts @@ -60,6 +60,8 @@ export declare class RagfairController { protected ragfairConfig: IRagfairConfig; constructor(logger: ILogger, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter, 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, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, ragfairOfferGenerator: RagfairOfferGenerator, configServer: ConfigServer); getOffers(sessionID: string, info: ISearchRequestData): IGetOffersResult; + protected isLinkedSearch(info: ISearchRequestData): boolean; + protected isRequiredSearch(info: ISearchRequestData): boolean; update(): void; getItemPrice(info: IGetMarketPriceRequestData): IGetItemPriceResult; addPlayerOffer(pmcData: IPmcData, info: IAddOfferRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/RepairController.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/RepairController.d.ts similarity index 92% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/RepairController.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/RepairController.d.ts index e9458f6..330684d 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/RepairController.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/RepairController.d.ts @@ -21,6 +21,7 @@ export declare class RepairController { protected repairHelper: RepairHelper; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; + protected readonly WEAPON_SKILL_REPAIR_GAIN: number; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, questHelper: QuestHelper, traderHelper: TraderHelper, paymentService: PaymentService, repairHelper: RepairHelper, configServer: ConfigServer); /** * Repair with trader @@ -37,5 +38,5 @@ export declare class RepairController { * @param sessionID session id * @returns item event router action */ - repair(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; + repairWithKit(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/RepeatableQuestController.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/RepeatableQuestController.d.ts similarity index 97% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/RepeatableQuestController.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/RepeatableQuestController.d.ts index ce190aa..2bb2aa9 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/RepeatableQuestController.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/RepeatableQuestController.d.ts @@ -15,6 +15,7 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { PaymentService } from "../services/PaymentService"; +import { ProfileFixerService } from "../services/ProfileFixerService"; import { JsonUtil } from "../utils/JsonUtil"; import { MathUtil } from "../utils/MathUtil"; import { ObjectId } from "../utils/ObjectId"; @@ -57,13 +58,14 @@ export declare class RepeatableQuestController { protected itemHelper: ItemHelper; protected presetHelper: PresetHelper; protected profileHelper: ProfileHelper; + protected profileFixerService: ProfileFixerService; protected ragfairServerHelper: RagfairServerHelper; protected itemEventRouter: ItemEventRouter; protected paymentService: PaymentService; protected objectId: ObjectId; protected configServer: ConfigServer; protected questConfig: IQuestConfig; - constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, itemEventRouter: ItemEventRouter, paymentService: PaymentService, objectId: ObjectId, configServer: ConfigServer); + constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, ragfairServerHelper: RagfairServerHelper, itemEventRouter: ItemEventRouter, paymentService: PaymentService, objectId: ObjectId, configServer: ConfigServer); /** * This is the method reached by the /client/repeatalbeQuests/activityPeriods endpoint * Returns an array of objects in the format of repeatable quests to the client. diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/TradeController.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/TradeController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/TradeController.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/TradeController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/TraderController.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/TraderController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/TraderController.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/TraderController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/WeatherController.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/WeatherController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/WeatherController.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/WeatherController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/WishlistController.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/WishlistController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/WishlistController.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/controllers/WishlistController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/di/Container.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/di/Container.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/di/Container.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/di/Container.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/di/OnLoad.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/di/OnLoad.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/di/OnLoad.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/di/OnLoad.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/di/OnLoadOnUpdate.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/di/OnLoadOnUpdate.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/di/OnLoadOnUpdate.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/di/OnLoadOnUpdate.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/di/OnUpdate.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/di/OnUpdate.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/di/OnUpdate.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/di/OnUpdate.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/di/Router.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/di/Router.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/di/Router.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/di/Router.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/di/Serializer.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/di/Serializer.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/di/Serializer.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/di/Serializer.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/generators/BotGenerator.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/generators/BotGenerator.d.ts similarity index 61% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/generators/BotGenerator.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/generators/BotGenerator.d.ts index 88a8014..28f05a9 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/generators/BotGenerator.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/generators/BotGenerator.d.ts @@ -31,16 +31,54 @@ export declare class BotGenerator { protected botConfig: IBotConfig; constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; + /** + * Choose if a bot should become a Pmc by checking if bot type is allowed to become a Pmc in bot config + * @param isPlayerScav is a player scav being generated, forces choice returned to never be a pmc + */ + protected shouldBotBePmc(isPlayerScav: boolean, role: string): boolean; + /** + * Get a randomised PMC side based on bot config value 'isUsec' + * @returns pmc side as string + */ + protected getRandomisedPmcSide(): string; + /** + * Get a clone of the database\bots\base.json file + * @returns IBotBase object + */ + protected getCloneOfBotBase(): IBotBase; protected generateBot(bot: IBotBase, role: string, isPmc: boolean): IBotBase; + /** + * Log the number of PMCs generated to the debug console + */ + protected logPmcGeneratedCount(output: IBotBase[]): void; protected generateRandomLevel(min: number, max: number): BotGenerator.IRandomisedBotLevelResult; - /** Converts health object to the required format */ + /** + * Converts health object to the required format + * @param healthObj health object from bot json + * @param playerScav Is a pscav bot being generated + * @returns PmcHealth object + */ protected generateHealth(healthObj: Health, playerScav?: boolean): PmcHealth; protected generateSkills(skillsObj: Skills): Skills; + /** + * Convert from pmc side (usec/bear) to the side as defined in the bot config (usecType/bearType) + * @param pmcSide eft side (usec/bear) + * @returns pmc side as defined in config + */ protected getPmcRole(pmcSide: string): string; + /** + * Iterate through bots inventory and loot to find and remove christmas items (as defined in GameEventHelper) + * @param nodeInventory Bots inventory to iterate over + */ protected removeChristmasItemsFromBotInventory(nodeInventory: Inventory): void; protected generateId(bot: IBotBase): IBotBase; protected generateInventoryID(profile: IBotBase): IBotBase; protected getPMCDifficulty(requestedDifficulty: string): 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; } export {}; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/generators/BotInventoryGenerator.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/generators/BotInventoryGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/generators/BotInventoryGenerator.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/generators/BotInventoryGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/generators/BotLootGenerator.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/generators/BotLootGenerator.d.ts similarity index 66% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/generators/BotLootGenerator.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/generators/BotLootGenerator.d.ts index 1d91836..2295f51 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/generators/BotLootGenerator.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/generators/BotLootGenerator.d.ts @@ -1,29 +1,27 @@ -import { PMCLootGenerator } from "../generators/PMCLootGenerator"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; import { HandbookHelper } from "../helpers/HandbookHelper"; import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; import { ItemMinMax, Items } from "../models/eft/common/tables/IBotType"; 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 { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; export declare class BotLootGenerator { - protected jsonUtil: JsonUtil; + protected logger: ILogger; protected hashUtil: HashUtil; protected randomUtil: RandomUtil; protected databaseServer: DatabaseServer; protected handbookHelper: HandbookHelper; protected botGeneratorHelper: BotGeneratorHelper; - protected pmcLootGenerator: PMCLootGenerator; + protected botLootCacheService: BotLootCacheService; protected configServer: ConfigServer; protected botConfig: IBotConfig; - constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, pmcLootGenerator: PMCLootGenerator, configServer: ConfigServer); - generateLoot(lootPool: Items, itemCounts: ItemMinMax, isPmc: boolean, inventory: PmcInventory): void; + constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer); + generateLoot(lootPool: Items, itemCounts: ItemMinMax, isPmc: boolean, botRole: string, inventory: PmcInventory): void; protected getRandomisedCount(min: number, max: number, nValue: number): number; protected addLootFromPool(pool: ITemplateItem[], equipmentSlots: string[], count: number, inventory: PmcInventory, totalValueLimit?: number, useLimits?: boolean): void; - /** Compares two item templates by their price to spawn chance ratio */ - protected compareByValue(a: ITemplateItem, b: ITemplateItem): number; } diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/generators/BotWeaponGenerator.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/generators/BotWeaponGenerator.d.ts new file mode 100644 index 0000000..80dc37c --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/generators/BotWeaponGenerator.d.ts @@ -0,0 +1,97 @@ +import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; +import { ItemHelper } from "../helpers/ItemHelper"; +import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; +import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { Inventory, MinMax, ModsChances } from "../models/eft/common/tables/IBotType"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HashUtil } from "../utils/HashUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +import { JsonUtil } from "../utils/JsonUtil"; +export declare class BotWeaponGenerator { + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected weightedRandomHelper: WeightedRandomHelper; + protected botGeneratorHelper: BotGeneratorHelper; + protected randomUtil: RandomUtil; + private readonly modMagazineSlotId; + constructor(jsonUtil: JsonUtil, logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil); + generateWeapon(equipmentSlot: string, templateInventory: Inventory, modChances: ModsChances, magCounts: MinMax, botRole: string, isPmc: boolean, inventory: PmcInventory): void; + /** + * Get the mods necessary to kit out a weapon to its preset level + * @param weaponTpl weapon to find preset for + * @param equipmentSlot the slot the weapon will be placed in + * @param weaponParentId + * @returns array of weapon mods + */ + protected getPresetWeaponMods(weaponTpl: string, equipmentSlot: string, weaponParentId: string, itemTemplate: ITemplateItem, botRole: string): Item[]; + /** Checks if all required slots are occupied on a weapon and all it's mods */ + protected isWeaponValid(itemList: Item[]): boolean; + /** + * Generates extra magazines or bullets (if magazine is internal) and adds them to TacticalVest and Pockets. + * Additionally, adds extra bullets to SecuredContainer + * @param weaponMods + * @param weaponTemplate + * @param magCounts + * @param ammoTpl + * @param inventory + * @returns + */ + protected generateExtraMagazines(weaponMods: Item[], weaponTemplate: ITemplateItem, magCounts: MinMax, ammoTpl: string, inventory: PmcInventory): void; + /** + * Get a randomised number of bullets for a specific magazine + * @param magCounts min and max count of magazines + * @param magTemplate magazine to generate bullet count for + * @returns bullet count number + */ + protected getRandomisedBulletCount(magCounts: MinMax, magTemplate: ITemplateItem): number; + /** + * Get a randomised count of magazines + * @param magCounts min and max value returned value can be between + * @returns numberical value of magazine count + */ + protected getRandomisedMagazineCount(magCounts: MinMax): number; + /** + * Add ammo to the secure container + * @param stackCount How many stacks of ammo to add + * @param ammoTpl Ammo type to add + * @param stackSize Size of the ammo stack to add + * @param inventory Player inventory + */ + protected addAmmoToSecureContainer(stackCount: number, ammoTpl: string, stackSize: number, inventory: PmcInventory): void; + /** + * Get a weapons magazine tpl from a weapon template + * @param weaponMods mods from a weapon template + * @param weaponTemplate Weapon to get magazine tpl for + * @returns magazine tpl string + */ + protected getMagazineTplFromWeaponTemplate(weaponMods: Item[], weaponTemplate: ITemplateItem): string; + protected addBulletsToVestAndPockets(ammoTpl: string, bulletCount: number, inventory: PmcInventory): void; + /** + * Finds and returns compatible ammo tpl + * + * @param {*} weaponMods + * @param {*} weaponTemplate + * @returns compatible ammo tpl + */ + protected getCompatibleAmmo(weaponMods: Item[], weaponTemplate: ITemplateItem): string; + /** + * Fill existing magazines to full, while replacing their contents with specified ammo + * @param weaponMods + * @param magazine + * @param ammoTpl + */ + protected fillExistingMagazines(weaponMods: Item[], magazine: Item, ammoTpl: string): void; + /** + * Fill each Camora with a bullet + * @param weaponMods Weapon mods to find and update camora mod(s) from + * @param magazineId magazine id to find and add to + * @param ammoTpl ammo template id to hydate with + */ + protected fillCamorasWithAmmo(weaponMods: Item[], magazineId: string, ammoTpl: string): void; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/generators/LocationGenerator.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/generators/LocationGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/generators/LocationGenerator.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/generators/LocationGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/generators/PMCLootGenerator.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/generators/PMCLootGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/generators/PMCLootGenerator.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/generators/PMCLootGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/generators/RagfairAssortGenerator.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/generators/RagfairAssortGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/generators/RagfairAssortGenerator.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/generators/RagfairAssortGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/generators/RagfairOfferGenerator.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/generators/RagfairOfferGenerator.d.ts similarity index 91% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/generators/RagfairOfferGenerator.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/generators/RagfairOfferGenerator.d.ts index de53ea9..3e7f4cc 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/generators/RagfairOfferGenerator.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/generators/RagfairOfferGenerator.d.ts @@ -11,6 +11,7 @@ import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { FenceService } from "../services/FenceService"; +import { RagfairCategoriesService } from "../services/RagfairCategoriesService"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { RagfairPriceService } from "../services/RagfairPriceService"; import { HashUtil } from "../utils/HashUtil"; @@ -31,11 +32,12 @@ export declare class RagfairOfferGenerator { protected ragfairAssortGenerator: RagfairAssortGenerator; protected ragfairOfferService: RagfairOfferService; protected ragfairPriceService: RagfairPriceService; + protected ragfairCategoriesService: RagfairCategoriesService; protected fenceService: FenceService; protected itemHelper: ItemHelper; protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, saveServer: SaveServer, presetHelper: PresetHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferService: RagfairOfferService, ragfairPriceService: RagfairPriceService, fenceService: FenceService, itemHelper: ItemHelper, configServer: ConfigServer); + constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, saveServer: SaveServer, presetHelper: PresetHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferService: RagfairOfferService, ragfairPriceService: RagfairPriceService, ragfairCategoriesService: RagfairCategoriesService, fenceService: FenceService, itemHelper: ItemHelper, configServer: ConfigServer); createOffer(userID: string, time: number, items: Item[], barterScheme: IBarterScheme[], loyalLevel: number, price: number, sellInOnePiece?: boolean): IRagfairOffer; protected getTraderId(userID: string): string; protected getRating(userID: string): number; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/generators/WeatherGenerator.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/generators/WeatherGenerator.d.ts similarity index 69% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/generators/WeatherGenerator.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/generators/WeatherGenerator.d.ts index 23aa169..44cecbb 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/generators/WeatherGenerator.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/generators/WeatherGenerator.d.ts @@ -12,6 +12,19 @@ export declare class WeatherGenerator { protected weatherConfig: IWeatherConfig; constructor(weightedRandomHelper: WeightedRandomHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer); calculateTime(data: IWeatherData): IWeatherData; + /** + * Get server uptime seconds multiplied by a multiplier and add to current time as seconds + * Format to BSGs requirements + * @param computedDate current date + * @returns formatted time + */ + protected getAcceleratedTime(computedDate: Date): string; + /** + * Get current time formatted to fit BSGs requirement + * @param computedDate + * @returns + */ + protected getNormalTime(computedDate: Date): string; generateWeather(data: IWeatherData): IWeatherData; protected getWeightedFog(): string; protected getWeightedRain(): number; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/AssortHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/AssortHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/AssortHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/AssortHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/BotGeneratorHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/BotGeneratorHelper.d.ts similarity index 69% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/BotGeneratorHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/BotGeneratorHelper.d.ts index c382fc9..243e7a8 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/BotGeneratorHelper.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/BotGeneratorHelper.d.ts @@ -13,11 +13,13 @@ import { RandomUtil } from "../utils/RandomUtil"; import { ContainerHelper } from "./ContainerHelper"; import { InventoryHelper } from "./InventoryHelper"; import { ItemHelper } from "./ItemHelper"; +import { ProbabilityHelper } from "./ProbabilityHelper"; export declare class BotGeneratorHelper { protected logger: ILogger; protected jsonUtil: JsonUtil; protected hashUtil: HashUtil; protected randomUtil: RandomUtil; + protected probabilityHelper: ProbabilityHelper; protected databaseServer: DatabaseServer; protected durabilityLimitsHelper: DurabilityLimitsHelper; protected itemHelper: ItemHelper; @@ -25,8 +27,42 @@ export declare class BotGeneratorHelper { protected containerHelper: ContainerHelper; protected configServer: ConfigServer; protected botConfig: IBotConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer); + constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, probabilityHelper: ProbabilityHelper, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer); generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances, isPmc?: boolean): Item[]; + /** + * Is this magazine cylinder related (revolvers and grenade launchers) + * @param magazineParentName the name of the magazines parent + * @returns true if it is cylinder related + */ + magazineIsCylinderRelated(magazineParentName: string): boolean; + /** + * Get a list of non black-listed cartridges from the PMC bot config + * @param modSlot mod item slot + * @param itemModPool + * @returns string array of cartridges PMCs can use + */ + protected getNonBlacklistedCartridges(modSlot: string, itemModPool: Record): string[]; + /** + * 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 + */ + protected shouldModBeSpawned(itemSlot: Slot, modSlot: string, modSpawnChances: ModsChances): boolean; + /** + * Get a list of containers that hold ammo + * @returns string array + */ + protected getAmmoContainers(): string[]; + /** + * Get the slot details for an item (chamber/cartridge/slot) + * @param modSlot e.g patron_in_weapon + * @param parentTemplate item template + * @returns + */ + protected getModItemSlot(modSlot: string, parentTemplate: ITemplateItem): Slot; /** * With the shotgun revolver (60db29ce99594040e04c4a27) 12.12 introduced CylinderMagazines. * Those magazines (e.g. 60dc519adf4c47305f6d410d) have a "Cartridges" entry with a _max_count=0. @@ -39,6 +75,12 @@ export declare class BotGeneratorHelper { * @param {object} parentTemplate The CylinderMagazine's template */ protected fillCamora(items: Item[], modPool: Mods, parentId: string, parentTemplate: 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 + */ + protected mergeCamoraPoolsTogether(camorasWithShells: Record): string[]; generateExtraPropertiesForItem(itemTemplate: ITemplateItem, botRole?: any): { upd?: Upd; }; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/BotHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/BotHelper.d.ts similarity index 97% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/BotHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/BotHelper.d.ts index 0cb1227..6b92566 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/BotHelper.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/BotHelper.d.ts @@ -34,7 +34,7 @@ export declare class BotHelper { * @param difficultySettings bot settings to alter * @param typesToAdd bot type to add to enemy list */ - addBotToEnemyList(difficultySettings: Difficulty, typesToAdd: string[]): void; + addBotToEnemyList(difficultySettings: Difficulty, typesToAdd: string[], typeBeingEdited: string): void; /** * Add a bot to the REVENGE_BOT_TYPES array * @param difficultySettings bot settings to alter diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/ContainerHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/ContainerHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/ContainerHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/ContainerHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/DialogueHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/DialogueHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/DialogueHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/DialogueHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/DurabilityLimitsHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/DurabilityLimitsHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/DurabilityLimitsHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/DurabilityLimitsHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/ExtendedProfileHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/ExtendedProfileHelper.d.ts similarity index 76% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/ExtendedProfileHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/ExtendedProfileHelper.d.ts index d8b754d..c05d88e 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/ExtendedProfileHelper.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/ExtendedProfileHelper.d.ts @@ -2,15 +2,20 @@ import { BotGenerator } from "../generators/BotGenerator"; import { IPmcData, Skills, Stats } from "../models/eft/common/IPmcData"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; import { FenceService } from "../services/FenceService"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { Watermark } from "../utils/Watermark"; import { ItemHelper } from "./ItemHelper"; import { ProfileHelper } from "./ProfileHelper"; +/** + * This class needs to exist outside of ProfileHelper to ensure cyclic deps don't cause the server to fail on load + */ export declare class ExtendedProfileHelper extends ProfileHelper { + protected botLootCacheService: BotLootCacheService; protected botGenerator: BotGenerator; - constructor(jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService, botGenerator: BotGenerator); + constructor(jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, botLootCacheService: BotLootCacheService, fenceService: FenceService, botGenerator: BotGenerator); generatePlayerScav(sessionID: string): IPmcData; protected getScavSkills(sessionID: string): Skills; protected removeSecureContainer(profile: IPmcData): IPmcData; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/GameEventHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/GameEventHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/GameEventHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/GameEventHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/HandbookHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/HandbookHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/HandbookHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/HandbookHelper.d.ts diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/HealthHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/HealthHelper.d.ts new file mode 100644 index 0000000..3116c9c --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/HealthHelper.d.ts @@ -0,0 +1,51 @@ +import { IPmcData } from "../models/eft/common/IPmcData"; +import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { IHealthConfig } from "../models/spt/config/IHealthConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { SaveServer } from "../servers/SaveServer"; +import { JsonUtil } from "../utils/JsonUtil"; +import { TimeUtil } from "../utils/TimeUtil"; +export declare class HealthHelper { + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected saveServer: SaveServer; + protected configServer: ConfigServer; + protected healthConfig: IHealthConfig; + constructor(jsonUtil: JsonUtil, logger: ILogger, timeUtil: TimeUtil, saveServer: SaveServer, configServer: ConfigServer); + /** + * Resets the profiles vitality/healh and vitality/effects properties to their defaults + * @param sessionID Session Id + * @returns updated profile + */ + resetVitality(sessionID: string): IAkiProfile; + /** + * Update player profile with changes from request object + * @param pmcData Player profile + * @param info Request object + * @param sessionID Session id + * @param addEffects Should effects be added or removed (default - add) + */ + saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string, addEffects?: boolean): void; + protected saveHealth(pmcData: IPmcData, sessionID: string): void; + /** + * Save effects to profile + * Works by removing all effects and adding them back from profile + * Remoces empty 'Effects' objects if found + * @param pmcData Player profile + * @param sessionID Session id + * @param addEffects Should effects be added back to profile + * @returns + */ + protected saveEffects(pmcData: IPmcData, sessionID: string, addEffects: boolean): void; + /** + * Add effect to body part in profile + * @param pmcData Player profile + * @param effectBodyPart body part to edit + * @param effectType Effect to add to body part + */ + protected addEffect(pmcData: IPmcData, effectBodyPart: string, effectType: string): void; + protected isEmpty(map: any): boolean; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/HideoutHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/HideoutHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/HideoutHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/HideoutHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/HttpServerHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/HttpServerHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/HttpServerHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/HttpServerHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/InRaidHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/InRaidHelper.d.ts similarity index 80% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/InRaidHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/InRaidHelper.d.ts index 05b6fdf..58e0f6a 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/InRaidHelper.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/InRaidHelper.d.ts @@ -28,6 +28,18 @@ export declare class InRaidHelper { markFoundItems(pmcData: IPmcData, profile: IPmcData, isPlayerScav: boolean): IPmcData; removeFoundInRaidStatusFromItems(profile: IPmcData): IPmcData; setInventory(sessionID: string, pmcData: IPmcData, profile: IPmcData): IPmcData; + /** + * Clear pmc inventory of all items except those that are exempt + * @param pmcData Player profile + * @param sessionID Session id + * @returns Player profile with pmc inventory cleared + */ deleteInventory(pmcData: IPmcData, sessionID: string): IPmcData; + /** + * Does the provided items slotId mean its kept on the player after death + * @param slotId slotid of item to check + * @returns true if item is kept after death + */ + isItemKeptAfterDeath(slotId: string): boolean; getPlayerGear(items: Item[]): Item[]; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/InventoryHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/InventoryHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/InventoryHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/InventoryHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/ItemHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/ItemHelper.d.ts similarity index 67% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/ItemHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/ItemHelper.d.ts index f124cb1..4e0eba4 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/ItemHelper.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/ItemHelper.d.ts @@ -1,6 +1,6 @@ import { InsuredItem, IPmcData } from "../models/eft/common/IPmcData"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ITemplateItem, StackSlot } from "../models/eft/common/tables/ITemplateItem"; +import { Item, Repairable } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HashUtil } from "../utils/HashUtil"; @@ -18,7 +18,7 @@ declare class ItemHelper { */ isValidItem(tpl: string, invalidBaseTypes?: string[]): boolean; /** - * Checks if a id is a valid item. Valid meaning that it's an item that may be a reward + * 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 {*} tpl template id of item to check * @returns boolean: true if item is valid reward @@ -82,27 +82,77 @@ declare class ItemHelper { * @param {string} parentId The id of the AmmoBox instance these StackSlotItems should be children of * @returns {array} The array of StackSlotItems */ - generateStackSlotItems(item: ITemplateItem, parentId: string): StackSlot[]; + generateItemsFromStackSlot(item: ITemplateItem, parentId: string): Item[]; + /** + * Gets item data from items.json + * @param tpl items template id to look up + * @returns bool - is valid + template item object as array + */ getItem(tpl: string): [boolean, ITemplateItem]; + /** + * get normalized value (0-1) based on item condition + * @param item + * @returns number between 0 and 1 + */ getItemQualityModifier(item: Item): number; + /** + * Get a quality value based on a repairable items (weapon/armor) current state between current and max durability + * @param itemDetails + * @param repairable repairable object + * @param item + * @returns a number between 0 and 1 + */ + protected getRepairableItemQualityValue(itemDetails: ITemplateItem, repairable: Repairable, item: Item): number; + /** + * Recursive function that looks at every item from parameter and gets their childrens Ids + * @param items + * @param itemID + * @returns an array of strings + */ findAndReturnChildrenByItems(items: Item[], itemID: string): string[]; /** * A variant of findAndReturnChildren where the output is list of item objects instead of their ids. + * @param items + * @param baseItemId + * @returns An array of Item objects */ findAndReturnChildrenAsItems(items: Item[], baseItemId: string): Item[]; /** - * find children of the item in a given assort (weapons parts for example, need recursive loop function) + * Find children of the item in a given assort (weapons parts for example, need recursive loop function) + * @param itemIdToFind Template id of item to check for + * @param assort Array of items to check in + * @returns Array of children of requested item */ findAndReturnChildrenByAssort(itemIdToFind: string, assort: Item[]): Item[]; + /** + * Check if the passed in item has buy count restrictions + * @param itemToCheck Item to check + * @returns true if it has buy restrictions + */ hasBuyRestrictions(itemToCheck: Item): boolean; /** - * Is Dogtag - * Checks if an item is a dogtag. Used under profile_f.js to modify preparePrice based - * on the level of the dogtag + * is the passed in template id a dog tag + * @param tpl Template id to check + * @returns true if it is a dogtag */ isDogtag(tpl: string): boolean; + /** + * Can the item passed in be sold to a trader because it is raw money + * @param tpl Item template id to check + * @returns true if unsellable + */ isNotSellable(tpl: string): boolean; + /** + * Gets the identifier for a child using slotId, locationX and locationY. + * @param item + * @returns "slotId OR slotid,locationX,locationY" + */ getChildId(item: Item): string; + /** + * Can the pased in item be stacked + * @param tpl item to check + * @returns true if it can be stacked + */ isItemTplStackable(tpl: string): boolean; /** * split item stack if it exceeds StackMaxSize @@ -112,15 +162,17 @@ declare class ItemHelper { * Find Barter items in the inventory * @param {string} by * @param {Object} pmcData - * @param {string} barter_itemID - * @returns Array + * @param {string} barterItemId + * @returns Array of Item objects */ - findBarterItems(by: string, pmcData: IPmcData, barter_itemID: string): any[]; + findBarterItems(by: string, pmcData: IPmcData, barterItemId: string): Item[]; /** - * @param {Object} pmcData - * @param {Array} items - * @param {Object} fastPanel - * @returns Array + * + * @param pmcData + * @param items + * @param insuredItems insured items to not replace ids for + * @param fastPanel + * @returns */ replaceIDs(pmcData: IPmcData, items: Item[], insuredItems?: InsuredItem[], fastPanel?: any): any[]; /** @@ -136,6 +188,12 @@ declare class ItemHelper { * @returns boolean */ isQuestItem(tpl: string): boolean; + /** + * Get the inventory size of an item + * @param items + * @param rootItemId + * @returns ItemSize object (width and height) + */ getItemSize(items: Item[], rootItemId: string): ItemHelper.ItemSize; } declare namespace ItemHelper { diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/NotificationSendHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/NotificationSendHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/NotificationSendHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/NotificationSendHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/NotifierHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/NotifierHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/NotifierHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/NotifierHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/PaymentHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/PaymentHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/PaymentHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/PaymentHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/PresetHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/PresetHelper.d.ts similarity index 79% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/PresetHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/PresetHelper.d.ts index 0371886..a469582 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/PresetHelper.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/PresetHelper.d.ts @@ -1,9 +1,11 @@ import { Preset } from "../models/eft/common/IGlobals"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "../utils/JsonUtil"; export declare class PresetHelper { + protected jsonUtil: JsonUtil; protected databaseServer: DatabaseServer; protected lookup: Record; - constructor(databaseServer: DatabaseServer); + constructor(jsonUtil: JsonUtil, databaseServer: DatabaseServer); hydratePresetStore(input: Record): void; isPreset(id: string): boolean; hasPreset(templateId: string): boolean; diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/ProbabilityHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/ProbabilityHelper.d.ts new file mode 100644 index 0000000..7a0676c --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/ProbabilityHelper.d.ts @@ -0,0 +1,14 @@ +import { ILogger } from "../models/spt/utils/ILogger"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class ProbabilityHelper { + protected logger: ILogger; + protected randomUtil: RandomUtil; + constructor(logger: ILogger, randomUtil: RandomUtil); + /** + * Chance to roll a number out of 100 + * @param chance Percentage chance roll should success + * @param scale scale of chance to allow support of numbers > 1-100 + * @returns true if success + */ + rollChance(chance: number, scale?: number): boolean; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/ProfileHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/ProfileHelper.d.ts similarity index 87% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/ProfileHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/ProfileHelper.d.ts index 6a64291..b369000 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/ProfileHelper.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/ProfileHelper.d.ts @@ -20,6 +20,12 @@ export declare class ProfileHelper { resetProfileQuestCondition(sessionID: string, conditionId: string): void; getCompleteProfile(sessionID: string): IPmcData[]; isNicknameTaken(info: IValidateNicknameRequestData, sessionID: string): boolean; + /** + * Add experience to a PMC inside the players profile + * @param sessionID Session id + * @param experienceToAdd Experiecne to add to PMC character + */ + addExperienceToPmc(sessionID: string, experienceToAdd: number): void; getProfileByPmcId(pmcId: string): IPmcData; getExperience(level: number): number; getMaxLevel(): number; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/QuestConditionHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/QuestConditionHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/QuestConditionHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/QuestConditionHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/QuestHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/QuestHelper.d.ts similarity index 71% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/QuestHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/QuestHelper.d.ts index f32c85c..0b10135 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/QuestHelper.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/QuestHelper.d.ts @@ -8,6 +8,7 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { LocaleService } from "../services/LocaleService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; @@ -25,6 +26,7 @@ export declare class QuestHelper { protected itemHelper: ItemHelper; protected itemEventRouter: ItemEventRouter; protected databaseServer: DatabaseServer; + protected localeService: LocaleService; protected ragfairServerHelper: RagfairServerHelper; protected dialogueHelper: DialogueHelper; protected profileHelper: ProfileHelper; @@ -32,7 +34,7 @@ export declare class QuestHelper { protected traderHelper: TraderHelper; protected configServer: ConfigServer; protected questConfig: IQuestConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer); + constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer); static get STATUS(): Record; questStatus(pmcData: IPmcData, questID: string): string; /** @@ -57,13 +59,44 @@ export declare class QuestHelper { changeItemStack(pmcData: IPmcData, id: string, value: number, sessionID: string, output: any): void; /** * Get List of All Quests as an array + * @returns Array of IQuest objects */ questValues(): IQuest[]; + /** + * Reest AvailableForStart conditions for quests + * @param quests queststo clean + * @returns quest array without conditions + */ protected cleanQuestList(quests: IQuest[]): IQuest[]; + /** + * Reset AvailableForStart conditions on a quest + * @param quest quest to clean + * @returns reset IQuest object + */ cleanQuestConditions(quest: IQuest): IQuest; failQuest(pmcData: IPmcData, body: any, sessionID: string): any; + /** + * Get quest by id from database + * @param questId questid to look for + * @param pmcData player profile + * @returns IQuest object + */ getQuestFromDb(questId: string, pmcData: IPmcData): IQuest; - getQuestLocaleIdFromDb(messageId: string, localisation?: string): string; - applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: string, sessionID: string): any[]; + getQuestLocaleIdFromDb(messageId: string): string; + /** + * Give player quest rewards - Skills/exp/trader standing/items/assort unlocks + * @param pmcData Player profile + * @param body complete quest request + * @param state State of the quest now its complete + * @param sessionID Seession id + * @returns array of reward objects + */ + applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: string, sessionID: string): Reward[]; + /** + * Get the intel center bonus a player has + * @param pmcData player profile + * @returns bonus in percent + */ + protected getIntelCenterRewardBonus(pmcData: IPmcData): number; getFindItemIdForQuestItem(itemTpl: string): string; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/RagfairHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/RagfairHelper.d.ts similarity index 97% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/RagfairHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/RagfairHelper.d.ts index c8bc5ba..2c8dbb5 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/RagfairHelper.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/RagfairHelper.d.ts @@ -40,5 +40,4 @@ export declare class RagfairHelper { */ mergeStackable(items: Item[]): Item[]; getCurrencySymbol(currencyTpl: string): string; - formatCurrency(moneyAmount: number): string; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/RagfairOfferHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/RagfairOfferHelper.d.ts similarity index 95% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/RagfairOfferHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/RagfairOfferHelper.d.ts index 129bc1c..5a77e13 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/RagfairOfferHelper.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/RagfairOfferHelper.d.ts @@ -10,6 +10,7 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { LocaleService } from "../services/LocaleService"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; @@ -37,11 +38,12 @@ export declare class RagfairOfferHelper { protected ragfairSortHelper: RagfairSortHelper; protected ragfairHelper: RagfairHelper; protected ragfairOfferService: RagfairOfferService; + protected localeService: LocaleService; protected configServer: ConfigServer; protected static TPL_GOODS_SOLD: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, localeService: LocaleService, configServer: ConfigServer); getValidOffers(info: ISearchRequestData, itemsToAdd: string[], assorts: Record, pmcProfile: IPmcData): IRagfairOffer[]; getOffersForBuild(info: ISearchRequestData, itemsToAdd: string[], assorts: Record, pmcProfile: IPmcData): IRagfairOffer[]; processOffers(sessionID: string): boolean; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/RagfairSellHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/RagfairSellHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/RagfairSellHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/RagfairSellHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/RagfairServerHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/RagfairServerHelper.d.ts similarity index 89% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/RagfairServerHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/RagfairServerHelper.d.ts index 2cb3ea5..a52306b 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/RagfairServerHelper.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/RagfairServerHelper.d.ts @@ -1,11 +1,12 @@ -import { MemberCategory } from "../models/enums/MemberCategory"; import { Item } from "../models/eft/common/tables/IItem"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { MemberCategory } from "../models/enums/MemberCategory"; import { IQuestConfig } from "../models/spt/config/IQuestConfig"; import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { LocaleService } from "../services/LocaleService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; @@ -19,13 +20,14 @@ export declare class RagfairServerHelper { protected databaseServer: DatabaseServer; protected profileHelper: ProfileHelper; protected itemHelper: ItemHelper; + protected localeService: LocaleService; protected dialogueHelper: DialogueHelper; protected jsonUtil: JsonUtil; protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; protected static TPL_GOODS_RETURNED: string; - constructor(randomUtil: RandomUtil, hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, profileHelper: ProfileHelper, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, jsonUtil: JsonUtil, configServer: ConfigServer); + constructor(randomUtil: RandomUtil, hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, profileHelper: ProfileHelper, itemHelper: ItemHelper, localeService: LocaleService, dialogueHelper: DialogueHelper, jsonUtil: JsonUtil, configServer: ConfigServer); /** * Is item valid / on blacklist / quest item * @param itemDetails diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/RagfairSortHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/RagfairSortHelper.d.ts similarity index 79% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/RagfairSortHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/RagfairSortHelper.d.ts index e983569..d20e10c 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/RagfairSortHelper.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/RagfairSortHelper.d.ts @@ -1,8 +1,10 @@ import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { LocaleService } from "../services/LocaleService"; export declare class RagfairSortHelper { protected databaseServer: DatabaseServer; - constructor(databaseServer: DatabaseServer); + protected localeService: LocaleService; + constructor(databaseServer: DatabaseServer, localeService: LocaleService); sortOffers(offers: IRagfairOffer[], type: number, direction?: number): IRagfairOffer[]; protected sortOffersByID(a: IRagfairOffer, b: IRagfairOffer): number; protected sortOffersByRating(a: IRagfairOffer, b: IRagfairOffer): number; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/RagfairTaxHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/RagfairTaxHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/RagfairTaxHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/RagfairTaxHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/RepairHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/RepairHelper.d.ts similarity index 81% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/RepairHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/RepairHelper.d.ts index 650c1aa..545108e 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/RepairHelper.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/RepairHelper.d.ts @@ -1,6 +1,5 @@ -import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; -import { Props } from "../models/eft/common/tables/ITemplateItem"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; import { IRepairConfig } from "../models/spt/config/IRepairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; @@ -15,7 +14,7 @@ export declare class RepairHelper { protected configServer: ConfigServer; protected repairConfig: IRepairConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); - updateItemDurability(itemToRepairId: string, amountToRepair: number, pmcData: IPmcData, useRepairKit?: boolean): Item; + updateItemDurability(itemToRepair: Item, itemToRepairDetails: ITemplateItem, isArmor: boolean, amountToRepair: number, useRepairKit?: boolean): Item; protected getRandomisedArmorRepairDegredationValue(armorMaterial: string, isRepairKit: boolean, armorMax: number): number; protected getRandomisedWeaponRepairDegredationValue(itemProps: Props, isRepairKit: boolean, armorMax: number): number; isWeaponTemplate(tpl: string): boolean; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/SecureContainerHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/SecureContainerHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/SecureContainerHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/SecureContainerHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/TradeHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/TradeHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/TradeHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/TradeHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/TraderAssortHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/TraderAssortHelper.d.ts similarity index 62% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/TraderAssortHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/TraderAssortHelper.d.ts index 4f41ac2..91ba6b9 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/TraderAssortHelper.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/TraderAssortHelper.d.ts @@ -2,24 +2,32 @@ import { RagfairAssortGenerator } from "../generators/RagfairAssortGenerator"; import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; import { Item } from "../models/eft/common/tables/IItem"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +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 { FenceService } from "../services/FenceService"; import { TraderAssortService } from "../services/TraderAssortService"; import { JsonUtil } from "../utils/JsonUtil"; +import { MathUtil } from "../utils/MathUtil"; import { AssortHelper } from "./AssortHelper"; +import { PaymentHelper } from "./PaymentHelper"; import { ProfileHelper } from "./ProfileHelper"; export declare class TraderAssortHelper { protected logger: ILogger; protected jsonUtil: JsonUtil; + protected mathUtil: MathUtil; protected databaseServer: DatabaseServer; protected profileHelper: ProfileHelper; protected assortHelper: AssortHelper; + protected paymentHelper: PaymentHelper; protected ragfairAssortGenerator: RagfairAssortGenerator; protected ragfairOfferGenerator: RagfairOfferGenerator; protected traderAssortService: TraderAssortService; protected fenceService: FenceService; - constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, fenceService: FenceService); + protected configServer: ConfigServer; + protected traderConfig: ITraderConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, mathUtil: MathUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, fenceService: FenceService, configServer: ConfigServer); /** * Get a traders assorts * Can be used for returning ragfair / fence assorts @@ -29,7 +37,12 @@ export declare class TraderAssortHelper { */ getAssort(sessionId: string, traderId: string): ITraderAssort; /** - * Get an array of pristine trader items prior to any alteration by player + * Iterate over all assorts barter_scheme values, find barters selling for money and multiply by multipler in config + * @param traderAssort Assorts to multiple price of + */ + protected multiplyItemPricesByConfigMultipler(traderAssort: ITraderAssort): void; + /** + * Get an array of pristine trader items prior to any alteration by player (as they were on server start) * @param traderId trader id * @returns array of Items */ diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/TraderHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/TraderHelper.d.ts new file mode 100644 index 0000000..b2e9d38 --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/TraderHelper.d.ts @@ -0,0 +1,109 @@ +import { FenceLevel } from "../models/eft/common/IGlobals"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; +import { IBarterScheme, ITraderAssort, ITraderBase, LoyaltyLevel } from "../models/eft/common/tables/ITrader"; +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 { SaveServer } from "../servers/SaveServer"; +import { FenceService } from "../services/FenceService"; +import { PlayerService } from "../services/PlayerService"; +import { HandbookHelper } from "./HandbookHelper"; +import { ItemHelper } from "./ItemHelper"; +import { PaymentHelper } from "./PaymentHelper"; +import { ProfileHelper } from "./ProfileHelper"; +export declare class TraderHelper { + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; + protected paymentHelper: PaymentHelper; + protected itemHelper: ItemHelper; + protected handbookHelper: HandbookHelper; + protected playerService: PlayerService; + protected fenceService: FenceService; + protected configServer: ConfigServer; + protected traderConfig: ITraderConfig; + constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemHelper: ItemHelper, handbookHelper: HandbookHelper, playerService: PlayerService, fenceService: FenceService, configServer: ConfigServer); + getTrader(traderID: string, sessionID: string): ITraderBase; + getTraderAssortsById(traderId: string): ITraderAssort; + /** + * Reset a profiles trader data back to its initial state as seen by a level 1 player + * Does NOT take into account different profile levels + * @param sessionID session id + * @param traderID trader id to reset + */ + resetTrader(sessionID: string, traderID: string): void; + /** + * Alter a traders unlocked status + * @param traderID Trader to alter + * @param status New status to use + * @param sessionID Session id + */ + setTraderUnlockedState(traderID: string, status: boolean, sessionID: string): void; + /** + * Get a list of items and their prices from player inventory that can be sold to a trader + * @param traderID trader id being traded with + * @param sessionID session id + * @returns IBarterScheme[][] + */ + getPurchasesData(traderID: string, sessionID: string): Record; + /** + * Should item be skipped when selling to trader according to its sell categories and other checks + * @param pmcData + * @param item + * @param sellCategory + * @returns true if should NOT be sold to trader + */ + protected isItemUnSellableToTrader(pmcData: IPmcData, item: Item, sellCategory: string[]): boolean; + /** + * Can this weapon be sold to a trader with its current durabiltiy level + * @param traderID + * @param item + * @returns boolean + */ + protected isWeaponAndBelowTraderBuyDurability(traderID: string, item: Item): boolean; + /** + * Get the price of an item and all of its attached children + * Take into account bonuses/adjsutments e.g. discounts + * @param pmcData profile data + * @param item item to calculate price of + * @param buyPriceCoefficient + * @param fenceInfo fence data + * @param traderBase trader details + * @param currencyTpl Currency to get price as + * @returns price of item + children + */ + protected getAdjustedItemPrice(pmcData: IPmcData, item: Item, buyPriceCoefficient: number, fenceInfo: FenceLevel, traderBase: ITraderBase, currencyTpl: string): number; + /** + * Get the raw price of item+child items from handbook without any modification + * @param pmcData profile data + * @param item item to calculate price of + * @returns price as number + */ + protected getRawItemPrice(pmcData: IPmcData, item: Item): number; + protected getTraderDiscount(trader: ITraderBase, buyPriceCoefficient: number, fenceInfo: FenceLevel, traderID: string): number; + /** + * Add standing to a trader and level them up if exp goes over level threshold + * @param sessionID Session id + * @param traderId traders id + * @param standingToAdd Standing value to add to trader + */ + addStandingToTrader(sessionID: string, traderId: string, standingToAdd: number): void; + /** + * Calculate traders level based on exp amount and increments level if over threshold + * @param traderID trader to process + * @param sessionID session id + */ + lvlUp(traderID: string, sessionID: string): void; + getTraderUpdateSeconds(traderId: string): number; + /** + * check if an item is allowed to be sold to a trader + * @param traderFilters array of allowed categories + * @param tplToCheck itemTpl of inventory + * @returns boolean + */ + traderFilter(traderFilters: string[], tplToCheck: string): boolean; + getLoyaltyLevel(traderID: string, pmcData: IPmcData): LoyaltyLevel; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/UtilityHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/UtilityHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/UtilityHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/UtilityHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/WeightedRandomHelper.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/WeightedRandomHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/WeightedRandomHelper.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/helpers/WeightedRandomHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/ide/BleedingEdgeEntry.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/ide/BleedingEdgeEntry.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/ide/BleedingEdgeEntry.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/ide/BleedingEdgeEntry.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/ide/Compiler.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/ide/Compiler.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/ide/Compiler.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/ide/Compiler.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/ide/DebugEntry.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/ide/DebugEntry.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/ide/DebugEntry.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/ide/DebugEntry.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/ide/ReleaseEntry.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/ide/ReleaseEntry.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/ide/ReleaseEntry.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/ide/ReleaseEntry.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/ide/TestEntry.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/ide/TestEntry.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/ide/TestEntry.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/ide/TestEntry.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/loaders/BundleLoader.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/loaders/BundleLoader.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/loaders/BundleLoader.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/loaders/BundleLoader.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/loaders/DelayedModLoader.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/loaders/DelayedModLoader.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/loaders/DelayedModLoader.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/loaders/DelayedModLoader.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/loaders/InitialModLoader.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/loaders/InitialModLoader.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/loaders/InitialModLoader.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/loaders/InitialModLoader.d.ts diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/loaders/PostAkiModLoader.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/loaders/PostAkiModLoader.d.ts new file mode 100644 index 0000000..edc6e5d --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/loaders/PostAkiModLoader.d.ts @@ -0,0 +1,21 @@ +import { DependencyContainer } from "tsyringe"; +import { HandbookController } from "../controllers/HandbookController"; +import { IModLoader } from "../models/spt/mod/IModLoader"; +import { ModCompilerService } from "../services/ModCompilerService"; +import { VFS } from "../utils/VFS"; +import { BundleLoader } from "./BundleLoader"; +import { PreAkiModLoader } from "./PreAkiModLoader"; +export declare class PostAkiModLoader implements IModLoader { + protected bundleLoader: BundleLoader; + protected handbookController: HandbookController; + protected vfs: VFS; + protected modCompilerService: ModCompilerService; + protected preAkiModLoader: PreAkiModLoader; + constructor(bundleLoader: BundleLoader, handbookController: HandbookController, vfs: VFS, modCompilerService: ModCompilerService, preAkiModLoader: PreAkiModLoader); + getBundles(local: boolean): string; + getBundle(key: string, local: boolean): void; + getModPath(mod: string): string; + load(): void; + protected executeMods(container: DependencyContainer): void; + protected addBundles(): void; +} diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/loaders/PostDBModLoader.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/loaders/PostDBModLoader.d.ts new file mode 100644 index 0000000..5101b7b --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/loaders/PostDBModLoader.d.ts @@ -0,0 +1,11 @@ +import { DependencyContainer } from "tsyringe"; +import { OnLoad } from "../di/OnLoad"; +import { PreAkiModLoader } from "./PreAkiModLoader"; +export declare class PostDBModLoader implements OnLoad { + protected preAkiModLoader: PreAkiModLoader; + constructor(preAkiModLoader: PreAkiModLoader); + onLoad(): void; + getRoute(): string; + getModPath(mod: string): string; + protected executeMods(container: DependencyContainer): void; +} diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/loaders/PreAkiModLoader.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/loaders/PreAkiModLoader.d.ts new file mode 100644 index 0000000..6ded3c6 --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/loaders/PreAkiModLoader.d.ts @@ -0,0 +1,64 @@ +import { DependencyContainer } from "tsyringe"; +import { ICoreConfig } from "../models/spt/config/ICoreConfig"; +import { ModLoader } from "../models/spt/mod/IMod"; +import { IModLoader } from "../models/spt/mod/IModLoader"; +import { IPackageJsonData } from "../models/spt/mod/IPackageJsonData"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { ModCompilerService } from "../services/ModCompilerService"; +import { JsonUtil } from "../utils/JsonUtil"; +import { VFS } from "../utils/VFS"; +import { BundleLoader } from "./BundleLoader"; +export declare class PreAkiModLoader implements IModLoader { + protected logger: ILogger; + protected vfs: VFS; + protected jsonUtil: JsonUtil; + protected modCompilerService: ModCompilerService; + protected bundleLoader: BundleLoader; + protected configServer: ConfigServer; + protected static container: DependencyContainer; + protected readonly basepath = "user/mods/"; + protected imported: Record; + protected akiConfig: ICoreConfig; + constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, bundleLoader: BundleLoader, configServer: ConfigServer); + load(container: DependencyContainer): Promise; + getBundles(local: boolean): string; + getBundle(key: string, local: boolean): void; + /** + * Returns a list of mods with preserved load order + * @returns Array of mod names in load order + */ + getImportedModsNames(): string[]; + getModPath(mod: string): string; + protected importClass(name: string, filepath: string, container: DependencyContainer): void; + protected importMods(): Promise; + /** + * + * @param mods Get an array of broken/invalid mods by name + * @returns Mod names array + */ + protected getBrokenMods(mods: string[]): string[]; + /** + * Get packageJson data for mods + * @param mods mods to get packageJson for + * @returns dictionary + */ + protected getModsPackageData(mods: string[]): Record; + /** + * Does mod have "delayedLoad(" string in its entry class + * @param modFolderName folder name + * @param modToValidate package.json details + * @returns boolean + */ + protected isModSpt3XXCompatible(modFolderName: string, modToValidate: IPackageJsonData): boolean; + protected isModCombatibleWithAki(mod: IPackageJsonData): boolean; + protected executeMods(container: DependencyContainer): void; + sortModsLoadOrder(): string[]; + protected addMod(mod: string): Promise; + protected areModDependenciesFulfilled(pkg: IPackageJsonData, loadedMods: Record): boolean; + protected isModCompatible(mod: IPackageJsonData, loadedMods: Record): boolean; + protected validMod(mod: string): boolean; + protected getLoadOrderRecursive(mod: string, result: Record, visited: Record): void; + protected getLoadOrder(mods: Record): Record; + getContainer(): DependencyContainer; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/bot/IGenerateBotsRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/bot/IGenerateBotsRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/bot/IGenerateBotsRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/bot/IGenerateBotsRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/IEmptyRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/IEmptyRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/IEmptyRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/IEmptyRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/IGlobals.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/IGlobals.d.ts similarity index 99% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/IGlobals.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/IGlobals.d.ts index 456895c..9d28dbc 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/IGlobals.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/IGlobals.d.ts @@ -1128,8 +1128,11 @@ export interface Inertia { SprintAccelerationLimits: xyz; SideTime: xyz; DiagonalTime: xyz; + MaxTimeWithoutInput: xyz; MinDirectionBlendTime: number; - MoveTime: number; + MoveTimeRange: xyz; + ProneDirectionAccelerationRange: xyz; + ProneSpeedAccelerationRange: xyz; MinMovementAccelerationRangeRight: xyz; MaxMovementAccelerationRangeRight: xyz; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/ILocation.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/ILocation.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/ILocation.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/ILocation.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/ILocationBase.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/ILocationBase.d.ts similarity index 94% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/ILocationBase.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/ILocationBase.d.ts index ad48d32..b1dd448 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/ILocationBase.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/ILocationBase.d.ts @@ -26,6 +26,7 @@ export interface ILocationBase { DisabledForScav: boolean; DisabledScavExits: string; Enabled: boolean; + EnableCoop: boolean; GlobalLootChanceModifier: number; IconX: number; IconY: number; @@ -41,6 +42,7 @@ export interface ILocationBase { MinDistToFreePoint: number; MinMaxBots: MinMaxBot[]; MinPlayers: number; + MaxCoopGroup: number; Name: string; NewSpawn: boolean; OcculsionCullingEnabled: boolean; @@ -48,6 +50,8 @@ export interface ILocationBase { OpenZones: string; Preview: Preview; RequiredPlayerLevel: number; + PmcMaxPlayersInGroup: number; + ScavMaxPlayersInGroup: number; Rules: string; SafeLocation: boolean; Scene: Scene; @@ -55,7 +59,8 @@ export interface ILocationBase { UnixDateTime: number; _Id: string; doors: any[]; - escape_time_limit: number; + EscapeTimeLimit: number; + EscapeTimeLimitCoop: number; exit_access_time: number; exit_count: number; exit_time: number; @@ -63,6 +68,7 @@ export interface ILocationBase { filter_ex: string[]; limits: ILimit[]; matching_min_seconds: number; + GenerateLocalLootCache: boolean; maxItemCountInLocation: MaxItemCountInLocation[]; sav_summon_seconds: number; tmp_location_field_remove_me: number; @@ -106,6 +112,7 @@ export interface BossLocationSpawn { BossName: string; BossPlayer: boolean; BossZone: string; + RandomTimeSpawn: boolean; Time: number; TriggerId: string; TriggerName: string; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/ILocationsSourceDestinationBase.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/ILocationsSourceDestinationBase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/ILocationsSourceDestinationBase.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/ILocationsSourceDestinationBase.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/ILooseLoot.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/ILooseLoot.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/ILooseLoot.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/ILooseLoot.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/IMetricsTableData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/IMetricsTableData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/IMetricsTableData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/IMetricsTableData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/IPmcData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/IPmcData.d.ts similarity index 97% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/IPmcData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/IPmcData.d.ts index adc2aa5..56bf07f 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/IPmcData.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/IPmcData.d.ts @@ -6,7 +6,7 @@ import { MemberCategory } from "../../enums/MemberCategory"; export interface IPmcData { _id: string; aid: string; - savage: string; + savage?: string; Info: Info; Customization: Customization; Health: Health; @@ -28,13 +28,6 @@ export interface IPmcData { CarExtractCounts: CarExtractCounts; SurvivorClass: SurvivorClass; } -export declare enum SurvivorClass { - Unknown = 0, - Neutralizer = 1, - Marauder = 2, - Paramedic = 3, - Survivor = 4 -} export interface Info { EntryPoint: string; Nickname: string; @@ -56,6 +49,9 @@ export interface Info { Bans: IBan[]; BannedState: boolean; BannedUntil: number; + NeedWipeOptions: any[]; + lastCompletedWipe: LastCompleted; + lastCompletedEvent?: LastCompleted; } export interface Settings { Role: string; @@ -339,3 +335,13 @@ export interface RagfairInfo { } export interface CarExtractCounts { } +export declare enum SurvivorClass { + Unknown = 0, + Neutralizer = 1, + Marauder = 2, + Paramedic = 3, + Survivor = 4 +} +export interface LastCompleted { + $oid: string; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/MemberCategory.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/MemberCategory.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/MemberCategory.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/MemberCategory.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/request/IBaseInteractionRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/request/IBaseInteractionRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/request/IBaseInteractionRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/request/IBaseInteractionRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/tables/IBotBase.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/IBotBase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/tables/IBotBase.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/IBotBase.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/tables/IBotCore.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/IBotCore.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/tables/IBotCore.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/IBotCore.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/tables/IBotType.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/IBotType.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/tables/IBotType.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/IBotType.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/tables/ICustomizationItem.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/ICustomizationItem.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/tables/ICustomizationItem.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/ICustomizationItem.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/tables/IHandbookBase.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/IHandbookBase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/tables/IHandbookBase.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/IHandbookBase.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/tables/IItem.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/IItem.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/tables/IItem.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/IItem.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/tables/ILocationsBase.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/ILocationsBase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/tables/ILocationsBase.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/ILocationsBase.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/tables/ILootBase.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/ILootBase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/tables/ILootBase.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/ILootBase.d.ts diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/IMatch.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/IMatch.d.ts new file mode 100644 index 0000000..c30cb48 --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/IMatch.d.ts @@ -0,0 +1,10 @@ +export interface IMatch { + metrics: Metrics; +} +export interface Metrics { + Keys: number[]; + NetProcessingBins: number[]; + RenderBins: number[]; + GameUpdateBins: number[]; + MemoryMeasureInterval: number; +} diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/IProfileTemplate.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/IProfileTemplate.d.ts new file mode 100644 index 0000000..fbcd81a --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -0,0 +1,25 @@ +import { Dialogue, WeaponBuild } from "../../profile/IAkiProfile"; +import { IPmcData } from "../IPmcData"; +export interface IProfileTemplates { + Standard: IProfileSides; + "Left Behind": IProfileSides; + "Prepare To Escape": IProfileSides; + "Edge Of Darkness": IProfileSides; +} +export interface IProfileSides { + usec: TemplateSide; + bear: TemplateSide; +} +export interface TemplateSide { + character: IPmcData; + suits: string[]; + dialogues: Record; + weaponbuilds: WeaponBuild[]; + trader: ProfileTraderTemplate; +} +export interface ProfileTraderTemplate { + initialLoyaltyLevel: number; + initialStanding: number; + initialSalesSum: number; + jaegerUnlocked: boolean; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/tables/IQuest.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/IQuest.d.ts similarity index 94% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/tables/IQuest.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/IQuest.d.ts index e1fc888..a349a6d 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/tables/IQuest.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/IQuest.d.ts @@ -1,3 +1,4 @@ +import { QuestRewardType } from "../../../enums/QuestRewardType"; import { Item } from "./IItem"; export interface IQuest { QuestName: string; @@ -23,6 +24,7 @@ export interface IQuest { status: string; KeyQuest: boolean; changeQuestMessageText: string; + side: string; } export interface Conditions { Started: AvailableForConditions[]; @@ -56,6 +58,7 @@ export interface AvailableForProps { plantTime?: number; zoneId?: string; type?: boolean; + countInRaid?: boolean; } export interface AvailableForCounter { id: string; @@ -97,9 +100,9 @@ export interface Rewards { Expired: Reward[]; } export interface Reward { - value?: string; + value?: string | number; id: string; - type: string; + type: QuestRewardType; index: number; target?: string; items?: Item[]; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/tables/IRepeatableQuests.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/IRepeatableQuests.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/tables/IRepeatableQuests.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/IRepeatableQuests.d.ts diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/ITemplateItem.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/ITemplateItem.d.ts new file mode 100644 index 0000000..23a1a14 --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/ITemplateItem.d.ts @@ -0,0 +1,455 @@ +export interface ITemplateItem { + _id: string; + _name: string; + _parent: string; + _type: string; + _props: Props; + _proto: string; +} +export interface Props { + Name?: string; + ShortName?: string; + Description?: string; + Weight?: number; + BackgroundColor?: string; + Width?: number; + Height?: number; + StackMaxSize?: number; + Rarity?: string; + SpawnChance?: number; + CreditsPrice?: number; + ItemSound?: string; + Prefab?: Prefab; + UsePrefab?: Prefab; + StackObjectsCount?: number; + NotShownInSlot?: boolean; + ExaminedByDefault?: boolean; + ExamineTime?: number; + IsUndiscardable?: boolean; + IsUnsaleable?: boolean; + IsUnbuyable?: boolean; + IsUngivable?: boolean; + IsLockedafterEquip?: boolean; + QuestItem?: boolean; + LootExperience?: number; + ExamineExperience?: number; + HideEntrails?: boolean; + RepairCost?: number; + RepairSpeed?: number; + ExtraSizeLeft?: number; + ExtraSizeRight?: number; + ExtraSizeUp?: number; + ExtraSizeDown?: number; + ExtraSizeForceAdd?: boolean; + MergesWithChildren?: boolean; + CanSellOnRagfair?: boolean; + CanRequireOnRagfair?: boolean; + ConflictingItems?: string[]; + Unlootable?: boolean; + UnlootableFromSlot?: string; + UnlootableFromSide?: string[]; + AnimationVariantsNumber?: number; + DiscardingBlock?: boolean; + DropSoundType?: string; + RagFairCommissionModifier?: number; + IsAlwaysAvailableForInsurance?: boolean; + DiscardLimit?: number; + MaxResource?: number; + Resource?: number; + DogTagQualities?: boolean; + Grids?: Grid[]; + Slots?: Slot[]; + CanPutIntoDuringTheRaid?: boolean; + CantRemoveFromSlotsDuringRaid?: string[]; + KeyIds?: string[]; + TagColor?: number; + TagName?: string; + Durability?: number; + Accuracy?: number; + Recoil?: number; + Loudness?: number; + EffectiveDistance?: number; + Ergonomics?: number; + Velocity?: number; + RaidModdable?: boolean; + ToolModdable?: boolean; + BlocksFolding?: boolean; + BlocksCollapsible?: boolean; + IsAnimated?: boolean; + HasShoulderContact?: boolean; + SightingRange?: number; + DoubleActionAccuracyPenaltyMult?: number; + ModesCount: any; + DurabilityBurnModificator?: number; + HeatFactor?: number; + CoolFactor?: number; + muzzleModType?: string; + CustomAimPlane?: string; + sightModType?: string; + aimingSensitivity?: number; + SightModesCount?: number; + OpticCalibrationDistances?: number[]; + ScopesCount?: number; + AimSensitivity?: number | number[][]; + Zooms?: number[][]; + CalibrationDistances?: number[][]; + Intensity?: number; + Mask?: string; + MaskSize?: number; + NoiseIntensity?: number; + NoiseScale?: number; + Color?: Color; + DiffuseIntensity?: number; + HasHinge?: boolean; + RampPalette?: string; + DepthFade?: number; + RoughnessCoef?: number; + SpecularCoef?: number; + MainTexColorCoef?: number; + MinimumTemperatureValue?: number; + RampShift?: number; + HeatMin?: number; + ColdMax?: number; + IsNoisy?: boolean; + IsFpsStuck?: boolean; + IsGlitch?: boolean; + IsMotionBlurred?: boolean; + IsPixelated?: boolean; + PixelationBlockCount?: number; + ShiftsAimCamera?: number; + magAnimationIndex?: number; + Cartridges?: Slot[]; + CanFast?: boolean; + CanHit?: boolean; + CanAdmin?: boolean; + LoadUnloadModifier?: number; + CheckTimeModifier?: number; + CheckOverride?: number; + ReloadMagType?: string; + VisibleAmmoRangesString?: string; + MalfunctionChance?: number; + IsShoulderContact?: boolean; + Foldable?: boolean; + Retractable?: boolean; + SizeReduceRight?: number; + CenterOfImpact?: number; + ShotgunDispersion?: number; + IsSilencer?: boolean; + DeviationCurve?: number; + DeviationMax?: number; + SearchSound?: string; + BlocksArmorVest?: boolean; + speedPenaltyPercent?: number; + GridLayoutName?: string; + SpawnFilter?: any[]; + containType?: any[]; + sizeWidth?: number; + sizeHeight?: number; + isSecured?: boolean; + spawnTypes?: string; + lootFilter?: any[]; + spawnRarity?: string; + minCountSpawn?: number; + maxCountSpawn?: number; + openedByKeyID?: any[]; + RigLayoutName?: string; + MaxDurability?: number; + armorZone?: string[]; + armorClass: any; + mousePenalty?: number; + weaponErgonomicPenalty?: number; + BluntThroughput?: number; + ArmorMaterial?: string; + weapClass?: string; + weapUseType?: string; + ammoCaliber?: string; + OperatingResource?: number; + RepairComplexity?: number; + durabSpawnMin?: number; + durabSpawnMax?: number; + isFastReload?: boolean; + RecoilForceUp?: number; + RecoilForceBack?: number; + Convergence?: number; + RecoilAngle?: number; + weapFireType?: string[]; + RecolDispersion?: number; + SingleFireRate?: number; + CanQueueSecondShot?: boolean; + bFirerate?: number; + bEffDist?: number; + bHearDist?: number; + isChamberLoad?: boolean; + chamberAmmoCount?: number; + isBoltCatch?: boolean; + defMagType?: string; + defAmmo?: string; + AdjustCollimatorsToTrajectory?: boolean; + shotgunDispersion?: number; + Chambers?: Slot[]; + CameraRecoil?: number; + CameraSnap?: number; + ReloadMode?: string; + AimPlane?: number; + TacticalReloadStiffnes?: Xyz; + TacticalReloadFixation?: number; + RecoilCenter?: Xyz; + RotationCenter?: Xyz; + RotationCenterNoStock?: Xyz; + FoldedSlot?: string; + CompactHandling?: boolean; + MinRepairDegradation?: number; + MaxRepairDegradation?: number; + IronSightRange?: number; + IsFlareGun?: boolean; + IsGrenadeLauncher?: boolean; + IsOneoff?: boolean; + MustBoltBeOpennedForExternalReload?: boolean; + MustBoltBeOpennedForInternalReload?: boolean; + BoltAction?: boolean; + HipAccuracyRestorationDelay?: number; + HipAccuracyRestorationSpeed?: number; + HipInnaccuracyGain?: number; + ManualBoltCatch?: boolean; + BurstShotsCount?: number; + BaseMalfunctionChance?: number; + AllowJam?: boolean; + AllowFeed?: boolean; + AllowMisfire?: boolean; + AllowSlide?: boolean; + DurabilityBurnRatio?: number; + HeatFactorGun?: number; + CoolFactorGun?: number; + CoolFactorGunMods?: number; + HeatFactorByShot?: number; + AllowOverheat?: boolean; + DoubleActionAccuracyPenalty?: number; + RecoilPosZMult?: number; + MinRepairKitDegradation?: number; + MaxRepairKitDegradation?: number; + BlocksEarpiece?: boolean; + BlocksEyewear?: boolean; + BlocksHeadwear?: boolean; + BlocksFaceCover?: boolean; + Indestructibility?: number; + headSegments?: string[]; + FaceShieldComponent?: boolean; + FaceShieldMask?: string; + MaterialType?: string; + RicochetParams?: Xyz; + DeafStrength?: string; + BlindnessProtection?: number; + Distortion?: number; + CompressorTreshold?: number; + CompressorAttack?: number; + CompressorRelease?: number; + CompressorGain?: number; + CutoffFreq?: number; + Resonance?: number; + CompressorVolume?: number; + AmbientVolume?: number; + DryVolume?: number; + foodUseTime?: number; + foodEffectType?: string; + StimulatorBuffs?: string; + effects_health: any; + effects_damage: any; + MaximumNumberOfUsage?: number; + knifeHitDelay?: number; + knifeHitSlashRate?: number; + knifeHitStabRate?: number; + knifeHitRadius?: number; + knifeHitSlashDam?: number; + knifeHitStabDam?: number; + knifeDurab?: number; + PrimaryDistance?: number; + SecondryDistance?: number; + SlashPenetration?: number; + StabPenetration?: number; + PrimaryConsumption?: number; + SecondryConsumption?: number; + DeflectionConsumption?: number; + AppliedTrunkRotation?: Xyz; + AppliedHeadRotation?: Xyz; + DisplayOnModel?: boolean; + AdditionalAnimationLayer?: number; + StaminaBurnRate?: number; + ColliderScaleMultiplier?: Xyz; + ConfigPathStr?: string; + MaxMarkersCount?: number; + scaleMin?: number; + scaleMax?: number; + medUseTime?: number; + medEffectType?: string; + MaxHpResource?: number; + hpResourceRate?: number; + apResource?: number; + krResource?: number; + MaxOpticZoom?: number; + MaxRepairResource?: number; + TargetItemFilter?: string[]; + RepairQuality?: number; + RepairType?: string; + StackMinRandom?: number; + StackMaxRandom?: number; + ammoType?: string; + InitialSpeed?: number; + BallisticCoeficient?: number; + BulletMassGram?: number; + BulletDiameterMilimeters?: number; + Damage?: number; + ammoAccr?: number; + ammoRec?: number; + ammoDist?: number; + buckshotBullets?: number; + PenetrationPower?: number; + PenetrationPowerDiviation?: number; + ammoHear?: number; + ammoSfx?: string; + MisfireChance?: number; + MinFragmentsCount?: number; + MaxFragmentsCount?: number; + ammoShiftChance?: number; + casingName?: string; + casingEjectPower?: number; + casingMass?: number; + casingSounds?: string; + ProjectileCount?: number; + PenetrationChance?: number; + RicochetChance?: number; + FragmentationChance?: number; + Deterioration?: number; + SpeedRetardation?: number; + Tracer?: boolean; + TracerColor?: string; + TracerDistance?: number; + ArmorDamage?: number; + Caliber?: string; + StaminaBurnPerDamage?: number; + HeavyBleedingDelta?: number; + LightBleedingDelta?: number; + ShowBullet?: boolean; + HasGrenaderComponent?: boolean; + FuzeArmTimeSec?: number; + ExplosionStrength?: number; + MinExplosionDistance?: number; + MaxExplosionDistance?: number; + FragmentsCount?: number; + FragmentType?: string; + ShowHitEffectOnExplode?: boolean; + ExplosionType?: string; + AmmoLifeTimeSec?: number; + Contusion?: Xyz; + ArmorDistanceDistanceDamage?: Xyz; + Blindness?: Xyz; + IsLightAndSoundShot?: boolean; + LightAndSoundShotAngle?: number; + LightAndSoundShotSelfContusionTime?: number; + LightAndSoundShotSelfContusionStrength?: number; + MalfMisfireChance?: number; + MalfFeedChance?: number; + StackSlots?: StackSlot[]; + type?: string; + eqMin?: number; + eqMax?: number; + rate?: number; + ThrowType?: string; + ExplDelay?: number; + Strength?: number; + ContusionDistance?: number; + throwDamMax?: number; + explDelay?: number; + EmitTime?: number; + CanBeHiddenDuringThrow?: boolean; + MinTimeToContactExplode?: number; + ExplosionEffectType?: string; +} +export interface Prefab { + path: string; + rcid: string; +} +export interface Grid { + _name: string; + _id: string; + _parent: string; + _props: GridProps; + _proto: string; +} +export interface GridProps { + filters: GridFilter[]; + cellsH: number; + cellsV: number; + minCount: number; + maxCount: number; + maxWeight: number; + isSortingTable: boolean; +} +export interface GridFilter { + Filter: string[]; + ExcludedFilter: string[]; +} +export interface Slot { + _name: string; + _id: string; + _parent: string; + _props: SlotProps; + _max_count?: number; + _required: boolean; + _mergeSlotWithChildren: boolean; + _proto: string; +} +export interface SlotProps { + filters: SlotFilter[]; +} +export interface SlotFilter { + Shift?: number; + Filter: string[]; + AnimationIndex?: number; +} +export interface Xyz { + x: number; + y: number; + z: number; +} +export interface StackSlot { + _name?: string; + _id: string; + _parent: string; + _max_count: number; + _props: StackSlotProps; + _proto: string; + upd: any; +} +export interface StackSlotProps { + filters: SlotFilter[]; +} +export interface EffectsHealth { + Energy: EffectsHealthProps; + Hydration: EffectsHealthProps; +} +export interface EffectsHealthProps { + value: number; +} +export interface EffectsDamage { + Pain: EffectDamageProps; + LightBleeding: EffectDamageProps; + HeavyBleeding: EffectDamageProps; + Contusion: EffectDamageProps; + RadExposure: EffectDamageProps; + Fracture: EffectDamageProps; + DestroyedPart: EffectDamageProps; +} +export interface EffectDamageProps { + delay: number; + duration: number; + fadeOut: number; + cost?: number; + healthPenaltyMin?: number; + healthPenaltyMax?: number; +} +export interface Color { + r: number; + g: number; + b: number; + a: number; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/tables/ITrader.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/ITrader.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/tables/ITrader.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/common/tables/ITrader.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/customization/IBuyClothingRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/customization/IBuyClothingRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/customization/IBuyClothingRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/customization/IBuyClothingRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/customization/IWearClothingRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/customization/IWearClothingRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/customization/IWearClothingRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/customization/IWearClothingRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/dialog/IFriendRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/dialog/IFriendRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/dialog/IFriendRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/dialog/IFriendRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/dialog/IGetChatServerListRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/dialog/IGetChatServerListRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/dialog/IGetChatServerListRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/dialog/IGetChatServerListRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/dialog/IGetFriendListDataResponse.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/dialog/IGetFriendListDataResponse.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/dialog/IGetFriendListDataResponse.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/dialog/IGetFriendListDataResponse.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/dialog/IPinDialogRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/dialog/IPinDialogRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/dialog/IPinDialogRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/dialog/IPinDialogRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/dialog/IRemoveDialogRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/dialog/IRemoveDialogRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/dialog/IRemoveDialogRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/dialog/IRemoveDialogRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/dialog/ISendMessageRequest.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/dialog/ISendMessageRequest.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/dialog/ISendMessageRequest.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/dialog/ISendMessageRequest.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/dialog/ISetDialogReadRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/dialog/ISetDialogReadRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/dialog/ISetDialogReadRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/dialog/ISetDialogReadRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/game/IGameConfigResponse.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/game/IGameConfigResponse.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/game/IGameConfigResponse.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/game/IGameConfigResponse.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/game/IGameEmptyCrcRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/game/IGameEmptyCrcRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/game/IGameEmptyCrcRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/game/IGameEmptyCrcRequestData.d.ts diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/game/IReportNicknameRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/game/IReportNicknameRequestData.d.ts new file mode 100644 index 0000000..087c58b --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/game/IReportNicknameRequestData.d.ts @@ -0,0 +1,3 @@ +export interface IReportNicknameRequestData { + uid: string; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/game/IVersionValidateRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/game/IVersionValidateRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/game/IVersionValidateRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/game/IVersionValidateRequestData.d.ts diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/health/Effect.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/health/Effect.d.ts new file mode 100644 index 0000000..2f0adac --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/health/Effect.d.ts @@ -0,0 +1,5 @@ +export declare enum Effect { + Fracture = "Fracture", + LightBleeding = "LightBleeding", + HeavyBleeding = "HeavyBleeding" +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/health/IHealthTreatmentRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/health/IHealthTreatmentRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/health/IHealthTreatmentRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/health/IHealthTreatmentRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/health/IOffraidEatRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/health/IOffraidEatRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/health/IOffraidEatRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/health/IOffraidEatRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/health/IOffraidHealRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/health/IOffraidHealRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/health/IOffraidHealRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/health/IOffraidHealRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/health/ISyncHealthRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/health/ISyncHealthRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/health/ISyncHealthRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/health/ISyncHealthRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/hideout/HideoutAreasEnum.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/hideout/HideoutAreasEnum.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/hideout/HideoutAreasEnum.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/hideout/HideoutAreasEnum.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/hideout/IHideoutArea.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/hideout/IHideoutArea.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/hideout/IHideoutArea.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/hideout/IHideoutArea.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/hideout/IHideoutProduction.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/hideout/IHideoutProduction.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/hideout/IHideoutProduction.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/hideout/IHideoutProduction.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/hideout/IHideoutScavCase.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/hideout/IHideoutScavCase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/hideout/IHideoutScavCase.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/hideout/IHideoutScavCase.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/hideout/IHideoutSettingsBase.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/hideout/IHideoutSettingsBase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/hideout/IHideoutSettingsBase.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/hideout/IHideoutSettingsBase.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/httpResponse/IGetBodyResponseData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/httpResponse/IGetBodyResponseData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/httpResponse/IGetBodyResponseData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/httpResponse/IGetBodyResponseData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/httpResponse/INullResponseData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/httpResponse/INullResponseData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/httpResponse/INullResponseData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/httpResponse/INullResponseData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inRaid/ISaveProgressRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inRaid/ISaveProgressRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inRaid/ISaveProgressRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inRaid/ISaveProgressRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts new file mode 100644 index 0000000..bf209c6 --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts @@ -0,0 +1 @@ +export declare type IGetInsuranceCostResponseData = Record>; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/insurance/IInsureRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/insurance/IInsureRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/insurance/IInsureRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/insurance/IInsureRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IAddItemRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IAddItemRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IAddItemRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IAddItemRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventoryAddRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventoryAddRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventoryAddRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventoryAddRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventoryBindRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventoryBindRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventoryBindRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventoryBindRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventoryExamineRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventoryExamineRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventoryExamineRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventoryExamineRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventoryFoldRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventoryFoldRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventoryFoldRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventoryFoldRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventoryMergeRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventoryMergeRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventoryMergeRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventoryMergeRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventoryMoveRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventoryMoveRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventoryMoveRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventoryMoveRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventorySortRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventorySortRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventorySortRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventorySortRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventorySplitRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventorySplitRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventorySplitRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventorySplitRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventorySwapRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventorySwapRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventorySwapRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventorySwapRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventoryTagRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventoryTagRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventoryTagRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventoryTagRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventoryToggleRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventoryToggleRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventoryToggleRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventoryToggleRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventoryTransferRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventoryTransferRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/inventory/IInventoryTransferRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/inventory/IInventoryTransferRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/itemEvent/IItemEventRouterBase.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/itemEvent/IItemEventRouterBase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/itemEvent/IItemEventRouterBase.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/itemEvent/IItemEventRouterBase.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/launcher/IChangeRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/launcher/IChangeRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/launcher/IChangeRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/launcher/IChangeRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/launcher/ILoginRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/launcher/ILoginRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/launcher/ILoginRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/launcher/ILoginRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/launcher/IMiniProfile.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/launcher/IMiniProfile.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/launcher/IMiniProfile.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/launcher/IMiniProfile.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/launcher/IRegisterData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/launcher/IRegisterData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/launcher/IRegisterData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/launcher/IRegisterData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/launcher/IRemoveProfileData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/launcher/IRemoveProfileData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/launcher/IRemoveProfileData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/launcher/IRemoveProfileData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/location/IGetLocationRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/location/IGetLocationRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/location/IGetLocationRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/location/IGetLocationRequestData.d.ts diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/match/ICreateGroupRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/match/ICreateGroupRequestData.d.ts new file mode 100644 index 0000000..7413a8a --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/match/ICreateGroupRequestData.d.ts @@ -0,0 +1,6 @@ +import { RaidMode } from "../../enums/RaidMode"; +export interface ICreateGroupRequestData { + location: string; + raidMode: RaidMode; + startInGroup: boolean; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/match/IEndOfflineRaidRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/match/IEndOfflineRaidRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/match/IEndOfflineRaidRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/match/IEndOfflineRaidRequestData.d.ts diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/match/IGetGroupStatusRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/match/IGetGroupStatusRequestData.d.ts new file mode 100644 index 0000000..55d7079 --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/match/IGetGroupStatusRequestData.d.ts @@ -0,0 +1,9 @@ +import { RaidMode } from "../../enums/RaidMode"; +export interface IGetGroupStatusRequestData { + location: string; + savage: boolean; + dt: string; + keyId: string; + raidMode: RaidMode; + startInGroup: boolean; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/match/IGetProfileRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/match/IGetProfileRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/match/IGetProfileRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/match/IGetProfileRequestData.d.ts diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/match/IJoinMatchRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/match/IJoinMatchRequestData.d.ts new file mode 100644 index 0000000..cd34f7b --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/match/IJoinMatchRequestData.d.ts @@ -0,0 +1,12 @@ +export interface IJoinMatchRequestData { + location: string; + savage: boolean; + dt: string; + servers: Server[]; + keyId: string; +} +export interface Server { + ping: number; + ip: string; + port: string; +} diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/match/IJoinMatchResult.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/match/IJoinMatchResult.d.ts new file mode 100644 index 0000000..df695f4 --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/match/IJoinMatchResult.d.ts @@ -0,0 +1,11 @@ +export interface IJoinMatchResult { + profileid: string; + status: string; + sid: string; + ip: string; + port: number; + version: string; + location: string; + gamemode: string; + shortid: string; +} diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/match/IPutMetricsRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/match/IPutMetricsRequestData.d.ts new file mode 100644 index 0000000..d9ed214 --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/match/IPutMetricsRequestData.d.ts @@ -0,0 +1,10 @@ +export interface IPutMetricsRequestData { + sid: string; + settings: any; + SharedSettings: any; + HardwareDescription: any; + Location: string; + Metrics: any; + ClientEvents: any; + SpikeSamples: any[]; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/match/IStartOffineRaidRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/match/IStartOffineRaidRequestData.d.ts similarity index 74% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/match/IStartOffineRaidRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/match/IStartOffineRaidRequestData.d.ts index 84bccc8..af0625e 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/match/IStartOffineRaidRequestData.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/match/IStartOffineRaidRequestData.d.ts @@ -1,6 +1,7 @@ +import { BotAmount } from "../../enums/BotAmount"; +import { BotDifficulty } from "../../enums/BotDifficulty"; export interface IStartOfflineRaidRequestData { locationName: string; - entryPoint: string; startTime: number; dateTime: string; gameSettings: GameSettings; @@ -17,11 +18,11 @@ export interface TimeAndWeatherSettings { export interface BotsSettings { isEnabled: boolean; isScavWars: boolean; - botAmount: string; + botAmount: BotAmount; } export interface WavesSettings { - botDifficulty: string; + botDifficulty: BotDifficulty; isBosses: boolean; isTaggedAndCursed: boolean; - wavesBotAmount: string; + wavesBotAmount: BotAmount; } diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/match/IUpdatePingRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/match/IUpdatePingRequestData.d.ts new file mode 100644 index 0000000..defbd66 --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/match/IUpdatePingRequestData.d.ts @@ -0,0 +1,3 @@ +export interface IUpdatePingRequestData { + servers: any[]; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/notes/INoteActionData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/notes/INoteActionData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/notes/INoteActionData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/notes/INoteActionData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/notifier/INotifier.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/notifier/INotifier.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/notifier/INotifier.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/notifier/INotifier.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/notifier/ISelectProfileRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/notifier/ISelectProfileRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/notifier/ISelectProfileRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/notifier/ISelectProfileRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/profile/GetProfileStatusResponseData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/profile/GetProfileStatusResponseData.d.ts new file mode 100644 index 0000000..eee9b4f --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/profile/GetProfileStatusResponseData.d.ts @@ -0,0 +1,11 @@ +export interface GetProfileStatusResponseData { + maxPveCountExceeded: false; + profiles: ProfileData[]; +} +export interface ProfileData { + profileid: string; + status: string; + sid: string; + ip: string; + port: number; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/profile/IAkiProfile.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/profile/IAkiProfile.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/profile/IAkiProfile.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/profile/IAkiProfile.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/profile/IProfileCreateRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/profile/IProfileCreateRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/profile/IProfileCreateRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/profile/IProfileCreateRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/profile/ISearchFriendRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/profile/ISearchFriendRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/profile/ISearchFriendRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/profile/ISearchFriendRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/profile/ISearchFriendResponse.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/profile/ISearchFriendResponse.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/profile/ISearchFriendResponse.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/profile/ISearchFriendResponse.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/profile/IValidateNicknameRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/profile/IValidateNicknameRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/profile/IValidateNicknameRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/profile/IValidateNicknameRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/quests/IAcceptQuestRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/quests/IAcceptQuestRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/quests/IAcceptQuestRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/quests/IAcceptQuestRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/quests/ICompleteQuestRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/quests/ICompleteQuestRequestData.d.ts similarity index 85% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/quests/ICompleteQuestRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/quests/ICompleteQuestRequestData.d.ts index cc67404..36a6db3 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/quests/ICompleteQuestRequestData.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/quests/ICompleteQuestRequestData.d.ts @@ -1,5 +1,6 @@ export interface ICompleteQuestRequestData { Action: string; + /** Quest Id */ qid: string; removeExcessItems: boolean; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/quests/IHandoverQuestRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/quests/IHandoverQuestRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/quests/IHandoverQuestRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/quests/IHandoverQuestRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/quests/IListQuestsRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/quests/IListQuestsRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/quests/IListQuestsRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/quests/IListQuestsRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/ragfair/IAddOfferRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/ragfair/IAddOfferRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/ragfair/IAddOfferRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/ragfair/IAddOfferRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/ragfair/IExtendOfferRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/ragfair/IExtendOfferRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/ragfair/IExtendOfferRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/ragfair/IExtendOfferRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/ragfair/IGetItemPriceResult.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/ragfair/IGetItemPriceResult.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/ragfair/IGetItemPriceResult.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/ragfair/IGetItemPriceResult.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/ragfair/IGetOffersResult.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/ragfair/IGetOffersResult.d.ts similarity index 80% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/ragfair/IGetOffersResult.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/ragfair/IGetOffersResult.d.ts index 1c11422..fbc631d 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/ragfair/IGetOffersResult.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/ragfair/IGetOffersResult.d.ts @@ -1,6 +1,6 @@ import { IRagfairOffer } from "./IRagfairOffer"; export interface IGetOffersResult { - categories: Record; + categories?: Record; offers: IRagfairOffer[]; offersCount: number; selectedCategory: string; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/ragfair/IRagfairOffer.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/ragfair/IRagfairOffer.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/ragfair/IRagfairOffer.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/ragfair/IRagfairOffer.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/ragfair/ISearchRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/ragfair/ISearchRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/ragfair/ISearchRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/ragfair/ISearchRequestData.d.ts diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts new file mode 100644 index 0000000..2d14d20 --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts @@ -0,0 +1,3 @@ +export interface ISendRagfairReportRequestData { + offerId: number; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/repair/IRepairActionDataRequest.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/repair/IRepairActionDataRequest.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/repair/IRepairActionDataRequest.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/repair/IRepairActionDataRequest.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/trade/IProcessSellTradeRequestData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/trade/IProcessSellTradeRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/trade/IProcessSellTradeRequestData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/trade/IProcessSellTradeRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/weather/IWeatherData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/weather/IWeatherData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/weather/IWeatherData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/weather/IWeatherData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/wishlist/IWishlistActionData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/wishlist/IWishlistActionData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/wishlist/IWishlistActionData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/eft/wishlist/IWishlistActionData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/enums/BaseClasses.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/BaseClasses.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/enums/BaseClasses.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/BaseClasses.d.ts diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/BotAmount.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/BotAmount.d.ts new file mode 100644 index 0000000..d0e1df1 --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/BotAmount.d.ts @@ -0,0 +1,7 @@ +export declare enum BotAmount { + AsOnline = "AsOnline", + Low = "Low", + Medium = "Medium", + High = "High", + Horde = "Horde" +} diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/BotDifficulty.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/BotDifficulty.d.ts new file mode 100644 index 0000000..c901bcf --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/BotDifficulty.d.ts @@ -0,0 +1,8 @@ +export declare enum BotDifficulty { + AsOnline = "AsOnline", + Easy = "Easy", + Medium = "Medium", + Hard = "Hard", + Impossible = "Impossible", + Random = "Random" +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/enums/ConfigTypes.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/ConfigTypes.d.ts similarity index 94% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/enums/ConfigTypes.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/ConfigTypes.d.ts index 6bd31e8..1c49e62 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/enums/ConfigTypes.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/ConfigTypes.d.ts @@ -8,6 +8,7 @@ export declare enum ConfigTypes { IN_RAID = "aki-inraid", INSURANCE = "aki-insurance", INVENTORY = "aki-inventory", + LOCALE = "aki-locale", LOCATION = "aki-location", MATCH = "aki-match", QUEST = "aki-quest", diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/enums/ELocationName.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/ELocationName.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/enums/ELocationName.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/ELocationName.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/enums/EquipmentSlots.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/EquipmentSlots.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/enums/EquipmentSlots.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/EquipmentSlots.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/enums/HideoutAreas.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/HideoutAreas.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/enums/HideoutAreas.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/HideoutAreas.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/enums/MemberCategory.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/MemberCategory.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/enums/MemberCategory.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/MemberCategory.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/enums/MessageType.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/MessageType.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/enums/MessageType.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/MessageType.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/enums/Money.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/Money.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/enums/Money.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/Money.d.ts diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/QuestRewardType.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/QuestRewardType.d.ts new file mode 100644 index 0000000..1d3db86 --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/QuestRewardType.d.ts @@ -0,0 +1,8 @@ +export declare enum QuestRewardType { + Skill = "Skill", + Experience = "Experience", + TraderStanding = "TraderStanding", + TraderUnlock = "TraderUnlock", + Item = "Item", + AssortmentUnlock = "AssortmentUnlock" +} diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/QuestStatus.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/QuestStatus.d.ts new file mode 100644 index 0000000..6335c73 --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/QuestStatus.d.ts @@ -0,0 +1,10 @@ +export declare enum QuestStatus { + Locked = 0, + AvailableForStart = 1, + Started = 2, + AvailableForFinish = 3, + Success = 4, + Fail = 5, + FailRestartable = 6, + MarkedAsFailed = 7 +} diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/RaidMode.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/RaidMode.d.ts new file mode 100644 index 0000000..c5a8cff --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/RaidMode.d.ts @@ -0,0 +1,5 @@ +export declare enum RaidMode { + Online = "Online", + Local = "Local", + Coop = "Coop" +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/enums/Traders.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/Traders.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/enums/Traders.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/enums/Traders.d.ts diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/external/IPostAkiLoadMod.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/external/IPostAkiLoadMod.d.ts new file mode 100644 index 0000000..f6950e8 --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/external/IPostAkiLoadMod.d.ts @@ -0,0 +1,4 @@ +import { DependencyContainer } from "./tsyringe"; +export interface IPostAkiLoadMod { + postAkiLoad(container: DependencyContainer): void; +} diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/external/IPostDBLoadMod.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/external/IPostDBLoadMod.d.ts new file mode 100644 index 0000000..ca7c682 --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/external/IPostDBLoadMod.d.ts @@ -0,0 +1,4 @@ +import { DependencyContainer } from "./tsyringe"; +export interface IPostDBLoadMod { + postDBLoad(container: DependencyContainer): void; +} diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/external/IPreAkiLoadMod.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/external/IPreAkiLoadMod.d.ts new file mode 100644 index 0000000..ae7579e --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/external/IPreAkiLoadMod.d.ts @@ -0,0 +1,4 @@ +import { DependencyContainer } from "./tsyringe"; +export interface IPreAkiLoadMod { + preAkiLoad(container: DependencyContainer): void; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/external/mod.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/external/mod.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/external/mod.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/external/mod.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/external/tsyringe.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/external/tsyringe.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/external/tsyringe.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/external/tsyringe.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/bindings/Route.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/bindings/Route.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/bindings/Route.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/bindings/Route.d.ts diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/bots/BotLootCache.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/bots/BotLootCache.d.ts new file mode 100644 index 0000000..e185315 --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/bots/BotLootCache.d.ts @@ -0,0 +1,23 @@ +import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; +export declare class BotLootCache { + backpackLoot: ITemplateItem[]; + pocketLoot: ITemplateItem[]; + vestLoot: ITemplateItem[]; + combinedPoolLoot: ITemplateItem[]; + specialItems: ITemplateItem[]; + healingItems: ITemplateItem[]; + drugItems: ITemplateItem[]; + stimItems: ITemplateItem[]; + grenadeItems: ITemplateItem[]; +} +export declare enum LootCacheType { + Special = "Special", + Backpack = "Backpack", + Pocket = "Pocket", + Vest = "Vest", + Combined = "Combined", + HealingItems = "HealingItems", + DrugItems = "DrugItems", + StimItems = "StimItems", + GrenadeItems = "GrenadeItems" +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IBotCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IBotCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IBotCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IBotCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IBundleCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IBundleCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IBundleCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IBundleCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/ICustomizationCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/ICustomizationCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/ICustomizationCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/ICustomizationCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IDataCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IDataCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IDataCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IDataCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IDialogueCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IDialogueCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IDialogueCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IDialogueCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IGameCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IGameCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IGameCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IGameCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IHandbookCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IHandbookCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IHandbookCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IHandbookCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IHealthCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IHealthCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IHealthCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IHealthCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IHideoutCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IHideoutCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IHideoutCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IHideoutCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IHttpCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IHttpCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IHttpCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IHttpCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IInraidCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IInraidCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IInraidCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IInraidCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IInsuranceCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IInsuranceCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IInsuranceCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IInsuranceCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IInventoryCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IInventoryCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IInventoryCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IInventoryCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IItemEventCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IItemEventCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IItemEventCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IItemEventCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/ILauncherCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/ILauncherCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/ILauncherCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/ILauncherCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/ILocationCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/ILocationCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/ILocationCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/ILocationCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IMatchCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IMatchCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IMatchCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IMatchCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IModCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IModCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IModCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IModCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/INoteCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/INoteCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/INoteCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/INoteCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/INotifierCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/INotifierCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/INotifierCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/INotifierCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IPresetCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IPresetCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IPresetCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IPresetCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IProfileCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IProfileCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IProfileCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IProfileCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IQuestCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IQuestCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IQuestCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IQuestCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IRagfairCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IRagfairCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IRagfairCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IRagfairCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IRepairCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IRepairCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IRepairCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IRepairCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/ISaveCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/ISaveCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/ISaveCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/ISaveCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/ITradeCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/ITradeCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/ITradeCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/ITradeCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/ITraderCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/ITraderCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/ITraderCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/ITraderCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IWeatherCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IWeatherCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IWeatherCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IWeatherCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IWishlistCallbacks.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IWishlistCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/callbacks/IWishlistCallbacks.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/callbacks/IWishlistCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IAirdropConfig.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IAirdropConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IAirdropConfig.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IAirdropConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IBaseConfig.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IBaseConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IBaseConfig.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IBaseConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IBotConfig.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IBotConfig.d.ts similarity index 97% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IBotConfig.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IBotConfig.d.ts index 5fb9d93..f8cf39b 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IBotConfig.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IBotConfig.d.ts @@ -18,6 +18,7 @@ export interface PresetBatch { bossKojaniy: number; bossSanitar: number; bossTagilla: number; + bossKnight: number; bossTest: number; cursedAssault: number; followerBully: number; @@ -28,6 +29,8 @@ export interface PresetBatch { followerKojaniy: number; followerSanitar: number; followerTagilla: number; + followerBirdEye: number; + followerBigPipe: number; followerTest: number; marksman: number; pmcBot: number; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/ICoreConfig.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/ICoreConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/ICoreConfig.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/ICoreConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IHealthConfig.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IHealthConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IHealthConfig.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IHealthConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IHideoutConfig.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IHideoutConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IHideoutConfig.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IHideoutConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IHttpConfig.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IHttpConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IHttpConfig.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IHttpConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IInRaidConfig.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IInRaidConfig.d.ts similarity index 95% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IInRaidConfig.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IInRaidConfig.d.ts index baaf083..3ae2972 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IInRaidConfig.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IInRaidConfig.d.ts @@ -14,6 +14,7 @@ export interface RaidMenuSettings { bossEnabled: boolean; scavWars: boolean; taggedAndCursed: boolean; + enablePve: boolean; } export interface Save { loot: boolean; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IInsuranceConfig.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IInsuranceConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IInsuranceConfig.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IInsuranceConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IInventoryConfig.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IInventoryConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IInventoryConfig.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IInventoryConfig.d.ts diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/ILocaleConfig.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/ILocaleConfig.d.ts new file mode 100644 index 0000000..fe9abf7 --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/ILocaleConfig.d.ts @@ -0,0 +1,5 @@ +import { IBaseConfig } from "./IBaseConfig"; +export interface ILocaleConfig extends IBaseConfig { + kind: "aki-locale"; + desiredLocale: string; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/ILocationConfig.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/ILocationConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/ILocationConfig.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/ILocationConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IMatchConfig.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IMatchConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IMatchConfig.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IMatchConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IQuestConfig.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IQuestConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IQuestConfig.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IQuestConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IRagfairConfig.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IRagfairConfig.d.ts similarity index 98% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IRagfairConfig.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IRagfairConfig.d.ts index 2d151ca..8518252 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IRagfairConfig.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IRagfairConfig.d.ts @@ -30,6 +30,7 @@ export interface Dynamic { expiredOfferThreshold: number; offerItemCount: MinMax; price: MinMax; + presetPrice: MinMax; endTimeSeconds: MinMax; condition: Condition; stackablePercent: MinMax; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IRepairConfig.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IRepairConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IRepairConfig.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IRepairConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/ITraderConfig.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/ITraderConfig.d.ts similarity index 59% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/ITraderConfig.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/ITraderConfig.d.ts index dab73e3..c8e8044 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/ITraderConfig.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/ITraderConfig.d.ts @@ -3,13 +3,17 @@ export interface ITraderConfig extends IBaseConfig { kind: "aki-trader"; updateTime: UpdateTime[]; updateTimeDefault: number; - fenceAssortSize: number; - fenceMaxPresetsCount: number; - fencePresetPriceMult: number; + traderPriceMultipler: number; minDurabilityForSale: number; - fenceItemIgnoreList: string[]; + fence: FenceConfig; } export interface UpdateTime { traderId: string; seconds: number; } +export interface FenceConfig { + assortSize: number; + maxPresetsCount: number; + presetPriceMult: number; + blacklist: string[]; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IWeatherConfig.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IWeatherConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IWeatherConfig.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/config/IWeatherConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/controllers/IBotController.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/controllers/IBotController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/controllers/IBotController.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/controllers/IBotController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/generators/IBotGenerator.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/generators/IBotGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/generators/IBotGenerator.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/generators/IBotGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/generators/ILocationGenerator.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/generators/ILocationGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/generators/ILocationGenerator.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/generators/ILocationGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/generators/IPMCLootGenerator.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/generators/IPMCLootGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/generators/IPMCLootGenerator.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/generators/IPMCLootGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/generators/IRagfairAssortGenerator.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/generators/IRagfairAssortGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/generators/IRagfairAssortGenerator.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/generators/IRagfairAssortGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/generators/IRagfairOfferGenerator.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/generators/IRagfairOfferGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/generators/IRagfairOfferGenerator.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/generators/IRagfairOfferGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/helpers/Traders.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/helpers/Traders.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/helpers/Traders.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/helpers/Traders.d.ts diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/logging/LogBackgroundColor.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/logging/LogBackgroundColor.d.ts new file mode 100644 index 0000000..87e08a9 --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/logging/LogBackgroundColor.d.ts @@ -0,0 +1,11 @@ +export declare enum LogBackgroundColor { + default = "", + black = "blackBG", + red = "redBG", + green = "greenBG", + yellow = "yellowBG", + blue = "blueBG", + magenta = "magentaBG", + cyan = "cyanBG", + white = "whiteBG" +} diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/logging/LogTextColor.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/logging/LogTextColor.d.ts new file mode 100644 index 0000000..7147ae3 --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/logging/LogTextColor.d.ts @@ -0,0 +1,11 @@ +export declare enum LogTextColor { + black = "black", + red = "red", + green = "green", + yellow = "yellow", + blue = "blue", + magenta = "magenta", + cyan = "cyan", + white = "white", + gray = "" +} diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/logging/SptLogger.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/logging/SptLogger.d.ts new file mode 100644 index 0000000..ea1b3d8 --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/logging/SptLogger.d.ts @@ -0,0 +1,7 @@ +export interface SptLogger { + error: (msg: string | Record) => void; + warn: (msg: string | Record) => void; + succ?: (msg: string | Record) => void; + info: (msg: string | Record) => void; + debug: (msg: string | Record) => void; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/mod/IMod.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/mod/IMod.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/mod/IMod.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/mod/IMod.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/mod/IModLoader.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/mod/IModLoader.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/mod/IModLoader.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/mod/IModLoader.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/mod/IPackageJsonData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/mod/IPackageJsonData.d.ts similarity index 84% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/mod/IPackageJsonData.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/mod/IPackageJsonData.d.ts index 09472cd..99e4ef9 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/mod/IPackageJsonData.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/mod/IPackageJsonData.d.ts @@ -1,6 +1,7 @@ export interface IPackageJsonData { incompatibilities?: string[]; dependencies?: string[]; + modDependencies?: Record; name: string; author: string; version: string; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/ragfair/IRagfairServerPrices.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/ragfair/IRagfairServerPrices.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/ragfair/IRagfairServerPrices.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/ragfair/IRagfairServerPrices.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/server/IDatabaseTables.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/server/IDatabaseTables.d.ts similarity index 69% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/server/IDatabaseTables.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/server/IDatabaseTables.d.ts index dbb71be..9978459 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/server/IDatabaseTables.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/server/IDatabaseTables.d.ts @@ -5,6 +5,8 @@ import { IBotType } from "../../eft/common/tables/IBotType"; import { ICustomizationItem } from "../../eft/common/tables/ICustomizationItem"; import { IHandbookBase } from "../../eft/common/tables/IHandbookBase"; import { ILootBase } from "../../eft/common/tables/ILootBase"; +import { IMatch } from "../../eft/common/tables/IMatch"; +import { IProfileTemplates } from "../../eft/common/tables/IProfileTemplate"; import { IQuest } from "../../eft/common/tables/IQuest"; import { IRepeatableQuestDatabase } from "../../eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; @@ -18,34 +20,37 @@ import { ILocations } from "./ILocations"; import { IServerBase } from "./IServerBase"; import { ISettingsBase } from "./ISettingsBase"; export interface IDatabaseTables { - bots: { + bots?: { types: Record; base: IBotBase; core: IBotCore; }; - hideout: { + hideout?: { areas: IHideoutArea[]; production: IHideoutProduction[]; scavcase: IHideoutScavCase[]; settings: IHideoutSettingsBase; }; - locales: ILocaleBase; - locations: ILocations; - loot: ILootBase; - match: any; - templates: { + locales?: ILocaleBase; + locations?: ILocations; + loot?: ILootBase; + match?: IMatch; + templates?: { character: string[]; items: Record; quests: IQuest[]; repeatableQuests: IRepeatableQuestDatabase; + /** DEPRECATED - Items file found in the client, massivly out of date compared to templates.items, try not to use this, remove ASAP*/ clientItems: Record; handbook: IHandbookBase; customization: Record; - profiles: any; + /** The profile templates listed in the launcher on profile creation, split by account type (e.g. Standard) then side (e.g. bear/usec) */ + profiles: IProfileTemplates; + /** Flea prices of items - gathered from online flea market dump */ prices: Record; }; - traders: Record; - globals: IGlobals; - server: IServerBase; - settings: ISettingsBase; + traders?: Record; + globals?: IGlobals; + server?: IServerBase; + settings?: ISettingsBase; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/server/IHttpServer.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/server/IHttpServer.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/server/IHttpServer.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/server/IHttpServer.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/server/ILocaleBase.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/server/ILocaleBase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/server/ILocaleBase.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/server/ILocaleBase.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/server/ILocations.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/server/ILocations.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/server/ILocations.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/server/ILocations.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/server/IServerBase.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/server/IServerBase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/server/IServerBase.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/server/IServerBase.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/server/ISettingsBase.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/server/ISettingsBase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/server/ISettingsBase.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/server/ISettingsBase.d.ts diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/services/CustomPreset.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/services/CustomPreset.d.ts new file mode 100644 index 0000000..f07382e --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/services/CustomPreset.d.ts @@ -0,0 +1,5 @@ +import { Preset } from "../../eft/common/IGlobals"; +export interface CustomPreset { + key: string; + preset: Preset; +} diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/services/CustomTraderAssortData.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/services/CustomTraderAssortData.d.ts new file mode 100644 index 0000000..265a26a --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/services/CustomTraderAssortData.d.ts @@ -0,0 +1,6 @@ +import { ITraderAssort } from "../../eft/common/tables/ITrader"; +import { Traders } from "../../enums/Traders"; +export interface CustomTraderAssortData { + traderId: Traders; + assorts: ITraderAssort; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/utils/IAsyncQueue.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/utils/IAsyncQueue.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/utils/IAsyncQueue.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/utils/IAsyncQueue.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/utils/ICommand.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/utils/ICommand.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/utils/ICommand.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/utils/ICommand.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/utils/ILogger.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/utils/ILogger.d.ts similarity index 59% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/utils/ILogger.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/utils/ILogger.d.ts index c983701..2af3fac 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/utils/ILogger.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/utils/ILogger.d.ts @@ -1,7 +1,10 @@ import { Daum } from "../../eft/itemEvent/IItemEventRouterRequest"; +import { LogBackgroundColor } from "../logging/LogBackgroundColor"; +import { LogTextColor } from "../logging/LogTextColor"; export interface ILogger { writeToLogFile(data: string | Daum): void; - log(data: string | Record | Error, color: string): void; + log(data: string | Record | Error, color: string, backgroundColor?: string): void; + logWithColor(data: string | Record, textColor: LogTextColor, backgroundColor?: LogBackgroundColor): void; error(data: string): void; warning(data: string): void; success(data: string): void; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/utils/IUuidGenerator.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/utils/IUuidGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/utils/IUuidGenerator.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/models/spt/utils/IUuidGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/HttpRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/HttpRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/HttpRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/HttpRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/ImageRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/ImageRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/ImageRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/ImageRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/ItemEventRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/ItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/ItemEventRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/ItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/dynamic/BotDynamicRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/dynamic/BotDynamicRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/dynamic/BotDynamicRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/dynamic/BotDynamicRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/dynamic/BundleDynamicRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/dynamic/BundleDynamicRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/dynamic/BundleDynamicRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/dynamic/BundleDynamicRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/dynamic/CustomizationDynamicRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/dynamic/CustomizationDynamicRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/dynamic/CustomizationDynamicRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/dynamic/CustomizationDynamicRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/dynamic/DataDynamicRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/dynamic/DataDynamicRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/dynamic/DataDynamicRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/dynamic/DataDynamicRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/dynamic/HttpDynamicRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/dynamic/HttpDynamicRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/dynamic/HttpDynamicRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/dynamic/HttpDynamicRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/dynamic/InraidDynamicRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/dynamic/InraidDynamicRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/dynamic/InraidDynamicRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/dynamic/InraidDynamicRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/dynamic/LocationDynamicRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/dynamic/LocationDynamicRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/dynamic/LocationDynamicRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/dynamic/LocationDynamicRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/dynamic/NotifierDynamicRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/dynamic/NotifierDynamicRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/dynamic/NotifierDynamicRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/dynamic/NotifierDynamicRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/dynamic/TraderDynamicRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/dynamic/TraderDynamicRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/dynamic/TraderDynamicRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/dynamic/TraderDynamicRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/item_events/CustomizationItemEventRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/item_events/CustomizationItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/item_events/CustomizationItemEventRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/item_events/CustomizationItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/item_events/HealthItemEventRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/item_events/HealthItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/item_events/HealthItemEventRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/item_events/HealthItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/item_events/HideoutItemEventRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/item_events/HideoutItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/item_events/HideoutItemEventRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/item_events/HideoutItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/item_events/InsuranceItemEventRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/item_events/InsuranceItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/item_events/InsuranceItemEventRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/item_events/InsuranceItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/item_events/InventoryItemEventRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/item_events/InventoryItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/item_events/InventoryItemEventRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/item_events/InventoryItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/item_events/NoteItemEventRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/item_events/NoteItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/item_events/NoteItemEventRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/item_events/NoteItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/item_events/PresetBuildItemEventRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/item_events/PresetBuildItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/item_events/PresetBuildItemEventRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/item_events/PresetBuildItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/item_events/QuestItemEventRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/item_events/QuestItemEventRouter.d.ts similarity index 62% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/item_events/QuestItemEventRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/item_events/QuestItemEventRouter.d.ts index db59c25..a092aa6 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/item_events/QuestItemEventRouter.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/item_events/QuestItemEventRouter.d.ts @@ -1,10 +1,12 @@ -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; import { QuestCallbacks } from "../../callbacks/QuestCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; +import { IPmcData } from "../../models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; +import { ILogger } from "../../models/spt/utils/ILogger"; export declare class QuestItemEventRouter extends ItemEventRouterDefinition { + protected logger: ILogger; protected questCallbacks: QuestCallbacks; - constructor(questCallbacks: QuestCallbacks); + constructor(logger: ILogger, questCallbacks: QuestCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; + handleItemEvent(eventAction: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/item_events/RagfairItemEventRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/item_events/RagfairItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/item_events/RagfairItemEventRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/item_events/RagfairItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/item_events/RepairItemEventRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/item_events/RepairItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/item_events/RepairItemEventRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/item_events/RepairItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/item_events/TradeItemEventRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/item_events/TradeItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/item_events/TradeItemEventRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/item_events/TradeItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/item_events/WishlistItemEventRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/item_events/WishlistItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/item_events/WishlistItemEventRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/item_events/WishlistItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/save_load/HealthSaveLoadRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/save_load/HealthSaveLoadRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/save_load/HealthSaveLoadRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/save_load/HealthSaveLoadRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/save_load/InraidSaveLoadRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/save_load/InraidSaveLoadRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/save_load/InraidSaveLoadRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/save_load/InraidSaveLoadRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/save_load/InsuranceSaveLoadRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/save_load/InsuranceSaveLoadRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/save_load/InsuranceSaveLoadRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/save_load/InsuranceSaveLoadRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/save_load/ProfileSaveLoadRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/save_load/ProfileSaveLoadRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/save_load/ProfileSaveLoadRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/save_load/ProfileSaveLoadRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/serializers/BundleSerializer.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/serializers/BundleSerializer.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/serializers/BundleSerializer.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/serializers/BundleSerializer.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/serializers/ImageSerializer.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/serializers/ImageSerializer.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/serializers/ImageSerializer.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/serializers/ImageSerializer.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/serializers/NotifySerializer.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/serializers/NotifySerializer.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/serializers/NotifySerializer.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/serializers/NotifySerializer.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/BotStaticRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/BotStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/BotStaticRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/BotStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/BundleStaticRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/BundleStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/BundleStaticRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/BundleStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/CustomizationStaticRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/CustomizationStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/CustomizationStaticRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/CustomizationStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/DataStaticRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/DataStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/DataStaticRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/DataStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/DialogStaticRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/DialogStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/DialogStaticRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/DialogStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/GameStaticRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/GameStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/GameStaticRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/GameStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/HealthStaticRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/HealthStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/HealthStaticRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/HealthStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/InraidStaticRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/InraidStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/InraidStaticRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/InraidStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/InsuranceStaticRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/InsuranceStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/InsuranceStaticRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/InsuranceStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/ItemEventStaticRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/ItemEventStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/ItemEventStaticRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/ItemEventStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/LauncherStaticRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/LauncherStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/LauncherStaticRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/LauncherStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/LocationStaticRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/LocationStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/LocationStaticRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/LocationStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/MatchStaticRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/MatchStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/MatchStaticRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/MatchStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/NotifierStaticRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/NotifierStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/NotifierStaticRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/NotifierStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/PresetStaticRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/PresetStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/PresetStaticRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/PresetStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/ProfileStaticRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/ProfileStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/ProfileStaticRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/ProfileStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/QuestStaticRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/QuestStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/QuestStaticRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/QuestStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/RagfairStaticRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/RagfairStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/RagfairStaticRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/RagfairStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/TraderStaticRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/TraderStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/TraderStaticRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/TraderStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/WeatherStaticRouter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/WeatherStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/static/WeatherStaticRouter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/routers/static/WeatherStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/servers/ConfigServer.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/servers/ConfigServer.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/servers/ConfigServer.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/servers/ConfigServer.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/servers/DatabaseServer.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/servers/DatabaseServer.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/servers/DatabaseServer.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/servers/DatabaseServer.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/servers/HttpServer.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/servers/HttpServer.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/servers/HttpServer.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/servers/HttpServer.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/servers/RagfairServer.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/servers/RagfairServer.d.ts similarity index 92% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/servers/RagfairServer.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/servers/RagfairServer.d.ts index 60c92b5..bc86cdb 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/servers/RagfairServer.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/servers/RagfairServer.d.ts @@ -17,7 +17,8 @@ export declare class RagfairServer { constructor(logger: ILogger, ragfairOfferGenerator: RagfairOfferGenerator, ragfairOfferService: RagfairOfferService, ragfairCategoriesService: RagfairCategoriesService, ragfairRequiredItemsService: RagfairRequiredItemsService, configServer: ConfigServer); load(): void; update(): void; - getCategories(): Record; + getAllCategories(): Record; + getBespokeCategories(offers: IRagfairOffer[]): Record; /** * Disable/Hide an offer from flea * @param offerId diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/servers/SaveServer.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/servers/SaveServer.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/servers/SaveServer.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/servers/SaveServer.d.ts diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/BotLootCacheService.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/BotLootCacheService.d.ts new file mode 100644 index 0000000..72eb332 --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/BotLootCacheService.d.ts @@ -0,0 +1,59 @@ +import { PMCLootGenerator } from "../generators/PMCLootGenerator"; +import { Items } from "../models/eft/common/tables/IBotType"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { BotLootCache, LootCacheType } from "../models/spt/bots/BotLootCache"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "../utils/JsonUtil"; +import { RagfairPriceService } from "./RagfairPriceService"; +export declare class BotLootCacheService { + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected pmcLootGenerator: PMCLootGenerator; + protected ragfairPriceService: RagfairPriceService; + protected lootCache: Record; + constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, pmcLootGenerator: PMCLootGenerator, ragfairPriceService: RagfairPriceService); + /** + * Remove all cached bot loot data + */ + clearCache(): void; + /** + * Get the fully created loot array, ordered by price low to high + * @param botRole bot to get loot for + * @param isPmc is the bot a pmc + * @param lootType what type of loot is needed + * @param lootPool the full pool of loot (needed when cache is empty) + * @returns ITemplateItem array + */ + getLootFromCache(botRole: string, isPmc: boolean, lootType: LootCacheType, lootPool: Items): ITemplateItem[]; + /** + * Generate loot for a bot and store inside a private class property + * @param botRole + * @param lootType + * @param lootPool the full pool of loot we use to create the various sub-categories with + * @param isPmc + */ + protected addLootToCache(botRole: string, isPmc: boolean, lootType: LootCacheType, lootPool: Items): void; + /** + * Check if a bot type exists inside the loot cache + * @param botRole role to check for + * @returns true if they exist + */ + protected botRoleExistsInCache(botRole: string): boolean; + /** + * If lootcache is null, init with empty property arrays + * @param botRole Bot role to hydrate + */ + protected initCacheForBotRole(botRole: string): void; + /** + * Compares two item prices by their flea (or handbook if that doesnt exist) price + * -1 when a < b + * 0 when a === b + * 1 when a > b + * @param itemAPrice + * @param itemBPrice + * @returns + */ + protected compareByValue(itemAPrice: number, itemBPrice: number): number; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/FenceService.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/FenceService.d.ts similarity index 95% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/FenceService.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/FenceService.d.ts index 12723fb..79058c6 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/FenceService.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/FenceService.d.ts @@ -29,8 +29,8 @@ export declare class FenceService { hasExpiredCache(refreshAssort: boolean): boolean; generateFenceAssortCache(pmcData: IPmcData): void; /** - * - * @param pmcData Get the fence level the passed in profile has + * Get the fence level the passed in profile has + * @param pmcData Player profile * @returns FenceLevel */ getFenceInfo(pmcData: IPmcData): FenceLevel; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/HashCacheService.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/HashCacheService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/HashCacheService.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/HashCacheService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/InsuranceService.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/InsuranceService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/InsuranceService.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/InsuranceService.d.ts diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/LocaleService.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/LocaleService.d.ts new file mode 100644 index 0000000..33bea7b --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/LocaleService.d.ts @@ -0,0 +1,14 @@ +import { ILocaleConfig } from "../models/spt/config/ILocaleConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +export declare class LocaleService { + protected logger: ILogger; + protected configServer: ConfigServer; + protected localeConfig: ILocaleConfig; + constructor(logger: ILogger, configServer: ConfigServer); + /** + * Gets the locale key from the locale.json file + * @returns locale e.g en/ge/cz/cn + */ + getDesiredLocale(): string; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/MatchLocationService.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/MatchLocationService.d.ts similarity index 58% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/MatchLocationService.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/MatchLocationService.d.ts index 2b5fc0e..c027bec 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/MatchLocationService.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/MatchLocationService.d.ts @@ -1,8 +1,9 @@ +import { ICreateGroupRequestData } from "../models/eft/match/ICreateGroupRequestData"; import { TimeUtil } from "../utils/TimeUtil"; export declare class MatchLocationService { protected timeUtil: TimeUtil; protected locations: {}; constructor(timeUtil: TimeUtil); - createGroup(sessionID: string, info: any): any; + createGroup(sessionID: string, info: ICreateGroupRequestData): any; deleteGroup(info: any): void; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/ModCompilerService.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/ModCompilerService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/ModCompilerService.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/ModCompilerService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/NotificationService.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/NotificationService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/NotificationService.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/NotificationService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/PaymentService.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/PaymentService.d.ts similarity index 79% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/PaymentService.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/PaymentService.d.ts index 5834750..a5e538f 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/PaymentService.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/PaymentService.d.ts @@ -45,5 +45,22 @@ export declare class PaymentService { * ancestor with slotId=hideout */ protected isItemInStash(pmcData: IPmcData, item: Item): boolean; + /** + * Remove currency from player stash/inventory + * @param pmcData Player profile to find and remove currency from + * @param currencyTpl Type of currency to pay + * @param amountToPay money value to pay + * @param sessionID Sessino id + * @param output output object to send to client + * @returns IItemEventRouterResponse + */ addPaymentToOutput(pmcData: IPmcData, currencyTpl: string, amountToPay: number, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse; + /** + * Prioritise player stash first over player inventory + * Post-raid healing would often take money out of the players pockets/secure container + * @param a Firsat money stack item + * @param b Second money stack item + * @returns sorted item + */ + protected moneySort(a: Item, b: Item): number; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/PlayerService.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/PlayerService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/PlayerService.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/PlayerService.d.ts diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/ProfileFixerService.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/ProfileFixerService.d.ts new file mode 100644 index 0000000..313a907 --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/ProfileFixerService.d.ts @@ -0,0 +1,40 @@ +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IPmcDataRepeatableQuest, IRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { Watermark } from "../utils/Watermark"; +export declare class ProfileFixerService { + protected logger: ILogger; + protected watermark: Watermark; + protected databaseServer: DatabaseServer; + constructor(logger: ILogger, watermark: Watermark, databaseServer: DatabaseServer); + /** + * Find issues in the pmc profile data that may cause issues and fix them + * @param pmcProfile profile to check and fix + */ + checkForAndFixPmcProfileIssues(pmcProfile: IPmcData): void; + /** + * Add tag to profile to indicate when it was made + * @param fullProfile + */ + addMissingAkiVersionTagToProfile(fullProfile: IAkiProfile): void; + /** + * TODO - make this non-public - currently used by RepeatableQuestController + * Remove unused condition counters + * @param pmcProfile profile to remove old counters from + */ + removeDanglingConditionCounters(pmcProfile: IPmcData): void; + protected removeDanglingBackendCounters(pmcProfile: IPmcData): void; + protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; + protected addMissingBonusesProperty(pmcProfile: IPmcData): void; + protected addMissingRepeatableQuestsProperty(pmcProfile: IPmcData): void; + protected addMissingWorkbenchWeaponSkills(pmcProfile: IPmcData): void; + /** + * In 18876 bsg changed the pockets tplid to be one that has 3 additional special slots + * @param pmcProfile + */ + protected updateProfilePocketsToNewId(pmcProfile: IPmcData): void; + addMissingArmorRepairSkill(pmcProfile: IPmcData): void; +} diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/RagfairCategoriesService.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/RagfairCategoriesService.d.ts new file mode 100644 index 0000000..83910e5 --- /dev/null +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/RagfairCategoriesService.d.ts @@ -0,0 +1,40 @@ +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { ILogger } from "../models/spt/utils/ILogger"; +export declare class RagfairCategoriesService { + protected logger: ILogger; + protected categories: Record; + constructor(logger: ILogger); + /** + * Get all flea categories and their count of offers + * @returns item categories and count + */ + getAllCategories(): Record; + /** + * With the supplied items, get custom categories + * @returns a custom list of categories + */ + getBespokeCategories(offers: IRagfairOffer[]): Record; + /** + * Take an array of ragfair offers and create a dictionary of items with thier corrisponding offer count + * @param offers ragfair offers + * @returns categories and count + */ + protected processOffersIntoCategories(offers: IRagfairOffer[]): Record; + /** + * Increment or decrement a category array + * @param offer offer to process + * @param categories categories to update + * @param increment should item be incremented or decremented + */ + protected addOrIncrementCategory(offer: IRagfairOffer, categories: Record, increment?: boolean): void; + /** + * Increase category count by 1 + * @param offer + */ + incrementCategory(offer: IRagfairOffer): void; + /** + * Reduce category count by 1 + * @param offer + */ + decrementCategory(offer: IRagfairOffer): void; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/RagfairLinkedItemService.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/RagfairLinkedItemService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/RagfairLinkedItemService.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/RagfairLinkedItemService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/RagfairOfferService.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/RagfairOfferService.d.ts similarity index 86% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/RagfairOfferService.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/RagfairOfferService.d.ts index 7afbf8c..7398a8f 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/RagfairOfferService.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/RagfairOfferService.d.ts @@ -11,12 +11,14 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; +import { RagfairCategoriesService } from "./RagfairCategoriesService"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; protected databaseServer: DatabaseServer; protected saveServer: SaveServer; protected ragfairServerHelper: RagfairServerHelper; + protected ragfairCategoriesService: RagfairCategoriesService; protected profileHelper: ProfileHelper; protected itemEventRouter: ItemEventRouter; protected httpResponse: HttpResponseUtil; @@ -26,12 +28,16 @@ export declare class RagfairOfferService { protected expiredOffers: Item[]; protected offers: IRagfairOffer[]; protected ragfairConfig: IRagfairConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, ragfairCategoriesService: RagfairCategoriesService, profileHelper: ProfileHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, configServer: ConfigServer); + /** + * Get all offers + * @returns IRagfairOffer array + */ getOffers(): IRagfairOffer[]; getOfferByOfferId(offerId: string): IRagfairOffer; getOffersOfType(templateId: string): IRagfairOffer[]; addOffer(offer: IRagfairOffer): void; - addOfferToExpired(offer: Item): void; + addOfferToExpired(staleOffer: IRagfairOffer): void; setTraderUpdateStatus(traderId: string, shouldUpdate: boolean): void; shouldTraderBeUpdated(traderID: string): boolean; getExpiredOfferCount(): number; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/RagfairPriceService.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/RagfairPriceService.d.ts similarity index 64% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/RagfairPriceService.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/RagfairPriceService.d.ts index 5256b99..e33bbb9 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/RagfairPriceService.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/RagfairPriceService.d.ts @@ -1,6 +1,7 @@ import { HandbookHelper } from "../helpers/HandbookHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { PresetHelper } from "../helpers/PresetHelper"; +import { Preset } from "../models/eft/common/IGlobals"; import { Item } from "../models/eft/common/tables/IItem"; import { IBarterScheme } from "../models/eft/common/tables/ITrader"; import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; @@ -28,5 +29,26 @@ export declare class RagfairPriceService { getFleaPriceForItem(tplId: string): number; getBarterPrice(barterScheme: IBarterScheme[]): number; getDynamicOfferPrice(items: Item[], desiredCurrency: string): number; + /** + * Multiply the price by a randomised curve where n = 2, shift = 2 + * @param existingPrice price to alter + * @param isPreset is the item we're multiplying a preset + * @returns multiplied price + */ + protected randomisePrice(existingPrice: number, isPreset: boolean): number; + /** + * Calculate the cost of a weapon preset by adding together the price of its mods + base price of default weapon preset + * @param item base weapon + * @param items weapon plus mods + * @param existingPrice price of existing base weapon + * @returns + */ getWeaponPresetPrice(item: Item, items: Item[], existingPrice: number): number; + /** + * Attempt to get the default preset for a weapon, failing that get the first preset in the array + * (assumes default = has encyclopedia entry) + * @param presets weapon presets to choose from + * @returns Default preset object + */ + protected getDefaultWeaponPreset(presets: Preset[], weapon: Item): Preset; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/RagfairRequiredItemsService.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/RagfairRequiredItemsService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/RagfairRequiredItemsService.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/RagfairRequiredItemsService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/TraderAssortService.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/TraderAssortService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/TraderAssortService.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/TraderAssortService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/mod/image/imageRouteService.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/mod/image/imageRouteService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/mod/image/imageRouteService.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/mod/image/imageRouteService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/mod/onLoad/OnLoadMod.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/mod/onLoad/OnLoadMod.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/mod/onLoad/OnLoadMod.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/mod/onLoad/OnLoadMod.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/mod/onLoad/OnLoadModService.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/mod/onLoad/OnLoadModService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/mod/onLoad/OnLoadModService.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/mod/onLoad/OnLoadModService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/mod/onUpdate/OnUpdateMod.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/mod/onUpdate/OnUpdateMod.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/mod/onUpdate/OnUpdateMod.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/mod/onUpdate/OnUpdateMod.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/mod/onUpdate/OnUpdateModService.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/mod/onUpdate/OnUpdateModService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/mod/onUpdate/OnUpdateModService.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/mod/onUpdate/OnUpdateModService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/mod/staticRouter/StaticRouterMod.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/mod/staticRouter/StaticRouterMod.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/mod/staticRouter/StaticRouterMod.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/mod/staticRouter/StaticRouterMod.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/mod/staticRouter/StaticRouterModService.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/mod/staticRouter/StaticRouterModService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/mod/staticRouter/StaticRouterModService.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/services/mod/staticRouter/StaticRouterModService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/App.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/App.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/App.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/App.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/AyncQueue.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/AyncQueue.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/AyncQueue.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/AyncQueue.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/DatabaseImporter.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/DatabaseImporter.d.ts similarity index 69% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/DatabaseImporter.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/DatabaseImporter.d.ts index 0857b67..483e135 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/DatabaseImporter.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/DatabaseImporter.d.ts @@ -1,9 +1,10 @@ -import { VFS } from "./VFS"; -import { JsonUtil } from "./JsonUtil"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ImageRouter } from "../routers/ImageRouter"; import { OnLoad } from "../di/OnLoad"; +import { IDatabaseTables } from "../models/spt/server/IDatabaseTables"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ImageRouter } from "../routers/ImageRouter"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "./JsonUtil"; +import { VFS } from "./VFS"; export declare class DatabaseImporter extends OnLoad { protected logger: ILogger; protected vfs: VFS; @@ -12,7 +13,12 @@ export declare class DatabaseImporter extends OnLoad { protected imageRouter: ImageRouter; constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, databaseServer: DatabaseServer, imageRouter: ImageRouter); onLoad(): void; + /** + * Read all json files in database folder and map into a json object + * @param filepath path to database folder + */ + protected hydrateDatabase(filepath: string): void; getRoute(): string; - loadRecursive(filepath: string): any; + loadRecursive(filepath: string): IDatabaseTables; loadImages(filepath: string): void; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/HashUtil.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/HashUtil.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/HashUtil.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/HashUtil.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/HttpResponseUtil.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/HttpResponseUtil.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/HttpResponseUtil.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/HttpResponseUtil.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/JsonUtil.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/JsonUtil.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/JsonUtil.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/JsonUtil.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/Logger.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/Logger.d.ts similarity index 67% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/Logger.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/Logger.d.ts index f5b774b..3d9013f 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/Logger.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/Logger.d.ts @@ -1,17 +1,13 @@ /// -import { Daum } from "../models/eft/itemEvent/IItemEventRouterRequest"; -import { ILogger } from "../models/spt/utils/ILogger"; -import winston from "winston"; -import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; -import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; import fs from "fs"; -interface SptLogger { - error: (msg: string | Record) => void; - warn: (msg: string | Record) => void; - succ?: (msg: string | Record) => void; - info: (msg: string | Record) => void; - debug: (msg: string | Record) => void; -} +import winston from "winston"; +import { Daum } from "../models/eft/itemEvent/IItemEventRouterRequest"; +import { LogBackgroundColor } from "../models/spt/logging/LogBackgroundColor"; +import { LogTextColor } from "../models/spt/logging/LogTextColor"; +import { SptLogger } from "../models/spt/logging/SptLogger"; +import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; export declare class WinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected uuidGenerator: IUUidGenerator; @@ -36,16 +32,27 @@ export declare class WinstonLogger implements ILogger { custom: string; debug: string; }; + bgColors: { + default: string; + blackBG: string; + redBG: string; + greenBG: string; + yellowBG: string; + blueBG: string; + magentaBG: string; + cyanBG: string; + whiteBG: string; + }; }; protected logger: winston.Logger & SptLogger; - writeFilePromisify: (path: fs.PathLike, data: string, options?: any) => Promise; + protected writeFilePromisify: (path: fs.PathLike, data: string, options?: any) => Promise; constructor(asyncQueue: IAsyncQueue, uuidGenerator: IUUidGenerator); writeToLogFile(data: string | Daum): Promise; - log(data: string | Error | Record, color: string): Promise; + log(data: string | Error | Record, color: string, backgroundColor?: string): Promise; error(data: string | Record): Promise; warning(data: string | Record): Promise; success(data: string | Record): Promise; info(data: string | Record): Promise; + logWithColor(data: string | Record, textColor: LogTextColor, backgroundColor?: LogBackgroundColor): Promise; debug(data: string | Record, onlyShowInConsole?: boolean): Promise; } -export {}; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/MathUtil.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/MathUtil.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/MathUtil.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/MathUtil.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/ObjectId.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/ObjectId.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/ObjectId.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/ObjectId.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/RandomUtil.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/RandomUtil.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/RandomUtil.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/RandomUtil.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/TimeUtil.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/TimeUtil.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/TimeUtil.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/TimeUtil.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/UUidGenerator.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/UUidGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/UUidGenerator.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/UUidGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/VFS.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/VFS.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/VFS.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/VFS.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/Watermark.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/Watermark.d.ts similarity index 83% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/Watermark.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/Watermark.d.ts index 111bdd0..c6dc120 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/Watermark.d.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/Watermark.d.ts @@ -28,7 +28,12 @@ export declare class Watermark { protected text: string[]; protected versionLabel: string; initialize(): void; - getVersionTag(): string; + /** + * Get a version string (x.x.x) or (x.x.x-BLEEDINGEDGE) OR (X.X.X (18xxx)) + * @param withEftVersion Include the eft version this spt version was made for + * @returns string + */ + getVersionTag(withEftVersion?: boolean): string; getVersionLabel(): string; /** Set window title */ setTitle(): void; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/decorators/Singleton.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/decorators/Singleton.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/decorators/Singleton.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/decorators/Singleton.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/decorators/constructor.d.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/decorators/constructor.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/decorators/constructor.d.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.0/user/mods/Faupi-MunitionsExpert 1.6.0/types/utils/decorators/constructor.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/bepInEx/plugins/Faupi-MunitionsExpert.dll b/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/bepInEx/plugins/Faupi-MunitionsExpert.dll deleted file mode 100644 index 8e06457..0000000 Binary files a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/bepInEx/plugins/Faupi-MunitionsExpert.dll and /dev/null differ diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/generators/BotWeaponGenerator.d.ts b/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/generators/BotWeaponGenerator.d.ts deleted file mode 100644 index 13fe7df..0000000 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/generators/BotWeaponGenerator.d.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { MinMax, Mods, ModsChances } from "../models/eft/common/tables/IBotType"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { HashUtil } from "../utils/HashUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -export declare class BotWeaponGenerator { - protected logger: ILogger; - protected hashUtil: HashUtil; - protected databaseServer: DatabaseServer; - protected itemHelper: ItemHelper; - protected weightedRandomHelper: WeightedRandomHelper; - protected botGeneratorHelper: BotGeneratorHelper; - protected randomUtil: RandomUtil; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil); - generateWeapon(equipmentSlot: string, weaponPool: Record, modPool: Mods, modChances: ModsChances, magCounts: MinMax, botRole: string, isPmc: boolean, inventory: PmcInventory): void; - /** Checks if all required slots are occupied on a weapon and all it's mods */ - protected isWeaponValid(itemList: Item[]): boolean; - /** - * Generates extra magazines or bullets (if magazine is internal) and adds them to TacticalVest and Pockets. - * Additionally, adds extra bullets to SecuredContainer - * - * @param {*} weaponMods - * @param {*} weaponTemplate - * @param {*} magCounts - * @param {*} ammoTpl - * @returns - */ - protected generateExtraMagazines(weaponMods: Item[], weaponTemplate: ITemplateItem, magCounts: MinMax, ammoTpl: string, inventory: PmcInventory): void; - protected addBullets(ammoTpl: string, bulletCount: number, inventory: PmcInventory): void; - /** - * Finds and returns tpl of ammo that should be used, while making sure it's compatible - * - * @param {*} weaponMods - * @param {*} weaponTemplate - * @returns - */ - protected getCompatibleAmmo(weaponMods: Item[], weaponTemplate: ITemplateItem): string; - /** Fill existing magazines to full, while replacing their contents with specified ammo */ - protected fillExistingMagazines(weaponMods: Item[], magazine: Item, ammoTpl: string): void; -} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/HealthHelper.d.ts b/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/HealthHelper.d.ts deleted file mode 100644 index 518c23f..0000000 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/HealthHelper.d.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { IPmcData } from "../models/eft/common/IPmcData"; -import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; -import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; -import { IHealthConfig } from "../models/spt/config/IHealthConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { SaveServer } from "../servers/SaveServer"; -import { JsonUtil } from "../utils/JsonUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -export declare class HealthHelper { - protected jsonUtil: JsonUtil; - protected logger: ILogger; - protected timeUtil: TimeUtil; - protected saveServer: SaveServer; - protected configServer: ConfigServer; - protected healthConfig: IHealthConfig; - constructor(jsonUtil: JsonUtil, logger: ILogger, timeUtil: TimeUtil, saveServer: SaveServer, configServer: ConfigServer); - resetVitality(sessionID: string): IAkiProfile; - saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string): void; - protected saveHealth(pmcData: IPmcData, sessionID: string): void; - protected saveEffects(pmcData: IPmcData, sessionID: string): void; - protected addEffect(pmcData: IPmcData, sessionID: string, effect: { - bodyPart: string; - effectType: string; - }): void; - protected isEmpty(map: any): boolean; -} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/TraderHelper.d.ts b/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/TraderHelper.d.ts deleted file mode 100644 index ab4a371..0000000 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/TraderHelper.d.ts +++ /dev/null @@ -1,53 +0,0 @@ -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IBarterScheme, ITraderAssort, ITraderBase, LoyaltyLevel } from "../models/eft/common/tables/ITrader"; -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 { SaveServer } from "../servers/SaveServer"; -import { FenceService } from "../services/FenceService"; -import { PlayerService } from "../services/PlayerService"; -import { HandbookHelper } from "./HandbookHelper"; -import { ItemHelper } from "./ItemHelper"; -import { PaymentHelper } from "./PaymentHelper"; -import { ProfileHelper } from "./ProfileHelper"; -export declare class TraderHelper { - protected logger: ILogger; - protected databaseServer: DatabaseServer; - protected saveServer: SaveServer; - protected profileHelper: ProfileHelper; - protected paymentHelper: PaymentHelper; - protected itemHelper: ItemHelper; - protected handbookHelper: HandbookHelper; - protected playerService: PlayerService; - protected fenceService: FenceService; - protected configServer: ConfigServer; - protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemHelper: ItemHelper, handbookHelper: HandbookHelper, playerService: PlayerService, fenceService: FenceService, configServer: ConfigServer); - getTrader(traderID: string, sessionID: string): ITraderBase; - getTraderAssortsById(traderId: string): ITraderAssort; - /** - * Reset a trader back to its initial state as seen by a level 1 player - * Does NOT take into account different profile levels - * @param sessionID session id - * @param traderID trader id to reset - */ - resetTrader(sessionID: string, traderID: string): void; - changeTraderDisplay(traderID: string, status: boolean, sessionID: string): void; - getPurchasesData(traderID: string, sessionID: string): Record; - /** - * Calculate traders level based on exp amount and increment level if over threshold - * @param traderID trader to process - * @param sessionID session id - */ - lvlUp(traderID: string, sessionID: string): void; - getTraderUpdateSeconds(traderId: string): number; - /** - * check if an item is allowed to be sold to a trader - * @param traderFilters array of allowed categories - * @param tplToCheck itemTpl of inventory - * @returns boolean - */ - traderFilter(traderFilters: string[], tplToCheck: string): boolean; - getLoyaltyLevel(traderID: string, pmcData: IPmcData): LoyaltyLevel; -} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/tables/ITemplateItem.d.ts b/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/tables/ITemplateItem.d.ts deleted file mode 100644 index c2ba762..0000000 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/tables/ITemplateItem.d.ts +++ /dev/null @@ -1,401 +0,0 @@ -export interface ITemplateItem { - _id: string; - _name: string; - _parent: string; - _type: string; - _props: Props; - _proto: string; -} -export interface Props { - Name: string; - ShortName: string; - Description: string; - Weight: number; - BackgroundColor: string; - Width: number; - Height: number; - StackMaxSize: number; - Rarity?: string; - SpawnChance?: number; - CreditsPrice?: number; - ItemSound: string; - Prefab: Prefab; - UsePrefab: Prefab; - StackObjectsCount: number; - NotShownInSlot: boolean; - ExaminedByDefault: boolean; - ExamineTime: number; - IsUndiscardable: boolean; - IsUnsaleable: boolean; - IsUnbuyable: boolean; - IsUngivable: boolean; - IsLockedafterEquip: boolean; - QuestItem: boolean; - LootExperience: number; - ExamineExperience: number; - HideEntrails: boolean; - RepairCost: number; - RepairSpeed: number; - ExtraSizeLeft: number; - ExtraSizeRight: number; - ExtraSizeUp: number; - ExtraSizeDown: number; - ExtraSizeForceAdd: boolean; - MergesWithChildren: boolean; - CanSellOnRagfair: boolean; - CanRequireOnRagfair: boolean; - ConflictingItems: string[]; - DiscardLimit: number; - Unlootable: boolean; - UnlootableFromSlot: string; - UnlootableFromSide: string[]; - AnimationVariantsNumber: number; - DiscardingBlock: boolean; - RagFairCommissionModifier: number; - IsAlwaysAvailableForInsurance: boolean; - Grids: Grid[]; - Slots: Slot[]; - CanPutIntoDuringTheRaid: boolean; - CantRemoveFromSlotsDuringRaid: string[]; - weapClass: string; - weapUseType: string; - ammoCaliber: string; - Durability: number; - MaxDurability: number; - OperatingResource: number; - RepairComplexity: number; - durabSpawnMin: number; - durabSpawnMax: number; - isFastReload: boolean; - RecoilForceUp: number; - RecoilForceBack: number; - Convergence: number; - RecoilAngle: number; - weapFireType: string[]; - RecolDispersion: number; - SingleFireRate: number; - CanQueueSecondShot: boolean; - bFirerate: number; - Ergonomics: number; - Velocity: number; - bEffDist: number; - bHearDist: number; - isChamberLoad: boolean; - chamberAmmoCount: number; - isBoltCatch: boolean; - defMagType: string; - defAmmo: string; - AdjustCollimatorsToTrajectory: boolean; - shotgunDispersion: number; - Chambers: Chamber[]; - CameraRecoil: number; - CameraSnap: number; - ReloadMode: string; - CenterOfImpact: number; - AimPlane: number; - DeviationCurve: number; - DeviationMax: number; - Foldable: boolean; - Retractable: boolean; - TacticalReloadStiffnes: Xyz; - TacticalReloadFixation: number; - RecoilCenter: Xyz; - RotationCenter: Xyz; - RotationCenterNoStock: Xyz; - SizeReduceRight: number; - FoldedSlot: string; - CompactHandling: boolean; - SightingRange: number; - MinRepairDegradation: number; - MaxRepairDegradation: number; - MinRepairKitDegradation: number; - MaxRepairKitDegradation: number; - IronSightRange: number; - MustBoltBeOpennedForExternalReload: boolean; - MustBoltBeOpennedForInternalReload: boolean; - BoltAction: boolean; - HipAccuracyRestorationDelay: number; - HipAccuracyRestorationSpeed: number; - HipInnaccuracyGain: number; - ManualBoltCatch: boolean; - BurstShotsCount: number; - BaseMalfunctionChance: number; - AllowJam: boolean; - AllowFeed: boolean; - AllowMisfire: boolean; - AllowSlide: boolean; - DurabilityBurnRatio: number; - HeatFactorGun: number; - CoolFactorGun: number; - CoolFactorGunMods: number; - HeatFactorByShot: number; - AllowOverheat: boolean; - DoubleActionAccuracyPenalty: number; - RecoilPosZMult: number; - ShotgunDispersion: number; - StackMinRandom: number; - StackMaxRandom: number; - StackSlots: StackSlot[]; - SearchSound: string; - BlocksArmorVest: boolean; - RigLayoutName: string; - armorZone: string[]; - armorClass: number; - speedPenaltyPercent: number; - mousePenalty: number; - weaponErgonomicPenalty: number; - BluntThroughput: number; - ArmorMaterial: string; - medUseTime: number; - medEffectType: string; - MaxHpResource: number; - hpResourceRate: number; - StimulatorBuffs: string; - effects_health: EffectsHealth; - effects_damage: EffectsDamage; - knifeHitDelay: number; - knifeHitSlashRate: number; - knifeHitStabRate: number; - knifeHitRadius: number; - knifeHitSlashDam: number; - knifeHitStabDam: number; - knifeDurab: number; - PrimaryDistance: number; - SecondryDistance: number; - SlashPenetration: number; - StabPenetration: number; - PrimaryConsumption: number; - SecondryConsumption: number; - DeflectionConsumption: number; - MaxResource: number; - AppliedTrunkRotation: Xyz; - AppliedHeadRotation: Xyz; - DisplayOnModel: boolean; - AdditionalAnimationLayer: number; - StaminaBurnRate: number; - ColliderScaleMultiplier: Xyz; - ammoType: string; - InitialSpeed: number; - BallisticCoeficient: number; - BulletMassGram: number; - BulletDiameterMilimeters: number; - Damage: number; - ammoAccr: number; - ammoRec: number; - ammoDist: number; - buckshotBullets: number; - PenetrationPower: number; - PenetrationPowerDiviation: number; - ammoHear: number; - ammoSfx: string; - MisfireChance: number; - MinFragmentsCount: number; - MaxFragmentsCount: number; - ammoShiftChance: number; - casingName: string; - casingEjectPower: number; - casingMass: number; - casingSounds: string; - ProjectileCount: number; - PenetrationChance: number; - RicochetChance: number; - FragmentationChance: number; - Deterioration: number; - SpeedRetardation: number; - Tracer: boolean; - TracerColor: string; - TracerDistance: number; - ArmorDamage: number; - Caliber: string; - StaminaBurnPerDamage: number; - HeavyBleedingDelta: number; - LightBleedingDelta: number; - ShowBullet: boolean; - HasGrenaderComponent: boolean; - FuzeArmTimeSec: number; - ExplosionStrength: number; - MinExplosionDistance: number; - MaxExplosionDistance: number; - FragmentsCount: number; - FragmentType: string; - ShowHitEffectOnExplode: boolean; - ExplosionType: string; - AmmoLifeTimeSec: number; - Contusion: Contusion; - ArmorDistanceDistanceDamage: Xyz; - Blindness: Xyz; - IsLightAndSoundShot: boolean; - LightAndSoundShotAngle: number; - LightAndSoundShotSelfContusionTime: number; - LightAndSoundShotSelfContusionStrength: number; - MalfMisfireChance: number; - DurabilityBurnModificator: number; - HeatFactor: number; - MalfFeedChance: number; - Accuracy: number; - Recoil: number; - Loudness: number; - EffectiveDistance: number; - RaidModdable: boolean; - ToolModdable: boolean; - BlocksFolding: boolean; - BlocksCollapsible: boolean; - IsAnimated: boolean; - HasShoulderContact: boolean; - DoubleActionAccuracyPenaltyMult: number; - magAnimationIndex: number; - Cartridges: Cartridge[]; - CanFast: boolean; - CanHit: boolean; - CanAdmin: boolean; - LoadUnloadModifier: number; - CheckTimeModifier: number; - CheckOverride: number; - ReloadMagType: string; - VisibleAmmoRangesString: string; - MalfunctionChance: number; - TagColor: number; - TagName: string; - MaximumNumberOfUsage: number; - CustomAimPlane: string; - sightModType: string; - aimingSensitivity: number; - SightModesCount: number; - OpticCalibrationDistances: number[]; - ScopesCount: number; - AimSensitivity: number[][]; - ModesCount: number[]; - Zooms: number[][]; - CalibrationDistances: number[][]; - Intensity: number; - Mask: string; - MaskSize: number; - NoiseIntensity: number; - NoiseScale: number; - Color: Color; - DiffuseIntensity: number; - HasHinge: boolean; - Resource?: number; - CoolFactor?: number; - foodUseTime?: number; - foodEffectType?: string; - MaxRepairResource: number; - RepairQuality: number; - RepairType: string; - TargetItemFilter: string[]; - apResource: number; - krResource: number; -} -export interface Prefab { - path: string; - rcid: string; -} -export interface Grid { - _name: string; - _id: string; - _parent: string; - _props: GridProps; - _proto: string; -} -export interface GridProps { - filters: GridFilter[]; - cellsH: number; - cellsV: number; - minCount: number; - maxCount: number; - maxWeight: number; - isSortingTable: boolean; -} -export interface GridFilter { - Filter: string[]; - ExcludedFilter: string[]; -} -export interface Slot { - _name: string; - _id: string; - _parent: string; - _props: SlotProps; - _required: boolean; - _mergeSlotWithChildren: boolean; - _proto: string; -} -export interface SlotProps { - filters: Filter[]; -} -export interface Chamber { - _name: string; - _id: string; - _parent: string; - _props: ChamberProps; - _required: boolean; - _mergeSlotWithChildren: boolean; - _proto: string; -} -export interface ChamberProps { - filters: FilterProps[]; -} -export interface FilterProps { - Filter: string[]; -} -export interface Xyz { - x: number; - y: number; - z: number; -} -export interface StackSlot { - _name?: string; - _id: string; - _sptTpl: string; - parent: string; - location: any; - slotId: string; - _max_count: number; - _props?: StackSlotProps; - _proto?: string; - upd: any; -} -export interface StackSlotProps { - filters: Filter[]; -} -export interface EffectsHealth { - Hydration: Hydration; -} -export interface Hydration { - value: number; -} -export interface EffectsDamage { - Pain: Pain; - Contusion: Contusion; -} -export interface Pain { - delay: number; - duration: number; - fadeOut: number; -} -export interface Contusion { - delay: number; - duration: number; - fadeOut: number; -} -export interface Cartridge { - _name: string; - _id: string; - _parent: string; - _max_count: number; - _props: CartridgeProps; - _proto: string; -} -export interface CartridgeProps { - filters: Filter[]; -} -export interface Filter { - Shift?: number; - Filter: string[]; - AnimationIndex?: number; -} -export interface Color { - r: number; - g: number; - b: number; - a: number; -} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/RagfairCategoriesService.d.ts b/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/RagfairCategoriesService.d.ts deleted file mode 100644 index 09956cc..0000000 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/RagfairCategoriesService.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; -export declare class RagfairCategoriesService { - updateCategories(offers: IRagfairOffer[]): void; - protected categories: Record; - getCategories(): Record; - getCategoryByItemId(itemId: string): number; - resetCategories(): void; - setCategoryValue(itemId: string, newValue: number): void; - incrementCategory(itemId: string): void; -} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/MunitionsExpert.csproj b/Faupi-MunitionsExpert/MunitionsExpert/MunitionsExpert.csproj deleted file mode 100644 index 1166121..0000000 --- a/Faupi-MunitionsExpert/MunitionsExpert/MunitionsExpert.csproj +++ /dev/null @@ -1,106 +0,0 @@ - - - - - Debug - AnyCPU - {C5889536-4EE7-40BC-A8FD-7F1A80C3F3E5} - Library - Properties - MunitionsExpert - Faupi-MunitionsExpert - v4.7.2 - 512 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE;/noentry - prompt - 4 - - - true - - - - - - - - - - - - - - - - - - - - - - - - - ..\..\Shared\BepInEx\0Harmony.dll - - - ..\..\Shared\AKI\Aki.Common.dll - - - ..\..\Shared\AKI\Aki.Reflection.dll - - - ..\..\Shared\EFT\Assembly-CSharp.dll - - - ..\..\Shared\BepInEx\BepInEx.dll - - - ..\..\Shared\EFT\Comfort.dll - - - - False - ..\References\EFT-Managed\Newtonsoft.Json.dll - - - - ..\..\Shared\EFT\UnityEngine.dll - - - ..\..\Shared\EFT\UnityEngine.CoreModule.dll - - - ..\..\Shared\EFT\UnityEngine.UnityWebRequestModule.dll - - - ..\..\Shared\EFT\UnityEngine.UnityWebRequestTextureModule.dll - - - ..\..\Shared\EFT\UnityEngine.UnityWebRequestWWWModule.dll - - - - - - - - - - - \ No newline at end of file diff --git a/Faupi-MunitionsExpert/MunitionsExpert/MunitionsExpert.sln b/Faupi-MunitionsExpert/MunitionsExpert/MunitionsExpert.sln index 12be45c..4c93e96 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/MunitionsExpert.sln +++ b/Faupi-MunitionsExpert/MunitionsExpert/MunitionsExpert.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 -VisualStudioVersion = 17.0.32014.148 +VisualStudioVersion = 17.2.32616.157 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MunitionsExpert", "MunitionsExpert.csproj", "{C5889536-4EE7-40BC-A8FD-7F1A80C3F3E5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MunitionsExpert", "MunitionsExpert\MunitionsExpert.csproj", "{97F53AEA-40EA-4DA6-9F9A-2426D8CEAD00}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,15 +11,15 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C5889536-4EE7-40BC-A8FD-7F1A80C3F3E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C5889536-4EE7-40BC-A8FD-7F1A80C3F3E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C5889536-4EE7-40BC-A8FD-7F1A80C3F3E5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C5889536-4EE7-40BC-A8FD-7F1A80C3F3E5}.Release|Any CPU.Build.0 = Release|Any CPU + {97F53AEA-40EA-4DA6-9F9A-2426D8CEAD00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {97F53AEA-40EA-4DA6-9F9A-2426D8CEAD00}.Debug|Any CPU.Build.0 = Debug|Any CPU + {97F53AEA-40EA-4DA6-9F9A-2426D8CEAD00}.Release|Any CPU.ActiveCfg = Release|Any CPU + {97F53AEA-40EA-4DA6-9F9A-2426D8CEAD00}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {C4FBDDAB-36FB-44F2-8D1D-4E7AF0E20BF1} + SolutionGuid = {852762F7-6799-4ADE-A6FC-CCB32F0D9E67} EndGlobalSection EndGlobal diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/client/Attributes.cs b/Faupi-MunitionsExpert/MunitionsExpert/MunitionsExpert/Attributes.cs similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/client/Attributes.cs rename to Faupi-MunitionsExpert/MunitionsExpert/MunitionsExpert/Attributes.cs diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/client/CachedAttributesPatch.cs b/Faupi-MunitionsExpert/MunitionsExpert/MunitionsExpert/CachedAttributesPatch.cs similarity index 85% rename from Faupi-MunitionsExpert/MunitionsExpert/src/client/CachedAttributesPatch.cs rename to Faupi-MunitionsExpert/MunitionsExpert/MunitionsExpert/CachedAttributesPatch.cs index 3acbec6..8a14dab 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/client/CachedAttributesPatch.cs +++ b/Faupi-MunitionsExpert/MunitionsExpert/MunitionsExpert/CachedAttributesPatch.cs @@ -7,7 +7,7 @@ using ItemAttributes = GClass2185; namespace MunitionsExpert { - internal class CachedAttributesPatch : ModulePatch + internal class CachedAttributesPatch : ModulePatch { protected override MethodBase GetTargetMethod() { @@ -20,7 +20,7 @@ namespace MunitionsExpert if (!__result.Any((ItemAttributes a) => (Attributes.ENewItemAttributeId)a.Id == Attributes.ENewItemAttributeId.Damage)) { //MunitionsExpert.FormatExistingAttributes(ref __result, __instance); - MunitionsExpert.AddNewAttributes(ref __result, __instance); + Plugin.AddNewAttributes(ref __result, __instance); } } } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/MunitionsExpert/MunitionsExpert.csproj b/Faupi-MunitionsExpert/MunitionsExpert/MunitionsExpert/MunitionsExpert.csproj new file mode 100644 index 0000000..111517c --- /dev/null +++ b/Faupi-MunitionsExpert/MunitionsExpert/MunitionsExpert/MunitionsExpert.csproj @@ -0,0 +1,44 @@ + + + + net472 + Faupi-MunitionsExpert + + + + + ..\..\..\Shared\AKI\Aki.Common.dll + + + ..\..\..\Shared\AKI\Aki.Reflection.dll + + + ..\..\..\Shared\EFT\Assembly-CSharp.dll + + + ..\..\..\Shared\BepInEx\BepInEx.dll + + + ..\..\..\Shared\EFT\Comfort.dll + + + ..\..\..\Shared\EFT\Newtonsoft.Json.dll + + + ..\..\..\Shared\EFT\UnityEngine.dll + + + ..\..\..\Shared\EFT\UnityEngine.CoreModule.dll + + + ..\..\..\Shared\EFT\UnityEngine.UnityWebRequestModule.dll + + + ..\..\..\Shared\EFT\UnityEngine.UnityWebRequestTextureModule.dll + + + ..\..\..\Shared\EFT\UnityEngine.UnityWebRequestWWWModule.dll + + + + diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/client/MunitionsExpert.cs b/Faupi-MunitionsExpert/MunitionsExpert/MunitionsExpert/Program.cs similarity index 88% rename from Faupi-MunitionsExpert/MunitionsExpert/src/client/MunitionsExpert.cs rename to Faupi-MunitionsExpert/MunitionsExpert/MunitionsExpert/Program.cs index 1cbaeea..1f91385 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/client/MunitionsExpert.cs +++ b/Faupi-MunitionsExpert/MunitionsExpert/MunitionsExpert/Program.cs @@ -7,43 +7,37 @@ using UnityEngine.Networking; using System.Threading.Tasks; using BepInEx; using Comfort.Common; +using Newtonsoft.Json; +using Aki.Common.Utils; using ItemAttribute = GClass2185; using ServerSettings = GClass1150; using static MunitionsExpert.Attributes; - +using Aki.Common.Http; namespace MunitionsExpert { - [BepInPlugin("com.FAUPI.MunitionsExpert", "FAUPI-MunitionsExpert", "1.4.0")] - public class MunitionsExpert : BaseUnityPlugin + [BepInPlugin("com.Faupi.MunitionsExpert", "Faupi-MunitionsExpert", "1.2.0")] + public class Plugin : BaseUnityPlugin { + public static Dictionary iconCache = new Dictionary(); + public static List penAttributes = new List(); + public static string modPath; + private void Awake() { + GetPath(); new CachedAttributesPatch().Enable(); new StaticIconsPatch().Enable(); CacheIcons(); } - private static ModInformation _modInfo; - public static ModInformation ModInfo + private void GetPath() { - private set - { - _modInfo = value; - } - get - { - if (_modInfo == null) - _modInfo = ModInformation.Load(); - return _modInfo; - } + var mod = RequestHandler.GetJson($"/MunitionsExpert/GetInfo"); + modPath = Json.Deserialize(mod); } - public static Dictionary iconCache = new Dictionary(); - public static List penAttributes = new List(); // For refreshing armor class rating - public static string modName = ModInfo.name; - public static void CacheIcons() { iconCache.Add(ENewItemAttributeId.Damage, Resources.Load("characteristics/icons/icon_info_damage")); @@ -51,8 +45,8 @@ namespace MunitionsExpert iconCache.Add(EItemAttributeId.LightBleedingDelta, Resources.Load("characteristics/icons/icon_info_bloodloss")); iconCache.Add(EItemAttributeId.HeavyBleedingDelta, Resources.Load("characteristics/icon_info_hydration")); iconCache.Add(ENewItemAttributeId.Penetration, Resources.Load("characteristics/icon_info_penetration")); - //_ = LoadTexture(ENewItemAttributeId.ArmorDamage, Path.Combine(ModInfo.path, "res/armorDamage.png")); - //_ = LoadTexture(ENewItemAttributeId.RicochetChance, Path.Combine(ModInfo.path, "res/ricochet.png")); + _ = LoadTexture(ENewItemAttributeId.ArmorDamage, Path.Combine(modPath, "res\\armorDamage.png")); + _ = LoadTexture(ENewItemAttributeId.RicochetChance, Path.Combine(modPath, "res\\armorDamage.png")); } public static async Task LoadTexture(Enum id, string path) @@ -162,4 +156,4 @@ namespace MunitionsExpert } } } -} \ No newline at end of file +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/client/StaticIconsPatch.cs b/Faupi-MunitionsExpert/MunitionsExpert/MunitionsExpert/StaticIconsPatch.cs similarity index 82% rename from Faupi-MunitionsExpert/MunitionsExpert/src/client/StaticIconsPatch.cs rename to Faupi-MunitionsExpert/MunitionsExpert/MunitionsExpert/StaticIconsPatch.cs index 3ab4d5e..e59e35a 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/client/StaticIconsPatch.cs +++ b/Faupi-MunitionsExpert/MunitionsExpert/MunitionsExpert/StaticIconsPatch.cs @@ -16,12 +16,12 @@ namespace MunitionsExpert [PatchPrefix] private static bool PatchPrefix(ref Sprite __result, Enum id) { - if (id == null || !MunitionsExpert.iconCache.ContainsKey(id)) + if (id == null || !Plugin.iconCache.ContainsKey(id)) { return true; } - Sprite sprite = MunitionsExpert.iconCache[id]; + Sprite sprite = Plugin.iconCache[id]; if (sprite != null) { @@ -32,4 +32,4 @@ namespace MunitionsExpert return true; } } -} +} \ No newline at end of file diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Properties/AssemblyInfo.cs b/Faupi-MunitionsExpert/MunitionsExpert/Properties/AssemblyInfo.cs deleted file mode 100644 index fa4904b..0000000 --- a/Faupi-MunitionsExpert/MunitionsExpert/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System.Resources; -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("MunitionsExpert - Ammo stats in inspect view")] -[assembly: AssemblyDescription("Adds ammo stats to inspect view as well as improving the format a little")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("SPT-AKI - MunitionsExpert")] -[assembly: AssemblyCopyright("Faupi © 2021")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("c5889536-4ee7-40bc-a8fd-7f1a80c3f3e5")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.1.0")] -[assembly: AssemblyFileVersion("1.2.1.0")] -[assembly: NeutralResourcesLanguage("en-US")] diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/client/ModInformation.cs b/Faupi-MunitionsExpert/MunitionsExpert/src/client/ModInformation.cs deleted file mode 100644 index c390b67..0000000 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/client/ModInformation.cs +++ /dev/null @@ -1,38 +0,0 @@ -using Aki.Common.Http; -using Newtonsoft.Json.Linq; -using System; -using UnityEngine; -using UnityEngine.Assertions; - -namespace MunitionsExpert -{ - public class ModInformation - { - public string name; - public string author; - public string version; - public string license; - public string main; - public string path; - - public static ModInformation Load() - { - ModInformation ModInfo; - - JObject response = JObject.Parse(RequestHandler.GetJson($"/MunitionsExpert/GetInfo")); - try - { - Assert.IsTrue(response.Value("status") == 0); - ModInfo = response["data"].ToObject(); - } - catch (Exception getModInfoException) - { - string errMsg = $"[{typeof(MunitionsExpert)}] Package.json couldn't be found! Make sure you've installed the mod on the server as well!"; - Debug.LogError(errMsg); - throw getModInfoException; - } - - return ModInfo; - } - } -} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/generators/BotWeaponGenerator.d.ts b/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/generators/BotWeaponGenerator.d.ts deleted file mode 100644 index 13fe7df..0000000 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/generators/BotWeaponGenerator.d.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { MinMax, Mods, ModsChances } from "../models/eft/common/tables/IBotType"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { HashUtil } from "../utils/HashUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -export declare class BotWeaponGenerator { - protected logger: ILogger; - protected hashUtil: HashUtil; - protected databaseServer: DatabaseServer; - protected itemHelper: ItemHelper; - protected weightedRandomHelper: WeightedRandomHelper; - protected botGeneratorHelper: BotGeneratorHelper; - protected randomUtil: RandomUtil; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil); - generateWeapon(equipmentSlot: string, weaponPool: Record, modPool: Mods, modChances: ModsChances, magCounts: MinMax, botRole: string, isPmc: boolean, inventory: PmcInventory): void; - /** Checks if all required slots are occupied on a weapon and all it's mods */ - protected isWeaponValid(itemList: Item[]): boolean; - /** - * Generates extra magazines or bullets (if magazine is internal) and adds them to TacticalVest and Pockets. - * Additionally, adds extra bullets to SecuredContainer - * - * @param {*} weaponMods - * @param {*} weaponTemplate - * @param {*} magCounts - * @param {*} ammoTpl - * @returns - */ - protected generateExtraMagazines(weaponMods: Item[], weaponTemplate: ITemplateItem, magCounts: MinMax, ammoTpl: string, inventory: PmcInventory): void; - protected addBullets(ammoTpl: string, bulletCount: number, inventory: PmcInventory): void; - /** - * Finds and returns tpl of ammo that should be used, while making sure it's compatible - * - * @param {*} weaponMods - * @param {*} weaponTemplate - * @returns - */ - protected getCompatibleAmmo(weaponMods: Item[], weaponTemplate: ITemplateItem): string; - /** Fill existing magazines to full, while replacing their contents with specified ammo */ - protected fillExistingMagazines(weaponMods: Item[], magazine: Item, ammoTpl: string): void; -} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/HealthHelper.d.ts b/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/HealthHelper.d.ts deleted file mode 100644 index 518c23f..0000000 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/HealthHelper.d.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { IPmcData } from "../models/eft/common/IPmcData"; -import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; -import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; -import { IHealthConfig } from "../models/spt/config/IHealthConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { SaveServer } from "../servers/SaveServer"; -import { JsonUtil } from "../utils/JsonUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -export declare class HealthHelper { - protected jsonUtil: JsonUtil; - protected logger: ILogger; - protected timeUtil: TimeUtil; - protected saveServer: SaveServer; - protected configServer: ConfigServer; - protected healthConfig: IHealthConfig; - constructor(jsonUtil: JsonUtil, logger: ILogger, timeUtil: TimeUtil, saveServer: SaveServer, configServer: ConfigServer); - resetVitality(sessionID: string): IAkiProfile; - saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string): void; - protected saveHealth(pmcData: IPmcData, sessionID: string): void; - protected saveEffects(pmcData: IPmcData, sessionID: string): void; - protected addEffect(pmcData: IPmcData, sessionID: string, effect: { - bodyPart: string; - effectType: string; - }): void; - protected isEmpty(map: any): boolean; -} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/TraderHelper.d.ts b/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/TraderHelper.d.ts deleted file mode 100644 index ab4a371..0000000 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/TraderHelper.d.ts +++ /dev/null @@ -1,53 +0,0 @@ -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IBarterScheme, ITraderAssort, ITraderBase, LoyaltyLevel } from "../models/eft/common/tables/ITrader"; -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 { SaveServer } from "../servers/SaveServer"; -import { FenceService } from "../services/FenceService"; -import { PlayerService } from "../services/PlayerService"; -import { HandbookHelper } from "./HandbookHelper"; -import { ItemHelper } from "./ItemHelper"; -import { PaymentHelper } from "./PaymentHelper"; -import { ProfileHelper } from "./ProfileHelper"; -export declare class TraderHelper { - protected logger: ILogger; - protected databaseServer: DatabaseServer; - protected saveServer: SaveServer; - protected profileHelper: ProfileHelper; - protected paymentHelper: PaymentHelper; - protected itemHelper: ItemHelper; - protected handbookHelper: HandbookHelper; - protected playerService: PlayerService; - protected fenceService: FenceService; - protected configServer: ConfigServer; - protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemHelper: ItemHelper, handbookHelper: HandbookHelper, playerService: PlayerService, fenceService: FenceService, configServer: ConfigServer); - getTrader(traderID: string, sessionID: string): ITraderBase; - getTraderAssortsById(traderId: string): ITraderAssort; - /** - * Reset a trader back to its initial state as seen by a level 1 player - * Does NOT take into account different profile levels - * @param sessionID session id - * @param traderID trader id to reset - */ - resetTrader(sessionID: string, traderID: string): void; - changeTraderDisplay(traderID: string, status: boolean, sessionID: string): void; - getPurchasesData(traderID: string, sessionID: string): Record; - /** - * Calculate traders level based on exp amount and increment level if over threshold - * @param traderID trader to process - * @param sessionID session id - */ - lvlUp(traderID: string, sessionID: string): void; - getTraderUpdateSeconds(traderId: string): number; - /** - * check if an item is allowed to be sold to a trader - * @param traderFilters array of allowed categories - * @param tplToCheck itemTpl of inventory - * @returns boolean - */ - traderFilter(traderFilters: string[], tplToCheck: string): boolean; - getLoyaltyLevel(traderID: string, pmcData: IPmcData): LoyaltyLevel; -} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/tables/ITemplateItem.d.ts b/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/tables/ITemplateItem.d.ts deleted file mode 100644 index c2ba762..0000000 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/tables/ITemplateItem.d.ts +++ /dev/null @@ -1,401 +0,0 @@ -export interface ITemplateItem { - _id: string; - _name: string; - _parent: string; - _type: string; - _props: Props; - _proto: string; -} -export interface Props { - Name: string; - ShortName: string; - Description: string; - Weight: number; - BackgroundColor: string; - Width: number; - Height: number; - StackMaxSize: number; - Rarity?: string; - SpawnChance?: number; - CreditsPrice?: number; - ItemSound: string; - Prefab: Prefab; - UsePrefab: Prefab; - StackObjectsCount: number; - NotShownInSlot: boolean; - ExaminedByDefault: boolean; - ExamineTime: number; - IsUndiscardable: boolean; - IsUnsaleable: boolean; - IsUnbuyable: boolean; - IsUngivable: boolean; - IsLockedafterEquip: boolean; - QuestItem: boolean; - LootExperience: number; - ExamineExperience: number; - HideEntrails: boolean; - RepairCost: number; - RepairSpeed: number; - ExtraSizeLeft: number; - ExtraSizeRight: number; - ExtraSizeUp: number; - ExtraSizeDown: number; - ExtraSizeForceAdd: boolean; - MergesWithChildren: boolean; - CanSellOnRagfair: boolean; - CanRequireOnRagfair: boolean; - ConflictingItems: string[]; - DiscardLimit: number; - Unlootable: boolean; - UnlootableFromSlot: string; - UnlootableFromSide: string[]; - AnimationVariantsNumber: number; - DiscardingBlock: boolean; - RagFairCommissionModifier: number; - IsAlwaysAvailableForInsurance: boolean; - Grids: Grid[]; - Slots: Slot[]; - CanPutIntoDuringTheRaid: boolean; - CantRemoveFromSlotsDuringRaid: string[]; - weapClass: string; - weapUseType: string; - ammoCaliber: string; - Durability: number; - MaxDurability: number; - OperatingResource: number; - RepairComplexity: number; - durabSpawnMin: number; - durabSpawnMax: number; - isFastReload: boolean; - RecoilForceUp: number; - RecoilForceBack: number; - Convergence: number; - RecoilAngle: number; - weapFireType: string[]; - RecolDispersion: number; - SingleFireRate: number; - CanQueueSecondShot: boolean; - bFirerate: number; - Ergonomics: number; - Velocity: number; - bEffDist: number; - bHearDist: number; - isChamberLoad: boolean; - chamberAmmoCount: number; - isBoltCatch: boolean; - defMagType: string; - defAmmo: string; - AdjustCollimatorsToTrajectory: boolean; - shotgunDispersion: number; - Chambers: Chamber[]; - CameraRecoil: number; - CameraSnap: number; - ReloadMode: string; - CenterOfImpact: number; - AimPlane: number; - DeviationCurve: number; - DeviationMax: number; - Foldable: boolean; - Retractable: boolean; - TacticalReloadStiffnes: Xyz; - TacticalReloadFixation: number; - RecoilCenter: Xyz; - RotationCenter: Xyz; - RotationCenterNoStock: Xyz; - SizeReduceRight: number; - FoldedSlot: string; - CompactHandling: boolean; - SightingRange: number; - MinRepairDegradation: number; - MaxRepairDegradation: number; - MinRepairKitDegradation: number; - MaxRepairKitDegradation: number; - IronSightRange: number; - MustBoltBeOpennedForExternalReload: boolean; - MustBoltBeOpennedForInternalReload: boolean; - BoltAction: boolean; - HipAccuracyRestorationDelay: number; - HipAccuracyRestorationSpeed: number; - HipInnaccuracyGain: number; - ManualBoltCatch: boolean; - BurstShotsCount: number; - BaseMalfunctionChance: number; - AllowJam: boolean; - AllowFeed: boolean; - AllowMisfire: boolean; - AllowSlide: boolean; - DurabilityBurnRatio: number; - HeatFactorGun: number; - CoolFactorGun: number; - CoolFactorGunMods: number; - HeatFactorByShot: number; - AllowOverheat: boolean; - DoubleActionAccuracyPenalty: number; - RecoilPosZMult: number; - ShotgunDispersion: number; - StackMinRandom: number; - StackMaxRandom: number; - StackSlots: StackSlot[]; - SearchSound: string; - BlocksArmorVest: boolean; - RigLayoutName: string; - armorZone: string[]; - armorClass: number; - speedPenaltyPercent: number; - mousePenalty: number; - weaponErgonomicPenalty: number; - BluntThroughput: number; - ArmorMaterial: string; - medUseTime: number; - medEffectType: string; - MaxHpResource: number; - hpResourceRate: number; - StimulatorBuffs: string; - effects_health: EffectsHealth; - effects_damage: EffectsDamage; - knifeHitDelay: number; - knifeHitSlashRate: number; - knifeHitStabRate: number; - knifeHitRadius: number; - knifeHitSlashDam: number; - knifeHitStabDam: number; - knifeDurab: number; - PrimaryDistance: number; - SecondryDistance: number; - SlashPenetration: number; - StabPenetration: number; - PrimaryConsumption: number; - SecondryConsumption: number; - DeflectionConsumption: number; - MaxResource: number; - AppliedTrunkRotation: Xyz; - AppliedHeadRotation: Xyz; - DisplayOnModel: boolean; - AdditionalAnimationLayer: number; - StaminaBurnRate: number; - ColliderScaleMultiplier: Xyz; - ammoType: string; - InitialSpeed: number; - BallisticCoeficient: number; - BulletMassGram: number; - BulletDiameterMilimeters: number; - Damage: number; - ammoAccr: number; - ammoRec: number; - ammoDist: number; - buckshotBullets: number; - PenetrationPower: number; - PenetrationPowerDiviation: number; - ammoHear: number; - ammoSfx: string; - MisfireChance: number; - MinFragmentsCount: number; - MaxFragmentsCount: number; - ammoShiftChance: number; - casingName: string; - casingEjectPower: number; - casingMass: number; - casingSounds: string; - ProjectileCount: number; - PenetrationChance: number; - RicochetChance: number; - FragmentationChance: number; - Deterioration: number; - SpeedRetardation: number; - Tracer: boolean; - TracerColor: string; - TracerDistance: number; - ArmorDamage: number; - Caliber: string; - StaminaBurnPerDamage: number; - HeavyBleedingDelta: number; - LightBleedingDelta: number; - ShowBullet: boolean; - HasGrenaderComponent: boolean; - FuzeArmTimeSec: number; - ExplosionStrength: number; - MinExplosionDistance: number; - MaxExplosionDistance: number; - FragmentsCount: number; - FragmentType: string; - ShowHitEffectOnExplode: boolean; - ExplosionType: string; - AmmoLifeTimeSec: number; - Contusion: Contusion; - ArmorDistanceDistanceDamage: Xyz; - Blindness: Xyz; - IsLightAndSoundShot: boolean; - LightAndSoundShotAngle: number; - LightAndSoundShotSelfContusionTime: number; - LightAndSoundShotSelfContusionStrength: number; - MalfMisfireChance: number; - DurabilityBurnModificator: number; - HeatFactor: number; - MalfFeedChance: number; - Accuracy: number; - Recoil: number; - Loudness: number; - EffectiveDistance: number; - RaidModdable: boolean; - ToolModdable: boolean; - BlocksFolding: boolean; - BlocksCollapsible: boolean; - IsAnimated: boolean; - HasShoulderContact: boolean; - DoubleActionAccuracyPenaltyMult: number; - magAnimationIndex: number; - Cartridges: Cartridge[]; - CanFast: boolean; - CanHit: boolean; - CanAdmin: boolean; - LoadUnloadModifier: number; - CheckTimeModifier: number; - CheckOverride: number; - ReloadMagType: string; - VisibleAmmoRangesString: string; - MalfunctionChance: number; - TagColor: number; - TagName: string; - MaximumNumberOfUsage: number; - CustomAimPlane: string; - sightModType: string; - aimingSensitivity: number; - SightModesCount: number; - OpticCalibrationDistances: number[]; - ScopesCount: number; - AimSensitivity: number[][]; - ModesCount: number[]; - Zooms: number[][]; - CalibrationDistances: number[][]; - Intensity: number; - Mask: string; - MaskSize: number; - NoiseIntensity: number; - NoiseScale: number; - Color: Color; - DiffuseIntensity: number; - HasHinge: boolean; - Resource?: number; - CoolFactor?: number; - foodUseTime?: number; - foodEffectType?: string; - MaxRepairResource: number; - RepairQuality: number; - RepairType: string; - TargetItemFilter: string[]; - apResource: number; - krResource: number; -} -export interface Prefab { - path: string; - rcid: string; -} -export interface Grid { - _name: string; - _id: string; - _parent: string; - _props: GridProps; - _proto: string; -} -export interface GridProps { - filters: GridFilter[]; - cellsH: number; - cellsV: number; - minCount: number; - maxCount: number; - maxWeight: number; - isSortingTable: boolean; -} -export interface GridFilter { - Filter: string[]; - ExcludedFilter: string[]; -} -export interface Slot { - _name: string; - _id: string; - _parent: string; - _props: SlotProps; - _required: boolean; - _mergeSlotWithChildren: boolean; - _proto: string; -} -export interface SlotProps { - filters: Filter[]; -} -export interface Chamber { - _name: string; - _id: string; - _parent: string; - _props: ChamberProps; - _required: boolean; - _mergeSlotWithChildren: boolean; - _proto: string; -} -export interface ChamberProps { - filters: FilterProps[]; -} -export interface FilterProps { - Filter: string[]; -} -export interface Xyz { - x: number; - y: number; - z: number; -} -export interface StackSlot { - _name?: string; - _id: string; - _sptTpl: string; - parent: string; - location: any; - slotId: string; - _max_count: number; - _props?: StackSlotProps; - _proto?: string; - upd: any; -} -export interface StackSlotProps { - filters: Filter[]; -} -export interface EffectsHealth { - Hydration: Hydration; -} -export interface Hydration { - value: number; -} -export interface EffectsDamage { - Pain: Pain; - Contusion: Contusion; -} -export interface Pain { - delay: number; - duration: number; - fadeOut: number; -} -export interface Contusion { - delay: number; - duration: number; - fadeOut: number; -} -export interface Cartridge { - _name: string; - _id: string; - _parent: string; - _max_count: number; - _props: CartridgeProps; - _proto: string; -} -export interface CartridgeProps { - filters: Filter[]; -} -export interface Filter { - Shift?: number; - Filter: string[]; - AnimationIndex?: number; -} -export interface Color { - r: number; - g: number; - b: number; - a: number; -} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/RagfairCategoriesService.d.ts b/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/RagfairCategoriesService.d.ts deleted file mode 100644 index 09956cc..0000000 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/RagfairCategoriesService.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; -export declare class RagfairCategoriesService { - updateCategories(offers: IRagfairOffer[]): void; - protected categories: Record; - getCategories(): Record; - getCategoryByItemId(itemId: string): number; - resetCategories(): void; - setCategoryValue(itemId: string, newValue: number): void; - incrementCategory(itemId: string): void; -} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/res/armorDamage.png b/Faupi-MunitionsExpert/MunitionsExpert/src/server/res/armorDamage.png deleted file mode 100644 index 70d5e40..0000000 Binary files a/Faupi-MunitionsExpert/MunitionsExpert/src/server/res/armorDamage.png and /dev/null differ diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/res/ricochet.png b/Faupi-MunitionsExpert/MunitionsExpert/src/server/res/ricochet.png deleted file mode 100644 index 27f371e..0000000 Binary files a/Faupi-MunitionsExpert/MunitionsExpert/src/server/res/ricochet.png and /dev/null differ diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/res/translations.json b/Faupi-MunitionsExpert/MunitionsExpert/src/server/res/translations.json deleted file mode 100644 index 530c6ff..0000000 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/res/translations.json +++ /dev/null @@ -1,137 +0,0 @@ -{ - "en": { - "DAMAGE": "Damage", - "PENETRATION": "Armor penetration", - "ARMOR DAMAGE": "Damage to armor", - "FRAGMENTATION CHANCE": "Fragmentation chance", - "RICOCHET CHANCE": "Ricochet chance", - "ME_class": "Class", - "ME_noarmor": "Unarmored" - }, - "cz": { - "DAMAGE": "Poškození", - "PENETRATION": "Průbojnost", - "ARMOR DAMAGE": "Poškození brnění", - "FRAGMENTATION CHANCE": "Šance na fragmentaci", - "RICOCHET CHANCE": "Šance na odraz", - "ME_class": "Třída", - "ME_noarmor": "Neobrněný" - }, - "pl": { - "DAMAGE": "Szkoda", - "PENETRATION": "Penetracja pancerza", - "ARMOR DAMAGE": "Uszkodzenie zbroi", - "FRAGMENTATION CHANCE": "Szansa na fragmentację", - "RICOCHET CHANCE": "Szansa na rykoszet", - "ME_class": "Klasa", - "ME_noarmor": "Nieumiejętny" - }, - "po": { - "DAMAGE": "Dano", - "PENETRATION": "Penetração de armadura", - "ARMOR DAMAGE": "Danos à armadura", - "FRAGMENTATION CHANCE": "Chance de fragmentação", - "RICOCHET CHANCE": "Chance de ricochete", - "ME_class": "Classe", - "ME_noarmor": "Sem armadura" - }, - "ch": { - "DAMAGE": "损坏", - "PENETRATION": "护甲穿透", - "ARMOR DAMAGE": "对盔甲的伤害", - "FRAGMENTATION CHANCE": "碎片机会", - "RICOCHET CHANCE": "跳弹机会", - "ME_class": "类", - "ME_noarmor": "无所作为" - }, - "ru": { - "DAMAGE": "Повреждать", - "PENETRATION": "Бронепробиваемость", - "ARMOR DAMAGE": "Повреждение брони", - "FRAGMENTATION CHANCE": "Вероятность фрагментации", - "RICOCHET CHANCE": "Шанс рикошета", - "ME_class": "Класс", - "ME_noarmor": "Без оружия" - }, - "es": { - "DAMAGE": "Daño", - "PENETRATION": "Penetración de armadura", - "ARMOR DAMAGE": "Daño a la armadura", - "FRAGMENTATION CHANCE": "Posibilidad de fragmentación", - "RICOCHET CHANCE": "Oportunidad de rebote", - "ME_class": "Clase", - "ME_noarmor": "Sin armadura" - }, - "es-mx": { - "DAMAGE": "Daño", - "PENETRATION": "Penetración de armadura", - "ARMOR DAMAGE": "Daño a la armadura", - "FRAGMENTATION CHANCE": "Posibilidad de fragmentación", - "RICOCHET CHANCE": "Oportunidad de rebote", - "ME_class": "Clase", - "ME_noarmor": "Sin armadura" - }, - "ge": { - "DAMAGE": "Schaden", - "PENETRATION": "Rüstungsdurchdringung", - "ARMOR DAMAGE": "Beschädigung der Rüstung", - "FRAGMENTATION CHANCE": "Fragmentierung Chance", - "RICOCHET CHANCE": "Querschläger-Chance", - "ME_class": "Klasse", - "ME_noarmor": "Ungepanzert" - }, - "sk": { - "DAMAGE": "Poškodenie", - "PENETRATION": "Prienik do brnenia", - "ARMOR DAMAGE": "Poškodenie brnenia", - "FRAGMENTATION CHANCE": "Šanca na fragmentáciu", - "RICOCHET CHANCE": "Šanca na odraz", - "ME_class": "Trieda", - "ME_noarmor": "Neozbrojený" - }, - "tu": { - "DAMAGE": "Hasar", - "PENETRATION": "Zırh penetrasyon", - "ARMOR DAMAGE": "Zırhta hasar", - "FRAGMENTATION CHANCE": "Parçalanma şansı", - "RICOCHET CHANCE": "Sekme şansı", - "ME_class": "Sınıf", - "ME_noarmor": "zırhsız" - }, - "it": { - "DAMAGE": "Danno", - "PENETRATION": "Penetrazione dell'armatura", - "ARMOR DAMAGE": "Danni all'armatura", - "FRAGMENTATION CHANCE": "Possibilità di frammentazione", - "RICOCHET CHANCE": "Possibilità di rimbalzo", - "ME_class": "Classe", - "ME_noarmor": "Disarmato" - }, - "jp": { - "DAMAGE": "ダメージ", - "PENETRATION": "装甲貫通", - "ARMOR DAMAGE": "鎧の損傷", - "FRAGMENTATION CHANCE": "断片化の可能性", - "RICOCHET CHANCE": "跳ね返るチャンス", - "ME_class": "クラス", - "ME_noarmor": "無装甲" - }, - "fr": { - "DAMAGE": "Dommage", - "PENETRATION": "Pénétration d'armure", - "ARMOR DAMAGE": "Dommages à l'armure", - "FRAGMENTATION CHANCE": "Chance de fragmentation", - "RICOCHET CHANCE": "Chance de ricochet", - "ME_class": "Classe", - "ME_noarmor": "Sans armure" - }, - "hu": { - "DAMAGE": "Kár", - "PENETRATION": "Páncélátütő", - "ARMOR DAMAGE": "A páncél sérülése", - "FRAGMENTATION CHANCE": "Töredezettség esélye", - "RICOCHET CHANCE": "Ricochet esély", - "ME_class": "Osztály", - "ME_noarmor": "Fegyvertelen" - } -} \ No newline at end of file diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/generators/BotWeaponGenerator.d.ts b/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/generators/BotWeaponGenerator.d.ts deleted file mode 100644 index 13fe7df..0000000 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/generators/BotWeaponGenerator.d.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { MinMax, Mods, ModsChances } from "../models/eft/common/tables/IBotType"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { HashUtil } from "../utils/HashUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -export declare class BotWeaponGenerator { - protected logger: ILogger; - protected hashUtil: HashUtil; - protected databaseServer: DatabaseServer; - protected itemHelper: ItemHelper; - protected weightedRandomHelper: WeightedRandomHelper; - protected botGeneratorHelper: BotGeneratorHelper; - protected randomUtil: RandomUtil; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil); - generateWeapon(equipmentSlot: string, weaponPool: Record, modPool: Mods, modChances: ModsChances, magCounts: MinMax, botRole: string, isPmc: boolean, inventory: PmcInventory): void; - /** Checks if all required slots are occupied on a weapon and all it's mods */ - protected isWeaponValid(itemList: Item[]): boolean; - /** - * Generates extra magazines or bullets (if magazine is internal) and adds them to TacticalVest and Pockets. - * Additionally, adds extra bullets to SecuredContainer - * - * @param {*} weaponMods - * @param {*} weaponTemplate - * @param {*} magCounts - * @param {*} ammoTpl - * @returns - */ - protected generateExtraMagazines(weaponMods: Item[], weaponTemplate: ITemplateItem, magCounts: MinMax, ammoTpl: string, inventory: PmcInventory): void; - protected addBullets(ammoTpl: string, bulletCount: number, inventory: PmcInventory): void; - /** - * Finds and returns tpl of ammo that should be used, while making sure it's compatible - * - * @param {*} weaponMods - * @param {*} weaponTemplate - * @returns - */ - protected getCompatibleAmmo(weaponMods: Item[], weaponTemplate: ITemplateItem): string; - /** Fill existing magazines to full, while replacing their contents with specified ammo */ - protected fillExistingMagazines(weaponMods: Item[], magazine: Item, ammoTpl: string): void; -} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/HealthHelper.d.ts b/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/HealthHelper.d.ts deleted file mode 100644 index 518c23f..0000000 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/HealthHelper.d.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { IPmcData } from "../models/eft/common/IPmcData"; -import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; -import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; -import { IHealthConfig } from "../models/spt/config/IHealthConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { SaveServer } from "../servers/SaveServer"; -import { JsonUtil } from "../utils/JsonUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -export declare class HealthHelper { - protected jsonUtil: JsonUtil; - protected logger: ILogger; - protected timeUtil: TimeUtil; - protected saveServer: SaveServer; - protected configServer: ConfigServer; - protected healthConfig: IHealthConfig; - constructor(jsonUtil: JsonUtil, logger: ILogger, timeUtil: TimeUtil, saveServer: SaveServer, configServer: ConfigServer); - resetVitality(sessionID: string): IAkiProfile; - saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string): void; - protected saveHealth(pmcData: IPmcData, sessionID: string): void; - protected saveEffects(pmcData: IPmcData, sessionID: string): void; - protected addEffect(pmcData: IPmcData, sessionID: string, effect: { - bodyPart: string; - effectType: string; - }): void; - protected isEmpty(map: any): boolean; -} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/TraderHelper.d.ts b/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/TraderHelper.d.ts deleted file mode 100644 index ab4a371..0000000 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/TraderHelper.d.ts +++ /dev/null @@ -1,53 +0,0 @@ -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IBarterScheme, ITraderAssort, ITraderBase, LoyaltyLevel } from "../models/eft/common/tables/ITrader"; -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 { SaveServer } from "../servers/SaveServer"; -import { FenceService } from "../services/FenceService"; -import { PlayerService } from "../services/PlayerService"; -import { HandbookHelper } from "./HandbookHelper"; -import { ItemHelper } from "./ItemHelper"; -import { PaymentHelper } from "./PaymentHelper"; -import { ProfileHelper } from "./ProfileHelper"; -export declare class TraderHelper { - protected logger: ILogger; - protected databaseServer: DatabaseServer; - protected saveServer: SaveServer; - protected profileHelper: ProfileHelper; - protected paymentHelper: PaymentHelper; - protected itemHelper: ItemHelper; - protected handbookHelper: HandbookHelper; - protected playerService: PlayerService; - protected fenceService: FenceService; - protected configServer: ConfigServer; - protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemHelper: ItemHelper, handbookHelper: HandbookHelper, playerService: PlayerService, fenceService: FenceService, configServer: ConfigServer); - getTrader(traderID: string, sessionID: string): ITraderBase; - getTraderAssortsById(traderId: string): ITraderAssort; - /** - * Reset a trader back to its initial state as seen by a level 1 player - * Does NOT take into account different profile levels - * @param sessionID session id - * @param traderID trader id to reset - */ - resetTrader(sessionID: string, traderID: string): void; - changeTraderDisplay(traderID: string, status: boolean, sessionID: string): void; - getPurchasesData(traderID: string, sessionID: string): Record; - /** - * Calculate traders level based on exp amount and increment level if over threshold - * @param traderID trader to process - * @param sessionID session id - */ - lvlUp(traderID: string, sessionID: string): void; - getTraderUpdateSeconds(traderId: string): number; - /** - * check if an item is allowed to be sold to a trader - * @param traderFilters array of allowed categories - * @param tplToCheck itemTpl of inventory - * @returns boolean - */ - traderFilter(traderFilters: string[], tplToCheck: string): boolean; - getLoyaltyLevel(traderID: string, pmcData: IPmcData): LoyaltyLevel; -} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/tables/ITemplateItem.d.ts b/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/tables/ITemplateItem.d.ts deleted file mode 100644 index c2ba762..0000000 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/tables/ITemplateItem.d.ts +++ /dev/null @@ -1,401 +0,0 @@ -export interface ITemplateItem { - _id: string; - _name: string; - _parent: string; - _type: string; - _props: Props; - _proto: string; -} -export interface Props { - Name: string; - ShortName: string; - Description: string; - Weight: number; - BackgroundColor: string; - Width: number; - Height: number; - StackMaxSize: number; - Rarity?: string; - SpawnChance?: number; - CreditsPrice?: number; - ItemSound: string; - Prefab: Prefab; - UsePrefab: Prefab; - StackObjectsCount: number; - NotShownInSlot: boolean; - ExaminedByDefault: boolean; - ExamineTime: number; - IsUndiscardable: boolean; - IsUnsaleable: boolean; - IsUnbuyable: boolean; - IsUngivable: boolean; - IsLockedafterEquip: boolean; - QuestItem: boolean; - LootExperience: number; - ExamineExperience: number; - HideEntrails: boolean; - RepairCost: number; - RepairSpeed: number; - ExtraSizeLeft: number; - ExtraSizeRight: number; - ExtraSizeUp: number; - ExtraSizeDown: number; - ExtraSizeForceAdd: boolean; - MergesWithChildren: boolean; - CanSellOnRagfair: boolean; - CanRequireOnRagfair: boolean; - ConflictingItems: string[]; - DiscardLimit: number; - Unlootable: boolean; - UnlootableFromSlot: string; - UnlootableFromSide: string[]; - AnimationVariantsNumber: number; - DiscardingBlock: boolean; - RagFairCommissionModifier: number; - IsAlwaysAvailableForInsurance: boolean; - Grids: Grid[]; - Slots: Slot[]; - CanPutIntoDuringTheRaid: boolean; - CantRemoveFromSlotsDuringRaid: string[]; - weapClass: string; - weapUseType: string; - ammoCaliber: string; - Durability: number; - MaxDurability: number; - OperatingResource: number; - RepairComplexity: number; - durabSpawnMin: number; - durabSpawnMax: number; - isFastReload: boolean; - RecoilForceUp: number; - RecoilForceBack: number; - Convergence: number; - RecoilAngle: number; - weapFireType: string[]; - RecolDispersion: number; - SingleFireRate: number; - CanQueueSecondShot: boolean; - bFirerate: number; - Ergonomics: number; - Velocity: number; - bEffDist: number; - bHearDist: number; - isChamberLoad: boolean; - chamberAmmoCount: number; - isBoltCatch: boolean; - defMagType: string; - defAmmo: string; - AdjustCollimatorsToTrajectory: boolean; - shotgunDispersion: number; - Chambers: Chamber[]; - CameraRecoil: number; - CameraSnap: number; - ReloadMode: string; - CenterOfImpact: number; - AimPlane: number; - DeviationCurve: number; - DeviationMax: number; - Foldable: boolean; - Retractable: boolean; - TacticalReloadStiffnes: Xyz; - TacticalReloadFixation: number; - RecoilCenter: Xyz; - RotationCenter: Xyz; - RotationCenterNoStock: Xyz; - SizeReduceRight: number; - FoldedSlot: string; - CompactHandling: boolean; - SightingRange: number; - MinRepairDegradation: number; - MaxRepairDegradation: number; - MinRepairKitDegradation: number; - MaxRepairKitDegradation: number; - IronSightRange: number; - MustBoltBeOpennedForExternalReload: boolean; - MustBoltBeOpennedForInternalReload: boolean; - BoltAction: boolean; - HipAccuracyRestorationDelay: number; - HipAccuracyRestorationSpeed: number; - HipInnaccuracyGain: number; - ManualBoltCatch: boolean; - BurstShotsCount: number; - BaseMalfunctionChance: number; - AllowJam: boolean; - AllowFeed: boolean; - AllowMisfire: boolean; - AllowSlide: boolean; - DurabilityBurnRatio: number; - HeatFactorGun: number; - CoolFactorGun: number; - CoolFactorGunMods: number; - HeatFactorByShot: number; - AllowOverheat: boolean; - DoubleActionAccuracyPenalty: number; - RecoilPosZMult: number; - ShotgunDispersion: number; - StackMinRandom: number; - StackMaxRandom: number; - StackSlots: StackSlot[]; - SearchSound: string; - BlocksArmorVest: boolean; - RigLayoutName: string; - armorZone: string[]; - armorClass: number; - speedPenaltyPercent: number; - mousePenalty: number; - weaponErgonomicPenalty: number; - BluntThroughput: number; - ArmorMaterial: string; - medUseTime: number; - medEffectType: string; - MaxHpResource: number; - hpResourceRate: number; - StimulatorBuffs: string; - effects_health: EffectsHealth; - effects_damage: EffectsDamage; - knifeHitDelay: number; - knifeHitSlashRate: number; - knifeHitStabRate: number; - knifeHitRadius: number; - knifeHitSlashDam: number; - knifeHitStabDam: number; - knifeDurab: number; - PrimaryDistance: number; - SecondryDistance: number; - SlashPenetration: number; - StabPenetration: number; - PrimaryConsumption: number; - SecondryConsumption: number; - DeflectionConsumption: number; - MaxResource: number; - AppliedTrunkRotation: Xyz; - AppliedHeadRotation: Xyz; - DisplayOnModel: boolean; - AdditionalAnimationLayer: number; - StaminaBurnRate: number; - ColliderScaleMultiplier: Xyz; - ammoType: string; - InitialSpeed: number; - BallisticCoeficient: number; - BulletMassGram: number; - BulletDiameterMilimeters: number; - Damage: number; - ammoAccr: number; - ammoRec: number; - ammoDist: number; - buckshotBullets: number; - PenetrationPower: number; - PenetrationPowerDiviation: number; - ammoHear: number; - ammoSfx: string; - MisfireChance: number; - MinFragmentsCount: number; - MaxFragmentsCount: number; - ammoShiftChance: number; - casingName: string; - casingEjectPower: number; - casingMass: number; - casingSounds: string; - ProjectileCount: number; - PenetrationChance: number; - RicochetChance: number; - FragmentationChance: number; - Deterioration: number; - SpeedRetardation: number; - Tracer: boolean; - TracerColor: string; - TracerDistance: number; - ArmorDamage: number; - Caliber: string; - StaminaBurnPerDamage: number; - HeavyBleedingDelta: number; - LightBleedingDelta: number; - ShowBullet: boolean; - HasGrenaderComponent: boolean; - FuzeArmTimeSec: number; - ExplosionStrength: number; - MinExplosionDistance: number; - MaxExplosionDistance: number; - FragmentsCount: number; - FragmentType: string; - ShowHitEffectOnExplode: boolean; - ExplosionType: string; - AmmoLifeTimeSec: number; - Contusion: Contusion; - ArmorDistanceDistanceDamage: Xyz; - Blindness: Xyz; - IsLightAndSoundShot: boolean; - LightAndSoundShotAngle: number; - LightAndSoundShotSelfContusionTime: number; - LightAndSoundShotSelfContusionStrength: number; - MalfMisfireChance: number; - DurabilityBurnModificator: number; - HeatFactor: number; - MalfFeedChance: number; - Accuracy: number; - Recoil: number; - Loudness: number; - EffectiveDistance: number; - RaidModdable: boolean; - ToolModdable: boolean; - BlocksFolding: boolean; - BlocksCollapsible: boolean; - IsAnimated: boolean; - HasShoulderContact: boolean; - DoubleActionAccuracyPenaltyMult: number; - magAnimationIndex: number; - Cartridges: Cartridge[]; - CanFast: boolean; - CanHit: boolean; - CanAdmin: boolean; - LoadUnloadModifier: number; - CheckTimeModifier: number; - CheckOverride: number; - ReloadMagType: string; - VisibleAmmoRangesString: string; - MalfunctionChance: number; - TagColor: number; - TagName: string; - MaximumNumberOfUsage: number; - CustomAimPlane: string; - sightModType: string; - aimingSensitivity: number; - SightModesCount: number; - OpticCalibrationDistances: number[]; - ScopesCount: number; - AimSensitivity: number[][]; - ModesCount: number[]; - Zooms: number[][]; - CalibrationDistances: number[][]; - Intensity: number; - Mask: string; - MaskSize: number; - NoiseIntensity: number; - NoiseScale: number; - Color: Color; - DiffuseIntensity: number; - HasHinge: boolean; - Resource?: number; - CoolFactor?: number; - foodUseTime?: number; - foodEffectType?: string; - MaxRepairResource: number; - RepairQuality: number; - RepairType: string; - TargetItemFilter: string[]; - apResource: number; - krResource: number; -} -export interface Prefab { - path: string; - rcid: string; -} -export interface Grid { - _name: string; - _id: string; - _parent: string; - _props: GridProps; - _proto: string; -} -export interface GridProps { - filters: GridFilter[]; - cellsH: number; - cellsV: number; - minCount: number; - maxCount: number; - maxWeight: number; - isSortingTable: boolean; -} -export interface GridFilter { - Filter: string[]; - ExcludedFilter: string[]; -} -export interface Slot { - _name: string; - _id: string; - _parent: string; - _props: SlotProps; - _required: boolean; - _mergeSlotWithChildren: boolean; - _proto: string; -} -export interface SlotProps { - filters: Filter[]; -} -export interface Chamber { - _name: string; - _id: string; - _parent: string; - _props: ChamberProps; - _required: boolean; - _mergeSlotWithChildren: boolean; - _proto: string; -} -export interface ChamberProps { - filters: FilterProps[]; -} -export interface FilterProps { - Filter: string[]; -} -export interface Xyz { - x: number; - y: number; - z: number; -} -export interface StackSlot { - _name?: string; - _id: string; - _sptTpl: string; - parent: string; - location: any; - slotId: string; - _max_count: number; - _props?: StackSlotProps; - _proto?: string; - upd: any; -} -export interface StackSlotProps { - filters: Filter[]; -} -export interface EffectsHealth { - Hydration: Hydration; -} -export interface Hydration { - value: number; -} -export interface EffectsDamage { - Pain: Pain; - Contusion: Contusion; -} -export interface Pain { - delay: number; - duration: number; - fadeOut: number; -} -export interface Contusion { - delay: number; - duration: number; - fadeOut: number; -} -export interface Cartridge { - _name: string; - _id: string; - _parent: string; - _max_count: number; - _props: CartridgeProps; - _proto: string; -} -export interface CartridgeProps { - filters: Filter[]; -} -export interface Filter { - Shift?: number; - Filter: string[]; - AnimationIndex?: number; -} -export interface Color { - r: number; - g: number; - b: number; - a: number; -} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/RagfairCategoriesService.d.ts b/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/RagfairCategoriesService.d.ts deleted file mode 100644 index 09956cc..0000000 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/RagfairCategoriesService.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; -export declare class RagfairCategoriesService { - updateCategories(offers: IRagfairOffer[]): void; - protected categories: Record; - getCategories(): Record; - getCategoryByItemId(itemId: string): number; - resetCategories(): void; - setCategoryValue(itemId: string, newValue: number): void; - incrementCategory(itemId: string): void; -} diff --git a/Faupi-MunitionsExpert/README.md b/Faupi-MunitionsExpert/README.md deleted file mode 100644 index 4c8a3f1..0000000 --- a/Faupi-MunitionsExpert/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# Faupi-MunitionsExpert -## Faupi-MunitionsExpert for EFT - SPT-AKI -### CURRENT AKI VERSION: 2.3.0 -### GAMEVERSION: 0.12.12.15.17107 diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/.eslintignore b/Faupi-MunitionsExpert/server/.eslintignore similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/.eslintignore rename to Faupi-MunitionsExpert/server/.eslintignore diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/.eslintrc.json b/Faupi-MunitionsExpert/server/.eslintrc.json similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/.eslintrc.json rename to Faupi-MunitionsExpert/server/.eslintrc.json diff --git a/Faupi-MunitionsExpert/MunitionsExpert/LICENSE b/Faupi-MunitionsExpert/server/LICENSE similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/LICENSE rename to Faupi-MunitionsExpert/server/LICENSE diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/LICENSE b/Faupi-MunitionsExpert/server/dist/LICENSE similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/LICENSE rename to Faupi-MunitionsExpert/server/dist/LICENSE diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/package.json b/Faupi-MunitionsExpert/server/dist/package.json similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/package.json rename to Faupi-MunitionsExpert/server/dist/package.json diff --git a/Faupi-MunitionsExpert/MunitionsExpert/res/armorDamage.png b/Faupi-MunitionsExpert/server/dist/res/armorDamage.png similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/res/armorDamage.png rename to Faupi-MunitionsExpert/server/dist/res/armorDamage.png diff --git a/Faupi-MunitionsExpert/MunitionsExpert/res/ricochet.png b/Faupi-MunitionsExpert/server/dist/res/ricochet.png similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/res/ricochet.png rename to Faupi-MunitionsExpert/server/dist/res/ricochet.png diff --git a/Faupi-MunitionsExpert/MunitionsExpert/res/translations.json b/Faupi-MunitionsExpert/server/dist/res/translations.json similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/res/translations.json rename to Faupi-MunitionsExpert/server/dist/res/translations.json diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/src/MunitionsExpert.ts b/Faupi-MunitionsExpert/server/dist/src/MunitionsExpert.ts similarity index 89% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/src/MunitionsExpert.ts rename to Faupi-MunitionsExpert/server/dist/src/MunitionsExpert.ts index b2626f0..b87730e 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/src/MunitionsExpert.ts +++ b/Faupi-MunitionsExpert/server/dist/src/MunitionsExpert.ts @@ -1,19 +1,21 @@ import type { DependencyContainer } from "tsyringe"; -import { IMod } from "@spt-aki/models/external/mod"; +import { IPreAkiLoadMod } from "@spt-aki/models/external/IPreAkiLoadMod"; +import { IPostAkiLoadMod } from "@spt-aki/models/external/IPostAkiLoadMod"; import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; import { DynamicRouterModService } from "@spt-aki/services/mod/dynamicRouter/DynamicRouterModService" import { DatabaseServer } from "@spt-aki/servers/DatabaseServer" import { JsonUtil } from "@spt-aki/utils/JsonUtil" import { InitialModLoader } from "@spt-aki/loaders/InitialModLoader" import { IDatabaseTables } from "@spt-aki/models/spt/server/IDatabaseTables"; +import { PreAkiModLoader } from "@spt-aki/loaders/PreAkiModLoader"; -class MunitionsExpert implements IMod +class MunitionsExpert implements IPreAkiLoadMod, IPostAkiLoadMod { private logger: ILogger; private database: DatabaseServer; private router: DynamicRouterModService; private json: JsonUtil; - private modLoader: InitialModLoader; + private modLoader: PreAkiModLoader; private table: IDatabaseTables; private globalLocale: { [x: string]: { interface: { [x: string]: any; }; }; }; private mod: { name: string; version: any; author: any;}; @@ -22,7 +24,7 @@ class MunitionsExpert implements IMod private path: { resolve: (arg0: string) => any; }; private cfg: { BulletBackgroundColours: boolean; }; - public load(container: DependencyContainer) + public preAkiLoad(container: DependencyContainer) { this.router = container.resolve("DynamicRouterModService"); this.logger = container.resolve("WinstonLogger"); @@ -35,9 +37,9 @@ class MunitionsExpert implements IMod this.hookRoutes(); } - public delayedLoad(container: DependencyContainer) + public postAkiLoad(container: DependencyContainer) { - this.modLoader = container.resolve("InitialModLoader"); + this.modLoader = container.resolve("PreAkiModLoader"); this.database = container.resolve("DatabaseServer"); this.table = this.database.getTables(); this.globalLocale = this.table.locales.global; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/src/config.json b/Faupi-MunitionsExpert/server/dist/src/config.json similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/src/config.json rename to Faupi-MunitionsExpert/server/dist/src/config.json diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/Program.d.ts b/Faupi-MunitionsExpert/server/dist/types/Program.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/Program.d.ts rename to Faupi-MunitionsExpert/server/dist/types/Program.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/TYPES.d.ts b/Faupi-MunitionsExpert/server/dist/types/TYPES.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/TYPES.d.ts rename to Faupi-MunitionsExpert/server/dist/types/TYPES.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/Utils.d.ts b/Faupi-MunitionsExpert/server/dist/types/Utils.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/Utils.d.ts rename to Faupi-MunitionsExpert/server/dist/types/Utils.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/BotCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/BotCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/BotCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/BotCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/BundleCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/BundleCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/BundleCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/BundleCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/CustomizationCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/CustomizationCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/CustomizationCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/CustomizationCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/DataCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/DataCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/DataCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/DataCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/DialogueCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/DialogueCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/DialogueCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/DialogueCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/GameCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/GameCallbacks.d.ts similarity index 90% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/GameCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/GameCallbacks.d.ts index d5cad76..06da1b5 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/GameCallbacks.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/callbacks/GameCallbacks.d.ts @@ -2,6 +2,7 @@ import { GameController } from "../controllers/GameController"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; import { IGameEmptyCrcRequestData } from "../models/eft/game/IGameEmptyCrcRequestData"; +import { IReportNicknameRequestData } from "../models/eft/game/IReportNicknameRequestData"; import { IVersionValidateRequestData } from "../models/eft/game/IVersionValidateRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; @@ -20,5 +21,6 @@ declare class GameCallbacks { validateGameVersion(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; gameKeepalive(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getVersion(url: string, info: IEmptyRequestData, sessionID: string): string; + reportNickname(url: string, info: IReportNicknameRequestData, sessionID: string): INullResponseData; } export { GameCallbacks }; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/HandbookCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/HandbookCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/HandbookCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/HandbookCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/HealthCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/HealthCallbacks.d.ts similarity index 85% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/HealthCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/HealthCallbacks.d.ts index 8f7b89d..8672be7 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/HealthCallbacks.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/callbacks/HealthCallbacks.d.ts @@ -13,6 +13,13 @@ export declare class HealthCallbacks { protected profileHelper: ProfileHelper; protected healthController: HealthController; constructor(httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, healthController: HealthController); + /** + * Custom aki server request found in modules/HealthSynchronizer.cs + * @param url + * @param info HealthListener.Instance.CurrentHealth class + * @param sessionID session id + * @returns empty response, no data sent back to client + */ syncHealth(url: string, info: ISyncHealthRequestData, sessionID: string): IGetBodyResponseData; offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): IItemEventRouterResponse; offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/HideoutCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/HideoutCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/HideoutCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/HideoutCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/HttpCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/HttpCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/HttpCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/HttpCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/InraidCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/InraidCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/InraidCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/InraidCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/InsuranceCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/InsuranceCallbacks.d.ts similarity index 89% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/InsuranceCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/InsuranceCallbacks.d.ts index 520d0eb..6819960 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/InsuranceCallbacks.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/callbacks/InsuranceCallbacks.d.ts @@ -3,6 +3,7 @@ import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; 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"; @@ -17,7 +18,7 @@ export declare class InsuranceCallbacks extends OnLoadOnUpdate { protected insuranceConfig: IInsuranceConfig; constructor(insuranceController: InsuranceController, insuranceService: InsuranceService, httpResponse: HttpResponseUtil, configServer: ConfigServer); onLoad(): void; - getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): IGetBodyResponseData; + getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): IGetBodyResponseData; insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse; onUpdate(secondsSinceLastRun: number): boolean; getRoute(): string; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/InventoryCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/InventoryCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/InventoryCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/InventoryCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/ItemEventCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/ItemEventCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/ItemEventCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/ItemEventCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/LauncherCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/LauncherCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/LauncherCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/LauncherCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/LocationCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/LocationCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/LocationCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/LocationCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/MatchCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/MatchCallbacks.d.ts similarity index 52% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/MatchCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/MatchCallbacks.d.ts index 083c1f5..2a92ef5 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/MatchCallbacks.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/callbacks/MatchCallbacks.d.ts @@ -1,10 +1,17 @@ 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 { 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 { IJoinMatchRequestData } from "../models/eft/match/IJoinMatchRequestData"; +import { IJoinMatchResult } from "../models/eft/match/IJoinMatchResult"; +import { IPutMetricsRequestData } from "../models/eft/match/IPutMetricsRequestData"; import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { IUpdatePingRequestData } from "../models/eft/match/IUpdatePingRequestData"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; @@ -14,21 +21,21 @@ export declare class MatchCallbacks { protected matchController: MatchController; protected databaseServer: DatabaseServer; constructor(httpResponse: HttpResponseUtil, jsonUtil: JsonUtil, matchController: MatchController, databaseServer: DatabaseServer); - updatePing(url: string, info: any, sessionID: string): INullResponseData; - exitMatch(url: string, info: any, sessionID: string): INullResponseData; - exitToMenu(url: string, info: any, sessionID: string): INullResponseData; - startGroupSearch(url: string, info: any, sessionID: string): INullResponseData; - stopGroupSearch(url: string, info: any, sessionID: string): INullResponseData; + updatePing(url: string, info: IUpdatePingRequestData, sessionID: string): INullResponseData; + exitMatch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; + exitToMenu(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; + startGroupSearch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; + stopGroupSearch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; sendGroupInvite(url: string, info: any, sessionID: string): INullResponseData; acceptGroupInvite(url: string, info: any, sessionID: string): INullResponseData; cancelGroupInvite(url: string, info: any, sessionID: string): INullResponseData; - putMetrics(url: string, info: any, sessionID: string): INullResponseData; + putMetrics(url: string, info: IPutMetricsRequestData, sessionID: string): INullResponseData; getProfile(url: string, info: IGetProfileRequestData, sessionID: string): IGetBodyResponseData; - serverAvailable(url: string, info: any, sessionID: string): IGetBodyResponseData | IGetBodyResponseData; - joinMatch(url: string, info: any, sessionID: string): IGetBodyResponseData; + serverAvailable(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData | IGetBodyResponseData; + joinMatch(url: string, info: IJoinMatchRequestData, sessionID: string): IGetBodyResponseData; getMetrics(url: string, info: any, sessionID: string): IGetBodyResponseData; - getGroupStatus(url: string, info: any, sessionID: string): IGetBodyResponseData; - createGroup(url: string, info: any, sessionID: string): IGetBodyResponseData; + getGroupStatus(url: string, info: IGetGroupStatusRequestData, sessionID: string): IGetBodyResponseData; + createGroup(url: string, info: ICreateGroupRequestData, sessionID: string): IGetBodyResponseData; deleteGroup(url: string, info: any, sessionID: string): INullResponseData; startOfflineRaid(url: string, info: IStartOfflineRaidRequestData, sessionID: string): INullResponseData; endOfflineRaid(url: string, info: IEndOfflineRaidRequestData, sessionID: string): INullResponseData; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/ModCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/ModCallbacks.d.ts similarity index 81% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/ModCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/ModCallbacks.d.ts index 866abf7..58342dc 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/ModCallbacks.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/callbacks/ModCallbacks.d.ts @@ -1,5 +1,5 @@ import { OnLoad } from "../di/OnLoad"; -import { DelayedModLoader } from "../loaders/DelayedModLoader"; +import { PostAkiModLoader } from "../loaders/PostAkiModLoader"; import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { IHttpServer } from "../models/spt/server/IHttpServer"; import { ILogger } from "../models/spt/utils/ILogger"; @@ -9,10 +9,10 @@ declare class ModCallbacks extends OnLoad { protected logger: ILogger; protected httpResponse: HttpResponseUtil; protected httpServer: IHttpServer; - protected modLoader: DelayedModLoader; + protected postAkiModLoader: PostAkiModLoader; protected configServer: ConfigServer; protected httpConfig: IHttpConfig; - constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, modLoader: DelayedModLoader, configServer: ConfigServer); + constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, postAkiModLoader: PostAkiModLoader, configServer: ConfigServer); onLoad(): void; getRoute(): string; sendBundle(sessionID: string, req: any, resp: any, body: any): void; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/NoteCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/NoteCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/NoteCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/NoteCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/NotifierCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/NotifierCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/NotifierCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/NotifierCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/PresetBuildCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/PresetBuildCallbacks.d.ts similarity index 84% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/PresetBuildCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/PresetBuildCallbacks.d.ts index 8a0c155..541715a 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/PresetBuildCallbacks.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/callbacks/PresetBuildCallbacks.d.ts @@ -1,4 +1,5 @@ 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"; @@ -9,7 +10,7 @@ export declare class PresetBuildCallbacks { protected httpResponse: HttpResponseUtil; protected presetBuildController: PresetBuildController; constructor(httpResponse: HttpResponseUtil, presetBuildController: PresetBuildController); - getHandbookUserlist(url: string, info: any, sessionID: string): IGetBodyResponseData; + getHandbookUserlist(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; saveBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse; removeBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/PresetCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/PresetCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/PresetCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/PresetCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/ProfileCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/ProfileCallbacks.d.ts similarity index 87% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/ProfileCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/ProfileCallbacks.d.ts index 116e7c5..6a86fc0 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/ProfileCallbacks.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/callbacks/ProfileCallbacks.d.ts @@ -3,6 +3,7 @@ import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; 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 { IProfileChangeNicknameRequestData } from "../models/eft/profile/IProfileChangeNicknameRequestData"; import { IProfileChangeVoiceRequestData } from "../models/eft/profile/IProfileChangeVoiceRequestData"; import { IProfileCreateRequestData } from "../models/eft/profile/IProfileCreateRequestData"; @@ -23,7 +24,14 @@ export declare class ProfileCallbacks { changeNickname(url: string, info: IProfileChangeNicknameRequestData, sessionID: string): IGetBodyResponseData; validateNickname(url: string, info: IValidateNicknameRequestData, sessionID: string): IGetBodyResponseData; getReservedNickname(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; - getProfileStatus(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; + /** + * Called when creating a character, when you choose a character face/voice + * @param url + * @param info response (empty) + * @param sessionID + * @returns + */ + getProfileStatus(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; searchFriend(url: string, info: ISearchFriendRequestData, sessionID: string): IGetBodyResponseData; getMiniProfile(url: string, info: IGetMiniProfileRequestData, sessionID: string): string; getAllMiniProfiles(url: string, info: any, sessionID: string): string; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/QuestCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/QuestCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/QuestCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/QuestCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/RagfairCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/RagfairCallbacks.d.ts similarity index 89% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/RagfairCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/RagfairCallbacks.d.ts index d5bab8b..3a405c9 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/RagfairCallbacks.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/callbacks/RagfairCallbacks.d.ts @@ -9,8 +9,10 @@ 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 { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; @@ -28,12 +30,12 @@ export declare class RagfairCallbacks extends OnLoadOnUpdate { constructor(httpResponse: HttpResponseUtil, logger: ILogger, jsonUtil: JsonUtil, ragfairServer: RagfairServer, ragfairController: RagfairController, configServer: ConfigServer); onLoad(): void; getRoute(): string; - search(url: string, info: ISearchRequestData, sessionID: string): IGetBodyResponseData; + search(url: string, info: ISearchRequestData, sessionID: string): IGetBodyResponseData; getMarketPrice(url: string, info: IGetMarketPriceRequestData, sessionID: string): IGetBodyResponseData; getItemPrices(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; addOffer(pmcData: IPmcData, info: IAddOfferRequestData, sessionID: string): IItemEventRouterResponse; removeOffer(pmcData: IPmcData, info: IRemoveOfferRequestData, sessionID: string): IItemEventRouterResponse; extendOffer(pmcData: IPmcData, info: IExtendOfferRequestData, sessionID: string): IItemEventRouterResponse; onUpdate(timeSinceLastRun: number): boolean; - sendReport(url: string, info: any, sessionID: string): INullResponseData; + sendReport(url: string, info: ISendRagfairReportRequestData, sessionID: string): INullResponseData; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/RepairCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/RepairCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/RepairCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/RepairCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/SaveCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/SaveCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/SaveCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/SaveCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/TradeCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/TradeCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/TradeCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/TradeCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/TraderCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/TraderCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/TraderCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/TraderCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/WeatherCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/WeatherCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/WeatherCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/WeatherCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/WishlistCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/callbacks/WishlistCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/WishlistCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/callbacks/WishlistCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/BotController.d.ts b/Faupi-MunitionsExpert/server/dist/types/controllers/BotController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/BotController.d.ts rename to Faupi-MunitionsExpert/server/dist/types/controllers/BotController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/CustomizationController.d.ts b/Faupi-MunitionsExpert/server/dist/types/controllers/CustomizationController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/CustomizationController.d.ts rename to Faupi-MunitionsExpert/server/dist/types/controllers/CustomizationController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/DialogueController.d.ts b/Faupi-MunitionsExpert/server/dist/types/controllers/DialogueController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/DialogueController.d.ts rename to Faupi-MunitionsExpert/server/dist/types/controllers/DialogueController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/GameController.d.ts b/Faupi-MunitionsExpert/server/dist/types/controllers/GameController.d.ts similarity index 53% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/GameController.d.ts rename to Faupi-MunitionsExpert/server/dist/types/controllers/GameController.d.ts index b9067fa..85ec418 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/GameController.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/controllers/GameController.d.ts @@ -1,32 +1,28 @@ import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IPmcDataRepeatableQuest, IRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { ICoreConfig } from "../models/spt/config/ICoreConfig"; import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; +import { LocaleService } from "../services/LocaleService"; +import { ProfileFixerService } from "../services/ProfileFixerService"; import { Watermark } from "../utils/Watermark"; export declare class GameController { protected logger: ILogger; protected watermark: Watermark; protected httpServerHelper: HttpServerHelper; + protected localeService: LocaleService; protected profileHelper: ProfileHelper; + protected profileFixerService: ProfileFixerService; protected configServer: ConfigServer; protected httpConfig: IHttpConfig; - constructor(logger: ILogger, watermark: Watermark, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); + protected coreConfig: ICoreConfig; + constructor(logger: ILogger, watermark: Watermark, httpServerHelper: HttpServerHelper, localeService: LocaleService, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, configServer: ConfigServer); gameStart(_url: string, _info: IEmptyRequestData, sessionID: string): void; - protected addMissingBonusesProperty(pmcProfile: IPmcData): void; - protected addMissingRepeatableQuestsProperty(pmcProfile: IPmcData): void; - protected addMissingWeaponRepairSkill(pmcProfile: IPmcData): void; - protected addMissingAkiVersionTagToProfile(fullProfile: IAkiProfile): void; - protected addMissingArmorRepairSkill(pmcProfile: IPmcData): void; - protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; - protected removeDanglingConditionCounters(pmcProfile: IPmcData): void; - protected removeDanglingBackendCounters(pmcProfile: IPmcData): void; + protected logProfileDetails(fullProfile: IAkiProfile): void; getGameConfig(sessionID: string): IGameConfigResponse; getServer(): any[]; - protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/HandbookController.d.ts b/Faupi-MunitionsExpert/server/dist/types/controllers/HandbookController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/HandbookController.d.ts rename to Faupi-MunitionsExpert/server/dist/types/controllers/HandbookController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/HealthController.d.ts b/Faupi-MunitionsExpert/server/dist/types/controllers/HealthController.d.ts similarity index 74% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/HealthController.d.ts rename to Faupi-MunitionsExpert/server/dist/types/controllers/HealthController.d.ts index aafb8df..cc13603 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/HealthController.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/controllers/HealthController.d.ts @@ -18,8 +18,29 @@ export declare class HealthController { protected inventoryHelper: InventoryHelper; protected healthHelper: HealthHelper; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, itemHelper: ItemHelper, paymentService: PaymentService, inventoryHelper: InventoryHelper, healthHelper: HealthHelper); - saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string): void; + /** + * stores in-raid player health + * @param pmcData Player profile + * @param info Request data + * @param sessionID + * @param addEffects Should effects found be added or removed from profile + */ + saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string, addEffects?: boolean): void; + /** + * When healing in menu + * @param pmcData + * @param body + * @param sessionID + * @returns + */ offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse; offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Occurs on post-raid healing page + * @param pmcData player profile + * @param info Request data from client + * @param sessionID Session id + * @returns + */ healthTreatment(pmcData: IPmcData, info: IHealthTreatmentRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/HideoutController.d.ts b/Faupi-MunitionsExpert/server/dist/types/controllers/HideoutController.d.ts similarity index 81% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/HideoutController.d.ts rename to Faupi-MunitionsExpert/server/dist/types/controllers/HideoutController.d.ts index a8bf229..f2930ff 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/HideoutController.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/controllers/HideoutController.d.ts @@ -3,10 +3,12 @@ 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, IPmcData, Product } from "../models/eft/common/IPmcData"; import { HideoutUpgradeCompleteRequestData } from "../models/eft/hideout/HideoutUpgradeCompleteRequestData"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; +import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction"; import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData"; +import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; import { IHideoutTakeItemOutRequestData } from "../models/eft/hideout/IHideoutTakeItemOutRequestData"; @@ -47,11 +49,20 @@ export declare class HideoutController { upgradeComplete(pmcData: IPmcData, body: HideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse; putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; takeItemsFromAreaSlots(pmcData: IPmcData, body: IHideoutTakeItemOutRequestData, sessionID: string): IItemEventRouterResponse; + protected removeItemFromGenerator(sessionID: string, pmcData: IPmcData, body: IHideoutTakeItemOutRequestData, output: IItemEventRouterResponse, hideoutArea: HideoutArea): IItemEventRouterResponse; toggleArea(pmcData: IPmcData, body: IHideoutToggleAreaRequestData, sessionID: string): IItemEventRouterResponse; singleProductionStart(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData, sessionID: string): IItemEventRouterResponse; scavCaseProductionStart(pmcData: IPmcData, body: IHideoutScavCaseStartRequestData, sessionID: string): IItemEventRouterResponse; + protected getRandomisedItemRarityCounter(recipe: IHideoutScavCase): { + [x: string]: number; + }; + protected getRandomisedScavRewards(rarityItemCounter: { + [x: string]: number; + }): Product[]; continuousProductionStart(pmcData: IPmcData, body: IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; takeProduction(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; + protected handleRecipie(sessionID: string, recipe: IHideoutProduction, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; + protected handleScavCase(sessionID: string, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; update(): void; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/InraidController.d.ts b/Faupi-MunitionsExpert/server/dist/types/controllers/InraidController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/InraidController.d.ts rename to Faupi-MunitionsExpert/server/dist/types/controllers/InraidController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/InsuranceController.d.ts b/Faupi-MunitionsExpert/server/dist/types/controllers/InsuranceController.d.ts similarity index 88% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/InsuranceController.d.ts rename to Faupi-MunitionsExpert/server/dist/types/controllers/InsuranceController.d.ts index db2c567..af45442 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/InsuranceController.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/controllers/InsuranceController.d.ts @@ -3,6 +3,7 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; 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"; @@ -33,6 +34,12 @@ export declare class InsuranceController { insuranceService: InsuranceService, configServer: ConfigServer); processReturn(): void; insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse; - cost(info: IGetInsuranceCostRequestData, sessionID: string): any; + /** + * Calculate insurance cost + * @param info request object + * @param sessionID session id + * @returns response object to send to client + */ + cost(info: IGetInsuranceCostRequestData, sessionID: string): IGetInsuranceCostResponseData; doAbsolutelyNothing(): void; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/InventoryController.d.ts b/Faupi-MunitionsExpert/server/dist/types/controllers/InventoryController.d.ts similarity index 87% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/InventoryController.d.ts rename to Faupi-MunitionsExpert/server/dist/types/controllers/InventoryController.d.ts index b732aa9..f57f731 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/InventoryController.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/controllers/InventoryController.d.ts @@ -24,6 +24,8 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { FenceService } from "../services/FenceService"; +import { RagfairOfferService } from "../services/RagfairOfferService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class InventoryController { @@ -31,12 +33,14 @@ export declare class InventoryController { protected hashUtil: HashUtil; protected jsonUtil: JsonUtil; protected databaseServer: DatabaseServer; + protected fenceService: FenceService; protected presetHelper: PresetHelper; protected inventoryHelper: InventoryHelper; + protected ragfairOfferService: RagfairOfferService; protected profileHelper: ProfileHelper; protected paymentHelper: PaymentHelper; protected itemEventRouter: ItemEventRouter; - constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, presetHelper: PresetHelper, inventoryHelper: InventoryHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter); + constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, fenceService: FenceService, presetHelper: PresetHelper, inventoryHelper: InventoryHelper, ragfairOfferService: RagfairOfferService, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter); /** * Move Item * change location of item with parentId and slotId @@ -93,9 +97,19 @@ export declare class InventoryController { tagItem(pmcData: IPmcData, body: IInventoryTagRequestData, sessionID: string): IItemEventRouterResponse; bindItem(pmcData: IPmcData, body: IInventoryBindRequestData, sessionID: string): IItemEventRouterResponse; /** - * Handles examining of the item * + * Handles examining an item + * @param pmcData player profile + * @param body request object + * @param sessionID session id + * @returns response */ examineItem(pmcData: IPmcData, body: IInventoryExamineRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Get the tplid of an item from the examine request object + * @param body response request + * @returns tplid + */ + protected getExaminedItemTpl(body: IInventoryExamineRequestData): string; readEncyclopedia(pmcData: IPmcData, body: IInventoryReadEncyclopediaRequestData, sessionID: string): IItemEventRouterResponse; /** * Handles sorting of Inventory. diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/LauncherController.d.ts b/Faupi-MunitionsExpert/server/dist/types/controllers/LauncherController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/LauncherController.d.ts rename to Faupi-MunitionsExpert/server/dist/types/controllers/LauncherController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/LocationController.d.ts b/Faupi-MunitionsExpert/server/dist/types/controllers/LocationController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/LocationController.d.ts rename to Faupi-MunitionsExpert/server/dist/types/controllers/LocationController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/MatchController.d.ts b/Faupi-MunitionsExpert/server/dist/types/controllers/MatchController.d.ts similarity index 65% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/MatchController.d.ts rename to Faupi-MunitionsExpert/server/dist/types/controllers/MatchController.d.ts index c322d96..0851ab0 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/MatchController.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/controllers/MatchController.d.ts @@ -1,30 +1,36 @@ 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 { IJoinMatchRequestData } from "../models/eft/match/IJoinMatchRequestData"; +import { IJoinMatchResult } from "../models/eft/match/IJoinMatchResult"; import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; import { IInRaidConfig } from "../models/spt/config/IInRaidConfig"; import { IMatchConfig } from "../models/spt/config/IMatchConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { SaveServer } from "../servers/SaveServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; import { MatchLocationService } from "../services/MatchLocationService"; export declare class MatchController { protected saveServer: SaveServer; protected profileHelper: ProfileHelper; protected matchLocationService: MatchLocationService; protected traderHelper: TraderHelper; + protected botLootCacheService: BotLootCacheService; protected configServer: ConfigServer; protected matchConfig: IMatchConfig; protected inraidConfig: IInRaidConfig; - constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, configServer: ConfigServer); + constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer); getEnabled(): boolean; getProfile(info: IGetProfileRequestData): IPmcData[]; - protected getMatch(location: any): any; - createGroup(sessionID: string, info: any): any; + createGroup(sessionID: string, info: ICreateGroupRequestData): any; deleteGroup(info: any): void; - joinMatch(info: any, sessionID: string): any[]; - getGroupStatus(info: any): any; + joinMatch(info: IJoinMatchRequestData, sessionID: string): IJoinMatchResult[]; + protected getMatch(location: string): any; + getGroupStatus(info: IGetGroupStatusRequestData): any; startOfflineRaid(info: IStartOfflineRaidRequestData, sessionID: string): void; endOfflineRaid(info: IEndOfflineRaidRequestData, sessionID: string): void; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/NoteController.d.ts b/Faupi-MunitionsExpert/server/dist/types/controllers/NoteController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/NoteController.d.ts rename to Faupi-MunitionsExpert/server/dist/types/controllers/NoteController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/NotifierController.d.ts b/Faupi-MunitionsExpert/server/dist/types/controllers/NotifierController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/NotifierController.d.ts rename to Faupi-MunitionsExpert/server/dist/types/controllers/NotifierController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/PresetBuildController.d.ts b/Faupi-MunitionsExpert/server/dist/types/controllers/PresetBuildController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/PresetBuildController.d.ts rename to Faupi-MunitionsExpert/server/dist/types/controllers/PresetBuildController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/PresetController.d.ts b/Faupi-MunitionsExpert/server/dist/types/controllers/PresetController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/PresetController.d.ts rename to Faupi-MunitionsExpert/server/dist/types/controllers/PresetController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/ProfileController.d.ts b/Faupi-MunitionsExpert/server/dist/types/controllers/ProfileController.d.ts similarity index 83% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/ProfileController.d.ts rename to Faupi-MunitionsExpert/server/dist/types/controllers/ProfileController.d.ts index 9b7a6d5..b40bb7d 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/ProfileController.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/controllers/ProfileController.d.ts @@ -11,6 +11,7 @@ import { ISearchFriendResponse } from "../models/eft/profile/ISearchFriendRespon import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { ProfileFixerService } from "../services/ProfileFixerService"; import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class ProfileController { @@ -19,13 +20,20 @@ export declare class ProfileController { protected saveServer: SaveServer; protected databaseServer: DatabaseServer; protected itemHelper: ItemHelper; + protected profileFixerService: ProfileFixerService; protected traderHelper: TraderHelper; protected extendedProfileHelper: ExtendedProfileHelper; - constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, traderHelper: TraderHelper, extendedProfileHelper: ExtendedProfileHelper); + constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileFixerService: ProfileFixerService, traderHelper: TraderHelper, extendedProfileHelper: ExtendedProfileHelper); getMiniProfiles(): IMiniProfile[]; getMiniProfile(sessionID: string): any; getCompleteProfile(sessionID: string): IPmcData[]; createProfile(info: IProfileCreateRequestData, sessionID: string): void; + /** + * Generate a player scav object + * pmc profile MUST exist first before pscav can be generated + * @param sessionID + * @returns IPmcData object + */ generatePlayerScav(sessionID: string): IPmcData; validateNickname(info: IValidateNicknameRequestData, sessionID: string): string; changeNickname(info: IProfileChangeNicknameRequestData, sessionID: string): string; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/QuestController.d.ts b/Faupi-MunitionsExpert/server/dist/types/controllers/QuestController.d.ts similarity index 59% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/QuestController.d.ts rename to Faupi-MunitionsExpert/server/dist/types/controllers/QuestController.d.ts index e588de0..2cbccfb 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/QuestController.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/controllers/QuestController.d.ts @@ -4,7 +4,7 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { QuestConditionHelper } from "../helpers/QuestConditionHelper"; import { QuestHelper } from "../helpers/QuestHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IQuest } from "../models/eft/common/tables/IQuest"; +import { IQuest, Reward } from "../models/eft/common/tables/IQuest"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; @@ -14,6 +14,7 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { LocaleService } from "../services/LocaleService"; import { PlayerService } from "../services/PlayerService"; import { TimeUtil } from "../utils/TimeUtil"; export declare class QuestController { @@ -27,12 +28,49 @@ export declare class QuestController { protected questHelper: QuestHelper; protected questConditionHelper: QuestConditionHelper; protected playerService: PlayerService; + protected localeService: LocaleService; protected configServer: ConfigServer; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, questConditionHelper: QuestConditionHelper, playerService: PlayerService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, questConditionHelper: QuestConditionHelper, playerService: PlayerService, localeService: LocaleService, configServer: ConfigServer); + /** + * Get all quests visible to player + * Exclude quests with incomplete preconditions (level/loyalty) + * @param sessionID session id + * @returns array of IQuest + */ getClientQuests(sessionID: string): IQuest[]; acceptQuest(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse; acceptRepeatableQuest(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Remove completed quest from profile + * Add newly unlocked quests to profile + * Also recalculate thier level due to exp rewards + * @param pmcData Player profile + * @param body completed quest request + * @param sessionID session id + * @returns ItemEvent response + */ completeQuest(pmcData: IPmcData, body: ICompleteQuestRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Send a popup to player on completion of a quest + * @param sessionID session id + * @param pmcData player profile + * @param completedQuestId completed quest id + * @param questRewards rewards given to player + */ + protected sendDialogMessageOnQuestComplete(sessionID: string, pmcData: IPmcData, completedQuestId: string, questRewards: Reward[]): 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 quests provided + * @param sessionID session id + * @param pmcData player profile + * @param questsToFail quests to fail + */ + protected failQuests(sessionID: string, pmcData: IPmcData, questsToFail: IQuest[]): void; handoverQuest(pmcData: IPmcData, body: IHandoverQuestRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/RagfairController.d.ts b/Faupi-MunitionsExpert/server/dist/types/controllers/RagfairController.d.ts similarity index 97% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/RagfairController.d.ts rename to Faupi-MunitionsExpert/server/dist/types/controllers/RagfairController.d.ts index c758593..c4ffc15 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/RagfairController.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/controllers/RagfairController.d.ts @@ -60,6 +60,8 @@ export declare class RagfairController { protected ragfairConfig: IRagfairConfig; constructor(logger: ILogger, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter, 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, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, ragfairOfferGenerator: RagfairOfferGenerator, configServer: ConfigServer); getOffers(sessionID: string, info: ISearchRequestData): IGetOffersResult; + protected isLinkedSearch(info: ISearchRequestData): boolean; + protected isRequiredSearch(info: ISearchRequestData): boolean; update(): void; getItemPrice(info: IGetMarketPriceRequestData): IGetItemPriceResult; addPlayerOffer(pmcData: IPmcData, info: IAddOfferRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/RepairController.d.ts b/Faupi-MunitionsExpert/server/dist/types/controllers/RepairController.d.ts similarity index 92% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/RepairController.d.ts rename to Faupi-MunitionsExpert/server/dist/types/controllers/RepairController.d.ts index e9458f6..330684d 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/RepairController.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/controllers/RepairController.d.ts @@ -21,6 +21,7 @@ export declare class RepairController { protected repairHelper: RepairHelper; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; + protected readonly WEAPON_SKILL_REPAIR_GAIN: number; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, questHelper: QuestHelper, traderHelper: TraderHelper, paymentService: PaymentService, repairHelper: RepairHelper, configServer: ConfigServer); /** * Repair with trader @@ -37,5 +38,5 @@ export declare class RepairController { * @param sessionID session id * @returns item event router action */ - repair(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; + repairWithKit(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/RepeatableQuestController.d.ts b/Faupi-MunitionsExpert/server/dist/types/controllers/RepeatableQuestController.d.ts similarity index 97% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/RepeatableQuestController.d.ts rename to Faupi-MunitionsExpert/server/dist/types/controllers/RepeatableQuestController.d.ts index ce190aa..2bb2aa9 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/RepeatableQuestController.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/controllers/RepeatableQuestController.d.ts @@ -15,6 +15,7 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { PaymentService } from "../services/PaymentService"; +import { ProfileFixerService } from "../services/ProfileFixerService"; import { JsonUtil } from "../utils/JsonUtil"; import { MathUtil } from "../utils/MathUtil"; import { ObjectId } from "../utils/ObjectId"; @@ -57,13 +58,14 @@ export declare class RepeatableQuestController { protected itemHelper: ItemHelper; protected presetHelper: PresetHelper; protected profileHelper: ProfileHelper; + protected profileFixerService: ProfileFixerService; protected ragfairServerHelper: RagfairServerHelper; protected itemEventRouter: ItemEventRouter; protected paymentService: PaymentService; protected objectId: ObjectId; protected configServer: ConfigServer; protected questConfig: IQuestConfig; - constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, itemEventRouter: ItemEventRouter, paymentService: PaymentService, objectId: ObjectId, configServer: ConfigServer); + constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, ragfairServerHelper: RagfairServerHelper, itemEventRouter: ItemEventRouter, paymentService: PaymentService, objectId: ObjectId, configServer: ConfigServer); /** * This is the method reached by the /client/repeatalbeQuests/activityPeriods endpoint * Returns an array of objects in the format of repeatable quests to the client. diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/TradeController.d.ts b/Faupi-MunitionsExpert/server/dist/types/controllers/TradeController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/TradeController.d.ts rename to Faupi-MunitionsExpert/server/dist/types/controllers/TradeController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/TraderController.d.ts b/Faupi-MunitionsExpert/server/dist/types/controllers/TraderController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/TraderController.d.ts rename to Faupi-MunitionsExpert/server/dist/types/controllers/TraderController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/WeatherController.d.ts b/Faupi-MunitionsExpert/server/dist/types/controllers/WeatherController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/WeatherController.d.ts rename to Faupi-MunitionsExpert/server/dist/types/controllers/WeatherController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/WishlistController.d.ts b/Faupi-MunitionsExpert/server/dist/types/controllers/WishlistController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/WishlistController.d.ts rename to Faupi-MunitionsExpert/server/dist/types/controllers/WishlistController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/di/Container.d.ts b/Faupi-MunitionsExpert/server/dist/types/di/Container.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/di/Container.d.ts rename to Faupi-MunitionsExpert/server/dist/types/di/Container.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/di/OnLoad.d.ts b/Faupi-MunitionsExpert/server/dist/types/di/OnLoad.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/di/OnLoad.d.ts rename to Faupi-MunitionsExpert/server/dist/types/di/OnLoad.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/di/OnLoadOnUpdate.d.ts b/Faupi-MunitionsExpert/server/dist/types/di/OnLoadOnUpdate.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/di/OnLoadOnUpdate.d.ts rename to Faupi-MunitionsExpert/server/dist/types/di/OnLoadOnUpdate.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/di/OnUpdate.d.ts b/Faupi-MunitionsExpert/server/dist/types/di/OnUpdate.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/di/OnUpdate.d.ts rename to Faupi-MunitionsExpert/server/dist/types/di/OnUpdate.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/di/Router.d.ts b/Faupi-MunitionsExpert/server/dist/types/di/Router.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/di/Router.d.ts rename to Faupi-MunitionsExpert/server/dist/types/di/Router.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/di/Serializer.d.ts b/Faupi-MunitionsExpert/server/dist/types/di/Serializer.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/di/Serializer.d.ts rename to Faupi-MunitionsExpert/server/dist/types/di/Serializer.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/generators/BotGenerator.d.ts b/Faupi-MunitionsExpert/server/dist/types/generators/BotGenerator.d.ts similarity index 61% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/generators/BotGenerator.d.ts rename to Faupi-MunitionsExpert/server/dist/types/generators/BotGenerator.d.ts index 88a8014..28f05a9 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/generators/BotGenerator.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/generators/BotGenerator.d.ts @@ -31,16 +31,54 @@ export declare class BotGenerator { protected botConfig: IBotConfig; constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; + /** + * Choose if a bot should become a Pmc by checking if bot type is allowed to become a Pmc in bot config + * @param isPlayerScav is a player scav being generated, forces choice returned to never be a pmc + */ + protected shouldBotBePmc(isPlayerScav: boolean, role: string): boolean; + /** + * Get a randomised PMC side based on bot config value 'isUsec' + * @returns pmc side as string + */ + protected getRandomisedPmcSide(): string; + /** + * Get a clone of the database\bots\base.json file + * @returns IBotBase object + */ + protected getCloneOfBotBase(): IBotBase; protected generateBot(bot: IBotBase, role: string, isPmc: boolean): IBotBase; + /** + * Log the number of PMCs generated to the debug console + */ + protected logPmcGeneratedCount(output: IBotBase[]): void; protected generateRandomLevel(min: number, max: number): BotGenerator.IRandomisedBotLevelResult; - /** Converts health object to the required format */ + /** + * Converts health object to the required format + * @param healthObj health object from bot json + * @param playerScav Is a pscav bot being generated + * @returns PmcHealth object + */ protected generateHealth(healthObj: Health, playerScav?: boolean): PmcHealth; protected generateSkills(skillsObj: Skills): Skills; + /** + * Convert from pmc side (usec/bear) to the side as defined in the bot config (usecType/bearType) + * @param pmcSide eft side (usec/bear) + * @returns pmc side as defined in config + */ protected getPmcRole(pmcSide: string): string; + /** + * Iterate through bots inventory and loot to find and remove christmas items (as defined in GameEventHelper) + * @param nodeInventory Bots inventory to iterate over + */ protected removeChristmasItemsFromBotInventory(nodeInventory: Inventory): void; protected generateId(bot: IBotBase): IBotBase; protected generateInventoryID(profile: IBotBase): IBotBase; protected getPMCDifficulty(requestedDifficulty: string): 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; } export {}; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/generators/BotInventoryGenerator.d.ts b/Faupi-MunitionsExpert/server/dist/types/generators/BotInventoryGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/generators/BotInventoryGenerator.d.ts rename to Faupi-MunitionsExpert/server/dist/types/generators/BotInventoryGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/generators/BotLootGenerator.d.ts b/Faupi-MunitionsExpert/server/dist/types/generators/BotLootGenerator.d.ts similarity index 66% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/generators/BotLootGenerator.d.ts rename to Faupi-MunitionsExpert/server/dist/types/generators/BotLootGenerator.d.ts index 1d91836..2295f51 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/generators/BotLootGenerator.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/generators/BotLootGenerator.d.ts @@ -1,29 +1,27 @@ -import { PMCLootGenerator } from "../generators/PMCLootGenerator"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; import { HandbookHelper } from "../helpers/HandbookHelper"; import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; import { ItemMinMax, Items } from "../models/eft/common/tables/IBotType"; 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 { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; export declare class BotLootGenerator { - protected jsonUtil: JsonUtil; + protected logger: ILogger; protected hashUtil: HashUtil; protected randomUtil: RandomUtil; protected databaseServer: DatabaseServer; protected handbookHelper: HandbookHelper; protected botGeneratorHelper: BotGeneratorHelper; - protected pmcLootGenerator: PMCLootGenerator; + protected botLootCacheService: BotLootCacheService; protected configServer: ConfigServer; protected botConfig: IBotConfig; - constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, pmcLootGenerator: PMCLootGenerator, configServer: ConfigServer); - generateLoot(lootPool: Items, itemCounts: ItemMinMax, isPmc: boolean, inventory: PmcInventory): void; + constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer); + generateLoot(lootPool: Items, itemCounts: ItemMinMax, isPmc: boolean, botRole: string, inventory: PmcInventory): void; protected getRandomisedCount(min: number, max: number, nValue: number): number; protected addLootFromPool(pool: ITemplateItem[], equipmentSlots: string[], count: number, inventory: PmcInventory, totalValueLimit?: number, useLimits?: boolean): void; - /** Compares two item templates by their price to spawn chance ratio */ - protected compareByValue(a: ITemplateItem, b: ITemplateItem): number; } diff --git a/Faupi-MunitionsExpert/server/dist/types/generators/BotWeaponGenerator.d.ts b/Faupi-MunitionsExpert/server/dist/types/generators/BotWeaponGenerator.d.ts new file mode 100644 index 0000000..80dc37c --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/generators/BotWeaponGenerator.d.ts @@ -0,0 +1,97 @@ +import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; +import { ItemHelper } from "../helpers/ItemHelper"; +import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; +import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { Inventory, MinMax, ModsChances } from "../models/eft/common/tables/IBotType"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HashUtil } from "../utils/HashUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +import { JsonUtil } from "../utils/JsonUtil"; +export declare class BotWeaponGenerator { + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected weightedRandomHelper: WeightedRandomHelper; + protected botGeneratorHelper: BotGeneratorHelper; + protected randomUtil: RandomUtil; + private readonly modMagazineSlotId; + constructor(jsonUtil: JsonUtil, logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil); + generateWeapon(equipmentSlot: string, templateInventory: Inventory, modChances: ModsChances, magCounts: MinMax, botRole: string, isPmc: boolean, inventory: PmcInventory): void; + /** + * Get the mods necessary to kit out a weapon to its preset level + * @param weaponTpl weapon to find preset for + * @param equipmentSlot the slot the weapon will be placed in + * @param weaponParentId + * @returns array of weapon mods + */ + protected getPresetWeaponMods(weaponTpl: string, equipmentSlot: string, weaponParentId: string, itemTemplate: ITemplateItem, botRole: string): Item[]; + /** Checks if all required slots are occupied on a weapon and all it's mods */ + protected isWeaponValid(itemList: Item[]): boolean; + /** + * Generates extra magazines or bullets (if magazine is internal) and adds them to TacticalVest and Pockets. + * Additionally, adds extra bullets to SecuredContainer + * @param weaponMods + * @param weaponTemplate + * @param magCounts + * @param ammoTpl + * @param inventory + * @returns + */ + protected generateExtraMagazines(weaponMods: Item[], weaponTemplate: ITemplateItem, magCounts: MinMax, ammoTpl: string, inventory: PmcInventory): void; + /** + * Get a randomised number of bullets for a specific magazine + * @param magCounts min and max count of magazines + * @param magTemplate magazine to generate bullet count for + * @returns bullet count number + */ + protected getRandomisedBulletCount(magCounts: MinMax, magTemplate: ITemplateItem): number; + /** + * Get a randomised count of magazines + * @param magCounts min and max value returned value can be between + * @returns numberical value of magazine count + */ + protected getRandomisedMagazineCount(magCounts: MinMax): number; + /** + * Add ammo to the secure container + * @param stackCount How many stacks of ammo to add + * @param ammoTpl Ammo type to add + * @param stackSize Size of the ammo stack to add + * @param inventory Player inventory + */ + protected addAmmoToSecureContainer(stackCount: number, ammoTpl: string, stackSize: number, inventory: PmcInventory): void; + /** + * Get a weapons magazine tpl from a weapon template + * @param weaponMods mods from a weapon template + * @param weaponTemplate Weapon to get magazine tpl for + * @returns magazine tpl string + */ + protected getMagazineTplFromWeaponTemplate(weaponMods: Item[], weaponTemplate: ITemplateItem): string; + protected addBulletsToVestAndPockets(ammoTpl: string, bulletCount: number, inventory: PmcInventory): void; + /** + * Finds and returns compatible ammo tpl + * + * @param {*} weaponMods + * @param {*} weaponTemplate + * @returns compatible ammo tpl + */ + protected getCompatibleAmmo(weaponMods: Item[], weaponTemplate: ITemplateItem): string; + /** + * Fill existing magazines to full, while replacing their contents with specified ammo + * @param weaponMods + * @param magazine + * @param ammoTpl + */ + protected fillExistingMagazines(weaponMods: Item[], magazine: Item, ammoTpl: string): void; + /** + * Fill each Camora with a bullet + * @param weaponMods Weapon mods to find and update camora mod(s) from + * @param magazineId magazine id to find and add to + * @param ammoTpl ammo template id to hydate with + */ + protected fillCamorasWithAmmo(weaponMods: Item[], magazineId: string, ammoTpl: string): void; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/generators/LocationGenerator.d.ts b/Faupi-MunitionsExpert/server/dist/types/generators/LocationGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/generators/LocationGenerator.d.ts rename to Faupi-MunitionsExpert/server/dist/types/generators/LocationGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/generators/PMCLootGenerator.d.ts b/Faupi-MunitionsExpert/server/dist/types/generators/PMCLootGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/generators/PMCLootGenerator.d.ts rename to Faupi-MunitionsExpert/server/dist/types/generators/PMCLootGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/generators/RagfairAssortGenerator.d.ts b/Faupi-MunitionsExpert/server/dist/types/generators/RagfairAssortGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/generators/RagfairAssortGenerator.d.ts rename to Faupi-MunitionsExpert/server/dist/types/generators/RagfairAssortGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/generators/RagfairOfferGenerator.d.ts b/Faupi-MunitionsExpert/server/dist/types/generators/RagfairOfferGenerator.d.ts similarity index 91% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/generators/RagfairOfferGenerator.d.ts rename to Faupi-MunitionsExpert/server/dist/types/generators/RagfairOfferGenerator.d.ts index de53ea9..3e7f4cc 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/generators/RagfairOfferGenerator.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/generators/RagfairOfferGenerator.d.ts @@ -11,6 +11,7 @@ import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { FenceService } from "../services/FenceService"; +import { RagfairCategoriesService } from "../services/RagfairCategoriesService"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { RagfairPriceService } from "../services/RagfairPriceService"; import { HashUtil } from "../utils/HashUtil"; @@ -31,11 +32,12 @@ export declare class RagfairOfferGenerator { protected ragfairAssortGenerator: RagfairAssortGenerator; protected ragfairOfferService: RagfairOfferService; protected ragfairPriceService: RagfairPriceService; + protected ragfairCategoriesService: RagfairCategoriesService; protected fenceService: FenceService; protected itemHelper: ItemHelper; protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, saveServer: SaveServer, presetHelper: PresetHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferService: RagfairOfferService, ragfairPriceService: RagfairPriceService, fenceService: FenceService, itemHelper: ItemHelper, configServer: ConfigServer); + constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, saveServer: SaveServer, presetHelper: PresetHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferService: RagfairOfferService, ragfairPriceService: RagfairPriceService, ragfairCategoriesService: RagfairCategoriesService, fenceService: FenceService, itemHelper: ItemHelper, configServer: ConfigServer); createOffer(userID: string, time: number, items: Item[], barterScheme: IBarterScheme[], loyalLevel: number, price: number, sellInOnePiece?: boolean): IRagfairOffer; protected getTraderId(userID: string): string; protected getRating(userID: string): number; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/generators/WeatherGenerator.d.ts b/Faupi-MunitionsExpert/server/dist/types/generators/WeatherGenerator.d.ts similarity index 69% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/generators/WeatherGenerator.d.ts rename to Faupi-MunitionsExpert/server/dist/types/generators/WeatherGenerator.d.ts index 23aa169..44cecbb 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/generators/WeatherGenerator.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/generators/WeatherGenerator.d.ts @@ -12,6 +12,19 @@ export declare class WeatherGenerator { protected weatherConfig: IWeatherConfig; constructor(weightedRandomHelper: WeightedRandomHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer); calculateTime(data: IWeatherData): IWeatherData; + /** + * Get server uptime seconds multiplied by a multiplier and add to current time as seconds + * Format to BSGs requirements + * @param computedDate current date + * @returns formatted time + */ + protected getAcceleratedTime(computedDate: Date): string; + /** + * Get current time formatted to fit BSGs requirement + * @param computedDate + * @returns + */ + protected getNormalTime(computedDate: Date): string; generateWeather(data: IWeatherData): IWeatherData; protected getWeightedFog(): string; protected getWeightedRain(): number; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/AssortHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/AssortHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/AssortHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/AssortHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/BotGeneratorHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/BotGeneratorHelper.d.ts similarity index 69% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/BotGeneratorHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/BotGeneratorHelper.d.ts index c382fc9..243e7a8 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/BotGeneratorHelper.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/helpers/BotGeneratorHelper.d.ts @@ -13,11 +13,13 @@ import { RandomUtil } from "../utils/RandomUtil"; import { ContainerHelper } from "./ContainerHelper"; import { InventoryHelper } from "./InventoryHelper"; import { ItemHelper } from "./ItemHelper"; +import { ProbabilityHelper } from "./ProbabilityHelper"; export declare class BotGeneratorHelper { protected logger: ILogger; protected jsonUtil: JsonUtil; protected hashUtil: HashUtil; protected randomUtil: RandomUtil; + protected probabilityHelper: ProbabilityHelper; protected databaseServer: DatabaseServer; protected durabilityLimitsHelper: DurabilityLimitsHelper; protected itemHelper: ItemHelper; @@ -25,8 +27,42 @@ export declare class BotGeneratorHelper { protected containerHelper: ContainerHelper; protected configServer: ConfigServer; protected botConfig: IBotConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer); + constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, probabilityHelper: ProbabilityHelper, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer); generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances, isPmc?: boolean): Item[]; + /** + * Is this magazine cylinder related (revolvers and grenade launchers) + * @param magazineParentName the name of the magazines parent + * @returns true if it is cylinder related + */ + magazineIsCylinderRelated(magazineParentName: string): boolean; + /** + * Get a list of non black-listed cartridges from the PMC bot config + * @param modSlot mod item slot + * @param itemModPool + * @returns string array of cartridges PMCs can use + */ + protected getNonBlacklistedCartridges(modSlot: string, itemModPool: Record): string[]; + /** + * 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 + */ + protected shouldModBeSpawned(itemSlot: Slot, modSlot: string, modSpawnChances: ModsChances): boolean; + /** + * Get a list of containers that hold ammo + * @returns string array + */ + protected getAmmoContainers(): string[]; + /** + * Get the slot details for an item (chamber/cartridge/slot) + * @param modSlot e.g patron_in_weapon + * @param parentTemplate item template + * @returns + */ + protected getModItemSlot(modSlot: string, parentTemplate: ITemplateItem): Slot; /** * With the shotgun revolver (60db29ce99594040e04c4a27) 12.12 introduced CylinderMagazines. * Those magazines (e.g. 60dc519adf4c47305f6d410d) have a "Cartridges" entry with a _max_count=0. @@ -39,6 +75,12 @@ export declare class BotGeneratorHelper { * @param {object} parentTemplate The CylinderMagazine's template */ protected fillCamora(items: Item[], modPool: Mods, parentId: string, parentTemplate: 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 + */ + protected mergeCamoraPoolsTogether(camorasWithShells: Record): string[]; generateExtraPropertiesForItem(itemTemplate: ITemplateItem, botRole?: any): { upd?: Upd; }; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/BotHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/BotHelper.d.ts similarity index 97% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/BotHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/BotHelper.d.ts index 0cb1227..6b92566 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/BotHelper.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/helpers/BotHelper.d.ts @@ -34,7 +34,7 @@ export declare class BotHelper { * @param difficultySettings bot settings to alter * @param typesToAdd bot type to add to enemy list */ - addBotToEnemyList(difficultySettings: Difficulty, typesToAdd: string[]): void; + addBotToEnemyList(difficultySettings: Difficulty, typesToAdd: string[], typeBeingEdited: string): void; /** * Add a bot to the REVENGE_BOT_TYPES array * @param difficultySettings bot settings to alter diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/ContainerHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/ContainerHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/ContainerHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/ContainerHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/DialogueHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/DialogueHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/DialogueHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/DialogueHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/DurabilityLimitsHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/DurabilityLimitsHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/DurabilityLimitsHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/DurabilityLimitsHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/ExtendedProfileHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/ExtendedProfileHelper.d.ts similarity index 76% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/ExtendedProfileHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/ExtendedProfileHelper.d.ts index d8b754d..c05d88e 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/ExtendedProfileHelper.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/helpers/ExtendedProfileHelper.d.ts @@ -2,15 +2,20 @@ import { BotGenerator } from "../generators/BotGenerator"; import { IPmcData, Skills, Stats } from "../models/eft/common/IPmcData"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; import { FenceService } from "../services/FenceService"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { Watermark } from "../utils/Watermark"; import { ItemHelper } from "./ItemHelper"; import { ProfileHelper } from "./ProfileHelper"; +/** + * This class needs to exist outside of ProfileHelper to ensure cyclic deps don't cause the server to fail on load + */ export declare class ExtendedProfileHelper extends ProfileHelper { + protected botLootCacheService: BotLootCacheService; protected botGenerator: BotGenerator; - constructor(jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService, botGenerator: BotGenerator); + constructor(jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, botLootCacheService: BotLootCacheService, fenceService: FenceService, botGenerator: BotGenerator); generatePlayerScav(sessionID: string): IPmcData; protected getScavSkills(sessionID: string): Skills; protected removeSecureContainer(profile: IPmcData): IPmcData; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/GameEventHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/GameEventHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/GameEventHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/GameEventHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/HandbookHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/HandbookHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/HandbookHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/HandbookHelper.d.ts diff --git a/Faupi-MunitionsExpert/server/dist/types/helpers/HealthHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/HealthHelper.d.ts new file mode 100644 index 0000000..3116c9c --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/helpers/HealthHelper.d.ts @@ -0,0 +1,51 @@ +import { IPmcData } from "../models/eft/common/IPmcData"; +import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { IHealthConfig } from "../models/spt/config/IHealthConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { SaveServer } from "../servers/SaveServer"; +import { JsonUtil } from "../utils/JsonUtil"; +import { TimeUtil } from "../utils/TimeUtil"; +export declare class HealthHelper { + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected saveServer: SaveServer; + protected configServer: ConfigServer; + protected healthConfig: IHealthConfig; + constructor(jsonUtil: JsonUtil, logger: ILogger, timeUtil: TimeUtil, saveServer: SaveServer, configServer: ConfigServer); + /** + * Resets the profiles vitality/healh and vitality/effects properties to their defaults + * @param sessionID Session Id + * @returns updated profile + */ + resetVitality(sessionID: string): IAkiProfile; + /** + * Update player profile with changes from request object + * @param pmcData Player profile + * @param info Request object + * @param sessionID Session id + * @param addEffects Should effects be added or removed (default - add) + */ + saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string, addEffects?: boolean): void; + protected saveHealth(pmcData: IPmcData, sessionID: string): void; + /** + * Save effects to profile + * Works by removing all effects and adding them back from profile + * Remoces empty 'Effects' objects if found + * @param pmcData Player profile + * @param sessionID Session id + * @param addEffects Should effects be added back to profile + * @returns + */ + protected saveEffects(pmcData: IPmcData, sessionID: string, addEffects: boolean): void; + /** + * Add effect to body part in profile + * @param pmcData Player profile + * @param effectBodyPart body part to edit + * @param effectType Effect to add to body part + */ + protected addEffect(pmcData: IPmcData, effectBodyPart: string, effectType: string): void; + protected isEmpty(map: any): boolean; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/HideoutHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/HideoutHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/HideoutHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/HideoutHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/HttpServerHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/HttpServerHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/HttpServerHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/HttpServerHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/InRaidHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/InRaidHelper.d.ts similarity index 80% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/InRaidHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/InRaidHelper.d.ts index 05b6fdf..58e0f6a 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/InRaidHelper.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/helpers/InRaidHelper.d.ts @@ -28,6 +28,18 @@ export declare class InRaidHelper { markFoundItems(pmcData: IPmcData, profile: IPmcData, isPlayerScav: boolean): IPmcData; removeFoundInRaidStatusFromItems(profile: IPmcData): IPmcData; setInventory(sessionID: string, pmcData: IPmcData, profile: IPmcData): IPmcData; + /** + * Clear pmc inventory of all items except those that are exempt + * @param pmcData Player profile + * @param sessionID Session id + * @returns Player profile with pmc inventory cleared + */ deleteInventory(pmcData: IPmcData, sessionID: string): IPmcData; + /** + * Does the provided items slotId mean its kept on the player after death + * @param slotId slotid of item to check + * @returns true if item is kept after death + */ + isItemKeptAfterDeath(slotId: string): boolean; getPlayerGear(items: Item[]): Item[]; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/InventoryHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/InventoryHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/InventoryHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/InventoryHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/ItemHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/ItemHelper.d.ts similarity index 67% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/ItemHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/ItemHelper.d.ts index f124cb1..4e0eba4 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/ItemHelper.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/helpers/ItemHelper.d.ts @@ -1,6 +1,6 @@ import { InsuredItem, IPmcData } from "../models/eft/common/IPmcData"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ITemplateItem, StackSlot } from "../models/eft/common/tables/ITemplateItem"; +import { Item, Repairable } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HashUtil } from "../utils/HashUtil"; @@ -18,7 +18,7 @@ declare class ItemHelper { */ isValidItem(tpl: string, invalidBaseTypes?: string[]): boolean; /** - * Checks if a id is a valid item. Valid meaning that it's an item that may be a reward + * 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 {*} tpl template id of item to check * @returns boolean: true if item is valid reward @@ -82,27 +82,77 @@ declare class ItemHelper { * @param {string} parentId The id of the AmmoBox instance these StackSlotItems should be children of * @returns {array} The array of StackSlotItems */ - generateStackSlotItems(item: ITemplateItem, parentId: string): StackSlot[]; + generateItemsFromStackSlot(item: ITemplateItem, parentId: string): Item[]; + /** + * Gets item data from items.json + * @param tpl items template id to look up + * @returns bool - is valid + template item object as array + */ getItem(tpl: string): [boolean, ITemplateItem]; + /** + * get normalized value (0-1) based on item condition + * @param item + * @returns number between 0 and 1 + */ getItemQualityModifier(item: Item): number; + /** + * Get a quality value based on a repairable items (weapon/armor) current state between current and max durability + * @param itemDetails + * @param repairable repairable object + * @param item + * @returns a number between 0 and 1 + */ + protected getRepairableItemQualityValue(itemDetails: ITemplateItem, repairable: Repairable, item: Item): number; + /** + * Recursive function that looks at every item from parameter and gets their childrens Ids + * @param items + * @param itemID + * @returns an array of strings + */ findAndReturnChildrenByItems(items: Item[], itemID: string): string[]; /** * A variant of findAndReturnChildren where the output is list of item objects instead of their ids. + * @param items + * @param baseItemId + * @returns An array of Item objects */ findAndReturnChildrenAsItems(items: Item[], baseItemId: string): Item[]; /** - * find children of the item in a given assort (weapons parts for example, need recursive loop function) + * Find children of the item in a given assort (weapons parts for example, need recursive loop function) + * @param itemIdToFind Template id of item to check for + * @param assort Array of items to check in + * @returns Array of children of requested item */ findAndReturnChildrenByAssort(itemIdToFind: string, assort: Item[]): Item[]; + /** + * Check if the passed in item has buy count restrictions + * @param itemToCheck Item to check + * @returns true if it has buy restrictions + */ hasBuyRestrictions(itemToCheck: Item): boolean; /** - * Is Dogtag - * Checks if an item is a dogtag. Used under profile_f.js to modify preparePrice based - * on the level of the dogtag + * is the passed in template id a dog tag + * @param tpl Template id to check + * @returns true if it is a dogtag */ isDogtag(tpl: string): boolean; + /** + * Can the item passed in be sold to a trader because it is raw money + * @param tpl Item template id to check + * @returns true if unsellable + */ isNotSellable(tpl: string): boolean; + /** + * Gets the identifier for a child using slotId, locationX and locationY. + * @param item + * @returns "slotId OR slotid,locationX,locationY" + */ getChildId(item: Item): string; + /** + * Can the pased in item be stacked + * @param tpl item to check + * @returns true if it can be stacked + */ isItemTplStackable(tpl: string): boolean; /** * split item stack if it exceeds StackMaxSize @@ -112,15 +162,17 @@ declare class ItemHelper { * Find Barter items in the inventory * @param {string} by * @param {Object} pmcData - * @param {string} barter_itemID - * @returns Array + * @param {string} barterItemId + * @returns Array of Item objects */ - findBarterItems(by: string, pmcData: IPmcData, barter_itemID: string): any[]; + findBarterItems(by: string, pmcData: IPmcData, barterItemId: string): Item[]; /** - * @param {Object} pmcData - * @param {Array} items - * @param {Object} fastPanel - * @returns Array + * + * @param pmcData + * @param items + * @param insuredItems insured items to not replace ids for + * @param fastPanel + * @returns */ replaceIDs(pmcData: IPmcData, items: Item[], insuredItems?: InsuredItem[], fastPanel?: any): any[]; /** @@ -136,6 +188,12 @@ declare class ItemHelper { * @returns boolean */ isQuestItem(tpl: string): boolean; + /** + * Get the inventory size of an item + * @param items + * @param rootItemId + * @returns ItemSize object (width and height) + */ getItemSize(items: Item[], rootItemId: string): ItemHelper.ItemSize; } declare namespace ItemHelper { diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/NotificationSendHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/NotificationSendHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/NotificationSendHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/NotificationSendHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/NotifierHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/NotifierHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/NotifierHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/NotifierHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/PaymentHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/PaymentHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/PaymentHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/PaymentHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/PresetHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/PresetHelper.d.ts similarity index 79% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/PresetHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/PresetHelper.d.ts index 0371886..a469582 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/PresetHelper.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/helpers/PresetHelper.d.ts @@ -1,9 +1,11 @@ import { Preset } from "../models/eft/common/IGlobals"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "../utils/JsonUtil"; export declare class PresetHelper { + protected jsonUtil: JsonUtil; protected databaseServer: DatabaseServer; protected lookup: Record; - constructor(databaseServer: DatabaseServer); + constructor(jsonUtil: JsonUtil, databaseServer: DatabaseServer); hydratePresetStore(input: Record): void; isPreset(id: string): boolean; hasPreset(templateId: string): boolean; diff --git a/Faupi-MunitionsExpert/server/dist/types/helpers/ProbabilityHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/ProbabilityHelper.d.ts new file mode 100644 index 0000000..7a0676c --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/helpers/ProbabilityHelper.d.ts @@ -0,0 +1,14 @@ +import { ILogger } from "../models/spt/utils/ILogger"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class ProbabilityHelper { + protected logger: ILogger; + protected randomUtil: RandomUtil; + constructor(logger: ILogger, randomUtil: RandomUtil); + /** + * Chance to roll a number out of 100 + * @param chance Percentage chance roll should success + * @param scale scale of chance to allow support of numbers > 1-100 + * @returns true if success + */ + rollChance(chance: number, scale?: number): boolean; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/ProfileHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/ProfileHelper.d.ts similarity index 87% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/ProfileHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/ProfileHelper.d.ts index 6a64291..b369000 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/ProfileHelper.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/helpers/ProfileHelper.d.ts @@ -20,6 +20,12 @@ export declare class ProfileHelper { resetProfileQuestCondition(sessionID: string, conditionId: string): void; getCompleteProfile(sessionID: string): IPmcData[]; isNicknameTaken(info: IValidateNicknameRequestData, sessionID: string): boolean; + /** + * Add experience to a PMC inside the players profile + * @param sessionID Session id + * @param experienceToAdd Experiecne to add to PMC character + */ + addExperienceToPmc(sessionID: string, experienceToAdd: number): void; getProfileByPmcId(pmcId: string): IPmcData; getExperience(level: number): number; getMaxLevel(): number; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/QuestConditionHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/QuestConditionHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/QuestConditionHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/QuestConditionHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/QuestHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/QuestHelper.d.ts similarity index 71% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/QuestHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/QuestHelper.d.ts index f32c85c..0b10135 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/QuestHelper.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/helpers/QuestHelper.d.ts @@ -8,6 +8,7 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { LocaleService } from "../services/LocaleService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; @@ -25,6 +26,7 @@ export declare class QuestHelper { protected itemHelper: ItemHelper; protected itemEventRouter: ItemEventRouter; protected databaseServer: DatabaseServer; + protected localeService: LocaleService; protected ragfairServerHelper: RagfairServerHelper; protected dialogueHelper: DialogueHelper; protected profileHelper: ProfileHelper; @@ -32,7 +34,7 @@ export declare class QuestHelper { protected traderHelper: TraderHelper; protected configServer: ConfigServer; protected questConfig: IQuestConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer); + constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer); static get STATUS(): Record; questStatus(pmcData: IPmcData, questID: string): string; /** @@ -57,13 +59,44 @@ export declare class QuestHelper { changeItemStack(pmcData: IPmcData, id: string, value: number, sessionID: string, output: any): void; /** * Get List of All Quests as an array + * @returns Array of IQuest objects */ questValues(): IQuest[]; + /** + * Reest AvailableForStart conditions for quests + * @param quests queststo clean + * @returns quest array without conditions + */ protected cleanQuestList(quests: IQuest[]): IQuest[]; + /** + * Reset AvailableForStart conditions on a quest + * @param quest quest to clean + * @returns reset IQuest object + */ cleanQuestConditions(quest: IQuest): IQuest; failQuest(pmcData: IPmcData, body: any, sessionID: string): any; + /** + * Get quest by id from database + * @param questId questid to look for + * @param pmcData player profile + * @returns IQuest object + */ getQuestFromDb(questId: string, pmcData: IPmcData): IQuest; - getQuestLocaleIdFromDb(messageId: string, localisation?: string): string; - applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: string, sessionID: string): any[]; + getQuestLocaleIdFromDb(messageId: string): string; + /** + * Give player quest rewards - Skills/exp/trader standing/items/assort unlocks + * @param pmcData Player profile + * @param body complete quest request + * @param state State of the quest now its complete + * @param sessionID Seession id + * @returns array of reward objects + */ + applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: string, sessionID: string): Reward[]; + /** + * Get the intel center bonus a player has + * @param pmcData player profile + * @returns bonus in percent + */ + protected getIntelCenterRewardBonus(pmcData: IPmcData): number; getFindItemIdForQuestItem(itemTpl: string): string; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/RagfairHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/RagfairHelper.d.ts similarity index 97% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/RagfairHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/RagfairHelper.d.ts index c8bc5ba..2c8dbb5 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/RagfairHelper.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/helpers/RagfairHelper.d.ts @@ -40,5 +40,4 @@ export declare class RagfairHelper { */ mergeStackable(items: Item[]): Item[]; getCurrencySymbol(currencyTpl: string): string; - formatCurrency(moneyAmount: number): string; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/RagfairOfferHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/RagfairOfferHelper.d.ts similarity index 95% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/RagfairOfferHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/RagfairOfferHelper.d.ts index 129bc1c..5a77e13 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/RagfairOfferHelper.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/helpers/RagfairOfferHelper.d.ts @@ -10,6 +10,7 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { LocaleService } from "../services/LocaleService"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; @@ -37,11 +38,12 @@ export declare class RagfairOfferHelper { protected ragfairSortHelper: RagfairSortHelper; protected ragfairHelper: RagfairHelper; protected ragfairOfferService: RagfairOfferService; + protected localeService: LocaleService; protected configServer: ConfigServer; protected static TPL_GOODS_SOLD: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, localeService: LocaleService, configServer: ConfigServer); getValidOffers(info: ISearchRequestData, itemsToAdd: string[], assorts: Record, pmcProfile: IPmcData): IRagfairOffer[]; getOffersForBuild(info: ISearchRequestData, itemsToAdd: string[], assorts: Record, pmcProfile: IPmcData): IRagfairOffer[]; processOffers(sessionID: string): boolean; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/RagfairSellHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/RagfairSellHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/RagfairSellHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/RagfairSellHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/RagfairServerHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/RagfairServerHelper.d.ts similarity index 89% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/RagfairServerHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/RagfairServerHelper.d.ts index 2cb3ea5..a52306b 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/RagfairServerHelper.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/helpers/RagfairServerHelper.d.ts @@ -1,11 +1,12 @@ -import { MemberCategory } from "../models/enums/MemberCategory"; import { Item } from "../models/eft/common/tables/IItem"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { MemberCategory } from "../models/enums/MemberCategory"; import { IQuestConfig } from "../models/spt/config/IQuestConfig"; import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { LocaleService } from "../services/LocaleService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; @@ -19,13 +20,14 @@ export declare class RagfairServerHelper { protected databaseServer: DatabaseServer; protected profileHelper: ProfileHelper; protected itemHelper: ItemHelper; + protected localeService: LocaleService; protected dialogueHelper: DialogueHelper; protected jsonUtil: JsonUtil; protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; protected static TPL_GOODS_RETURNED: string; - constructor(randomUtil: RandomUtil, hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, profileHelper: ProfileHelper, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, jsonUtil: JsonUtil, configServer: ConfigServer); + constructor(randomUtil: RandomUtil, hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, profileHelper: ProfileHelper, itemHelper: ItemHelper, localeService: LocaleService, dialogueHelper: DialogueHelper, jsonUtil: JsonUtil, configServer: ConfigServer); /** * Is item valid / on blacklist / quest item * @param itemDetails diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/RagfairSortHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/RagfairSortHelper.d.ts similarity index 79% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/RagfairSortHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/RagfairSortHelper.d.ts index e983569..d20e10c 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/RagfairSortHelper.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/helpers/RagfairSortHelper.d.ts @@ -1,8 +1,10 @@ import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { LocaleService } from "../services/LocaleService"; export declare class RagfairSortHelper { protected databaseServer: DatabaseServer; - constructor(databaseServer: DatabaseServer); + protected localeService: LocaleService; + constructor(databaseServer: DatabaseServer, localeService: LocaleService); sortOffers(offers: IRagfairOffer[], type: number, direction?: number): IRagfairOffer[]; protected sortOffersByID(a: IRagfairOffer, b: IRagfairOffer): number; protected sortOffersByRating(a: IRagfairOffer, b: IRagfairOffer): number; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/RagfairTaxHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/RagfairTaxHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/RagfairTaxHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/RagfairTaxHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/RepairHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/RepairHelper.d.ts similarity index 81% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/RepairHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/RepairHelper.d.ts index 650c1aa..545108e 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/RepairHelper.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/helpers/RepairHelper.d.ts @@ -1,6 +1,5 @@ -import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; -import { Props } from "../models/eft/common/tables/ITemplateItem"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; import { IRepairConfig } from "../models/spt/config/IRepairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; @@ -15,7 +14,7 @@ export declare class RepairHelper { protected configServer: ConfigServer; protected repairConfig: IRepairConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); - updateItemDurability(itemToRepairId: string, amountToRepair: number, pmcData: IPmcData, useRepairKit?: boolean): Item; + updateItemDurability(itemToRepair: Item, itemToRepairDetails: ITemplateItem, isArmor: boolean, amountToRepair: number, useRepairKit?: boolean): Item; protected getRandomisedArmorRepairDegredationValue(armorMaterial: string, isRepairKit: boolean, armorMax: number): number; protected getRandomisedWeaponRepairDegredationValue(itemProps: Props, isRepairKit: boolean, armorMax: number): number; isWeaponTemplate(tpl: string): boolean; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/SecureContainerHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/SecureContainerHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/SecureContainerHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/SecureContainerHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/TradeHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/TradeHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/TradeHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/TradeHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/TraderAssortHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/TraderAssortHelper.d.ts similarity index 62% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/TraderAssortHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/TraderAssortHelper.d.ts index 4f41ac2..91ba6b9 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/TraderAssortHelper.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/helpers/TraderAssortHelper.d.ts @@ -2,24 +2,32 @@ import { RagfairAssortGenerator } from "../generators/RagfairAssortGenerator"; import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; import { Item } from "../models/eft/common/tables/IItem"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +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 { FenceService } from "../services/FenceService"; import { TraderAssortService } from "../services/TraderAssortService"; import { JsonUtil } from "../utils/JsonUtil"; +import { MathUtil } from "../utils/MathUtil"; import { AssortHelper } from "./AssortHelper"; +import { PaymentHelper } from "./PaymentHelper"; import { ProfileHelper } from "./ProfileHelper"; export declare class TraderAssortHelper { protected logger: ILogger; protected jsonUtil: JsonUtil; + protected mathUtil: MathUtil; protected databaseServer: DatabaseServer; protected profileHelper: ProfileHelper; protected assortHelper: AssortHelper; + protected paymentHelper: PaymentHelper; protected ragfairAssortGenerator: RagfairAssortGenerator; protected ragfairOfferGenerator: RagfairOfferGenerator; protected traderAssortService: TraderAssortService; protected fenceService: FenceService; - constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, fenceService: FenceService); + protected configServer: ConfigServer; + protected traderConfig: ITraderConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, mathUtil: MathUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, fenceService: FenceService, configServer: ConfigServer); /** * Get a traders assorts * Can be used for returning ragfair / fence assorts @@ -29,7 +37,12 @@ export declare class TraderAssortHelper { */ getAssort(sessionId: string, traderId: string): ITraderAssort; /** - * Get an array of pristine trader items prior to any alteration by player + * Iterate over all assorts barter_scheme values, find barters selling for money and multiply by multipler in config + * @param traderAssort Assorts to multiple price of + */ + protected multiplyItemPricesByConfigMultipler(traderAssort: ITraderAssort): void; + /** + * Get an array of pristine trader items prior to any alteration by player (as they were on server start) * @param traderId trader id * @returns array of Items */ diff --git a/Faupi-MunitionsExpert/server/dist/types/helpers/TraderHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/TraderHelper.d.ts new file mode 100644 index 0000000..b2e9d38 --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/helpers/TraderHelper.d.ts @@ -0,0 +1,109 @@ +import { FenceLevel } from "../models/eft/common/IGlobals"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; +import { IBarterScheme, ITraderAssort, ITraderBase, LoyaltyLevel } from "../models/eft/common/tables/ITrader"; +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 { SaveServer } from "../servers/SaveServer"; +import { FenceService } from "../services/FenceService"; +import { PlayerService } from "../services/PlayerService"; +import { HandbookHelper } from "./HandbookHelper"; +import { ItemHelper } from "./ItemHelper"; +import { PaymentHelper } from "./PaymentHelper"; +import { ProfileHelper } from "./ProfileHelper"; +export declare class TraderHelper { + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; + protected paymentHelper: PaymentHelper; + protected itemHelper: ItemHelper; + protected handbookHelper: HandbookHelper; + protected playerService: PlayerService; + protected fenceService: FenceService; + protected configServer: ConfigServer; + protected traderConfig: ITraderConfig; + constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemHelper: ItemHelper, handbookHelper: HandbookHelper, playerService: PlayerService, fenceService: FenceService, configServer: ConfigServer); + getTrader(traderID: string, sessionID: string): ITraderBase; + getTraderAssortsById(traderId: string): ITraderAssort; + /** + * Reset a profiles trader data back to its initial state as seen by a level 1 player + * Does NOT take into account different profile levels + * @param sessionID session id + * @param traderID trader id to reset + */ + resetTrader(sessionID: string, traderID: string): void; + /** + * Alter a traders unlocked status + * @param traderID Trader to alter + * @param status New status to use + * @param sessionID Session id + */ + setTraderUnlockedState(traderID: string, status: boolean, sessionID: string): void; + /** + * Get a list of items and their prices from player inventory that can be sold to a trader + * @param traderID trader id being traded with + * @param sessionID session id + * @returns IBarterScheme[][] + */ + getPurchasesData(traderID: string, sessionID: string): Record; + /** + * Should item be skipped when selling to trader according to its sell categories and other checks + * @param pmcData + * @param item + * @param sellCategory + * @returns true if should NOT be sold to trader + */ + protected isItemUnSellableToTrader(pmcData: IPmcData, item: Item, sellCategory: string[]): boolean; + /** + * Can this weapon be sold to a trader with its current durabiltiy level + * @param traderID + * @param item + * @returns boolean + */ + protected isWeaponAndBelowTraderBuyDurability(traderID: string, item: Item): boolean; + /** + * Get the price of an item and all of its attached children + * Take into account bonuses/adjsutments e.g. discounts + * @param pmcData profile data + * @param item item to calculate price of + * @param buyPriceCoefficient + * @param fenceInfo fence data + * @param traderBase trader details + * @param currencyTpl Currency to get price as + * @returns price of item + children + */ + protected getAdjustedItemPrice(pmcData: IPmcData, item: Item, buyPriceCoefficient: number, fenceInfo: FenceLevel, traderBase: ITraderBase, currencyTpl: string): number; + /** + * Get the raw price of item+child items from handbook without any modification + * @param pmcData profile data + * @param item item to calculate price of + * @returns price as number + */ + protected getRawItemPrice(pmcData: IPmcData, item: Item): number; + protected getTraderDiscount(trader: ITraderBase, buyPriceCoefficient: number, fenceInfo: FenceLevel, traderID: string): number; + /** + * Add standing to a trader and level them up if exp goes over level threshold + * @param sessionID Session id + * @param traderId traders id + * @param standingToAdd Standing value to add to trader + */ + addStandingToTrader(sessionID: string, traderId: string, standingToAdd: number): void; + /** + * Calculate traders level based on exp amount and increments level if over threshold + * @param traderID trader to process + * @param sessionID session id + */ + lvlUp(traderID: string, sessionID: string): void; + getTraderUpdateSeconds(traderId: string): number; + /** + * check if an item is allowed to be sold to a trader + * @param traderFilters array of allowed categories + * @param tplToCheck itemTpl of inventory + * @returns boolean + */ + traderFilter(traderFilters: string[], tplToCheck: string): boolean; + getLoyaltyLevel(traderID: string, pmcData: IPmcData): LoyaltyLevel; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/UtilityHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/UtilityHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/UtilityHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/UtilityHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/WeightedRandomHelper.d.ts b/Faupi-MunitionsExpert/server/dist/types/helpers/WeightedRandomHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/WeightedRandomHelper.d.ts rename to Faupi-MunitionsExpert/server/dist/types/helpers/WeightedRandomHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/ide/BleedingEdgeEntry.d.ts b/Faupi-MunitionsExpert/server/dist/types/ide/BleedingEdgeEntry.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/ide/BleedingEdgeEntry.d.ts rename to Faupi-MunitionsExpert/server/dist/types/ide/BleedingEdgeEntry.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/ide/Compiler.d.ts b/Faupi-MunitionsExpert/server/dist/types/ide/Compiler.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/ide/Compiler.d.ts rename to Faupi-MunitionsExpert/server/dist/types/ide/Compiler.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/ide/DebugEntry.d.ts b/Faupi-MunitionsExpert/server/dist/types/ide/DebugEntry.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/ide/DebugEntry.d.ts rename to Faupi-MunitionsExpert/server/dist/types/ide/DebugEntry.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/ide/ReleaseEntry.d.ts b/Faupi-MunitionsExpert/server/dist/types/ide/ReleaseEntry.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/ide/ReleaseEntry.d.ts rename to Faupi-MunitionsExpert/server/dist/types/ide/ReleaseEntry.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/ide/TestEntry.d.ts b/Faupi-MunitionsExpert/server/dist/types/ide/TestEntry.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/ide/TestEntry.d.ts rename to Faupi-MunitionsExpert/server/dist/types/ide/TestEntry.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/loaders/BundleLoader.d.ts b/Faupi-MunitionsExpert/server/dist/types/loaders/BundleLoader.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/loaders/BundleLoader.d.ts rename to Faupi-MunitionsExpert/server/dist/types/loaders/BundleLoader.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/loaders/DelayedModLoader.d.ts b/Faupi-MunitionsExpert/server/dist/types/loaders/DelayedModLoader.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/loaders/DelayedModLoader.d.ts rename to Faupi-MunitionsExpert/server/dist/types/loaders/DelayedModLoader.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/loaders/InitialModLoader.d.ts b/Faupi-MunitionsExpert/server/dist/types/loaders/InitialModLoader.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/loaders/InitialModLoader.d.ts rename to Faupi-MunitionsExpert/server/dist/types/loaders/InitialModLoader.d.ts diff --git a/Faupi-MunitionsExpert/server/dist/types/loaders/PostAkiModLoader.d.ts b/Faupi-MunitionsExpert/server/dist/types/loaders/PostAkiModLoader.d.ts new file mode 100644 index 0000000..edc6e5d --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/loaders/PostAkiModLoader.d.ts @@ -0,0 +1,21 @@ +import { DependencyContainer } from "tsyringe"; +import { HandbookController } from "../controllers/HandbookController"; +import { IModLoader } from "../models/spt/mod/IModLoader"; +import { ModCompilerService } from "../services/ModCompilerService"; +import { VFS } from "../utils/VFS"; +import { BundleLoader } from "./BundleLoader"; +import { PreAkiModLoader } from "./PreAkiModLoader"; +export declare class PostAkiModLoader implements IModLoader { + protected bundleLoader: BundleLoader; + protected handbookController: HandbookController; + protected vfs: VFS; + protected modCompilerService: ModCompilerService; + protected preAkiModLoader: PreAkiModLoader; + constructor(bundleLoader: BundleLoader, handbookController: HandbookController, vfs: VFS, modCompilerService: ModCompilerService, preAkiModLoader: PreAkiModLoader); + getBundles(local: boolean): string; + getBundle(key: string, local: boolean): void; + getModPath(mod: string): string; + load(): void; + protected executeMods(container: DependencyContainer): void; + protected addBundles(): void; +} diff --git a/Faupi-MunitionsExpert/server/dist/types/loaders/PostDBModLoader.d.ts b/Faupi-MunitionsExpert/server/dist/types/loaders/PostDBModLoader.d.ts new file mode 100644 index 0000000..5101b7b --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/loaders/PostDBModLoader.d.ts @@ -0,0 +1,11 @@ +import { DependencyContainer } from "tsyringe"; +import { OnLoad } from "../di/OnLoad"; +import { PreAkiModLoader } from "./PreAkiModLoader"; +export declare class PostDBModLoader implements OnLoad { + protected preAkiModLoader: PreAkiModLoader; + constructor(preAkiModLoader: PreAkiModLoader); + onLoad(): void; + getRoute(): string; + getModPath(mod: string): string; + protected executeMods(container: DependencyContainer): void; +} diff --git a/Faupi-MunitionsExpert/server/dist/types/loaders/PreAkiModLoader.d.ts b/Faupi-MunitionsExpert/server/dist/types/loaders/PreAkiModLoader.d.ts new file mode 100644 index 0000000..6ded3c6 --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/loaders/PreAkiModLoader.d.ts @@ -0,0 +1,64 @@ +import { DependencyContainer } from "tsyringe"; +import { ICoreConfig } from "../models/spt/config/ICoreConfig"; +import { ModLoader } from "../models/spt/mod/IMod"; +import { IModLoader } from "../models/spt/mod/IModLoader"; +import { IPackageJsonData } from "../models/spt/mod/IPackageJsonData"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { ModCompilerService } from "../services/ModCompilerService"; +import { JsonUtil } from "../utils/JsonUtil"; +import { VFS } from "../utils/VFS"; +import { BundleLoader } from "./BundleLoader"; +export declare class PreAkiModLoader implements IModLoader { + protected logger: ILogger; + protected vfs: VFS; + protected jsonUtil: JsonUtil; + protected modCompilerService: ModCompilerService; + protected bundleLoader: BundleLoader; + protected configServer: ConfigServer; + protected static container: DependencyContainer; + protected readonly basepath = "user/mods/"; + protected imported: Record; + protected akiConfig: ICoreConfig; + constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, bundleLoader: BundleLoader, configServer: ConfigServer); + load(container: DependencyContainer): Promise; + getBundles(local: boolean): string; + getBundle(key: string, local: boolean): void; + /** + * Returns a list of mods with preserved load order + * @returns Array of mod names in load order + */ + getImportedModsNames(): string[]; + getModPath(mod: string): string; + protected importClass(name: string, filepath: string, container: DependencyContainer): void; + protected importMods(): Promise; + /** + * + * @param mods Get an array of broken/invalid mods by name + * @returns Mod names array + */ + protected getBrokenMods(mods: string[]): string[]; + /** + * Get packageJson data for mods + * @param mods mods to get packageJson for + * @returns dictionary + */ + protected getModsPackageData(mods: string[]): Record; + /** + * Does mod have "delayedLoad(" string in its entry class + * @param modFolderName folder name + * @param modToValidate package.json details + * @returns boolean + */ + protected isModSpt3XXCompatible(modFolderName: string, modToValidate: IPackageJsonData): boolean; + protected isModCombatibleWithAki(mod: IPackageJsonData): boolean; + protected executeMods(container: DependencyContainer): void; + sortModsLoadOrder(): string[]; + protected addMod(mod: string): Promise; + protected areModDependenciesFulfilled(pkg: IPackageJsonData, loadedMods: Record): boolean; + protected isModCompatible(mod: IPackageJsonData, loadedMods: Record): boolean; + protected validMod(mod: string): boolean; + protected getLoadOrderRecursive(mod: string, result: Record, visited: Record): void; + protected getLoadOrder(mods: Record): Record; + getContainer(): DependencyContainer; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/bot/IGenerateBotsRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/bot/IGenerateBotsRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/bot/IGenerateBotsRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/bot/IGenerateBotsRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/IEmptyRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/IEmptyRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/IEmptyRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/common/IEmptyRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/IGlobals.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/IGlobals.d.ts similarity index 99% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/IGlobals.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/common/IGlobals.d.ts index 456895c..9d28dbc 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/IGlobals.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/IGlobals.d.ts @@ -1128,8 +1128,11 @@ export interface Inertia { SprintAccelerationLimits: xyz; SideTime: xyz; DiagonalTime: xyz; + MaxTimeWithoutInput: xyz; MinDirectionBlendTime: number; - MoveTime: number; + MoveTimeRange: xyz; + ProneDirectionAccelerationRange: xyz; + ProneSpeedAccelerationRange: xyz; MinMovementAccelerationRangeRight: xyz; MaxMovementAccelerationRangeRight: xyz; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/ILocation.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/ILocation.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/ILocation.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/common/ILocation.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/ILocationBase.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/ILocationBase.d.ts similarity index 94% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/ILocationBase.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/common/ILocationBase.d.ts index ad48d32..b1dd448 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/ILocationBase.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/ILocationBase.d.ts @@ -26,6 +26,7 @@ export interface ILocationBase { DisabledForScav: boolean; DisabledScavExits: string; Enabled: boolean; + EnableCoop: boolean; GlobalLootChanceModifier: number; IconX: number; IconY: number; @@ -41,6 +42,7 @@ export interface ILocationBase { MinDistToFreePoint: number; MinMaxBots: MinMaxBot[]; MinPlayers: number; + MaxCoopGroup: number; Name: string; NewSpawn: boolean; OcculsionCullingEnabled: boolean; @@ -48,6 +50,8 @@ export interface ILocationBase { OpenZones: string; Preview: Preview; RequiredPlayerLevel: number; + PmcMaxPlayersInGroup: number; + ScavMaxPlayersInGroup: number; Rules: string; SafeLocation: boolean; Scene: Scene; @@ -55,7 +59,8 @@ export interface ILocationBase { UnixDateTime: number; _Id: string; doors: any[]; - escape_time_limit: number; + EscapeTimeLimit: number; + EscapeTimeLimitCoop: number; exit_access_time: number; exit_count: number; exit_time: number; @@ -63,6 +68,7 @@ export interface ILocationBase { filter_ex: string[]; limits: ILimit[]; matching_min_seconds: number; + GenerateLocalLootCache: boolean; maxItemCountInLocation: MaxItemCountInLocation[]; sav_summon_seconds: number; tmp_location_field_remove_me: number; @@ -106,6 +112,7 @@ export interface BossLocationSpawn { BossName: string; BossPlayer: boolean; BossZone: string; + RandomTimeSpawn: boolean; Time: number; TriggerId: string; TriggerName: string; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/ILocationsSourceDestinationBase.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/ILocationsSourceDestinationBase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/ILocationsSourceDestinationBase.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/common/ILocationsSourceDestinationBase.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/ILooseLoot.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/ILooseLoot.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/ILooseLoot.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/common/ILooseLoot.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/IMetricsTableData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/IMetricsTableData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/IMetricsTableData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/common/IMetricsTableData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/IPmcData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/IPmcData.d.ts similarity index 97% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/IPmcData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/common/IPmcData.d.ts index adc2aa5..56bf07f 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/IPmcData.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/IPmcData.d.ts @@ -6,7 +6,7 @@ import { MemberCategory } from "../../enums/MemberCategory"; export interface IPmcData { _id: string; aid: string; - savage: string; + savage?: string; Info: Info; Customization: Customization; Health: Health; @@ -28,13 +28,6 @@ export interface IPmcData { CarExtractCounts: CarExtractCounts; SurvivorClass: SurvivorClass; } -export declare enum SurvivorClass { - Unknown = 0, - Neutralizer = 1, - Marauder = 2, - Paramedic = 3, - Survivor = 4 -} export interface Info { EntryPoint: string; Nickname: string; @@ -56,6 +49,9 @@ export interface Info { Bans: IBan[]; BannedState: boolean; BannedUntil: number; + NeedWipeOptions: any[]; + lastCompletedWipe: LastCompleted; + lastCompletedEvent?: LastCompleted; } export interface Settings { Role: string; @@ -339,3 +335,13 @@ export interface RagfairInfo { } export interface CarExtractCounts { } +export declare enum SurvivorClass { + Unknown = 0, + Neutralizer = 1, + Marauder = 2, + Paramedic = 3, + Survivor = 4 +} +export interface LastCompleted { + $oid: string; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/MemberCategory.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/MemberCategory.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/MemberCategory.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/common/MemberCategory.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/request/IBaseInteractionRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/request/IBaseInteractionRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/request/IBaseInteractionRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/common/request/IBaseInteractionRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/tables/IBotBase.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/IBotBase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/tables/IBotBase.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/IBotBase.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/tables/IBotCore.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/IBotCore.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/tables/IBotCore.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/IBotCore.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/tables/IBotType.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/IBotType.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/tables/IBotType.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/IBotType.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/tables/ICustomizationItem.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/ICustomizationItem.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/tables/ICustomizationItem.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/ICustomizationItem.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/tables/IHandbookBase.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/IHandbookBase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/tables/IHandbookBase.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/IHandbookBase.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/tables/IItem.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/IItem.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/tables/IItem.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/IItem.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/tables/ILocationsBase.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/ILocationsBase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/tables/ILocationsBase.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/ILocationsBase.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/tables/ILootBase.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/ILootBase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/tables/ILootBase.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/ILootBase.d.ts diff --git a/Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/IMatch.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/IMatch.d.ts new file mode 100644 index 0000000..c30cb48 --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/IMatch.d.ts @@ -0,0 +1,10 @@ +export interface IMatch { + metrics: Metrics; +} +export interface Metrics { + Keys: number[]; + NetProcessingBins: number[]; + RenderBins: number[]; + GameUpdateBins: number[]; + MemoryMeasureInterval: number; +} diff --git a/Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/IProfileTemplate.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/IProfileTemplate.d.ts new file mode 100644 index 0000000..fbcd81a --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -0,0 +1,25 @@ +import { Dialogue, WeaponBuild } from "../../profile/IAkiProfile"; +import { IPmcData } from "../IPmcData"; +export interface IProfileTemplates { + Standard: IProfileSides; + "Left Behind": IProfileSides; + "Prepare To Escape": IProfileSides; + "Edge Of Darkness": IProfileSides; +} +export interface IProfileSides { + usec: TemplateSide; + bear: TemplateSide; +} +export interface TemplateSide { + character: IPmcData; + suits: string[]; + dialogues: Record; + weaponbuilds: WeaponBuild[]; + trader: ProfileTraderTemplate; +} +export interface ProfileTraderTemplate { + initialLoyaltyLevel: number; + initialStanding: number; + initialSalesSum: number; + jaegerUnlocked: boolean; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/tables/IQuest.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/IQuest.d.ts similarity index 94% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/tables/IQuest.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/IQuest.d.ts index e1fc888..a349a6d 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/tables/IQuest.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/IQuest.d.ts @@ -1,3 +1,4 @@ +import { QuestRewardType } from "../../../enums/QuestRewardType"; import { Item } from "./IItem"; export interface IQuest { QuestName: string; @@ -23,6 +24,7 @@ export interface IQuest { status: string; KeyQuest: boolean; changeQuestMessageText: string; + side: string; } export interface Conditions { Started: AvailableForConditions[]; @@ -56,6 +58,7 @@ export interface AvailableForProps { plantTime?: number; zoneId?: string; type?: boolean; + countInRaid?: boolean; } export interface AvailableForCounter { id: string; @@ -97,9 +100,9 @@ export interface Rewards { Expired: Reward[]; } export interface Reward { - value?: string; + value?: string | number; id: string; - type: string; + type: QuestRewardType; index: number; target?: string; items?: Item[]; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/tables/IRepeatableQuests.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/IRepeatableQuests.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/tables/IRepeatableQuests.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/IRepeatableQuests.d.ts diff --git a/Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/ITemplateItem.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/ITemplateItem.d.ts new file mode 100644 index 0000000..23a1a14 --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/ITemplateItem.d.ts @@ -0,0 +1,455 @@ +export interface ITemplateItem { + _id: string; + _name: string; + _parent: string; + _type: string; + _props: Props; + _proto: string; +} +export interface Props { + Name?: string; + ShortName?: string; + Description?: string; + Weight?: number; + BackgroundColor?: string; + Width?: number; + Height?: number; + StackMaxSize?: number; + Rarity?: string; + SpawnChance?: number; + CreditsPrice?: number; + ItemSound?: string; + Prefab?: Prefab; + UsePrefab?: Prefab; + StackObjectsCount?: number; + NotShownInSlot?: boolean; + ExaminedByDefault?: boolean; + ExamineTime?: number; + IsUndiscardable?: boolean; + IsUnsaleable?: boolean; + IsUnbuyable?: boolean; + IsUngivable?: boolean; + IsLockedafterEquip?: boolean; + QuestItem?: boolean; + LootExperience?: number; + ExamineExperience?: number; + HideEntrails?: boolean; + RepairCost?: number; + RepairSpeed?: number; + ExtraSizeLeft?: number; + ExtraSizeRight?: number; + ExtraSizeUp?: number; + ExtraSizeDown?: number; + ExtraSizeForceAdd?: boolean; + MergesWithChildren?: boolean; + CanSellOnRagfair?: boolean; + CanRequireOnRagfair?: boolean; + ConflictingItems?: string[]; + Unlootable?: boolean; + UnlootableFromSlot?: string; + UnlootableFromSide?: string[]; + AnimationVariantsNumber?: number; + DiscardingBlock?: boolean; + DropSoundType?: string; + RagFairCommissionModifier?: number; + IsAlwaysAvailableForInsurance?: boolean; + DiscardLimit?: number; + MaxResource?: number; + Resource?: number; + DogTagQualities?: boolean; + Grids?: Grid[]; + Slots?: Slot[]; + CanPutIntoDuringTheRaid?: boolean; + CantRemoveFromSlotsDuringRaid?: string[]; + KeyIds?: string[]; + TagColor?: number; + TagName?: string; + Durability?: number; + Accuracy?: number; + Recoil?: number; + Loudness?: number; + EffectiveDistance?: number; + Ergonomics?: number; + Velocity?: number; + RaidModdable?: boolean; + ToolModdable?: boolean; + BlocksFolding?: boolean; + BlocksCollapsible?: boolean; + IsAnimated?: boolean; + HasShoulderContact?: boolean; + SightingRange?: number; + DoubleActionAccuracyPenaltyMult?: number; + ModesCount: any; + DurabilityBurnModificator?: number; + HeatFactor?: number; + CoolFactor?: number; + muzzleModType?: string; + CustomAimPlane?: string; + sightModType?: string; + aimingSensitivity?: number; + SightModesCount?: number; + OpticCalibrationDistances?: number[]; + ScopesCount?: number; + AimSensitivity?: number | number[][]; + Zooms?: number[][]; + CalibrationDistances?: number[][]; + Intensity?: number; + Mask?: string; + MaskSize?: number; + NoiseIntensity?: number; + NoiseScale?: number; + Color?: Color; + DiffuseIntensity?: number; + HasHinge?: boolean; + RampPalette?: string; + DepthFade?: number; + RoughnessCoef?: number; + SpecularCoef?: number; + MainTexColorCoef?: number; + MinimumTemperatureValue?: number; + RampShift?: number; + HeatMin?: number; + ColdMax?: number; + IsNoisy?: boolean; + IsFpsStuck?: boolean; + IsGlitch?: boolean; + IsMotionBlurred?: boolean; + IsPixelated?: boolean; + PixelationBlockCount?: number; + ShiftsAimCamera?: number; + magAnimationIndex?: number; + Cartridges?: Slot[]; + CanFast?: boolean; + CanHit?: boolean; + CanAdmin?: boolean; + LoadUnloadModifier?: number; + CheckTimeModifier?: number; + CheckOverride?: number; + ReloadMagType?: string; + VisibleAmmoRangesString?: string; + MalfunctionChance?: number; + IsShoulderContact?: boolean; + Foldable?: boolean; + Retractable?: boolean; + SizeReduceRight?: number; + CenterOfImpact?: number; + ShotgunDispersion?: number; + IsSilencer?: boolean; + DeviationCurve?: number; + DeviationMax?: number; + SearchSound?: string; + BlocksArmorVest?: boolean; + speedPenaltyPercent?: number; + GridLayoutName?: string; + SpawnFilter?: any[]; + containType?: any[]; + sizeWidth?: number; + sizeHeight?: number; + isSecured?: boolean; + spawnTypes?: string; + lootFilter?: any[]; + spawnRarity?: string; + minCountSpawn?: number; + maxCountSpawn?: number; + openedByKeyID?: any[]; + RigLayoutName?: string; + MaxDurability?: number; + armorZone?: string[]; + armorClass: any; + mousePenalty?: number; + weaponErgonomicPenalty?: number; + BluntThroughput?: number; + ArmorMaterial?: string; + weapClass?: string; + weapUseType?: string; + ammoCaliber?: string; + OperatingResource?: number; + RepairComplexity?: number; + durabSpawnMin?: number; + durabSpawnMax?: number; + isFastReload?: boolean; + RecoilForceUp?: number; + RecoilForceBack?: number; + Convergence?: number; + RecoilAngle?: number; + weapFireType?: string[]; + RecolDispersion?: number; + SingleFireRate?: number; + CanQueueSecondShot?: boolean; + bFirerate?: number; + bEffDist?: number; + bHearDist?: number; + isChamberLoad?: boolean; + chamberAmmoCount?: number; + isBoltCatch?: boolean; + defMagType?: string; + defAmmo?: string; + AdjustCollimatorsToTrajectory?: boolean; + shotgunDispersion?: number; + Chambers?: Slot[]; + CameraRecoil?: number; + CameraSnap?: number; + ReloadMode?: string; + AimPlane?: number; + TacticalReloadStiffnes?: Xyz; + TacticalReloadFixation?: number; + RecoilCenter?: Xyz; + RotationCenter?: Xyz; + RotationCenterNoStock?: Xyz; + FoldedSlot?: string; + CompactHandling?: boolean; + MinRepairDegradation?: number; + MaxRepairDegradation?: number; + IronSightRange?: number; + IsFlareGun?: boolean; + IsGrenadeLauncher?: boolean; + IsOneoff?: boolean; + MustBoltBeOpennedForExternalReload?: boolean; + MustBoltBeOpennedForInternalReload?: boolean; + BoltAction?: boolean; + HipAccuracyRestorationDelay?: number; + HipAccuracyRestorationSpeed?: number; + HipInnaccuracyGain?: number; + ManualBoltCatch?: boolean; + BurstShotsCount?: number; + BaseMalfunctionChance?: number; + AllowJam?: boolean; + AllowFeed?: boolean; + AllowMisfire?: boolean; + AllowSlide?: boolean; + DurabilityBurnRatio?: number; + HeatFactorGun?: number; + CoolFactorGun?: number; + CoolFactorGunMods?: number; + HeatFactorByShot?: number; + AllowOverheat?: boolean; + DoubleActionAccuracyPenalty?: number; + RecoilPosZMult?: number; + MinRepairKitDegradation?: number; + MaxRepairKitDegradation?: number; + BlocksEarpiece?: boolean; + BlocksEyewear?: boolean; + BlocksHeadwear?: boolean; + BlocksFaceCover?: boolean; + Indestructibility?: number; + headSegments?: string[]; + FaceShieldComponent?: boolean; + FaceShieldMask?: string; + MaterialType?: string; + RicochetParams?: Xyz; + DeafStrength?: string; + BlindnessProtection?: number; + Distortion?: number; + CompressorTreshold?: number; + CompressorAttack?: number; + CompressorRelease?: number; + CompressorGain?: number; + CutoffFreq?: number; + Resonance?: number; + CompressorVolume?: number; + AmbientVolume?: number; + DryVolume?: number; + foodUseTime?: number; + foodEffectType?: string; + StimulatorBuffs?: string; + effects_health: any; + effects_damage: any; + MaximumNumberOfUsage?: number; + knifeHitDelay?: number; + knifeHitSlashRate?: number; + knifeHitStabRate?: number; + knifeHitRadius?: number; + knifeHitSlashDam?: number; + knifeHitStabDam?: number; + knifeDurab?: number; + PrimaryDistance?: number; + SecondryDistance?: number; + SlashPenetration?: number; + StabPenetration?: number; + PrimaryConsumption?: number; + SecondryConsumption?: number; + DeflectionConsumption?: number; + AppliedTrunkRotation?: Xyz; + AppliedHeadRotation?: Xyz; + DisplayOnModel?: boolean; + AdditionalAnimationLayer?: number; + StaminaBurnRate?: number; + ColliderScaleMultiplier?: Xyz; + ConfigPathStr?: string; + MaxMarkersCount?: number; + scaleMin?: number; + scaleMax?: number; + medUseTime?: number; + medEffectType?: string; + MaxHpResource?: number; + hpResourceRate?: number; + apResource?: number; + krResource?: number; + MaxOpticZoom?: number; + MaxRepairResource?: number; + TargetItemFilter?: string[]; + RepairQuality?: number; + RepairType?: string; + StackMinRandom?: number; + StackMaxRandom?: number; + ammoType?: string; + InitialSpeed?: number; + BallisticCoeficient?: number; + BulletMassGram?: number; + BulletDiameterMilimeters?: number; + Damage?: number; + ammoAccr?: number; + ammoRec?: number; + ammoDist?: number; + buckshotBullets?: number; + PenetrationPower?: number; + PenetrationPowerDiviation?: number; + ammoHear?: number; + ammoSfx?: string; + MisfireChance?: number; + MinFragmentsCount?: number; + MaxFragmentsCount?: number; + ammoShiftChance?: number; + casingName?: string; + casingEjectPower?: number; + casingMass?: number; + casingSounds?: string; + ProjectileCount?: number; + PenetrationChance?: number; + RicochetChance?: number; + FragmentationChance?: number; + Deterioration?: number; + SpeedRetardation?: number; + Tracer?: boolean; + TracerColor?: string; + TracerDistance?: number; + ArmorDamage?: number; + Caliber?: string; + StaminaBurnPerDamage?: number; + HeavyBleedingDelta?: number; + LightBleedingDelta?: number; + ShowBullet?: boolean; + HasGrenaderComponent?: boolean; + FuzeArmTimeSec?: number; + ExplosionStrength?: number; + MinExplosionDistance?: number; + MaxExplosionDistance?: number; + FragmentsCount?: number; + FragmentType?: string; + ShowHitEffectOnExplode?: boolean; + ExplosionType?: string; + AmmoLifeTimeSec?: number; + Contusion?: Xyz; + ArmorDistanceDistanceDamage?: Xyz; + Blindness?: Xyz; + IsLightAndSoundShot?: boolean; + LightAndSoundShotAngle?: number; + LightAndSoundShotSelfContusionTime?: number; + LightAndSoundShotSelfContusionStrength?: number; + MalfMisfireChance?: number; + MalfFeedChance?: number; + StackSlots?: StackSlot[]; + type?: string; + eqMin?: number; + eqMax?: number; + rate?: number; + ThrowType?: string; + ExplDelay?: number; + Strength?: number; + ContusionDistance?: number; + throwDamMax?: number; + explDelay?: number; + EmitTime?: number; + CanBeHiddenDuringThrow?: boolean; + MinTimeToContactExplode?: number; + ExplosionEffectType?: string; +} +export interface Prefab { + path: string; + rcid: string; +} +export interface Grid { + _name: string; + _id: string; + _parent: string; + _props: GridProps; + _proto: string; +} +export interface GridProps { + filters: GridFilter[]; + cellsH: number; + cellsV: number; + minCount: number; + maxCount: number; + maxWeight: number; + isSortingTable: boolean; +} +export interface GridFilter { + Filter: string[]; + ExcludedFilter: string[]; +} +export interface Slot { + _name: string; + _id: string; + _parent: string; + _props: SlotProps; + _max_count?: number; + _required: boolean; + _mergeSlotWithChildren: boolean; + _proto: string; +} +export interface SlotProps { + filters: SlotFilter[]; +} +export interface SlotFilter { + Shift?: number; + Filter: string[]; + AnimationIndex?: number; +} +export interface Xyz { + x: number; + y: number; + z: number; +} +export interface StackSlot { + _name?: string; + _id: string; + _parent: string; + _max_count: number; + _props: StackSlotProps; + _proto: string; + upd: any; +} +export interface StackSlotProps { + filters: SlotFilter[]; +} +export interface EffectsHealth { + Energy: EffectsHealthProps; + Hydration: EffectsHealthProps; +} +export interface EffectsHealthProps { + value: number; +} +export interface EffectsDamage { + Pain: EffectDamageProps; + LightBleeding: EffectDamageProps; + HeavyBleeding: EffectDamageProps; + Contusion: EffectDamageProps; + RadExposure: EffectDamageProps; + Fracture: EffectDamageProps; + DestroyedPart: EffectDamageProps; +} +export interface EffectDamageProps { + delay: number; + duration: number; + fadeOut: number; + cost?: number; + healthPenaltyMin?: number; + healthPenaltyMax?: number; +} +export interface Color { + r: number; + g: number; + b: number; + a: number; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/tables/ITrader.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/ITrader.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/tables/ITrader.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/common/tables/ITrader.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/customization/IBuyClothingRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/customization/IBuyClothingRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/customization/IBuyClothingRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/customization/IBuyClothingRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/customization/IWearClothingRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/customization/IWearClothingRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/customization/IWearClothingRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/customization/IWearClothingRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/dialog/IFriendRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/dialog/IFriendRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/dialog/IFriendRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/dialog/IFriendRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/dialog/IGetChatServerListRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/dialog/IGetChatServerListRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/dialog/IGetChatServerListRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/dialog/IGetChatServerListRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/dialog/IGetFriendListDataResponse.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/dialog/IGetFriendListDataResponse.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/dialog/IGetFriendListDataResponse.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/dialog/IGetFriendListDataResponse.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/dialog/IPinDialogRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/dialog/IPinDialogRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/dialog/IPinDialogRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/dialog/IPinDialogRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/dialog/IRemoveDialogRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/dialog/IRemoveDialogRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/dialog/IRemoveDialogRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/dialog/IRemoveDialogRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/dialog/ISendMessageRequest.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/dialog/ISendMessageRequest.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/dialog/ISendMessageRequest.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/dialog/ISendMessageRequest.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/dialog/ISetDialogReadRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/dialog/ISetDialogReadRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/dialog/ISetDialogReadRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/dialog/ISetDialogReadRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/game/IGameConfigResponse.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/game/IGameConfigResponse.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/game/IGameConfigResponse.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/game/IGameConfigResponse.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/game/IGameEmptyCrcRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/game/IGameEmptyCrcRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/game/IGameEmptyCrcRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/game/IGameEmptyCrcRequestData.d.ts diff --git a/Faupi-MunitionsExpert/server/dist/types/models/eft/game/IReportNicknameRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/game/IReportNicknameRequestData.d.ts new file mode 100644 index 0000000..087c58b --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/models/eft/game/IReportNicknameRequestData.d.ts @@ -0,0 +1,3 @@ +export interface IReportNicknameRequestData { + uid: string; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/game/IVersionValidateRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/game/IVersionValidateRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/game/IVersionValidateRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/game/IVersionValidateRequestData.d.ts diff --git a/Faupi-MunitionsExpert/server/dist/types/models/eft/health/Effect.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/health/Effect.d.ts new file mode 100644 index 0000000..2f0adac --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/models/eft/health/Effect.d.ts @@ -0,0 +1,5 @@ +export declare enum Effect { + Fracture = "Fracture", + LightBleeding = "LightBleeding", + HeavyBleeding = "HeavyBleeding" +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/health/IHealthTreatmentRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/health/IHealthTreatmentRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/health/IHealthTreatmentRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/health/IHealthTreatmentRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/health/IOffraidEatRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/health/IOffraidEatRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/health/IOffraidEatRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/health/IOffraidEatRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/health/IOffraidHealRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/health/IOffraidHealRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/health/IOffraidHealRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/health/IOffraidHealRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/health/ISyncHealthRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/health/ISyncHealthRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/health/ISyncHealthRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/health/ISyncHealthRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/hideout/HideoutAreasEnum.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/hideout/HideoutAreasEnum.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/hideout/HideoutAreasEnum.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/hideout/HideoutAreasEnum.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/hideout/IHideoutArea.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/hideout/IHideoutArea.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/hideout/IHideoutArea.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/hideout/IHideoutArea.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/hideout/IHideoutProduction.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/hideout/IHideoutProduction.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/hideout/IHideoutProduction.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/hideout/IHideoutProduction.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/hideout/IHideoutScavCase.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/hideout/IHideoutScavCase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/hideout/IHideoutScavCase.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/hideout/IHideoutScavCase.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/hideout/IHideoutSettingsBase.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/hideout/IHideoutSettingsBase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/hideout/IHideoutSettingsBase.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/hideout/IHideoutSettingsBase.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/httpResponse/IGetBodyResponseData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/httpResponse/IGetBodyResponseData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/httpResponse/IGetBodyResponseData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/httpResponse/IGetBodyResponseData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/httpResponse/INullResponseData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/httpResponse/INullResponseData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/httpResponse/INullResponseData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/httpResponse/INullResponseData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inRaid/ISaveProgressRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/inRaid/ISaveProgressRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inRaid/ISaveProgressRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/inRaid/ISaveProgressRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts diff --git a/Faupi-MunitionsExpert/server/dist/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts new file mode 100644 index 0000000..bf209c6 --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts @@ -0,0 +1 @@ +export declare type IGetInsuranceCostResponseData = Record>; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/insurance/IInsureRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/insurance/IInsureRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/insurance/IInsureRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/insurance/IInsureRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IAddItemRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IAddItemRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IAddItemRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IAddItemRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventoryAddRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventoryAddRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventoryAddRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventoryAddRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventoryBindRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventoryBindRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventoryBindRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventoryBindRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventoryExamineRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventoryExamineRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventoryExamineRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventoryExamineRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventoryFoldRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventoryFoldRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventoryFoldRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventoryFoldRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventoryMergeRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventoryMergeRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventoryMergeRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventoryMergeRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventoryMoveRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventoryMoveRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventoryMoveRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventoryMoveRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventorySortRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventorySortRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventorySortRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventorySortRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventorySplitRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventorySplitRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventorySplitRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventorySplitRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventorySwapRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventorySwapRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventorySwapRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventorySwapRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventoryTagRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventoryTagRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventoryTagRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventoryTagRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventoryToggleRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventoryToggleRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventoryToggleRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventoryToggleRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventoryTransferRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventoryTransferRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/inventory/IInventoryTransferRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/inventory/IInventoryTransferRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/itemEvent/IItemEventRouterBase.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/itemEvent/IItemEventRouterBase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/itemEvent/IItemEventRouterBase.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/itemEvent/IItemEventRouterBase.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/launcher/IChangeRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/launcher/IChangeRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/launcher/IChangeRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/launcher/IChangeRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/launcher/ILoginRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/launcher/ILoginRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/launcher/ILoginRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/launcher/ILoginRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/launcher/IMiniProfile.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/launcher/IMiniProfile.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/launcher/IMiniProfile.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/launcher/IMiniProfile.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/launcher/IRegisterData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/launcher/IRegisterData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/launcher/IRegisterData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/launcher/IRegisterData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/launcher/IRemoveProfileData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/launcher/IRemoveProfileData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/launcher/IRemoveProfileData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/launcher/IRemoveProfileData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/location/IGetLocationRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/location/IGetLocationRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/location/IGetLocationRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/location/IGetLocationRequestData.d.ts diff --git a/Faupi-MunitionsExpert/server/dist/types/models/eft/match/ICreateGroupRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/match/ICreateGroupRequestData.d.ts new file mode 100644 index 0000000..7413a8a --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/models/eft/match/ICreateGroupRequestData.d.ts @@ -0,0 +1,6 @@ +import { RaidMode } from "../../enums/RaidMode"; +export interface ICreateGroupRequestData { + location: string; + raidMode: RaidMode; + startInGroup: boolean; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/match/IEndOfflineRaidRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/match/IEndOfflineRaidRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/match/IEndOfflineRaidRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/match/IEndOfflineRaidRequestData.d.ts diff --git a/Faupi-MunitionsExpert/server/dist/types/models/eft/match/IGetGroupStatusRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/match/IGetGroupStatusRequestData.d.ts new file mode 100644 index 0000000..55d7079 --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/models/eft/match/IGetGroupStatusRequestData.d.ts @@ -0,0 +1,9 @@ +import { RaidMode } from "../../enums/RaidMode"; +export interface IGetGroupStatusRequestData { + location: string; + savage: boolean; + dt: string; + keyId: string; + raidMode: RaidMode; + startInGroup: boolean; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/match/IGetProfileRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/match/IGetProfileRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/match/IGetProfileRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/match/IGetProfileRequestData.d.ts diff --git a/Faupi-MunitionsExpert/server/dist/types/models/eft/match/IJoinMatchRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/match/IJoinMatchRequestData.d.ts new file mode 100644 index 0000000..cd34f7b --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/models/eft/match/IJoinMatchRequestData.d.ts @@ -0,0 +1,12 @@ +export interface IJoinMatchRequestData { + location: string; + savage: boolean; + dt: string; + servers: Server[]; + keyId: string; +} +export interface Server { + ping: number; + ip: string; + port: string; +} diff --git a/Faupi-MunitionsExpert/server/dist/types/models/eft/match/IJoinMatchResult.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/match/IJoinMatchResult.d.ts new file mode 100644 index 0000000..df695f4 --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/models/eft/match/IJoinMatchResult.d.ts @@ -0,0 +1,11 @@ +export interface IJoinMatchResult { + profileid: string; + status: string; + sid: string; + ip: string; + port: number; + version: string; + location: string; + gamemode: string; + shortid: string; +} diff --git a/Faupi-MunitionsExpert/server/dist/types/models/eft/match/IPutMetricsRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/match/IPutMetricsRequestData.d.ts new file mode 100644 index 0000000..d9ed214 --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/models/eft/match/IPutMetricsRequestData.d.ts @@ -0,0 +1,10 @@ +export interface IPutMetricsRequestData { + sid: string; + settings: any; + SharedSettings: any; + HardwareDescription: any; + Location: string; + Metrics: any; + ClientEvents: any; + SpikeSamples: any[]; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/match/IStartOffineRaidRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/match/IStartOffineRaidRequestData.d.ts similarity index 74% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/match/IStartOffineRaidRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/match/IStartOffineRaidRequestData.d.ts index 84bccc8..af0625e 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/match/IStartOffineRaidRequestData.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/models/eft/match/IStartOffineRaidRequestData.d.ts @@ -1,6 +1,7 @@ +import { BotAmount } from "../../enums/BotAmount"; +import { BotDifficulty } from "../../enums/BotDifficulty"; export interface IStartOfflineRaidRequestData { locationName: string; - entryPoint: string; startTime: number; dateTime: string; gameSettings: GameSettings; @@ -17,11 +18,11 @@ export interface TimeAndWeatherSettings { export interface BotsSettings { isEnabled: boolean; isScavWars: boolean; - botAmount: string; + botAmount: BotAmount; } export interface WavesSettings { - botDifficulty: string; + botDifficulty: BotDifficulty; isBosses: boolean; isTaggedAndCursed: boolean; - wavesBotAmount: string; + wavesBotAmount: BotAmount; } diff --git a/Faupi-MunitionsExpert/server/dist/types/models/eft/match/IUpdatePingRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/match/IUpdatePingRequestData.d.ts new file mode 100644 index 0000000..defbd66 --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/models/eft/match/IUpdatePingRequestData.d.ts @@ -0,0 +1,3 @@ +export interface IUpdatePingRequestData { + servers: any[]; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/notes/INoteActionData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/notes/INoteActionData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/notes/INoteActionData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/notes/INoteActionData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/notifier/INotifier.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/notifier/INotifier.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/notifier/INotifier.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/notifier/INotifier.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/notifier/ISelectProfileRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/notifier/ISelectProfileRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/notifier/ISelectProfileRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/notifier/ISelectProfileRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts diff --git a/Faupi-MunitionsExpert/server/dist/types/models/eft/profile/GetProfileStatusResponseData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/profile/GetProfileStatusResponseData.d.ts new file mode 100644 index 0000000..eee9b4f --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/models/eft/profile/GetProfileStatusResponseData.d.ts @@ -0,0 +1,11 @@ +export interface GetProfileStatusResponseData { + maxPveCountExceeded: false; + profiles: ProfileData[]; +} +export interface ProfileData { + profileid: string; + status: string; + sid: string; + ip: string; + port: number; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/profile/IAkiProfile.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/profile/IAkiProfile.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/profile/IAkiProfile.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/profile/IAkiProfile.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/profile/IProfileCreateRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/profile/IProfileCreateRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/profile/IProfileCreateRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/profile/IProfileCreateRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/profile/ISearchFriendRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/profile/ISearchFriendRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/profile/ISearchFriendRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/profile/ISearchFriendRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/profile/ISearchFriendResponse.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/profile/ISearchFriendResponse.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/profile/ISearchFriendResponse.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/profile/ISearchFriendResponse.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/profile/IValidateNicknameRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/profile/IValidateNicknameRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/profile/IValidateNicknameRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/profile/IValidateNicknameRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/quests/IAcceptQuestRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/quests/IAcceptQuestRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/quests/IAcceptQuestRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/quests/IAcceptQuestRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/quests/ICompleteQuestRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/quests/ICompleteQuestRequestData.d.ts similarity index 85% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/quests/ICompleteQuestRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/quests/ICompleteQuestRequestData.d.ts index cc67404..36a6db3 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/quests/ICompleteQuestRequestData.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/models/eft/quests/ICompleteQuestRequestData.d.ts @@ -1,5 +1,6 @@ export interface ICompleteQuestRequestData { Action: string; + /** Quest Id */ qid: string; removeExcessItems: boolean; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/quests/IHandoverQuestRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/quests/IHandoverQuestRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/quests/IHandoverQuestRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/quests/IHandoverQuestRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/quests/IListQuestsRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/quests/IListQuestsRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/quests/IListQuestsRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/quests/IListQuestsRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/ragfair/IAddOfferRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/ragfair/IAddOfferRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/ragfair/IAddOfferRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/ragfair/IAddOfferRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/ragfair/IExtendOfferRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/ragfair/IExtendOfferRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/ragfair/IExtendOfferRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/ragfair/IExtendOfferRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/ragfair/IGetItemPriceResult.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/ragfair/IGetItemPriceResult.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/ragfair/IGetItemPriceResult.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/ragfair/IGetItemPriceResult.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/ragfair/IGetOffersResult.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/ragfair/IGetOffersResult.d.ts similarity index 80% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/ragfair/IGetOffersResult.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/ragfair/IGetOffersResult.d.ts index 1c11422..fbc631d 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/ragfair/IGetOffersResult.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/models/eft/ragfair/IGetOffersResult.d.ts @@ -1,6 +1,6 @@ import { IRagfairOffer } from "./IRagfairOffer"; export interface IGetOffersResult { - categories: Record; + categories?: Record; offers: IRagfairOffer[]; offersCount: number; selectedCategory: string; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/ragfair/IRagfairOffer.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/ragfair/IRagfairOffer.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/ragfair/IRagfairOffer.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/ragfair/IRagfairOffer.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/ragfair/ISearchRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/ragfair/ISearchRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/ragfair/ISearchRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/ragfair/ISearchRequestData.d.ts diff --git a/Faupi-MunitionsExpert/server/dist/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts new file mode 100644 index 0000000..2d14d20 --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts @@ -0,0 +1,3 @@ +export interface ISendRagfairReportRequestData { + offerId: number; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/repair/IRepairActionDataRequest.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/repair/IRepairActionDataRequest.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/repair/IRepairActionDataRequest.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/repair/IRepairActionDataRequest.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/trade/IProcessSellTradeRequestData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/trade/IProcessSellTradeRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/trade/IProcessSellTradeRequestData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/trade/IProcessSellTradeRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/weather/IWeatherData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/weather/IWeatherData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/weather/IWeatherData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/weather/IWeatherData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/wishlist/IWishlistActionData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/eft/wishlist/IWishlistActionData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/wishlist/IWishlistActionData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/eft/wishlist/IWishlistActionData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/enums/BaseClasses.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/enums/BaseClasses.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/enums/BaseClasses.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/enums/BaseClasses.d.ts diff --git a/Faupi-MunitionsExpert/server/dist/types/models/enums/BotAmount.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/enums/BotAmount.d.ts new file mode 100644 index 0000000..d0e1df1 --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/models/enums/BotAmount.d.ts @@ -0,0 +1,7 @@ +export declare enum BotAmount { + AsOnline = "AsOnline", + Low = "Low", + Medium = "Medium", + High = "High", + Horde = "Horde" +} diff --git a/Faupi-MunitionsExpert/server/dist/types/models/enums/BotDifficulty.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/enums/BotDifficulty.d.ts new file mode 100644 index 0000000..c901bcf --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/models/enums/BotDifficulty.d.ts @@ -0,0 +1,8 @@ +export declare enum BotDifficulty { + AsOnline = "AsOnline", + Easy = "Easy", + Medium = "Medium", + Hard = "Hard", + Impossible = "Impossible", + Random = "Random" +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/enums/ConfigTypes.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/enums/ConfigTypes.d.ts similarity index 94% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/enums/ConfigTypes.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/enums/ConfigTypes.d.ts index 6bd31e8..1c49e62 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/enums/ConfigTypes.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/models/enums/ConfigTypes.d.ts @@ -8,6 +8,7 @@ export declare enum ConfigTypes { IN_RAID = "aki-inraid", INSURANCE = "aki-insurance", INVENTORY = "aki-inventory", + LOCALE = "aki-locale", LOCATION = "aki-location", MATCH = "aki-match", QUEST = "aki-quest", diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/enums/ELocationName.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/enums/ELocationName.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/enums/ELocationName.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/enums/ELocationName.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/enums/EquipmentSlots.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/enums/EquipmentSlots.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/enums/EquipmentSlots.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/enums/EquipmentSlots.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/enums/HideoutAreas.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/enums/HideoutAreas.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/enums/HideoutAreas.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/enums/HideoutAreas.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/enums/MemberCategory.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/enums/MemberCategory.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/enums/MemberCategory.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/enums/MemberCategory.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/enums/MessageType.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/enums/MessageType.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/enums/MessageType.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/enums/MessageType.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/enums/Money.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/enums/Money.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/enums/Money.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/enums/Money.d.ts diff --git a/Faupi-MunitionsExpert/server/dist/types/models/enums/QuestRewardType.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/enums/QuestRewardType.d.ts new file mode 100644 index 0000000..1d3db86 --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/models/enums/QuestRewardType.d.ts @@ -0,0 +1,8 @@ +export declare enum QuestRewardType { + Skill = "Skill", + Experience = "Experience", + TraderStanding = "TraderStanding", + TraderUnlock = "TraderUnlock", + Item = "Item", + AssortmentUnlock = "AssortmentUnlock" +} diff --git a/Faupi-MunitionsExpert/server/dist/types/models/enums/QuestStatus.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/enums/QuestStatus.d.ts new file mode 100644 index 0000000..6335c73 --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/models/enums/QuestStatus.d.ts @@ -0,0 +1,10 @@ +export declare enum QuestStatus { + Locked = 0, + AvailableForStart = 1, + Started = 2, + AvailableForFinish = 3, + Success = 4, + Fail = 5, + FailRestartable = 6, + MarkedAsFailed = 7 +} diff --git a/Faupi-MunitionsExpert/server/dist/types/models/enums/RaidMode.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/enums/RaidMode.d.ts new file mode 100644 index 0000000..c5a8cff --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/models/enums/RaidMode.d.ts @@ -0,0 +1,5 @@ +export declare enum RaidMode { + Online = "Online", + Local = "Local", + Coop = "Coop" +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/enums/Traders.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/enums/Traders.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/enums/Traders.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/enums/Traders.d.ts diff --git a/Faupi-MunitionsExpert/server/dist/types/models/external/IPostAkiLoadMod.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/external/IPostAkiLoadMod.d.ts new file mode 100644 index 0000000..f6950e8 --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/models/external/IPostAkiLoadMod.d.ts @@ -0,0 +1,4 @@ +import { DependencyContainer } from "./tsyringe"; +export interface IPostAkiLoadMod { + postAkiLoad(container: DependencyContainer): void; +} diff --git a/Faupi-MunitionsExpert/server/dist/types/models/external/IPostDBLoadMod.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/external/IPostDBLoadMod.d.ts new file mode 100644 index 0000000..ca7c682 --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/models/external/IPostDBLoadMod.d.ts @@ -0,0 +1,4 @@ +import { DependencyContainer } from "./tsyringe"; +export interface IPostDBLoadMod { + postDBLoad(container: DependencyContainer): void; +} diff --git a/Faupi-MunitionsExpert/server/dist/types/models/external/IPreAkiLoadMod.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/external/IPreAkiLoadMod.d.ts new file mode 100644 index 0000000..ae7579e --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/models/external/IPreAkiLoadMod.d.ts @@ -0,0 +1,4 @@ +import { DependencyContainer } from "./tsyringe"; +export interface IPreAkiLoadMod { + preAkiLoad(container: DependencyContainer): void; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/external/mod.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/external/mod.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/external/mod.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/external/mod.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/external/tsyringe.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/external/tsyringe.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/external/tsyringe.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/external/tsyringe.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/bindings/Route.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/bindings/Route.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/bindings/Route.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/bindings/Route.d.ts diff --git a/Faupi-MunitionsExpert/server/dist/types/models/spt/bots/BotLootCache.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/bots/BotLootCache.d.ts new file mode 100644 index 0000000..e185315 --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/models/spt/bots/BotLootCache.d.ts @@ -0,0 +1,23 @@ +import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; +export declare class BotLootCache { + backpackLoot: ITemplateItem[]; + pocketLoot: ITemplateItem[]; + vestLoot: ITemplateItem[]; + combinedPoolLoot: ITemplateItem[]; + specialItems: ITemplateItem[]; + healingItems: ITemplateItem[]; + drugItems: ITemplateItem[]; + stimItems: ITemplateItem[]; + grenadeItems: ITemplateItem[]; +} +export declare enum LootCacheType { + Special = "Special", + Backpack = "Backpack", + Pocket = "Pocket", + Vest = "Vest", + Combined = "Combined", + HealingItems = "HealingItems", + DrugItems = "DrugItems", + StimItems = "StimItems", + GrenadeItems = "GrenadeItems" +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IBotCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IBotCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IBotCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IBotCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IBundleCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IBundleCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IBundleCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IBundleCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/ICustomizationCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/ICustomizationCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/ICustomizationCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/ICustomizationCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IDataCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IDataCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IDataCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IDataCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IDialogueCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IDialogueCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IDialogueCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IDialogueCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IGameCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IGameCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IGameCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IGameCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IHandbookCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IHandbookCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IHandbookCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IHandbookCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IHealthCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IHealthCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IHealthCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IHealthCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IHideoutCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IHideoutCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IHideoutCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IHideoutCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IHttpCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IHttpCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IHttpCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IHttpCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IInraidCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IInraidCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IInraidCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IInraidCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IInsuranceCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IInsuranceCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IInsuranceCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IInsuranceCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IInventoryCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IInventoryCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IInventoryCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IInventoryCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IItemEventCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IItemEventCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IItemEventCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IItemEventCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/ILauncherCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/ILauncherCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/ILauncherCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/ILauncherCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/ILocationCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/ILocationCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/ILocationCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/ILocationCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IMatchCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IMatchCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IMatchCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IMatchCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IModCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IModCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IModCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IModCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/INoteCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/INoteCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/INoteCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/INoteCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/INotifierCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/INotifierCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/INotifierCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/INotifierCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IPresetCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IPresetCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IPresetCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IPresetCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IProfileCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IProfileCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IProfileCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IProfileCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IQuestCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IQuestCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IQuestCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IQuestCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IRagfairCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IRagfairCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IRagfairCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IRagfairCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IRepairCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IRepairCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IRepairCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IRepairCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/ISaveCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/ISaveCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/ISaveCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/ISaveCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/ITradeCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/ITradeCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/ITradeCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/ITradeCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/ITraderCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/ITraderCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/ITraderCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/ITraderCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IWeatherCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IWeatherCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IWeatherCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IWeatherCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IWishlistCallbacks.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IWishlistCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/callbacks/IWishlistCallbacks.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/callbacks/IWishlistCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IAirdropConfig.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/config/IAirdropConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IAirdropConfig.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/config/IAirdropConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IBaseConfig.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/config/IBaseConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IBaseConfig.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/config/IBaseConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IBotConfig.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/config/IBotConfig.d.ts similarity index 97% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IBotConfig.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/config/IBotConfig.d.ts index 5fb9d93..f8cf39b 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IBotConfig.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/models/spt/config/IBotConfig.d.ts @@ -18,6 +18,7 @@ export interface PresetBatch { bossKojaniy: number; bossSanitar: number; bossTagilla: number; + bossKnight: number; bossTest: number; cursedAssault: number; followerBully: number; @@ -28,6 +29,8 @@ export interface PresetBatch { followerKojaniy: number; followerSanitar: number; followerTagilla: number; + followerBirdEye: number; + followerBigPipe: number; followerTest: number; marksman: number; pmcBot: number; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/ICoreConfig.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/config/ICoreConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/ICoreConfig.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/config/ICoreConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IHealthConfig.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/config/IHealthConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IHealthConfig.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/config/IHealthConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IHideoutConfig.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/config/IHideoutConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IHideoutConfig.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/config/IHideoutConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IHttpConfig.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/config/IHttpConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IHttpConfig.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/config/IHttpConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IInRaidConfig.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/config/IInRaidConfig.d.ts similarity index 95% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IInRaidConfig.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/config/IInRaidConfig.d.ts index baaf083..3ae2972 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IInRaidConfig.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/models/spt/config/IInRaidConfig.d.ts @@ -14,6 +14,7 @@ export interface RaidMenuSettings { bossEnabled: boolean; scavWars: boolean; taggedAndCursed: boolean; + enablePve: boolean; } export interface Save { loot: boolean; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IInsuranceConfig.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/config/IInsuranceConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IInsuranceConfig.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/config/IInsuranceConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IInventoryConfig.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/config/IInventoryConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IInventoryConfig.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/config/IInventoryConfig.d.ts diff --git a/Faupi-MunitionsExpert/server/dist/types/models/spt/config/ILocaleConfig.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/config/ILocaleConfig.d.ts new file mode 100644 index 0000000..fe9abf7 --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/models/spt/config/ILocaleConfig.d.ts @@ -0,0 +1,5 @@ +import { IBaseConfig } from "./IBaseConfig"; +export interface ILocaleConfig extends IBaseConfig { + kind: "aki-locale"; + desiredLocale: string; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/ILocationConfig.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/config/ILocationConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/ILocationConfig.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/config/ILocationConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IMatchConfig.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/config/IMatchConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IMatchConfig.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/config/IMatchConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IQuestConfig.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/config/IQuestConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IQuestConfig.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/config/IQuestConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IRagfairConfig.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/config/IRagfairConfig.d.ts similarity index 98% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IRagfairConfig.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/config/IRagfairConfig.d.ts index 2d151ca..8518252 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IRagfairConfig.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/models/spt/config/IRagfairConfig.d.ts @@ -30,6 +30,7 @@ export interface Dynamic { expiredOfferThreshold: number; offerItemCount: MinMax; price: MinMax; + presetPrice: MinMax; endTimeSeconds: MinMax; condition: Condition; stackablePercent: MinMax; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IRepairConfig.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/config/IRepairConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IRepairConfig.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/config/IRepairConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/ITraderConfig.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/config/ITraderConfig.d.ts similarity index 59% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/ITraderConfig.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/config/ITraderConfig.d.ts index dab73e3..c8e8044 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/ITraderConfig.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/models/spt/config/ITraderConfig.d.ts @@ -3,13 +3,17 @@ export interface ITraderConfig extends IBaseConfig { kind: "aki-trader"; updateTime: UpdateTime[]; updateTimeDefault: number; - fenceAssortSize: number; - fenceMaxPresetsCount: number; - fencePresetPriceMult: number; + traderPriceMultipler: number; minDurabilityForSale: number; - fenceItemIgnoreList: string[]; + fence: FenceConfig; } export interface UpdateTime { traderId: string; seconds: number; } +export interface FenceConfig { + assortSize: number; + maxPresetsCount: number; + presetPriceMult: number; + blacklist: string[]; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IWeatherConfig.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/config/IWeatherConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IWeatherConfig.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/config/IWeatherConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/controllers/IBotController.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/controllers/IBotController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/controllers/IBotController.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/controllers/IBotController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/generators/IBotGenerator.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/generators/IBotGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/generators/IBotGenerator.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/generators/IBotGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/generators/ILocationGenerator.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/generators/ILocationGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/generators/ILocationGenerator.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/generators/ILocationGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/generators/IPMCLootGenerator.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/generators/IPMCLootGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/generators/IPMCLootGenerator.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/generators/IPMCLootGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/generators/IRagfairAssortGenerator.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/generators/IRagfairAssortGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/generators/IRagfairAssortGenerator.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/generators/IRagfairAssortGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/generators/IRagfairOfferGenerator.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/generators/IRagfairOfferGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/generators/IRagfairOfferGenerator.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/generators/IRagfairOfferGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/helpers/Traders.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/helpers/Traders.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/helpers/Traders.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/helpers/Traders.d.ts diff --git a/Faupi-MunitionsExpert/server/dist/types/models/spt/logging/LogBackgroundColor.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/logging/LogBackgroundColor.d.ts new file mode 100644 index 0000000..87e08a9 --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/models/spt/logging/LogBackgroundColor.d.ts @@ -0,0 +1,11 @@ +export declare enum LogBackgroundColor { + default = "", + black = "blackBG", + red = "redBG", + green = "greenBG", + yellow = "yellowBG", + blue = "blueBG", + magenta = "magentaBG", + cyan = "cyanBG", + white = "whiteBG" +} diff --git a/Faupi-MunitionsExpert/server/dist/types/models/spt/logging/LogTextColor.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/logging/LogTextColor.d.ts new file mode 100644 index 0000000..7147ae3 --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/models/spt/logging/LogTextColor.d.ts @@ -0,0 +1,11 @@ +export declare enum LogTextColor { + black = "black", + red = "red", + green = "green", + yellow = "yellow", + blue = "blue", + magenta = "magenta", + cyan = "cyan", + white = "white", + gray = "" +} diff --git a/Faupi-MunitionsExpert/server/dist/types/models/spt/logging/SptLogger.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/logging/SptLogger.d.ts new file mode 100644 index 0000000..ea1b3d8 --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/models/spt/logging/SptLogger.d.ts @@ -0,0 +1,7 @@ +export interface SptLogger { + error: (msg: string | Record) => void; + warn: (msg: string | Record) => void; + succ?: (msg: string | Record) => void; + info: (msg: string | Record) => void; + debug: (msg: string | Record) => void; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/mod/IMod.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/mod/IMod.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/mod/IMod.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/mod/IMod.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/mod/IModLoader.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/mod/IModLoader.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/mod/IModLoader.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/mod/IModLoader.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/mod/IPackageJsonData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/mod/IPackageJsonData.d.ts similarity index 84% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/mod/IPackageJsonData.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/mod/IPackageJsonData.d.ts index 09472cd..99e4ef9 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/mod/IPackageJsonData.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/models/spt/mod/IPackageJsonData.d.ts @@ -1,6 +1,7 @@ export interface IPackageJsonData { incompatibilities?: string[]; dependencies?: string[]; + modDependencies?: Record; name: string; author: string; version: string; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/ragfair/IRagfairServerPrices.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/ragfair/IRagfairServerPrices.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/ragfair/IRagfairServerPrices.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/ragfair/IRagfairServerPrices.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/server/IDatabaseTables.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/server/IDatabaseTables.d.ts similarity index 69% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/server/IDatabaseTables.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/server/IDatabaseTables.d.ts index dbb71be..9978459 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/server/IDatabaseTables.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/models/spt/server/IDatabaseTables.d.ts @@ -5,6 +5,8 @@ import { IBotType } from "../../eft/common/tables/IBotType"; import { ICustomizationItem } from "../../eft/common/tables/ICustomizationItem"; import { IHandbookBase } from "../../eft/common/tables/IHandbookBase"; import { ILootBase } from "../../eft/common/tables/ILootBase"; +import { IMatch } from "../../eft/common/tables/IMatch"; +import { IProfileTemplates } from "../../eft/common/tables/IProfileTemplate"; import { IQuest } from "../../eft/common/tables/IQuest"; import { IRepeatableQuestDatabase } from "../../eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; @@ -18,34 +20,37 @@ import { ILocations } from "./ILocations"; import { IServerBase } from "./IServerBase"; import { ISettingsBase } from "./ISettingsBase"; export interface IDatabaseTables { - bots: { + bots?: { types: Record; base: IBotBase; core: IBotCore; }; - hideout: { + hideout?: { areas: IHideoutArea[]; production: IHideoutProduction[]; scavcase: IHideoutScavCase[]; settings: IHideoutSettingsBase; }; - locales: ILocaleBase; - locations: ILocations; - loot: ILootBase; - match: any; - templates: { + locales?: ILocaleBase; + locations?: ILocations; + loot?: ILootBase; + match?: IMatch; + templates?: { character: string[]; items: Record; quests: IQuest[]; repeatableQuests: IRepeatableQuestDatabase; + /** DEPRECATED - Items file found in the client, massivly out of date compared to templates.items, try not to use this, remove ASAP*/ clientItems: Record; handbook: IHandbookBase; customization: Record; - profiles: any; + /** The profile templates listed in the launcher on profile creation, split by account type (e.g. Standard) then side (e.g. bear/usec) */ + profiles: IProfileTemplates; + /** Flea prices of items - gathered from online flea market dump */ prices: Record; }; - traders: Record; - globals: IGlobals; - server: IServerBase; - settings: ISettingsBase; + traders?: Record; + globals?: IGlobals; + server?: IServerBase; + settings?: ISettingsBase; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/server/IHttpServer.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/server/IHttpServer.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/server/IHttpServer.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/server/IHttpServer.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/server/ILocaleBase.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/server/ILocaleBase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/server/ILocaleBase.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/server/ILocaleBase.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/server/ILocations.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/server/ILocations.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/server/ILocations.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/server/ILocations.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/server/IServerBase.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/server/IServerBase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/server/IServerBase.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/server/IServerBase.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/server/ISettingsBase.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/server/ISettingsBase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/server/ISettingsBase.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/server/ISettingsBase.d.ts diff --git a/Faupi-MunitionsExpert/server/dist/types/models/spt/services/CustomPreset.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/services/CustomPreset.d.ts new file mode 100644 index 0000000..f07382e --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/models/spt/services/CustomPreset.d.ts @@ -0,0 +1,5 @@ +import { Preset } from "../../eft/common/IGlobals"; +export interface CustomPreset { + key: string; + preset: Preset; +} diff --git a/Faupi-MunitionsExpert/server/dist/types/models/spt/services/CustomTraderAssortData.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/services/CustomTraderAssortData.d.ts new file mode 100644 index 0000000..265a26a --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/models/spt/services/CustomTraderAssortData.d.ts @@ -0,0 +1,6 @@ +import { ITraderAssort } from "../../eft/common/tables/ITrader"; +import { Traders } from "../../enums/Traders"; +export interface CustomTraderAssortData { + traderId: Traders; + assorts: ITraderAssort; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/utils/IAsyncQueue.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/utils/IAsyncQueue.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/utils/IAsyncQueue.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/utils/IAsyncQueue.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/utils/ICommand.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/utils/ICommand.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/utils/ICommand.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/utils/ICommand.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/utils/ILogger.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/utils/ILogger.d.ts similarity index 59% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/utils/ILogger.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/utils/ILogger.d.ts index c983701..2af3fac 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/utils/ILogger.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/models/spt/utils/ILogger.d.ts @@ -1,7 +1,10 @@ import { Daum } from "../../eft/itemEvent/IItemEventRouterRequest"; +import { LogBackgroundColor } from "../logging/LogBackgroundColor"; +import { LogTextColor } from "../logging/LogTextColor"; export interface ILogger { writeToLogFile(data: string | Daum): void; - log(data: string | Record | Error, color: string): void; + log(data: string | Record | Error, color: string, backgroundColor?: string): void; + logWithColor(data: string | Record, textColor: LogTextColor, backgroundColor?: LogBackgroundColor): void; error(data: string): void; warning(data: string): void; success(data: string): void; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/utils/IUuidGenerator.d.ts b/Faupi-MunitionsExpert/server/dist/types/models/spt/utils/IUuidGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/utils/IUuidGenerator.d.ts rename to Faupi-MunitionsExpert/server/dist/types/models/spt/utils/IUuidGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/HttpRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/HttpRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/HttpRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/HttpRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/ImageRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/ImageRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/ImageRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/ImageRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/ItemEventRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/ItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/ItemEventRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/ItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/dynamic/BotDynamicRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/dynamic/BotDynamicRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/dynamic/BotDynamicRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/dynamic/BotDynamicRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/dynamic/BundleDynamicRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/dynamic/BundleDynamicRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/dynamic/BundleDynamicRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/dynamic/BundleDynamicRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/dynamic/CustomizationDynamicRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/dynamic/CustomizationDynamicRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/dynamic/CustomizationDynamicRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/dynamic/CustomizationDynamicRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/dynamic/DataDynamicRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/dynamic/DataDynamicRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/dynamic/DataDynamicRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/dynamic/DataDynamicRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/dynamic/HttpDynamicRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/dynamic/HttpDynamicRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/dynamic/HttpDynamicRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/dynamic/HttpDynamicRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/dynamic/InraidDynamicRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/dynamic/InraidDynamicRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/dynamic/InraidDynamicRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/dynamic/InraidDynamicRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/dynamic/LocationDynamicRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/dynamic/LocationDynamicRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/dynamic/LocationDynamicRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/dynamic/LocationDynamicRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/dynamic/NotifierDynamicRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/dynamic/NotifierDynamicRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/dynamic/NotifierDynamicRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/dynamic/NotifierDynamicRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/dynamic/TraderDynamicRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/dynamic/TraderDynamicRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/dynamic/TraderDynamicRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/dynamic/TraderDynamicRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/item_events/CustomizationItemEventRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/item_events/CustomizationItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/item_events/CustomizationItemEventRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/item_events/CustomizationItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/item_events/HealthItemEventRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/item_events/HealthItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/item_events/HealthItemEventRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/item_events/HealthItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/item_events/HideoutItemEventRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/item_events/HideoutItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/item_events/HideoutItemEventRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/item_events/HideoutItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/item_events/InsuranceItemEventRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/item_events/InsuranceItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/item_events/InsuranceItemEventRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/item_events/InsuranceItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/item_events/InventoryItemEventRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/item_events/InventoryItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/item_events/InventoryItemEventRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/item_events/InventoryItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/item_events/NoteItemEventRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/item_events/NoteItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/item_events/NoteItemEventRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/item_events/NoteItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/item_events/PresetBuildItemEventRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/item_events/PresetBuildItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/item_events/PresetBuildItemEventRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/item_events/PresetBuildItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/item_events/QuestItemEventRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/item_events/QuestItemEventRouter.d.ts similarity index 62% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/item_events/QuestItemEventRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/item_events/QuestItemEventRouter.d.ts index db59c25..a092aa6 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/item_events/QuestItemEventRouter.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/routers/item_events/QuestItemEventRouter.d.ts @@ -1,10 +1,12 @@ -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; import { QuestCallbacks } from "../../callbacks/QuestCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; +import { IPmcData } from "../../models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; +import { ILogger } from "../../models/spt/utils/ILogger"; export declare class QuestItemEventRouter extends ItemEventRouterDefinition { + protected logger: ILogger; protected questCallbacks: QuestCallbacks; - constructor(questCallbacks: QuestCallbacks); + constructor(logger: ILogger, questCallbacks: QuestCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; + handleItemEvent(eventAction: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/item_events/RagfairItemEventRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/item_events/RagfairItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/item_events/RagfairItemEventRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/item_events/RagfairItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/item_events/RepairItemEventRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/item_events/RepairItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/item_events/RepairItemEventRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/item_events/RepairItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/item_events/TradeItemEventRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/item_events/TradeItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/item_events/TradeItemEventRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/item_events/TradeItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/item_events/WishlistItemEventRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/item_events/WishlistItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/item_events/WishlistItemEventRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/item_events/WishlistItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/save_load/HealthSaveLoadRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/save_load/HealthSaveLoadRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/save_load/HealthSaveLoadRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/save_load/HealthSaveLoadRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/save_load/InraidSaveLoadRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/save_load/InraidSaveLoadRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/save_load/InraidSaveLoadRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/save_load/InraidSaveLoadRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/save_load/InsuranceSaveLoadRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/save_load/InsuranceSaveLoadRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/save_load/InsuranceSaveLoadRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/save_load/InsuranceSaveLoadRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/save_load/ProfileSaveLoadRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/save_load/ProfileSaveLoadRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/save_load/ProfileSaveLoadRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/save_load/ProfileSaveLoadRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/serializers/BundleSerializer.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/serializers/BundleSerializer.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/serializers/BundleSerializer.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/serializers/BundleSerializer.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/serializers/ImageSerializer.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/serializers/ImageSerializer.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/serializers/ImageSerializer.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/serializers/ImageSerializer.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/serializers/NotifySerializer.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/serializers/NotifySerializer.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/serializers/NotifySerializer.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/serializers/NotifySerializer.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/BotStaticRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/static/BotStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/BotStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/static/BotStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/BundleStaticRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/static/BundleStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/BundleStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/static/BundleStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/CustomizationStaticRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/static/CustomizationStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/CustomizationStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/static/CustomizationStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/DataStaticRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/static/DataStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/DataStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/static/DataStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/DialogStaticRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/static/DialogStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/DialogStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/static/DialogStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/GameStaticRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/static/GameStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/GameStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/static/GameStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/HealthStaticRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/static/HealthStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/HealthStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/static/HealthStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/InraidStaticRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/static/InraidStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/InraidStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/static/InraidStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/InsuranceStaticRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/static/InsuranceStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/InsuranceStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/static/InsuranceStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/ItemEventStaticRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/static/ItemEventStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/ItemEventStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/static/ItemEventStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/LauncherStaticRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/static/LauncherStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/LauncherStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/static/LauncherStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/LocationStaticRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/static/LocationStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/LocationStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/static/LocationStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/MatchStaticRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/static/MatchStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/MatchStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/static/MatchStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/NotifierStaticRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/static/NotifierStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/NotifierStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/static/NotifierStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/PresetStaticRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/static/PresetStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/PresetStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/static/PresetStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/ProfileStaticRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/static/ProfileStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/ProfileStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/static/ProfileStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/QuestStaticRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/static/QuestStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/QuestStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/static/QuestStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/RagfairStaticRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/static/RagfairStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/RagfairStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/static/RagfairStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/TraderStaticRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/static/TraderStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/TraderStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/static/TraderStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/WeatherStaticRouter.d.ts b/Faupi-MunitionsExpert/server/dist/types/routers/static/WeatherStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/routers/static/WeatherStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/routers/static/WeatherStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/servers/ConfigServer.d.ts b/Faupi-MunitionsExpert/server/dist/types/servers/ConfigServer.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/servers/ConfigServer.d.ts rename to Faupi-MunitionsExpert/server/dist/types/servers/ConfigServer.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/servers/DatabaseServer.d.ts b/Faupi-MunitionsExpert/server/dist/types/servers/DatabaseServer.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/servers/DatabaseServer.d.ts rename to Faupi-MunitionsExpert/server/dist/types/servers/DatabaseServer.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/servers/HttpServer.d.ts b/Faupi-MunitionsExpert/server/dist/types/servers/HttpServer.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/servers/HttpServer.d.ts rename to Faupi-MunitionsExpert/server/dist/types/servers/HttpServer.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/servers/RagfairServer.d.ts b/Faupi-MunitionsExpert/server/dist/types/servers/RagfairServer.d.ts similarity index 92% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/servers/RagfairServer.d.ts rename to Faupi-MunitionsExpert/server/dist/types/servers/RagfairServer.d.ts index 60c92b5..bc86cdb 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/servers/RagfairServer.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/servers/RagfairServer.d.ts @@ -17,7 +17,8 @@ export declare class RagfairServer { constructor(logger: ILogger, ragfairOfferGenerator: RagfairOfferGenerator, ragfairOfferService: RagfairOfferService, ragfairCategoriesService: RagfairCategoriesService, ragfairRequiredItemsService: RagfairRequiredItemsService, configServer: ConfigServer); load(): void; update(): void; - getCategories(): Record; + getAllCategories(): Record; + getBespokeCategories(offers: IRagfairOffer[]): Record; /** * Disable/Hide an offer from flea * @param offerId diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/servers/SaveServer.d.ts b/Faupi-MunitionsExpert/server/dist/types/servers/SaveServer.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/servers/SaveServer.d.ts rename to Faupi-MunitionsExpert/server/dist/types/servers/SaveServer.d.ts diff --git a/Faupi-MunitionsExpert/server/dist/types/services/BotLootCacheService.d.ts b/Faupi-MunitionsExpert/server/dist/types/services/BotLootCacheService.d.ts new file mode 100644 index 0000000..72eb332 --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/services/BotLootCacheService.d.ts @@ -0,0 +1,59 @@ +import { PMCLootGenerator } from "../generators/PMCLootGenerator"; +import { Items } from "../models/eft/common/tables/IBotType"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { BotLootCache, LootCacheType } from "../models/spt/bots/BotLootCache"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "../utils/JsonUtil"; +import { RagfairPriceService } from "./RagfairPriceService"; +export declare class BotLootCacheService { + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected pmcLootGenerator: PMCLootGenerator; + protected ragfairPriceService: RagfairPriceService; + protected lootCache: Record; + constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, pmcLootGenerator: PMCLootGenerator, ragfairPriceService: RagfairPriceService); + /** + * Remove all cached bot loot data + */ + clearCache(): void; + /** + * Get the fully created loot array, ordered by price low to high + * @param botRole bot to get loot for + * @param isPmc is the bot a pmc + * @param lootType what type of loot is needed + * @param lootPool the full pool of loot (needed when cache is empty) + * @returns ITemplateItem array + */ + getLootFromCache(botRole: string, isPmc: boolean, lootType: LootCacheType, lootPool: Items): ITemplateItem[]; + /** + * Generate loot for a bot and store inside a private class property + * @param botRole + * @param lootType + * @param lootPool the full pool of loot we use to create the various sub-categories with + * @param isPmc + */ + protected addLootToCache(botRole: string, isPmc: boolean, lootType: LootCacheType, lootPool: Items): void; + /** + * Check if a bot type exists inside the loot cache + * @param botRole role to check for + * @returns true if they exist + */ + protected botRoleExistsInCache(botRole: string): boolean; + /** + * If lootcache is null, init with empty property arrays + * @param botRole Bot role to hydrate + */ + protected initCacheForBotRole(botRole: string): void; + /** + * Compares two item prices by their flea (or handbook if that doesnt exist) price + * -1 when a < b + * 0 when a === b + * 1 when a > b + * @param itemAPrice + * @param itemBPrice + * @returns + */ + protected compareByValue(itemAPrice: number, itemBPrice: number): number; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/FenceService.d.ts b/Faupi-MunitionsExpert/server/dist/types/services/FenceService.d.ts similarity index 95% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/FenceService.d.ts rename to Faupi-MunitionsExpert/server/dist/types/services/FenceService.d.ts index 12723fb..79058c6 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/FenceService.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/services/FenceService.d.ts @@ -29,8 +29,8 @@ export declare class FenceService { hasExpiredCache(refreshAssort: boolean): boolean; generateFenceAssortCache(pmcData: IPmcData): void; /** - * - * @param pmcData Get the fence level the passed in profile has + * Get the fence level the passed in profile has + * @param pmcData Player profile * @returns FenceLevel */ getFenceInfo(pmcData: IPmcData): FenceLevel; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/HashCacheService.d.ts b/Faupi-MunitionsExpert/server/dist/types/services/HashCacheService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/HashCacheService.d.ts rename to Faupi-MunitionsExpert/server/dist/types/services/HashCacheService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/InsuranceService.d.ts b/Faupi-MunitionsExpert/server/dist/types/services/InsuranceService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/InsuranceService.d.ts rename to Faupi-MunitionsExpert/server/dist/types/services/InsuranceService.d.ts diff --git a/Faupi-MunitionsExpert/server/dist/types/services/LocaleService.d.ts b/Faupi-MunitionsExpert/server/dist/types/services/LocaleService.d.ts new file mode 100644 index 0000000..33bea7b --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/services/LocaleService.d.ts @@ -0,0 +1,14 @@ +import { ILocaleConfig } from "../models/spt/config/ILocaleConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +export declare class LocaleService { + protected logger: ILogger; + protected configServer: ConfigServer; + protected localeConfig: ILocaleConfig; + constructor(logger: ILogger, configServer: ConfigServer); + /** + * Gets the locale key from the locale.json file + * @returns locale e.g en/ge/cz/cn + */ + getDesiredLocale(): string; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/MatchLocationService.d.ts b/Faupi-MunitionsExpert/server/dist/types/services/MatchLocationService.d.ts similarity index 58% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/MatchLocationService.d.ts rename to Faupi-MunitionsExpert/server/dist/types/services/MatchLocationService.d.ts index 2b5fc0e..c027bec 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/MatchLocationService.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/services/MatchLocationService.d.ts @@ -1,8 +1,9 @@ +import { ICreateGroupRequestData } from "../models/eft/match/ICreateGroupRequestData"; import { TimeUtil } from "../utils/TimeUtil"; export declare class MatchLocationService { protected timeUtil: TimeUtil; protected locations: {}; constructor(timeUtil: TimeUtil); - createGroup(sessionID: string, info: any): any; + createGroup(sessionID: string, info: ICreateGroupRequestData): any; deleteGroup(info: any): void; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/ModCompilerService.d.ts b/Faupi-MunitionsExpert/server/dist/types/services/ModCompilerService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/ModCompilerService.d.ts rename to Faupi-MunitionsExpert/server/dist/types/services/ModCompilerService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/NotificationService.d.ts b/Faupi-MunitionsExpert/server/dist/types/services/NotificationService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/NotificationService.d.ts rename to Faupi-MunitionsExpert/server/dist/types/services/NotificationService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/PaymentService.d.ts b/Faupi-MunitionsExpert/server/dist/types/services/PaymentService.d.ts similarity index 79% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/PaymentService.d.ts rename to Faupi-MunitionsExpert/server/dist/types/services/PaymentService.d.ts index 5834750..a5e538f 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/PaymentService.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/services/PaymentService.d.ts @@ -45,5 +45,22 @@ export declare class PaymentService { * ancestor with slotId=hideout */ protected isItemInStash(pmcData: IPmcData, item: Item): boolean; + /** + * Remove currency from player stash/inventory + * @param pmcData Player profile to find and remove currency from + * @param currencyTpl Type of currency to pay + * @param amountToPay money value to pay + * @param sessionID Sessino id + * @param output output object to send to client + * @returns IItemEventRouterResponse + */ addPaymentToOutput(pmcData: IPmcData, currencyTpl: string, amountToPay: number, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse; + /** + * Prioritise player stash first over player inventory + * Post-raid healing would often take money out of the players pockets/secure container + * @param a Firsat money stack item + * @param b Second money stack item + * @returns sorted item + */ + protected moneySort(a: Item, b: Item): number; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/PlayerService.d.ts b/Faupi-MunitionsExpert/server/dist/types/services/PlayerService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/PlayerService.d.ts rename to Faupi-MunitionsExpert/server/dist/types/services/PlayerService.d.ts diff --git a/Faupi-MunitionsExpert/server/dist/types/services/ProfileFixerService.d.ts b/Faupi-MunitionsExpert/server/dist/types/services/ProfileFixerService.d.ts new file mode 100644 index 0000000..313a907 --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/services/ProfileFixerService.d.ts @@ -0,0 +1,40 @@ +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IPmcDataRepeatableQuest, IRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { Watermark } from "../utils/Watermark"; +export declare class ProfileFixerService { + protected logger: ILogger; + protected watermark: Watermark; + protected databaseServer: DatabaseServer; + constructor(logger: ILogger, watermark: Watermark, databaseServer: DatabaseServer); + /** + * Find issues in the pmc profile data that may cause issues and fix them + * @param pmcProfile profile to check and fix + */ + checkForAndFixPmcProfileIssues(pmcProfile: IPmcData): void; + /** + * Add tag to profile to indicate when it was made + * @param fullProfile + */ + addMissingAkiVersionTagToProfile(fullProfile: IAkiProfile): void; + /** + * TODO - make this non-public - currently used by RepeatableQuestController + * Remove unused condition counters + * @param pmcProfile profile to remove old counters from + */ + removeDanglingConditionCounters(pmcProfile: IPmcData): void; + protected removeDanglingBackendCounters(pmcProfile: IPmcData): void; + protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; + protected addMissingBonusesProperty(pmcProfile: IPmcData): void; + protected addMissingRepeatableQuestsProperty(pmcProfile: IPmcData): void; + protected addMissingWorkbenchWeaponSkills(pmcProfile: IPmcData): void; + /** + * In 18876 bsg changed the pockets tplid to be one that has 3 additional special slots + * @param pmcProfile + */ + protected updateProfilePocketsToNewId(pmcProfile: IPmcData): void; + addMissingArmorRepairSkill(pmcProfile: IPmcData): void; +} diff --git a/Faupi-MunitionsExpert/server/dist/types/services/RagfairCategoriesService.d.ts b/Faupi-MunitionsExpert/server/dist/types/services/RagfairCategoriesService.d.ts new file mode 100644 index 0000000..83910e5 --- /dev/null +++ b/Faupi-MunitionsExpert/server/dist/types/services/RagfairCategoriesService.d.ts @@ -0,0 +1,40 @@ +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { ILogger } from "../models/spt/utils/ILogger"; +export declare class RagfairCategoriesService { + protected logger: ILogger; + protected categories: Record; + constructor(logger: ILogger); + /** + * Get all flea categories and their count of offers + * @returns item categories and count + */ + getAllCategories(): Record; + /** + * With the supplied items, get custom categories + * @returns a custom list of categories + */ + getBespokeCategories(offers: IRagfairOffer[]): Record; + /** + * Take an array of ragfair offers and create a dictionary of items with thier corrisponding offer count + * @param offers ragfair offers + * @returns categories and count + */ + protected processOffersIntoCategories(offers: IRagfairOffer[]): Record; + /** + * Increment or decrement a category array + * @param offer offer to process + * @param categories categories to update + * @param increment should item be incremented or decremented + */ + protected addOrIncrementCategory(offer: IRagfairOffer, categories: Record, increment?: boolean): void; + /** + * Increase category count by 1 + * @param offer + */ + incrementCategory(offer: IRagfairOffer): void; + /** + * Reduce category count by 1 + * @param offer + */ + decrementCategory(offer: IRagfairOffer): void; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/RagfairLinkedItemService.d.ts b/Faupi-MunitionsExpert/server/dist/types/services/RagfairLinkedItemService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/RagfairLinkedItemService.d.ts rename to Faupi-MunitionsExpert/server/dist/types/services/RagfairLinkedItemService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/RagfairOfferService.d.ts b/Faupi-MunitionsExpert/server/dist/types/services/RagfairOfferService.d.ts similarity index 86% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/RagfairOfferService.d.ts rename to Faupi-MunitionsExpert/server/dist/types/services/RagfairOfferService.d.ts index 7afbf8c..7398a8f 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/RagfairOfferService.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/services/RagfairOfferService.d.ts @@ -11,12 +11,14 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; +import { RagfairCategoriesService } from "./RagfairCategoriesService"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; protected databaseServer: DatabaseServer; protected saveServer: SaveServer; protected ragfairServerHelper: RagfairServerHelper; + protected ragfairCategoriesService: RagfairCategoriesService; protected profileHelper: ProfileHelper; protected itemEventRouter: ItemEventRouter; protected httpResponse: HttpResponseUtil; @@ -26,12 +28,16 @@ export declare class RagfairOfferService { protected expiredOffers: Item[]; protected offers: IRagfairOffer[]; protected ragfairConfig: IRagfairConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, ragfairCategoriesService: RagfairCategoriesService, profileHelper: ProfileHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, configServer: ConfigServer); + /** + * Get all offers + * @returns IRagfairOffer array + */ getOffers(): IRagfairOffer[]; getOfferByOfferId(offerId: string): IRagfairOffer; getOffersOfType(templateId: string): IRagfairOffer[]; addOffer(offer: IRagfairOffer): void; - addOfferToExpired(offer: Item): void; + addOfferToExpired(staleOffer: IRagfairOffer): void; setTraderUpdateStatus(traderId: string, shouldUpdate: boolean): void; shouldTraderBeUpdated(traderID: string): boolean; getExpiredOfferCount(): number; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/RagfairPriceService.d.ts b/Faupi-MunitionsExpert/server/dist/types/services/RagfairPriceService.d.ts similarity index 64% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/RagfairPriceService.d.ts rename to Faupi-MunitionsExpert/server/dist/types/services/RagfairPriceService.d.ts index 5256b99..e33bbb9 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/RagfairPriceService.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/services/RagfairPriceService.d.ts @@ -1,6 +1,7 @@ import { HandbookHelper } from "../helpers/HandbookHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { PresetHelper } from "../helpers/PresetHelper"; +import { Preset } from "../models/eft/common/IGlobals"; import { Item } from "../models/eft/common/tables/IItem"; import { IBarterScheme } from "../models/eft/common/tables/ITrader"; import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; @@ -28,5 +29,26 @@ export declare class RagfairPriceService { getFleaPriceForItem(tplId: string): number; getBarterPrice(barterScheme: IBarterScheme[]): number; getDynamicOfferPrice(items: Item[], desiredCurrency: string): number; + /** + * Multiply the price by a randomised curve where n = 2, shift = 2 + * @param existingPrice price to alter + * @param isPreset is the item we're multiplying a preset + * @returns multiplied price + */ + protected randomisePrice(existingPrice: number, isPreset: boolean): number; + /** + * Calculate the cost of a weapon preset by adding together the price of its mods + base price of default weapon preset + * @param item base weapon + * @param items weapon plus mods + * @param existingPrice price of existing base weapon + * @returns + */ getWeaponPresetPrice(item: Item, items: Item[], existingPrice: number): number; + /** + * Attempt to get the default preset for a weapon, failing that get the first preset in the array + * (assumes default = has encyclopedia entry) + * @param presets weapon presets to choose from + * @returns Default preset object + */ + protected getDefaultWeaponPreset(presets: Preset[], weapon: Item): Preset; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/RagfairRequiredItemsService.d.ts b/Faupi-MunitionsExpert/server/dist/types/services/RagfairRequiredItemsService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/RagfairRequiredItemsService.d.ts rename to Faupi-MunitionsExpert/server/dist/types/services/RagfairRequiredItemsService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/TraderAssortService.d.ts b/Faupi-MunitionsExpert/server/dist/types/services/TraderAssortService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/TraderAssortService.d.ts rename to Faupi-MunitionsExpert/server/dist/types/services/TraderAssortService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts b/Faupi-MunitionsExpert/server/dist/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts rename to Faupi-MunitionsExpert/server/dist/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/Faupi-MunitionsExpert/server/dist/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts rename to Faupi-MunitionsExpert/server/dist/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/mod/image/imageRouteService.d.ts b/Faupi-MunitionsExpert/server/dist/types/services/mod/image/imageRouteService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/mod/image/imageRouteService.d.ts rename to Faupi-MunitionsExpert/server/dist/types/services/mod/image/imageRouteService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/mod/onLoad/OnLoadMod.d.ts b/Faupi-MunitionsExpert/server/dist/types/services/mod/onLoad/OnLoadMod.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/mod/onLoad/OnLoadMod.d.ts rename to Faupi-MunitionsExpert/server/dist/types/services/mod/onLoad/OnLoadMod.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/mod/onLoad/OnLoadModService.d.ts b/Faupi-MunitionsExpert/server/dist/types/services/mod/onLoad/OnLoadModService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/mod/onLoad/OnLoadModService.d.ts rename to Faupi-MunitionsExpert/server/dist/types/services/mod/onLoad/OnLoadModService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/mod/onUpdate/OnUpdateMod.d.ts b/Faupi-MunitionsExpert/server/dist/types/services/mod/onUpdate/OnUpdateMod.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/mod/onUpdate/OnUpdateMod.d.ts rename to Faupi-MunitionsExpert/server/dist/types/services/mod/onUpdate/OnUpdateMod.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/mod/onUpdate/OnUpdateModService.d.ts b/Faupi-MunitionsExpert/server/dist/types/services/mod/onUpdate/OnUpdateModService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/mod/onUpdate/OnUpdateModService.d.ts rename to Faupi-MunitionsExpert/server/dist/types/services/mod/onUpdate/OnUpdateModService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/mod/staticRouter/StaticRouterMod.d.ts b/Faupi-MunitionsExpert/server/dist/types/services/mod/staticRouter/StaticRouterMod.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/mod/staticRouter/StaticRouterMod.d.ts rename to Faupi-MunitionsExpert/server/dist/types/services/mod/staticRouter/StaticRouterMod.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/mod/staticRouter/StaticRouterModService.d.ts b/Faupi-MunitionsExpert/server/dist/types/services/mod/staticRouter/StaticRouterModService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/mod/staticRouter/StaticRouterModService.d.ts rename to Faupi-MunitionsExpert/server/dist/types/services/mod/staticRouter/StaticRouterModService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/App.d.ts b/Faupi-MunitionsExpert/server/dist/types/utils/App.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/App.d.ts rename to Faupi-MunitionsExpert/server/dist/types/utils/App.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/AyncQueue.d.ts b/Faupi-MunitionsExpert/server/dist/types/utils/AyncQueue.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/AyncQueue.d.ts rename to Faupi-MunitionsExpert/server/dist/types/utils/AyncQueue.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/DatabaseImporter.d.ts b/Faupi-MunitionsExpert/server/dist/types/utils/DatabaseImporter.d.ts similarity index 69% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/DatabaseImporter.d.ts rename to Faupi-MunitionsExpert/server/dist/types/utils/DatabaseImporter.d.ts index 0857b67..483e135 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/DatabaseImporter.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/utils/DatabaseImporter.d.ts @@ -1,9 +1,10 @@ -import { VFS } from "./VFS"; -import { JsonUtil } from "./JsonUtil"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ImageRouter } from "../routers/ImageRouter"; import { OnLoad } from "../di/OnLoad"; +import { IDatabaseTables } from "../models/spt/server/IDatabaseTables"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ImageRouter } from "../routers/ImageRouter"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "./JsonUtil"; +import { VFS } from "./VFS"; export declare class DatabaseImporter extends OnLoad { protected logger: ILogger; protected vfs: VFS; @@ -12,7 +13,12 @@ export declare class DatabaseImporter extends OnLoad { protected imageRouter: ImageRouter; constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, databaseServer: DatabaseServer, imageRouter: ImageRouter); onLoad(): void; + /** + * Read all json files in database folder and map into a json object + * @param filepath path to database folder + */ + protected hydrateDatabase(filepath: string): void; getRoute(): string; - loadRecursive(filepath: string): any; + loadRecursive(filepath: string): IDatabaseTables; loadImages(filepath: string): void; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/HashUtil.d.ts b/Faupi-MunitionsExpert/server/dist/types/utils/HashUtil.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/HashUtil.d.ts rename to Faupi-MunitionsExpert/server/dist/types/utils/HashUtil.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/HttpResponseUtil.d.ts b/Faupi-MunitionsExpert/server/dist/types/utils/HttpResponseUtil.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/HttpResponseUtil.d.ts rename to Faupi-MunitionsExpert/server/dist/types/utils/HttpResponseUtil.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/JsonUtil.d.ts b/Faupi-MunitionsExpert/server/dist/types/utils/JsonUtil.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/JsonUtil.d.ts rename to Faupi-MunitionsExpert/server/dist/types/utils/JsonUtil.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/Logger.d.ts b/Faupi-MunitionsExpert/server/dist/types/utils/Logger.d.ts similarity index 67% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/Logger.d.ts rename to Faupi-MunitionsExpert/server/dist/types/utils/Logger.d.ts index f5b774b..3d9013f 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/Logger.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/utils/Logger.d.ts @@ -1,17 +1,13 @@ /// -import { Daum } from "../models/eft/itemEvent/IItemEventRouterRequest"; -import { ILogger } from "../models/spt/utils/ILogger"; -import winston from "winston"; -import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; -import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; import fs from "fs"; -interface SptLogger { - error: (msg: string | Record) => void; - warn: (msg: string | Record) => void; - succ?: (msg: string | Record) => void; - info: (msg: string | Record) => void; - debug: (msg: string | Record) => void; -} +import winston from "winston"; +import { Daum } from "../models/eft/itemEvent/IItemEventRouterRequest"; +import { LogBackgroundColor } from "../models/spt/logging/LogBackgroundColor"; +import { LogTextColor } from "../models/spt/logging/LogTextColor"; +import { SptLogger } from "../models/spt/logging/SptLogger"; +import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; export declare class WinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected uuidGenerator: IUUidGenerator; @@ -36,16 +32,27 @@ export declare class WinstonLogger implements ILogger { custom: string; debug: string; }; + bgColors: { + default: string; + blackBG: string; + redBG: string; + greenBG: string; + yellowBG: string; + blueBG: string; + magentaBG: string; + cyanBG: string; + whiteBG: string; + }; }; protected logger: winston.Logger & SptLogger; - writeFilePromisify: (path: fs.PathLike, data: string, options?: any) => Promise; + protected writeFilePromisify: (path: fs.PathLike, data: string, options?: any) => Promise; constructor(asyncQueue: IAsyncQueue, uuidGenerator: IUUidGenerator); writeToLogFile(data: string | Daum): Promise; - log(data: string | Error | Record, color: string): Promise; + log(data: string | Error | Record, color: string, backgroundColor?: string): Promise; error(data: string | Record): Promise; warning(data: string | Record): Promise; success(data: string | Record): Promise; info(data: string | Record): Promise; + logWithColor(data: string | Record, textColor: LogTextColor, backgroundColor?: LogBackgroundColor): Promise; debug(data: string | Record, onlyShowInConsole?: boolean): Promise; } -export {}; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/MathUtil.d.ts b/Faupi-MunitionsExpert/server/dist/types/utils/MathUtil.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/MathUtil.d.ts rename to Faupi-MunitionsExpert/server/dist/types/utils/MathUtil.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/ObjectId.d.ts b/Faupi-MunitionsExpert/server/dist/types/utils/ObjectId.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/ObjectId.d.ts rename to Faupi-MunitionsExpert/server/dist/types/utils/ObjectId.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/RandomUtil.d.ts b/Faupi-MunitionsExpert/server/dist/types/utils/RandomUtil.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/RandomUtil.d.ts rename to Faupi-MunitionsExpert/server/dist/types/utils/RandomUtil.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/TimeUtil.d.ts b/Faupi-MunitionsExpert/server/dist/types/utils/TimeUtil.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/TimeUtil.d.ts rename to Faupi-MunitionsExpert/server/dist/types/utils/TimeUtil.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/UUidGenerator.d.ts b/Faupi-MunitionsExpert/server/dist/types/utils/UUidGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/UUidGenerator.d.ts rename to Faupi-MunitionsExpert/server/dist/types/utils/UUidGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/VFS.d.ts b/Faupi-MunitionsExpert/server/dist/types/utils/VFS.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/VFS.d.ts rename to Faupi-MunitionsExpert/server/dist/types/utils/VFS.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/Watermark.d.ts b/Faupi-MunitionsExpert/server/dist/types/utils/Watermark.d.ts similarity index 83% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/Watermark.d.ts rename to Faupi-MunitionsExpert/server/dist/types/utils/Watermark.d.ts index 111bdd0..c6dc120 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/Watermark.d.ts +++ b/Faupi-MunitionsExpert/server/dist/types/utils/Watermark.d.ts @@ -28,7 +28,12 @@ export declare class Watermark { protected text: string[]; protected versionLabel: string; initialize(): void; - getVersionTag(): string; + /** + * Get a version string (x.x.x) or (x.x.x-BLEEDINGEDGE) OR (X.X.X (18xxx)) + * @param withEftVersion Include the eft version this spt version was made for + * @returns string + */ + getVersionTag(withEftVersion?: boolean): string; getVersionLabel(): string; /** Set window title */ setTitle(): void; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/decorators/Singleton.d.ts b/Faupi-MunitionsExpert/server/dist/types/utils/decorators/Singleton.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/decorators/Singleton.d.ts rename to Faupi-MunitionsExpert/server/dist/types/utils/decorators/Singleton.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/decorators/constructor.d.ts b/Faupi-MunitionsExpert/server/dist/types/utils/decorators/constructor.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/utils/decorators/constructor.d.ts rename to Faupi-MunitionsExpert/server/dist/types/utils/decorators/constructor.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/mod.code-workspace b/Faupi-MunitionsExpert/server/mod.code-workspace similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/mod.code-workspace rename to Faupi-MunitionsExpert/server/mod.code-workspace diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/package.json b/Faupi-MunitionsExpert/server/package.json similarity index 95% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/package.json rename to Faupi-MunitionsExpert/server/package.json index 146de25..2e4e92f 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/package.json +++ b/Faupi-MunitionsExpert/server/package.json @@ -1,10 +1,10 @@ { "name": "MunitionsExpert", "author": "Faupi", - "version": "1.5.0", + "version": "1.6.0", "license": "NCSA Open Source", "main": "./src/MunitionsExpert.js", - "akiVersion": "3.0.0", + "akiVersion": "3.1.1", "updatedBy": "CWX", "scripts": { "setup:environment": "npm i", diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/res/armorDamage.png b/Faupi-MunitionsExpert/server/res/armorDamage.png similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/res/armorDamage.png rename to Faupi-MunitionsExpert/server/res/armorDamage.png diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/res/ricochet.png b/Faupi-MunitionsExpert/server/res/ricochet.png similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/res/ricochet.png rename to Faupi-MunitionsExpert/server/res/ricochet.png diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/res/translations.json b/Faupi-MunitionsExpert/server/res/translations.json similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/res/translations.json rename to Faupi-MunitionsExpert/server/res/translations.json diff --git a/Faupi-MunitionsExpert/server/src/MunitionsExpert.js b/Faupi-MunitionsExpert/server/src/MunitionsExpert.js new file mode 100644 index 0000000..3066dd2 --- /dev/null +++ b/Faupi-MunitionsExpert/server/src/MunitionsExpert.js @@ -0,0 +1,66 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +class MunitionsExpert { + preAkiLoad(container) { + this.router = container.resolve("DynamicRouterModService"); + this.logger = container.resolve("WinstonLogger"); + this.json = container.resolve("JsonUtil"); + this.mod = require("../package.json"); + this.translations = require("../res/translations.json"); + this.logger.info(`Loading: ${this.mod.author}: ${this.mod.name} ${this.mod.version}`); + this.path = require("path"); + this.cfg = require("./config.json"); + this.hookRoutes(); + } + postAkiLoad(container) { + this.modLoader = container.resolve("PreAkiModLoader"); + this.database = container.resolve("DatabaseServer"); + this.table = this.database.getTables(); + this.globalLocale = this.table.locales.global; + this.items = this.table.templates.items; + this.updateLocalization(); + this.changeBulletColour(); + } + updateLocalization() { + for (const language in this.translations) { + if (!(language in this.globalLocale)) { + continue; + } + const attrKvPair = this.translations[language]; + for (const attrKey in attrKvPair) { + const attrValue = attrKvPair[attrKey]; + this.globalLocale[language].interface[attrKey] = attrValue; + } + } + } + hookRoutes() { + this.router.registerDynamicRouter("MunitionsExpert", [ + { + url: "/MunitionsExpert/GetInfo", + action: (url, info, sessionId, output) => { + return this.json.serialize(this.path.resolve(this.modLoader.getModPath("Faupi-MunitionsExpert 1.6.0"))); + } + } + ], "MunitionsExpert"); + } + changeBulletColour() { + if (this.cfg.BulletBackgroundColours === true) { + for (const i in this.items) { + const item = this.items[i]; + //set baground colour of ammo depending on pen + if (item._parent === "5485a8684bdc2da71d8b4567") { + const pen = item._props.PenetrationPower; + let colour = ""; + pen > 60 ? colour = "red" : //SuperHighPen + pen > 50 ? colour = "yellow" : //HighPen + pen > 40 ? colour = "violet" : //MedHighPen + pen > 30 ? colour = "blue" : //MedPen + pen > 20 ? colour = "green" : //LowMedPen + colour = "grey"; //LowPen + item._props.BackgroundColor = colour; + } + } + } + } +} +module.exports = { mod: new MunitionsExpert() }; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/src/MunitionsExpert.ts b/Faupi-MunitionsExpert/server/src/MunitionsExpert.ts similarity index 77% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/src/MunitionsExpert.ts rename to Faupi-MunitionsExpert/server/src/MunitionsExpert.ts index 9a3a9d7..a8a3529 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/src/MunitionsExpert.ts +++ b/Faupi-MunitionsExpert/server/src/MunitionsExpert.ts @@ -1,43 +1,44 @@ import type { DependencyContainer } from "tsyringe"; -import { IMod } from "@spt-aki/models/external/mod"; +import { IPreAkiLoadMod } from "@spt-aki/models/external/IPreAkiLoadMod"; +import { IPostAkiLoadMod } from "@spt-aki/models/external/IPostAkiLoadMod"; import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; import { DynamicRouterModService } from "@spt-aki/services/mod/dynamicRouter/DynamicRouterModService" import { DatabaseServer } from "@spt-aki/servers/DatabaseServer" import { JsonUtil } from "@spt-aki/utils/JsonUtil" -import { InitialModLoader } from "@spt-aki/loaders/InitialModLoader" import { IDatabaseTables } from "@spt-aki/models/spt/server/IDatabaseTables"; +import { PreAkiModLoader } from "@spt-aki/loaders/PreAkiModLoader"; -class MunitionsExpert implements IMod +class MunitionsExpert implements IPreAkiLoadMod, IPostAkiLoadMod { private logger: ILogger; private database: DatabaseServer; private router: DynamicRouterModService; private json: JsonUtil; - private modLoader: InitialModLoader; + private modLoader: PreAkiModLoader; private table: IDatabaseTables; private globalLocale: { [x: string]: { interface: { [x: string]: any; }; }; }; - private mod: { name: string; version: any; }; + private mod: { name: string; version: any; author: any;}; private translations: { [x: string]: any; }; private items: { [x: string]: any; }; private path: { resolve: (arg0: string) => any; }; private cfg: { BulletBackgroundColours: boolean; }; - public load(container: DependencyContainer) + public preAkiLoad(container: DependencyContainer) { this.router = container.resolve("DynamicRouterModService"); this.logger = container.resolve("WinstonLogger"); this.json = container.resolve("JsonUtil"); this.mod = require("../package.json"); this.translations = require("../res/translations.json"); - this.logger.info(`Loading: ${this.mod.name} ${this.mod.version}`); + this.logger.info(`Loading: ${this.mod.author}: ${this.mod.name} ${this.mod.version}`); this.path = require("path"); this.cfg = require("./config.json"); this.hookRoutes(); } - public delayedLoad(container: DependencyContainer) + public postAkiLoad(container: DependencyContainer) { - this.modLoader = container.resolve("InitialModLoader"); + this.modLoader = container.resolve("PreAkiModLoader"); this.database = container.resolve("DatabaseServer"); this.table = this.database.getTables(); this.globalLocale = this.table.locales.global; @@ -74,7 +75,7 @@ class MunitionsExpert implements IMod url: "/MunitionsExpert/GetInfo", action: (url, info, sessionId, output) => { - return this.getModInfo(url, info, sessionId, output) + return this.json.serialize(this.path.resolve(this.modLoader.getModPath("Faupi-MunitionsExpert 1.6.0"))); } } ], @@ -82,19 +83,6 @@ class MunitionsExpert implements IMod ) } - getModInfo(url: string, info: any, sessionID: string, output: string) - { - const modOutput = { - status: 1, - data: null - }; - - modOutput.data = {...this.mod, ...{path: this.path.resolve(this.modLoader.getModPath(this.mod.name))}}; - modOutput.status = 0; - - return this.json.serialize(modOutput); - } - changeBulletColour() { if (this.cfg.BulletBackgroundColours === true) @@ -122,4 +110,5 @@ class MunitionsExpert implements IMod } } -module.exports = { mod: new MunitionsExpert() }; \ No newline at end of file +module.exports = { mod: new MunitionsExpert() }; + diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/src/config.json b/Faupi-MunitionsExpert/server/src/config.json similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/src/config.json rename to Faupi-MunitionsExpert/server/src/config.json diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/tsconfig.json b/Faupi-MunitionsExpert/server/tsconfig.json similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/tsconfig.json rename to Faupi-MunitionsExpert/server/tsconfig.json diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/Program.d.ts b/Faupi-MunitionsExpert/server/types/Program.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/Program.d.ts rename to Faupi-MunitionsExpert/server/types/Program.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/TYPES.d.ts b/Faupi-MunitionsExpert/server/types/TYPES.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/TYPES.d.ts rename to Faupi-MunitionsExpert/server/types/TYPES.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/Utils.d.ts b/Faupi-MunitionsExpert/server/types/Utils.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/Utils.d.ts rename to Faupi-MunitionsExpert/server/types/Utils.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/BotCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/BotCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/BotCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/BotCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/BundleCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/BundleCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/BundleCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/BundleCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/CustomizationCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/CustomizationCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/CustomizationCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/CustomizationCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/DataCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/DataCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/DataCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/DataCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/DialogueCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/DialogueCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/DialogueCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/DialogueCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/GameCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/GameCallbacks.d.ts similarity index 90% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/GameCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/GameCallbacks.d.ts index d5cad76..06da1b5 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/GameCallbacks.d.ts +++ b/Faupi-MunitionsExpert/server/types/callbacks/GameCallbacks.d.ts @@ -2,6 +2,7 @@ import { GameController } from "../controllers/GameController"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; import { IGameEmptyCrcRequestData } from "../models/eft/game/IGameEmptyCrcRequestData"; +import { IReportNicknameRequestData } from "../models/eft/game/IReportNicknameRequestData"; import { IVersionValidateRequestData } from "../models/eft/game/IVersionValidateRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; @@ -20,5 +21,6 @@ declare class GameCallbacks { validateGameVersion(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; gameKeepalive(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getVersion(url: string, info: IEmptyRequestData, sessionID: string): string; + reportNickname(url: string, info: IReportNicknameRequestData, sessionID: string): INullResponseData; } export { GameCallbacks }; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/HandbookCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/HandbookCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/HandbookCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/HandbookCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/HealthCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/HealthCallbacks.d.ts similarity index 85% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/HealthCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/HealthCallbacks.d.ts index 8f7b89d..8672be7 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/HealthCallbacks.d.ts +++ b/Faupi-MunitionsExpert/server/types/callbacks/HealthCallbacks.d.ts @@ -13,6 +13,13 @@ export declare class HealthCallbacks { protected profileHelper: ProfileHelper; protected healthController: HealthController; constructor(httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, healthController: HealthController); + /** + * Custom aki server request found in modules/HealthSynchronizer.cs + * @param url + * @param info HealthListener.Instance.CurrentHealth class + * @param sessionID session id + * @returns empty response, no data sent back to client + */ syncHealth(url: string, info: ISyncHealthRequestData, sessionID: string): IGetBodyResponseData; offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): IItemEventRouterResponse; offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/HideoutCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/HideoutCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/HideoutCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/HideoutCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/HttpCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/HttpCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/HttpCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/HttpCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/InraidCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/InraidCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/InraidCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/InraidCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/InsuranceCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/InsuranceCallbacks.d.ts similarity index 89% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/InsuranceCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/InsuranceCallbacks.d.ts index 520d0eb..6819960 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/InsuranceCallbacks.d.ts +++ b/Faupi-MunitionsExpert/server/types/callbacks/InsuranceCallbacks.d.ts @@ -3,6 +3,7 @@ import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; 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"; @@ -17,7 +18,7 @@ export declare class InsuranceCallbacks extends OnLoadOnUpdate { protected insuranceConfig: IInsuranceConfig; constructor(insuranceController: InsuranceController, insuranceService: InsuranceService, httpResponse: HttpResponseUtil, configServer: ConfigServer); onLoad(): void; - getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): IGetBodyResponseData; + getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): IGetBodyResponseData; insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse; onUpdate(secondsSinceLastRun: number): boolean; getRoute(): string; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/InventoryCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/InventoryCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/InventoryCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/InventoryCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/ItemEventCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/ItemEventCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/ItemEventCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/ItemEventCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/LauncherCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/LauncherCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/LauncherCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/LauncherCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/LocationCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/LocationCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/LocationCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/LocationCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/MatchCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/MatchCallbacks.d.ts similarity index 52% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/MatchCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/MatchCallbacks.d.ts index 083c1f5..2a92ef5 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/MatchCallbacks.d.ts +++ b/Faupi-MunitionsExpert/server/types/callbacks/MatchCallbacks.d.ts @@ -1,10 +1,17 @@ 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 { 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 { IJoinMatchRequestData } from "../models/eft/match/IJoinMatchRequestData"; +import { IJoinMatchResult } from "../models/eft/match/IJoinMatchResult"; +import { IPutMetricsRequestData } from "../models/eft/match/IPutMetricsRequestData"; import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { IUpdatePingRequestData } from "../models/eft/match/IUpdatePingRequestData"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; @@ -14,21 +21,21 @@ export declare class MatchCallbacks { protected matchController: MatchController; protected databaseServer: DatabaseServer; constructor(httpResponse: HttpResponseUtil, jsonUtil: JsonUtil, matchController: MatchController, databaseServer: DatabaseServer); - updatePing(url: string, info: any, sessionID: string): INullResponseData; - exitMatch(url: string, info: any, sessionID: string): INullResponseData; - exitToMenu(url: string, info: any, sessionID: string): INullResponseData; - startGroupSearch(url: string, info: any, sessionID: string): INullResponseData; - stopGroupSearch(url: string, info: any, sessionID: string): INullResponseData; + updatePing(url: string, info: IUpdatePingRequestData, sessionID: string): INullResponseData; + exitMatch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; + exitToMenu(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; + startGroupSearch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; + stopGroupSearch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; sendGroupInvite(url: string, info: any, sessionID: string): INullResponseData; acceptGroupInvite(url: string, info: any, sessionID: string): INullResponseData; cancelGroupInvite(url: string, info: any, sessionID: string): INullResponseData; - putMetrics(url: string, info: any, sessionID: string): INullResponseData; + putMetrics(url: string, info: IPutMetricsRequestData, sessionID: string): INullResponseData; getProfile(url: string, info: IGetProfileRequestData, sessionID: string): IGetBodyResponseData; - serverAvailable(url: string, info: any, sessionID: string): IGetBodyResponseData | IGetBodyResponseData; - joinMatch(url: string, info: any, sessionID: string): IGetBodyResponseData; + serverAvailable(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData | IGetBodyResponseData; + joinMatch(url: string, info: IJoinMatchRequestData, sessionID: string): IGetBodyResponseData; getMetrics(url: string, info: any, sessionID: string): IGetBodyResponseData; - getGroupStatus(url: string, info: any, sessionID: string): IGetBodyResponseData; - createGroup(url: string, info: any, sessionID: string): IGetBodyResponseData; + getGroupStatus(url: string, info: IGetGroupStatusRequestData, sessionID: string): IGetBodyResponseData; + createGroup(url: string, info: ICreateGroupRequestData, sessionID: string): IGetBodyResponseData; deleteGroup(url: string, info: any, sessionID: string): INullResponseData; startOfflineRaid(url: string, info: IStartOfflineRaidRequestData, sessionID: string): INullResponseData; endOfflineRaid(url: string, info: IEndOfflineRaidRequestData, sessionID: string): INullResponseData; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/ModCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/ModCallbacks.d.ts similarity index 81% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/ModCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/ModCallbacks.d.ts index 866abf7..58342dc 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/callbacks/ModCallbacks.d.ts +++ b/Faupi-MunitionsExpert/server/types/callbacks/ModCallbacks.d.ts @@ -1,5 +1,5 @@ import { OnLoad } from "../di/OnLoad"; -import { DelayedModLoader } from "../loaders/DelayedModLoader"; +import { PostAkiModLoader } from "../loaders/PostAkiModLoader"; import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { IHttpServer } from "../models/spt/server/IHttpServer"; import { ILogger } from "../models/spt/utils/ILogger"; @@ -9,10 +9,10 @@ declare class ModCallbacks extends OnLoad { protected logger: ILogger; protected httpResponse: HttpResponseUtil; protected httpServer: IHttpServer; - protected modLoader: DelayedModLoader; + protected postAkiModLoader: PostAkiModLoader; protected configServer: ConfigServer; protected httpConfig: IHttpConfig; - constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, modLoader: DelayedModLoader, configServer: ConfigServer); + constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, postAkiModLoader: PostAkiModLoader, configServer: ConfigServer); onLoad(): void; getRoute(): string; sendBundle(sessionID: string, req: any, resp: any, body: any): void; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/NoteCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/NoteCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/NoteCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/NoteCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/NotifierCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/NotifierCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/NotifierCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/NotifierCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/PresetBuildCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/PresetBuildCallbacks.d.ts similarity index 84% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/PresetBuildCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/PresetBuildCallbacks.d.ts index 8a0c155..541715a 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/PresetBuildCallbacks.d.ts +++ b/Faupi-MunitionsExpert/server/types/callbacks/PresetBuildCallbacks.d.ts @@ -1,4 +1,5 @@ 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"; @@ -9,7 +10,7 @@ export declare class PresetBuildCallbacks { protected httpResponse: HttpResponseUtil; protected presetBuildController: PresetBuildController; constructor(httpResponse: HttpResponseUtil, presetBuildController: PresetBuildController); - getHandbookUserlist(url: string, info: any, sessionID: string): IGetBodyResponseData; + getHandbookUserlist(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; saveBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse; removeBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/PresetCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/PresetCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/PresetCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/PresetCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/ProfileCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/ProfileCallbacks.d.ts similarity index 87% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/ProfileCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/ProfileCallbacks.d.ts index 116e7c5..6a86fc0 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/ProfileCallbacks.d.ts +++ b/Faupi-MunitionsExpert/server/types/callbacks/ProfileCallbacks.d.ts @@ -3,6 +3,7 @@ import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; 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 { IProfileChangeNicknameRequestData } from "../models/eft/profile/IProfileChangeNicknameRequestData"; import { IProfileChangeVoiceRequestData } from "../models/eft/profile/IProfileChangeVoiceRequestData"; import { IProfileCreateRequestData } from "../models/eft/profile/IProfileCreateRequestData"; @@ -23,7 +24,14 @@ export declare class ProfileCallbacks { changeNickname(url: string, info: IProfileChangeNicknameRequestData, sessionID: string): IGetBodyResponseData; validateNickname(url: string, info: IValidateNicknameRequestData, sessionID: string): IGetBodyResponseData; getReservedNickname(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; - getProfileStatus(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; + /** + * Called when creating a character, when you choose a character face/voice + * @param url + * @param info response (empty) + * @param sessionID + * @returns + */ + getProfileStatus(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; searchFriend(url: string, info: ISearchFriendRequestData, sessionID: string): IGetBodyResponseData; getMiniProfile(url: string, info: IGetMiniProfileRequestData, sessionID: string): string; getAllMiniProfiles(url: string, info: any, sessionID: string): string; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/QuestCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/QuestCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/QuestCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/QuestCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/RagfairCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/RagfairCallbacks.d.ts similarity index 89% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/RagfairCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/RagfairCallbacks.d.ts index d5bab8b..3a405c9 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/callbacks/RagfairCallbacks.d.ts +++ b/Faupi-MunitionsExpert/server/types/callbacks/RagfairCallbacks.d.ts @@ -9,8 +9,10 @@ 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 { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; @@ -28,12 +30,12 @@ export declare class RagfairCallbacks extends OnLoadOnUpdate { constructor(httpResponse: HttpResponseUtil, logger: ILogger, jsonUtil: JsonUtil, ragfairServer: RagfairServer, ragfairController: RagfairController, configServer: ConfigServer); onLoad(): void; getRoute(): string; - search(url: string, info: ISearchRequestData, sessionID: string): IGetBodyResponseData; + search(url: string, info: ISearchRequestData, sessionID: string): IGetBodyResponseData; getMarketPrice(url: string, info: IGetMarketPriceRequestData, sessionID: string): IGetBodyResponseData; getItemPrices(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; addOffer(pmcData: IPmcData, info: IAddOfferRequestData, sessionID: string): IItemEventRouterResponse; removeOffer(pmcData: IPmcData, info: IRemoveOfferRequestData, sessionID: string): IItemEventRouterResponse; extendOffer(pmcData: IPmcData, info: IExtendOfferRequestData, sessionID: string): IItemEventRouterResponse; onUpdate(timeSinceLastRun: number): boolean; - sendReport(url: string, info: any, sessionID: string): INullResponseData; + sendReport(url: string, info: ISendRagfairReportRequestData, sessionID: string): INullResponseData; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/RepairCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/RepairCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/RepairCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/RepairCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/SaveCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/SaveCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/SaveCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/SaveCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/TradeCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/TradeCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/TradeCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/TradeCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/TraderCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/TraderCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/TraderCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/TraderCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/WeatherCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/WeatherCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/WeatherCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/WeatherCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/WishlistCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/callbacks/WishlistCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/callbacks/WishlistCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/callbacks/WishlistCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/BotController.d.ts b/Faupi-MunitionsExpert/server/types/controllers/BotController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/BotController.d.ts rename to Faupi-MunitionsExpert/server/types/controllers/BotController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/CustomizationController.d.ts b/Faupi-MunitionsExpert/server/types/controllers/CustomizationController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/CustomizationController.d.ts rename to Faupi-MunitionsExpert/server/types/controllers/CustomizationController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/DialogueController.d.ts b/Faupi-MunitionsExpert/server/types/controllers/DialogueController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/DialogueController.d.ts rename to Faupi-MunitionsExpert/server/types/controllers/DialogueController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/GameController.d.ts b/Faupi-MunitionsExpert/server/types/controllers/GameController.d.ts similarity index 53% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/GameController.d.ts rename to Faupi-MunitionsExpert/server/types/controllers/GameController.d.ts index b9067fa..85ec418 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/GameController.d.ts +++ b/Faupi-MunitionsExpert/server/types/controllers/GameController.d.ts @@ -1,32 +1,28 @@ import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IPmcDataRepeatableQuest, IRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { ICoreConfig } from "../models/spt/config/ICoreConfig"; import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; +import { LocaleService } from "../services/LocaleService"; +import { ProfileFixerService } from "../services/ProfileFixerService"; import { Watermark } from "../utils/Watermark"; export declare class GameController { protected logger: ILogger; protected watermark: Watermark; protected httpServerHelper: HttpServerHelper; + protected localeService: LocaleService; protected profileHelper: ProfileHelper; + protected profileFixerService: ProfileFixerService; protected configServer: ConfigServer; protected httpConfig: IHttpConfig; - constructor(logger: ILogger, watermark: Watermark, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); + protected coreConfig: ICoreConfig; + constructor(logger: ILogger, watermark: Watermark, httpServerHelper: HttpServerHelper, localeService: LocaleService, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, configServer: ConfigServer); gameStart(_url: string, _info: IEmptyRequestData, sessionID: string): void; - protected addMissingBonusesProperty(pmcProfile: IPmcData): void; - protected addMissingRepeatableQuestsProperty(pmcProfile: IPmcData): void; - protected addMissingWeaponRepairSkill(pmcProfile: IPmcData): void; - protected addMissingAkiVersionTagToProfile(fullProfile: IAkiProfile): void; - protected addMissingArmorRepairSkill(pmcProfile: IPmcData): void; - protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; - protected removeDanglingConditionCounters(pmcProfile: IPmcData): void; - protected removeDanglingBackendCounters(pmcProfile: IPmcData): void; + protected logProfileDetails(fullProfile: IAkiProfile): void; getGameConfig(sessionID: string): IGameConfigResponse; getServer(): any[]; - protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/HandbookController.d.ts b/Faupi-MunitionsExpert/server/types/controllers/HandbookController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/HandbookController.d.ts rename to Faupi-MunitionsExpert/server/types/controllers/HandbookController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/HealthController.d.ts b/Faupi-MunitionsExpert/server/types/controllers/HealthController.d.ts similarity index 74% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/HealthController.d.ts rename to Faupi-MunitionsExpert/server/types/controllers/HealthController.d.ts index aafb8df..cc13603 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/HealthController.d.ts +++ b/Faupi-MunitionsExpert/server/types/controllers/HealthController.d.ts @@ -18,8 +18,29 @@ export declare class HealthController { protected inventoryHelper: InventoryHelper; protected healthHelper: HealthHelper; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, itemHelper: ItemHelper, paymentService: PaymentService, inventoryHelper: InventoryHelper, healthHelper: HealthHelper); - saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string): void; + /** + * stores in-raid player health + * @param pmcData Player profile + * @param info Request data + * @param sessionID + * @param addEffects Should effects found be added or removed from profile + */ + saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string, addEffects?: boolean): void; + /** + * When healing in menu + * @param pmcData + * @param body + * @param sessionID + * @returns + */ offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse; offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Occurs on post-raid healing page + * @param pmcData player profile + * @param info Request data from client + * @param sessionID Session id + * @returns + */ healthTreatment(pmcData: IPmcData, info: IHealthTreatmentRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/HideoutController.d.ts b/Faupi-MunitionsExpert/server/types/controllers/HideoutController.d.ts similarity index 81% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/HideoutController.d.ts rename to Faupi-MunitionsExpert/server/types/controllers/HideoutController.d.ts index a8bf229..f2930ff 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/HideoutController.d.ts +++ b/Faupi-MunitionsExpert/server/types/controllers/HideoutController.d.ts @@ -3,10 +3,12 @@ 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, IPmcData, Product } from "../models/eft/common/IPmcData"; import { HideoutUpgradeCompleteRequestData } from "../models/eft/hideout/HideoutUpgradeCompleteRequestData"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; +import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction"; import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData"; +import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; import { IHideoutTakeItemOutRequestData } from "../models/eft/hideout/IHideoutTakeItemOutRequestData"; @@ -47,11 +49,20 @@ export declare class HideoutController { upgradeComplete(pmcData: IPmcData, body: HideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse; putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; takeItemsFromAreaSlots(pmcData: IPmcData, body: IHideoutTakeItemOutRequestData, sessionID: string): IItemEventRouterResponse; + protected removeItemFromGenerator(sessionID: string, pmcData: IPmcData, body: IHideoutTakeItemOutRequestData, output: IItemEventRouterResponse, hideoutArea: HideoutArea): IItemEventRouterResponse; toggleArea(pmcData: IPmcData, body: IHideoutToggleAreaRequestData, sessionID: string): IItemEventRouterResponse; singleProductionStart(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData, sessionID: string): IItemEventRouterResponse; scavCaseProductionStart(pmcData: IPmcData, body: IHideoutScavCaseStartRequestData, sessionID: string): IItemEventRouterResponse; + protected getRandomisedItemRarityCounter(recipe: IHideoutScavCase): { + [x: string]: number; + }; + protected getRandomisedScavRewards(rarityItemCounter: { + [x: string]: number; + }): Product[]; continuousProductionStart(pmcData: IPmcData, body: IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; takeProduction(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; + protected handleRecipie(sessionID: string, recipe: IHideoutProduction, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; + protected handleScavCase(sessionID: string, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; update(): void; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/InraidController.d.ts b/Faupi-MunitionsExpert/server/types/controllers/InraidController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/InraidController.d.ts rename to Faupi-MunitionsExpert/server/types/controllers/InraidController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/InsuranceController.d.ts b/Faupi-MunitionsExpert/server/types/controllers/InsuranceController.d.ts similarity index 88% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/InsuranceController.d.ts rename to Faupi-MunitionsExpert/server/types/controllers/InsuranceController.d.ts index db2c567..af45442 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/InsuranceController.d.ts +++ b/Faupi-MunitionsExpert/server/types/controllers/InsuranceController.d.ts @@ -3,6 +3,7 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; 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"; @@ -33,6 +34,12 @@ export declare class InsuranceController { insuranceService: InsuranceService, configServer: ConfigServer); processReturn(): void; insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse; - cost(info: IGetInsuranceCostRequestData, sessionID: string): any; + /** + * Calculate insurance cost + * @param info request object + * @param sessionID session id + * @returns response object to send to client + */ + cost(info: IGetInsuranceCostRequestData, sessionID: string): IGetInsuranceCostResponseData; doAbsolutelyNothing(): void; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/InventoryController.d.ts b/Faupi-MunitionsExpert/server/types/controllers/InventoryController.d.ts similarity index 87% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/InventoryController.d.ts rename to Faupi-MunitionsExpert/server/types/controllers/InventoryController.d.ts index b732aa9..f57f731 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/InventoryController.d.ts +++ b/Faupi-MunitionsExpert/server/types/controllers/InventoryController.d.ts @@ -24,6 +24,8 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { FenceService } from "../services/FenceService"; +import { RagfairOfferService } from "../services/RagfairOfferService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class InventoryController { @@ -31,12 +33,14 @@ export declare class InventoryController { protected hashUtil: HashUtil; protected jsonUtil: JsonUtil; protected databaseServer: DatabaseServer; + protected fenceService: FenceService; protected presetHelper: PresetHelper; protected inventoryHelper: InventoryHelper; + protected ragfairOfferService: RagfairOfferService; protected profileHelper: ProfileHelper; protected paymentHelper: PaymentHelper; protected itemEventRouter: ItemEventRouter; - constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, presetHelper: PresetHelper, inventoryHelper: InventoryHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter); + constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, fenceService: FenceService, presetHelper: PresetHelper, inventoryHelper: InventoryHelper, ragfairOfferService: RagfairOfferService, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter); /** * Move Item * change location of item with parentId and slotId @@ -93,9 +97,19 @@ export declare class InventoryController { tagItem(pmcData: IPmcData, body: IInventoryTagRequestData, sessionID: string): IItemEventRouterResponse; bindItem(pmcData: IPmcData, body: IInventoryBindRequestData, sessionID: string): IItemEventRouterResponse; /** - * Handles examining of the item * + * Handles examining an item + * @param pmcData player profile + * @param body request object + * @param sessionID session id + * @returns response */ examineItem(pmcData: IPmcData, body: IInventoryExamineRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Get the tplid of an item from the examine request object + * @param body response request + * @returns tplid + */ + protected getExaminedItemTpl(body: IInventoryExamineRequestData): string; readEncyclopedia(pmcData: IPmcData, body: IInventoryReadEncyclopediaRequestData, sessionID: string): IItemEventRouterResponse; /** * Handles sorting of Inventory. diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/LauncherController.d.ts b/Faupi-MunitionsExpert/server/types/controllers/LauncherController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/LauncherController.d.ts rename to Faupi-MunitionsExpert/server/types/controllers/LauncherController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/LocationController.d.ts b/Faupi-MunitionsExpert/server/types/controllers/LocationController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/LocationController.d.ts rename to Faupi-MunitionsExpert/server/types/controllers/LocationController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/MatchController.d.ts b/Faupi-MunitionsExpert/server/types/controllers/MatchController.d.ts similarity index 65% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/MatchController.d.ts rename to Faupi-MunitionsExpert/server/types/controllers/MatchController.d.ts index c322d96..0851ab0 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/MatchController.d.ts +++ b/Faupi-MunitionsExpert/server/types/controllers/MatchController.d.ts @@ -1,30 +1,36 @@ 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 { IJoinMatchRequestData } from "../models/eft/match/IJoinMatchRequestData"; +import { IJoinMatchResult } from "../models/eft/match/IJoinMatchResult"; import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; import { IInRaidConfig } from "../models/spt/config/IInRaidConfig"; import { IMatchConfig } from "../models/spt/config/IMatchConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { SaveServer } from "../servers/SaveServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; import { MatchLocationService } from "../services/MatchLocationService"; export declare class MatchController { protected saveServer: SaveServer; protected profileHelper: ProfileHelper; protected matchLocationService: MatchLocationService; protected traderHelper: TraderHelper; + protected botLootCacheService: BotLootCacheService; protected configServer: ConfigServer; protected matchConfig: IMatchConfig; protected inraidConfig: IInRaidConfig; - constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, configServer: ConfigServer); + constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer); getEnabled(): boolean; getProfile(info: IGetProfileRequestData): IPmcData[]; - protected getMatch(location: any): any; - createGroup(sessionID: string, info: any): any; + createGroup(sessionID: string, info: ICreateGroupRequestData): any; deleteGroup(info: any): void; - joinMatch(info: any, sessionID: string): any[]; - getGroupStatus(info: any): any; + joinMatch(info: IJoinMatchRequestData, sessionID: string): IJoinMatchResult[]; + protected getMatch(location: string): any; + getGroupStatus(info: IGetGroupStatusRequestData): any; startOfflineRaid(info: IStartOfflineRaidRequestData, sessionID: string): void; endOfflineRaid(info: IEndOfflineRaidRequestData, sessionID: string): void; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/NoteController.d.ts b/Faupi-MunitionsExpert/server/types/controllers/NoteController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/NoteController.d.ts rename to Faupi-MunitionsExpert/server/types/controllers/NoteController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/NotifierController.d.ts b/Faupi-MunitionsExpert/server/types/controllers/NotifierController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/NotifierController.d.ts rename to Faupi-MunitionsExpert/server/types/controllers/NotifierController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/PresetBuildController.d.ts b/Faupi-MunitionsExpert/server/types/controllers/PresetBuildController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/PresetBuildController.d.ts rename to Faupi-MunitionsExpert/server/types/controllers/PresetBuildController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/PresetController.d.ts b/Faupi-MunitionsExpert/server/types/controllers/PresetController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/PresetController.d.ts rename to Faupi-MunitionsExpert/server/types/controllers/PresetController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/ProfileController.d.ts b/Faupi-MunitionsExpert/server/types/controllers/ProfileController.d.ts similarity index 83% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/ProfileController.d.ts rename to Faupi-MunitionsExpert/server/types/controllers/ProfileController.d.ts index 9b7a6d5..b40bb7d 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/ProfileController.d.ts +++ b/Faupi-MunitionsExpert/server/types/controllers/ProfileController.d.ts @@ -11,6 +11,7 @@ import { ISearchFriendResponse } from "../models/eft/profile/ISearchFriendRespon import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { ProfileFixerService } from "../services/ProfileFixerService"; import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class ProfileController { @@ -19,13 +20,20 @@ export declare class ProfileController { protected saveServer: SaveServer; protected databaseServer: DatabaseServer; protected itemHelper: ItemHelper; + protected profileFixerService: ProfileFixerService; protected traderHelper: TraderHelper; protected extendedProfileHelper: ExtendedProfileHelper; - constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, traderHelper: TraderHelper, extendedProfileHelper: ExtendedProfileHelper); + constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileFixerService: ProfileFixerService, traderHelper: TraderHelper, extendedProfileHelper: ExtendedProfileHelper); getMiniProfiles(): IMiniProfile[]; getMiniProfile(sessionID: string): any; getCompleteProfile(sessionID: string): IPmcData[]; createProfile(info: IProfileCreateRequestData, sessionID: string): void; + /** + * Generate a player scav object + * pmc profile MUST exist first before pscav can be generated + * @param sessionID + * @returns IPmcData object + */ generatePlayerScav(sessionID: string): IPmcData; validateNickname(info: IValidateNicknameRequestData, sessionID: string): string; changeNickname(info: IProfileChangeNicknameRequestData, sessionID: string): string; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/QuestController.d.ts b/Faupi-MunitionsExpert/server/types/controllers/QuestController.d.ts similarity index 59% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/QuestController.d.ts rename to Faupi-MunitionsExpert/server/types/controllers/QuestController.d.ts index e588de0..2cbccfb 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/QuestController.d.ts +++ b/Faupi-MunitionsExpert/server/types/controllers/QuestController.d.ts @@ -4,7 +4,7 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { QuestConditionHelper } from "../helpers/QuestConditionHelper"; import { QuestHelper } from "../helpers/QuestHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IQuest } from "../models/eft/common/tables/IQuest"; +import { IQuest, Reward } from "../models/eft/common/tables/IQuest"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; @@ -14,6 +14,7 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { LocaleService } from "../services/LocaleService"; import { PlayerService } from "../services/PlayerService"; import { TimeUtil } from "../utils/TimeUtil"; export declare class QuestController { @@ -27,12 +28,49 @@ export declare class QuestController { protected questHelper: QuestHelper; protected questConditionHelper: QuestConditionHelper; protected playerService: PlayerService; + protected localeService: LocaleService; protected configServer: ConfigServer; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, questConditionHelper: QuestConditionHelper, playerService: PlayerService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, questConditionHelper: QuestConditionHelper, playerService: PlayerService, localeService: LocaleService, configServer: ConfigServer); + /** + * Get all quests visible to player + * Exclude quests with incomplete preconditions (level/loyalty) + * @param sessionID session id + * @returns array of IQuest + */ getClientQuests(sessionID: string): IQuest[]; acceptQuest(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse; acceptRepeatableQuest(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Remove completed quest from profile + * Add newly unlocked quests to profile + * Also recalculate thier level due to exp rewards + * @param pmcData Player profile + * @param body completed quest request + * @param sessionID session id + * @returns ItemEvent response + */ completeQuest(pmcData: IPmcData, body: ICompleteQuestRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Send a popup to player on completion of a quest + * @param sessionID session id + * @param pmcData player profile + * @param completedQuestId completed quest id + * @param questRewards rewards given to player + */ + protected sendDialogMessageOnQuestComplete(sessionID: string, pmcData: IPmcData, completedQuestId: string, questRewards: Reward[]): 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 quests provided + * @param sessionID session id + * @param pmcData player profile + * @param questsToFail quests to fail + */ + protected failQuests(sessionID: string, pmcData: IPmcData, questsToFail: IQuest[]): void; handoverQuest(pmcData: IPmcData, body: IHandoverQuestRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/RagfairController.d.ts b/Faupi-MunitionsExpert/server/types/controllers/RagfairController.d.ts similarity index 97% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/RagfairController.d.ts rename to Faupi-MunitionsExpert/server/types/controllers/RagfairController.d.ts index c758593..c4ffc15 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/controllers/RagfairController.d.ts +++ b/Faupi-MunitionsExpert/server/types/controllers/RagfairController.d.ts @@ -60,6 +60,8 @@ export declare class RagfairController { protected ragfairConfig: IRagfairConfig; constructor(logger: ILogger, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter, 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, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, ragfairOfferGenerator: RagfairOfferGenerator, configServer: ConfigServer); getOffers(sessionID: string, info: ISearchRequestData): IGetOffersResult; + protected isLinkedSearch(info: ISearchRequestData): boolean; + protected isRequiredSearch(info: ISearchRequestData): boolean; update(): void; getItemPrice(info: IGetMarketPriceRequestData): IGetItemPriceResult; addPlayerOffer(pmcData: IPmcData, info: IAddOfferRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/RepairController.d.ts b/Faupi-MunitionsExpert/server/types/controllers/RepairController.d.ts similarity index 92% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/RepairController.d.ts rename to Faupi-MunitionsExpert/server/types/controllers/RepairController.d.ts index e9458f6..330684d 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/RepairController.d.ts +++ b/Faupi-MunitionsExpert/server/types/controllers/RepairController.d.ts @@ -21,6 +21,7 @@ export declare class RepairController { protected repairHelper: RepairHelper; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; + protected readonly WEAPON_SKILL_REPAIR_GAIN: number; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, questHelper: QuestHelper, traderHelper: TraderHelper, paymentService: PaymentService, repairHelper: RepairHelper, configServer: ConfigServer); /** * Repair with trader @@ -37,5 +38,5 @@ export declare class RepairController { * @param sessionID session id * @returns item event router action */ - repair(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; + repairWithKit(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/RepeatableQuestController.d.ts b/Faupi-MunitionsExpert/server/types/controllers/RepeatableQuestController.d.ts similarity index 97% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/RepeatableQuestController.d.ts rename to Faupi-MunitionsExpert/server/types/controllers/RepeatableQuestController.d.ts index ce190aa..2bb2aa9 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/controllers/RepeatableQuestController.d.ts +++ b/Faupi-MunitionsExpert/server/types/controllers/RepeatableQuestController.d.ts @@ -15,6 +15,7 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { PaymentService } from "../services/PaymentService"; +import { ProfileFixerService } from "../services/ProfileFixerService"; import { JsonUtil } from "../utils/JsonUtil"; import { MathUtil } from "../utils/MathUtil"; import { ObjectId } from "../utils/ObjectId"; @@ -57,13 +58,14 @@ export declare class RepeatableQuestController { protected itemHelper: ItemHelper; protected presetHelper: PresetHelper; protected profileHelper: ProfileHelper; + protected profileFixerService: ProfileFixerService; protected ragfairServerHelper: RagfairServerHelper; protected itemEventRouter: ItemEventRouter; protected paymentService: PaymentService; protected objectId: ObjectId; protected configServer: ConfigServer; protected questConfig: IQuestConfig; - constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, itemEventRouter: ItemEventRouter, paymentService: PaymentService, objectId: ObjectId, configServer: ConfigServer); + constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, ragfairServerHelper: RagfairServerHelper, itemEventRouter: ItemEventRouter, paymentService: PaymentService, objectId: ObjectId, configServer: ConfigServer); /** * This is the method reached by the /client/repeatalbeQuests/activityPeriods endpoint * Returns an array of objects in the format of repeatable quests to the client. diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/TradeController.d.ts b/Faupi-MunitionsExpert/server/types/controllers/TradeController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/TradeController.d.ts rename to Faupi-MunitionsExpert/server/types/controllers/TradeController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/TraderController.d.ts b/Faupi-MunitionsExpert/server/types/controllers/TraderController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/TraderController.d.ts rename to Faupi-MunitionsExpert/server/types/controllers/TraderController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/WeatherController.d.ts b/Faupi-MunitionsExpert/server/types/controllers/WeatherController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/WeatherController.d.ts rename to Faupi-MunitionsExpert/server/types/controllers/WeatherController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/WishlistController.d.ts b/Faupi-MunitionsExpert/server/types/controllers/WishlistController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/controllers/WishlistController.d.ts rename to Faupi-MunitionsExpert/server/types/controllers/WishlistController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/di/Container.d.ts b/Faupi-MunitionsExpert/server/types/di/Container.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/di/Container.d.ts rename to Faupi-MunitionsExpert/server/types/di/Container.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/di/OnLoad.d.ts b/Faupi-MunitionsExpert/server/types/di/OnLoad.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/di/OnLoad.d.ts rename to Faupi-MunitionsExpert/server/types/di/OnLoad.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/di/OnLoadOnUpdate.d.ts b/Faupi-MunitionsExpert/server/types/di/OnLoadOnUpdate.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/di/OnLoadOnUpdate.d.ts rename to Faupi-MunitionsExpert/server/types/di/OnLoadOnUpdate.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/di/OnUpdate.d.ts b/Faupi-MunitionsExpert/server/types/di/OnUpdate.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/di/OnUpdate.d.ts rename to Faupi-MunitionsExpert/server/types/di/OnUpdate.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/di/Router.d.ts b/Faupi-MunitionsExpert/server/types/di/Router.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/di/Router.d.ts rename to Faupi-MunitionsExpert/server/types/di/Router.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/di/Serializer.d.ts b/Faupi-MunitionsExpert/server/types/di/Serializer.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/di/Serializer.d.ts rename to Faupi-MunitionsExpert/server/types/di/Serializer.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/generators/BotGenerator.d.ts b/Faupi-MunitionsExpert/server/types/generators/BotGenerator.d.ts similarity index 61% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/generators/BotGenerator.d.ts rename to Faupi-MunitionsExpert/server/types/generators/BotGenerator.d.ts index 88a8014..28f05a9 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/generators/BotGenerator.d.ts +++ b/Faupi-MunitionsExpert/server/types/generators/BotGenerator.d.ts @@ -31,16 +31,54 @@ export declare class BotGenerator { protected botConfig: IBotConfig; constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; + /** + * Choose if a bot should become a Pmc by checking if bot type is allowed to become a Pmc in bot config + * @param isPlayerScav is a player scav being generated, forces choice returned to never be a pmc + */ + protected shouldBotBePmc(isPlayerScav: boolean, role: string): boolean; + /** + * Get a randomised PMC side based on bot config value 'isUsec' + * @returns pmc side as string + */ + protected getRandomisedPmcSide(): string; + /** + * Get a clone of the database\bots\base.json file + * @returns IBotBase object + */ + protected getCloneOfBotBase(): IBotBase; protected generateBot(bot: IBotBase, role: string, isPmc: boolean): IBotBase; + /** + * Log the number of PMCs generated to the debug console + */ + protected logPmcGeneratedCount(output: IBotBase[]): void; protected generateRandomLevel(min: number, max: number): BotGenerator.IRandomisedBotLevelResult; - /** Converts health object to the required format */ + /** + * Converts health object to the required format + * @param healthObj health object from bot json + * @param playerScav Is a pscav bot being generated + * @returns PmcHealth object + */ protected generateHealth(healthObj: Health, playerScav?: boolean): PmcHealth; protected generateSkills(skillsObj: Skills): Skills; + /** + * Convert from pmc side (usec/bear) to the side as defined in the bot config (usecType/bearType) + * @param pmcSide eft side (usec/bear) + * @returns pmc side as defined in config + */ protected getPmcRole(pmcSide: string): string; + /** + * Iterate through bots inventory and loot to find and remove christmas items (as defined in GameEventHelper) + * @param nodeInventory Bots inventory to iterate over + */ protected removeChristmasItemsFromBotInventory(nodeInventory: Inventory): void; protected generateId(bot: IBotBase): IBotBase; protected generateInventoryID(profile: IBotBase): IBotBase; protected getPMCDifficulty(requestedDifficulty: string): 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; } export {}; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/generators/BotInventoryGenerator.d.ts b/Faupi-MunitionsExpert/server/types/generators/BotInventoryGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/generators/BotInventoryGenerator.d.ts rename to Faupi-MunitionsExpert/server/types/generators/BotInventoryGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/generators/BotLootGenerator.d.ts b/Faupi-MunitionsExpert/server/types/generators/BotLootGenerator.d.ts similarity index 66% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/generators/BotLootGenerator.d.ts rename to Faupi-MunitionsExpert/server/types/generators/BotLootGenerator.d.ts index 1d91836..2295f51 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/generators/BotLootGenerator.d.ts +++ b/Faupi-MunitionsExpert/server/types/generators/BotLootGenerator.d.ts @@ -1,29 +1,27 @@ -import { PMCLootGenerator } from "../generators/PMCLootGenerator"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; import { HandbookHelper } from "../helpers/HandbookHelper"; import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; import { ItemMinMax, Items } from "../models/eft/common/tables/IBotType"; 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 { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; export declare class BotLootGenerator { - protected jsonUtil: JsonUtil; + protected logger: ILogger; protected hashUtil: HashUtil; protected randomUtil: RandomUtil; protected databaseServer: DatabaseServer; protected handbookHelper: HandbookHelper; protected botGeneratorHelper: BotGeneratorHelper; - protected pmcLootGenerator: PMCLootGenerator; + protected botLootCacheService: BotLootCacheService; protected configServer: ConfigServer; protected botConfig: IBotConfig; - constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, pmcLootGenerator: PMCLootGenerator, configServer: ConfigServer); - generateLoot(lootPool: Items, itemCounts: ItemMinMax, isPmc: boolean, inventory: PmcInventory): void; + constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer); + generateLoot(lootPool: Items, itemCounts: ItemMinMax, isPmc: boolean, botRole: string, inventory: PmcInventory): void; protected getRandomisedCount(min: number, max: number, nValue: number): number; protected addLootFromPool(pool: ITemplateItem[], equipmentSlots: string[], count: number, inventory: PmcInventory, totalValueLimit?: number, useLimits?: boolean): void; - /** Compares two item templates by their price to spawn chance ratio */ - protected compareByValue(a: ITemplateItem, b: ITemplateItem): number; } diff --git a/Faupi-MunitionsExpert/server/types/generators/BotWeaponGenerator.d.ts b/Faupi-MunitionsExpert/server/types/generators/BotWeaponGenerator.d.ts new file mode 100644 index 0000000..80dc37c --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/generators/BotWeaponGenerator.d.ts @@ -0,0 +1,97 @@ +import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; +import { ItemHelper } from "../helpers/ItemHelper"; +import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; +import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { Inventory, MinMax, ModsChances } from "../models/eft/common/tables/IBotType"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HashUtil } from "../utils/HashUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +import { JsonUtil } from "../utils/JsonUtil"; +export declare class BotWeaponGenerator { + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected weightedRandomHelper: WeightedRandomHelper; + protected botGeneratorHelper: BotGeneratorHelper; + protected randomUtil: RandomUtil; + private readonly modMagazineSlotId; + constructor(jsonUtil: JsonUtil, logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil); + generateWeapon(equipmentSlot: string, templateInventory: Inventory, modChances: ModsChances, magCounts: MinMax, botRole: string, isPmc: boolean, inventory: PmcInventory): void; + /** + * Get the mods necessary to kit out a weapon to its preset level + * @param weaponTpl weapon to find preset for + * @param equipmentSlot the slot the weapon will be placed in + * @param weaponParentId + * @returns array of weapon mods + */ + protected getPresetWeaponMods(weaponTpl: string, equipmentSlot: string, weaponParentId: string, itemTemplate: ITemplateItem, botRole: string): Item[]; + /** Checks if all required slots are occupied on a weapon and all it's mods */ + protected isWeaponValid(itemList: Item[]): boolean; + /** + * Generates extra magazines or bullets (if magazine is internal) and adds them to TacticalVest and Pockets. + * Additionally, adds extra bullets to SecuredContainer + * @param weaponMods + * @param weaponTemplate + * @param magCounts + * @param ammoTpl + * @param inventory + * @returns + */ + protected generateExtraMagazines(weaponMods: Item[], weaponTemplate: ITemplateItem, magCounts: MinMax, ammoTpl: string, inventory: PmcInventory): void; + /** + * Get a randomised number of bullets for a specific magazine + * @param magCounts min and max count of magazines + * @param magTemplate magazine to generate bullet count for + * @returns bullet count number + */ + protected getRandomisedBulletCount(magCounts: MinMax, magTemplate: ITemplateItem): number; + /** + * Get a randomised count of magazines + * @param magCounts min and max value returned value can be between + * @returns numberical value of magazine count + */ + protected getRandomisedMagazineCount(magCounts: MinMax): number; + /** + * Add ammo to the secure container + * @param stackCount How many stacks of ammo to add + * @param ammoTpl Ammo type to add + * @param stackSize Size of the ammo stack to add + * @param inventory Player inventory + */ + protected addAmmoToSecureContainer(stackCount: number, ammoTpl: string, stackSize: number, inventory: PmcInventory): void; + /** + * Get a weapons magazine tpl from a weapon template + * @param weaponMods mods from a weapon template + * @param weaponTemplate Weapon to get magazine tpl for + * @returns magazine tpl string + */ + protected getMagazineTplFromWeaponTemplate(weaponMods: Item[], weaponTemplate: ITemplateItem): string; + protected addBulletsToVestAndPockets(ammoTpl: string, bulletCount: number, inventory: PmcInventory): void; + /** + * Finds and returns compatible ammo tpl + * + * @param {*} weaponMods + * @param {*} weaponTemplate + * @returns compatible ammo tpl + */ + protected getCompatibleAmmo(weaponMods: Item[], weaponTemplate: ITemplateItem): string; + /** + * Fill existing magazines to full, while replacing their contents with specified ammo + * @param weaponMods + * @param magazine + * @param ammoTpl + */ + protected fillExistingMagazines(weaponMods: Item[], magazine: Item, ammoTpl: string): void; + /** + * Fill each Camora with a bullet + * @param weaponMods Weapon mods to find and update camora mod(s) from + * @param magazineId magazine id to find and add to + * @param ammoTpl ammo template id to hydate with + */ + protected fillCamorasWithAmmo(weaponMods: Item[], magazineId: string, ammoTpl: string): void; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/generators/LocationGenerator.d.ts b/Faupi-MunitionsExpert/server/types/generators/LocationGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/generators/LocationGenerator.d.ts rename to Faupi-MunitionsExpert/server/types/generators/LocationGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/generators/PMCLootGenerator.d.ts b/Faupi-MunitionsExpert/server/types/generators/PMCLootGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/generators/PMCLootGenerator.d.ts rename to Faupi-MunitionsExpert/server/types/generators/PMCLootGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/generators/RagfairAssortGenerator.d.ts b/Faupi-MunitionsExpert/server/types/generators/RagfairAssortGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/generators/RagfairAssortGenerator.d.ts rename to Faupi-MunitionsExpert/server/types/generators/RagfairAssortGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/generators/RagfairOfferGenerator.d.ts b/Faupi-MunitionsExpert/server/types/generators/RagfairOfferGenerator.d.ts similarity index 91% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/generators/RagfairOfferGenerator.d.ts rename to Faupi-MunitionsExpert/server/types/generators/RagfairOfferGenerator.d.ts index de53ea9..3e7f4cc 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/generators/RagfairOfferGenerator.d.ts +++ b/Faupi-MunitionsExpert/server/types/generators/RagfairOfferGenerator.d.ts @@ -11,6 +11,7 @@ import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { FenceService } from "../services/FenceService"; +import { RagfairCategoriesService } from "../services/RagfairCategoriesService"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { RagfairPriceService } from "../services/RagfairPriceService"; import { HashUtil } from "../utils/HashUtil"; @@ -31,11 +32,12 @@ export declare class RagfairOfferGenerator { protected ragfairAssortGenerator: RagfairAssortGenerator; protected ragfairOfferService: RagfairOfferService; protected ragfairPriceService: RagfairPriceService; + protected ragfairCategoriesService: RagfairCategoriesService; protected fenceService: FenceService; protected itemHelper: ItemHelper; protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, saveServer: SaveServer, presetHelper: PresetHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferService: RagfairOfferService, ragfairPriceService: RagfairPriceService, fenceService: FenceService, itemHelper: ItemHelper, configServer: ConfigServer); + constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, saveServer: SaveServer, presetHelper: PresetHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferService: RagfairOfferService, ragfairPriceService: RagfairPriceService, ragfairCategoriesService: RagfairCategoriesService, fenceService: FenceService, itemHelper: ItemHelper, configServer: ConfigServer); createOffer(userID: string, time: number, items: Item[], barterScheme: IBarterScheme[], loyalLevel: number, price: number, sellInOnePiece?: boolean): IRagfairOffer; protected getTraderId(userID: string): string; protected getRating(userID: string): number; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/generators/WeatherGenerator.d.ts b/Faupi-MunitionsExpert/server/types/generators/WeatherGenerator.d.ts similarity index 69% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/generators/WeatherGenerator.d.ts rename to Faupi-MunitionsExpert/server/types/generators/WeatherGenerator.d.ts index 23aa169..44cecbb 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/generators/WeatherGenerator.d.ts +++ b/Faupi-MunitionsExpert/server/types/generators/WeatherGenerator.d.ts @@ -12,6 +12,19 @@ export declare class WeatherGenerator { protected weatherConfig: IWeatherConfig; constructor(weightedRandomHelper: WeightedRandomHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer); calculateTime(data: IWeatherData): IWeatherData; + /** + * Get server uptime seconds multiplied by a multiplier and add to current time as seconds + * Format to BSGs requirements + * @param computedDate current date + * @returns formatted time + */ + protected getAcceleratedTime(computedDate: Date): string; + /** + * Get current time formatted to fit BSGs requirement + * @param computedDate + * @returns + */ + protected getNormalTime(computedDate: Date): string; generateWeather(data: IWeatherData): IWeatherData; protected getWeightedFog(): string; protected getWeightedRain(): number; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/AssortHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/AssortHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/AssortHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/AssortHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/BotGeneratorHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/BotGeneratorHelper.d.ts similarity index 69% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/BotGeneratorHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/BotGeneratorHelper.d.ts index c382fc9..243e7a8 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/BotGeneratorHelper.d.ts +++ b/Faupi-MunitionsExpert/server/types/helpers/BotGeneratorHelper.d.ts @@ -13,11 +13,13 @@ import { RandomUtil } from "../utils/RandomUtil"; import { ContainerHelper } from "./ContainerHelper"; import { InventoryHelper } from "./InventoryHelper"; import { ItemHelper } from "./ItemHelper"; +import { ProbabilityHelper } from "./ProbabilityHelper"; export declare class BotGeneratorHelper { protected logger: ILogger; protected jsonUtil: JsonUtil; protected hashUtil: HashUtil; protected randomUtil: RandomUtil; + protected probabilityHelper: ProbabilityHelper; protected databaseServer: DatabaseServer; protected durabilityLimitsHelper: DurabilityLimitsHelper; protected itemHelper: ItemHelper; @@ -25,8 +27,42 @@ export declare class BotGeneratorHelper { protected containerHelper: ContainerHelper; protected configServer: ConfigServer; protected botConfig: IBotConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer); + constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, probabilityHelper: ProbabilityHelper, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer); generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances, isPmc?: boolean): Item[]; + /** + * Is this magazine cylinder related (revolvers and grenade launchers) + * @param magazineParentName the name of the magazines parent + * @returns true if it is cylinder related + */ + magazineIsCylinderRelated(magazineParentName: string): boolean; + /** + * Get a list of non black-listed cartridges from the PMC bot config + * @param modSlot mod item slot + * @param itemModPool + * @returns string array of cartridges PMCs can use + */ + protected getNonBlacklistedCartridges(modSlot: string, itemModPool: Record): string[]; + /** + * 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 + */ + protected shouldModBeSpawned(itemSlot: Slot, modSlot: string, modSpawnChances: ModsChances): boolean; + /** + * Get a list of containers that hold ammo + * @returns string array + */ + protected getAmmoContainers(): string[]; + /** + * Get the slot details for an item (chamber/cartridge/slot) + * @param modSlot e.g patron_in_weapon + * @param parentTemplate item template + * @returns + */ + protected getModItemSlot(modSlot: string, parentTemplate: ITemplateItem): Slot; /** * With the shotgun revolver (60db29ce99594040e04c4a27) 12.12 introduced CylinderMagazines. * Those magazines (e.g. 60dc519adf4c47305f6d410d) have a "Cartridges" entry with a _max_count=0. @@ -39,6 +75,12 @@ export declare class BotGeneratorHelper { * @param {object} parentTemplate The CylinderMagazine's template */ protected fillCamora(items: Item[], modPool: Mods, parentId: string, parentTemplate: 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 + */ + protected mergeCamoraPoolsTogether(camorasWithShells: Record): string[]; generateExtraPropertiesForItem(itemTemplate: ITemplateItem, botRole?: any): { upd?: Upd; }; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/BotHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/BotHelper.d.ts similarity index 97% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/BotHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/BotHelper.d.ts index 0cb1227..6b92566 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/BotHelper.d.ts +++ b/Faupi-MunitionsExpert/server/types/helpers/BotHelper.d.ts @@ -34,7 +34,7 @@ export declare class BotHelper { * @param difficultySettings bot settings to alter * @param typesToAdd bot type to add to enemy list */ - addBotToEnemyList(difficultySettings: Difficulty, typesToAdd: string[]): void; + addBotToEnemyList(difficultySettings: Difficulty, typesToAdd: string[], typeBeingEdited: string): void; /** * Add a bot to the REVENGE_BOT_TYPES array * @param difficultySettings bot settings to alter diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/ContainerHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/ContainerHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/ContainerHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/ContainerHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/DialogueHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/DialogueHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/DialogueHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/DialogueHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/DurabilityLimitsHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/DurabilityLimitsHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/DurabilityLimitsHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/DurabilityLimitsHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/ExtendedProfileHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/ExtendedProfileHelper.d.ts similarity index 76% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/ExtendedProfileHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/ExtendedProfileHelper.d.ts index d8b754d..c05d88e 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/ExtendedProfileHelper.d.ts +++ b/Faupi-MunitionsExpert/server/types/helpers/ExtendedProfileHelper.d.ts @@ -2,15 +2,20 @@ import { BotGenerator } from "../generators/BotGenerator"; import { IPmcData, Skills, Stats } from "../models/eft/common/IPmcData"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; import { FenceService } from "../services/FenceService"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { Watermark } from "../utils/Watermark"; import { ItemHelper } from "./ItemHelper"; import { ProfileHelper } from "./ProfileHelper"; +/** + * This class needs to exist outside of ProfileHelper to ensure cyclic deps don't cause the server to fail on load + */ export declare class ExtendedProfileHelper extends ProfileHelper { + protected botLootCacheService: BotLootCacheService; protected botGenerator: BotGenerator; - constructor(jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService, botGenerator: BotGenerator); + constructor(jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, botLootCacheService: BotLootCacheService, fenceService: FenceService, botGenerator: BotGenerator); generatePlayerScav(sessionID: string): IPmcData; protected getScavSkills(sessionID: string): Skills; protected removeSecureContainer(profile: IPmcData): IPmcData; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/GameEventHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/GameEventHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/GameEventHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/GameEventHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/HandbookHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/HandbookHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/HandbookHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/HandbookHelper.d.ts diff --git a/Faupi-MunitionsExpert/server/types/helpers/HealthHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/HealthHelper.d.ts new file mode 100644 index 0000000..3116c9c --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/helpers/HealthHelper.d.ts @@ -0,0 +1,51 @@ +import { IPmcData } from "../models/eft/common/IPmcData"; +import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { IHealthConfig } from "../models/spt/config/IHealthConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { SaveServer } from "../servers/SaveServer"; +import { JsonUtil } from "../utils/JsonUtil"; +import { TimeUtil } from "../utils/TimeUtil"; +export declare class HealthHelper { + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected saveServer: SaveServer; + protected configServer: ConfigServer; + protected healthConfig: IHealthConfig; + constructor(jsonUtil: JsonUtil, logger: ILogger, timeUtil: TimeUtil, saveServer: SaveServer, configServer: ConfigServer); + /** + * Resets the profiles vitality/healh and vitality/effects properties to their defaults + * @param sessionID Session Id + * @returns updated profile + */ + resetVitality(sessionID: string): IAkiProfile; + /** + * Update player profile with changes from request object + * @param pmcData Player profile + * @param info Request object + * @param sessionID Session id + * @param addEffects Should effects be added or removed (default - add) + */ + saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string, addEffects?: boolean): void; + protected saveHealth(pmcData: IPmcData, sessionID: string): void; + /** + * Save effects to profile + * Works by removing all effects and adding them back from profile + * Remoces empty 'Effects' objects if found + * @param pmcData Player profile + * @param sessionID Session id + * @param addEffects Should effects be added back to profile + * @returns + */ + protected saveEffects(pmcData: IPmcData, sessionID: string, addEffects: boolean): void; + /** + * Add effect to body part in profile + * @param pmcData Player profile + * @param effectBodyPart body part to edit + * @param effectType Effect to add to body part + */ + protected addEffect(pmcData: IPmcData, effectBodyPart: string, effectType: string): void; + protected isEmpty(map: any): boolean; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/HideoutHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/HideoutHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/HideoutHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/HideoutHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/HttpServerHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/HttpServerHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/HttpServerHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/HttpServerHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/InRaidHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/InRaidHelper.d.ts similarity index 80% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/InRaidHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/InRaidHelper.d.ts index 05b6fdf..58e0f6a 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/InRaidHelper.d.ts +++ b/Faupi-MunitionsExpert/server/types/helpers/InRaidHelper.d.ts @@ -28,6 +28,18 @@ export declare class InRaidHelper { markFoundItems(pmcData: IPmcData, profile: IPmcData, isPlayerScav: boolean): IPmcData; removeFoundInRaidStatusFromItems(profile: IPmcData): IPmcData; setInventory(sessionID: string, pmcData: IPmcData, profile: IPmcData): IPmcData; + /** + * Clear pmc inventory of all items except those that are exempt + * @param pmcData Player profile + * @param sessionID Session id + * @returns Player profile with pmc inventory cleared + */ deleteInventory(pmcData: IPmcData, sessionID: string): IPmcData; + /** + * Does the provided items slotId mean its kept on the player after death + * @param slotId slotid of item to check + * @returns true if item is kept after death + */ + isItemKeptAfterDeath(slotId: string): boolean; getPlayerGear(items: Item[]): Item[]; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/InventoryHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/InventoryHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/InventoryHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/InventoryHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/ItemHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/ItemHelper.d.ts similarity index 67% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/ItemHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/ItemHelper.d.ts index f124cb1..4e0eba4 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/ItemHelper.d.ts +++ b/Faupi-MunitionsExpert/server/types/helpers/ItemHelper.d.ts @@ -1,6 +1,6 @@ import { InsuredItem, IPmcData } from "../models/eft/common/IPmcData"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ITemplateItem, StackSlot } from "../models/eft/common/tables/ITemplateItem"; +import { Item, Repairable } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HashUtil } from "../utils/HashUtil"; @@ -18,7 +18,7 @@ declare class ItemHelper { */ isValidItem(tpl: string, invalidBaseTypes?: string[]): boolean; /** - * Checks if a id is a valid item. Valid meaning that it's an item that may be a reward + * 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 {*} tpl template id of item to check * @returns boolean: true if item is valid reward @@ -82,27 +82,77 @@ declare class ItemHelper { * @param {string} parentId The id of the AmmoBox instance these StackSlotItems should be children of * @returns {array} The array of StackSlotItems */ - generateStackSlotItems(item: ITemplateItem, parentId: string): StackSlot[]; + generateItemsFromStackSlot(item: ITemplateItem, parentId: string): Item[]; + /** + * Gets item data from items.json + * @param tpl items template id to look up + * @returns bool - is valid + template item object as array + */ getItem(tpl: string): [boolean, ITemplateItem]; + /** + * get normalized value (0-1) based on item condition + * @param item + * @returns number between 0 and 1 + */ getItemQualityModifier(item: Item): number; + /** + * Get a quality value based on a repairable items (weapon/armor) current state between current and max durability + * @param itemDetails + * @param repairable repairable object + * @param item + * @returns a number between 0 and 1 + */ + protected getRepairableItemQualityValue(itemDetails: ITemplateItem, repairable: Repairable, item: Item): number; + /** + * Recursive function that looks at every item from parameter and gets their childrens Ids + * @param items + * @param itemID + * @returns an array of strings + */ findAndReturnChildrenByItems(items: Item[], itemID: string): string[]; /** * A variant of findAndReturnChildren where the output is list of item objects instead of their ids. + * @param items + * @param baseItemId + * @returns An array of Item objects */ findAndReturnChildrenAsItems(items: Item[], baseItemId: string): Item[]; /** - * find children of the item in a given assort (weapons parts for example, need recursive loop function) + * Find children of the item in a given assort (weapons parts for example, need recursive loop function) + * @param itemIdToFind Template id of item to check for + * @param assort Array of items to check in + * @returns Array of children of requested item */ findAndReturnChildrenByAssort(itemIdToFind: string, assort: Item[]): Item[]; + /** + * Check if the passed in item has buy count restrictions + * @param itemToCheck Item to check + * @returns true if it has buy restrictions + */ hasBuyRestrictions(itemToCheck: Item): boolean; /** - * Is Dogtag - * Checks if an item is a dogtag. Used under profile_f.js to modify preparePrice based - * on the level of the dogtag + * is the passed in template id a dog tag + * @param tpl Template id to check + * @returns true if it is a dogtag */ isDogtag(tpl: string): boolean; + /** + * Can the item passed in be sold to a trader because it is raw money + * @param tpl Item template id to check + * @returns true if unsellable + */ isNotSellable(tpl: string): boolean; + /** + * Gets the identifier for a child using slotId, locationX and locationY. + * @param item + * @returns "slotId OR slotid,locationX,locationY" + */ getChildId(item: Item): string; + /** + * Can the pased in item be stacked + * @param tpl item to check + * @returns true if it can be stacked + */ isItemTplStackable(tpl: string): boolean; /** * split item stack if it exceeds StackMaxSize @@ -112,15 +162,17 @@ declare class ItemHelper { * Find Barter items in the inventory * @param {string} by * @param {Object} pmcData - * @param {string} barter_itemID - * @returns Array + * @param {string} barterItemId + * @returns Array of Item objects */ - findBarterItems(by: string, pmcData: IPmcData, barter_itemID: string): any[]; + findBarterItems(by: string, pmcData: IPmcData, barterItemId: string): Item[]; /** - * @param {Object} pmcData - * @param {Array} items - * @param {Object} fastPanel - * @returns Array + * + * @param pmcData + * @param items + * @param insuredItems insured items to not replace ids for + * @param fastPanel + * @returns */ replaceIDs(pmcData: IPmcData, items: Item[], insuredItems?: InsuredItem[], fastPanel?: any): any[]; /** @@ -136,6 +188,12 @@ declare class ItemHelper { * @returns boolean */ isQuestItem(tpl: string): boolean; + /** + * Get the inventory size of an item + * @param items + * @param rootItemId + * @returns ItemSize object (width and height) + */ getItemSize(items: Item[], rootItemId: string): ItemHelper.ItemSize; } declare namespace ItemHelper { diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/NotificationSendHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/NotificationSendHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/NotificationSendHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/NotificationSendHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/NotifierHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/NotifierHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/NotifierHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/NotifierHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/PaymentHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/PaymentHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/PaymentHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/PaymentHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/PresetHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/PresetHelper.d.ts similarity index 79% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/PresetHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/PresetHelper.d.ts index 0371886..a469582 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/PresetHelper.d.ts +++ b/Faupi-MunitionsExpert/server/types/helpers/PresetHelper.d.ts @@ -1,9 +1,11 @@ import { Preset } from "../models/eft/common/IGlobals"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "../utils/JsonUtil"; export declare class PresetHelper { + protected jsonUtil: JsonUtil; protected databaseServer: DatabaseServer; protected lookup: Record; - constructor(databaseServer: DatabaseServer); + constructor(jsonUtil: JsonUtil, databaseServer: DatabaseServer); hydratePresetStore(input: Record): void; isPreset(id: string): boolean; hasPreset(templateId: string): boolean; diff --git a/Faupi-MunitionsExpert/server/types/helpers/ProbabilityHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/ProbabilityHelper.d.ts new file mode 100644 index 0000000..7a0676c --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/helpers/ProbabilityHelper.d.ts @@ -0,0 +1,14 @@ +import { ILogger } from "../models/spt/utils/ILogger"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class ProbabilityHelper { + protected logger: ILogger; + protected randomUtil: RandomUtil; + constructor(logger: ILogger, randomUtil: RandomUtil); + /** + * Chance to roll a number out of 100 + * @param chance Percentage chance roll should success + * @param scale scale of chance to allow support of numbers > 1-100 + * @returns true if success + */ + rollChance(chance: number, scale?: number): boolean; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/ProfileHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/ProfileHelper.d.ts similarity index 87% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/ProfileHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/ProfileHelper.d.ts index 6a64291..b369000 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/ProfileHelper.d.ts +++ b/Faupi-MunitionsExpert/server/types/helpers/ProfileHelper.d.ts @@ -20,6 +20,12 @@ export declare class ProfileHelper { resetProfileQuestCondition(sessionID: string, conditionId: string): void; getCompleteProfile(sessionID: string): IPmcData[]; isNicknameTaken(info: IValidateNicknameRequestData, sessionID: string): boolean; + /** + * Add experience to a PMC inside the players profile + * @param sessionID Session id + * @param experienceToAdd Experiecne to add to PMC character + */ + addExperienceToPmc(sessionID: string, experienceToAdd: number): void; getProfileByPmcId(pmcId: string): IPmcData; getExperience(level: number): number; getMaxLevel(): number; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/QuestConditionHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/QuestConditionHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/QuestConditionHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/QuestConditionHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/QuestHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/QuestHelper.d.ts similarity index 71% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/QuestHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/QuestHelper.d.ts index f32c85c..0b10135 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/QuestHelper.d.ts +++ b/Faupi-MunitionsExpert/server/types/helpers/QuestHelper.d.ts @@ -8,6 +8,7 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { LocaleService } from "../services/LocaleService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; @@ -25,6 +26,7 @@ export declare class QuestHelper { protected itemHelper: ItemHelper; protected itemEventRouter: ItemEventRouter; protected databaseServer: DatabaseServer; + protected localeService: LocaleService; protected ragfairServerHelper: RagfairServerHelper; protected dialogueHelper: DialogueHelper; protected profileHelper: ProfileHelper; @@ -32,7 +34,7 @@ export declare class QuestHelper { protected traderHelper: TraderHelper; protected configServer: ConfigServer; protected questConfig: IQuestConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer); + constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer); static get STATUS(): Record; questStatus(pmcData: IPmcData, questID: string): string; /** @@ -57,13 +59,44 @@ export declare class QuestHelper { changeItemStack(pmcData: IPmcData, id: string, value: number, sessionID: string, output: any): void; /** * Get List of All Quests as an array + * @returns Array of IQuest objects */ questValues(): IQuest[]; + /** + * Reest AvailableForStart conditions for quests + * @param quests queststo clean + * @returns quest array without conditions + */ protected cleanQuestList(quests: IQuest[]): IQuest[]; + /** + * Reset AvailableForStart conditions on a quest + * @param quest quest to clean + * @returns reset IQuest object + */ cleanQuestConditions(quest: IQuest): IQuest; failQuest(pmcData: IPmcData, body: any, sessionID: string): any; + /** + * Get quest by id from database + * @param questId questid to look for + * @param pmcData player profile + * @returns IQuest object + */ getQuestFromDb(questId: string, pmcData: IPmcData): IQuest; - getQuestLocaleIdFromDb(messageId: string, localisation?: string): string; - applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: string, sessionID: string): any[]; + getQuestLocaleIdFromDb(messageId: string): string; + /** + * Give player quest rewards - Skills/exp/trader standing/items/assort unlocks + * @param pmcData Player profile + * @param body complete quest request + * @param state State of the quest now its complete + * @param sessionID Seession id + * @returns array of reward objects + */ + applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: string, sessionID: string): Reward[]; + /** + * Get the intel center bonus a player has + * @param pmcData player profile + * @returns bonus in percent + */ + protected getIntelCenterRewardBonus(pmcData: IPmcData): number; getFindItemIdForQuestItem(itemTpl: string): string; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/RagfairHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/RagfairHelper.d.ts similarity index 97% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/RagfairHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/RagfairHelper.d.ts index c8bc5ba..2c8dbb5 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/RagfairHelper.d.ts +++ b/Faupi-MunitionsExpert/server/types/helpers/RagfairHelper.d.ts @@ -40,5 +40,4 @@ export declare class RagfairHelper { */ mergeStackable(items: Item[]): Item[]; getCurrencySymbol(currencyTpl: string): string; - formatCurrency(moneyAmount: number): string; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/RagfairOfferHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/RagfairOfferHelper.d.ts similarity index 95% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/RagfairOfferHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/RagfairOfferHelper.d.ts index 129bc1c..5a77e13 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/RagfairOfferHelper.d.ts +++ b/Faupi-MunitionsExpert/server/types/helpers/RagfairOfferHelper.d.ts @@ -10,6 +10,7 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { LocaleService } from "../services/LocaleService"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; @@ -37,11 +38,12 @@ export declare class RagfairOfferHelper { protected ragfairSortHelper: RagfairSortHelper; protected ragfairHelper: RagfairHelper; protected ragfairOfferService: RagfairOfferService; + protected localeService: LocaleService; protected configServer: ConfigServer; protected static TPL_GOODS_SOLD: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, localeService: LocaleService, configServer: ConfigServer); getValidOffers(info: ISearchRequestData, itemsToAdd: string[], assorts: Record, pmcProfile: IPmcData): IRagfairOffer[]; getOffersForBuild(info: ISearchRequestData, itemsToAdd: string[], assorts: Record, pmcProfile: IPmcData): IRagfairOffer[]; processOffers(sessionID: string): boolean; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/RagfairSellHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/RagfairSellHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/RagfairSellHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/RagfairSellHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/RagfairServerHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/RagfairServerHelper.d.ts similarity index 89% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/RagfairServerHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/RagfairServerHelper.d.ts index 2cb3ea5..a52306b 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/RagfairServerHelper.d.ts +++ b/Faupi-MunitionsExpert/server/types/helpers/RagfairServerHelper.d.ts @@ -1,11 +1,12 @@ -import { MemberCategory } from "../models/enums/MemberCategory"; import { Item } from "../models/eft/common/tables/IItem"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { MemberCategory } from "../models/enums/MemberCategory"; import { IQuestConfig } from "../models/spt/config/IQuestConfig"; import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { LocaleService } from "../services/LocaleService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; @@ -19,13 +20,14 @@ export declare class RagfairServerHelper { protected databaseServer: DatabaseServer; protected profileHelper: ProfileHelper; protected itemHelper: ItemHelper; + protected localeService: LocaleService; protected dialogueHelper: DialogueHelper; protected jsonUtil: JsonUtil; protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; protected static TPL_GOODS_RETURNED: string; - constructor(randomUtil: RandomUtil, hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, profileHelper: ProfileHelper, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, jsonUtil: JsonUtil, configServer: ConfigServer); + constructor(randomUtil: RandomUtil, hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, profileHelper: ProfileHelper, itemHelper: ItemHelper, localeService: LocaleService, dialogueHelper: DialogueHelper, jsonUtil: JsonUtil, configServer: ConfigServer); /** * Is item valid / on blacklist / quest item * @param itemDetails diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/RagfairSortHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/RagfairSortHelper.d.ts similarity index 79% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/RagfairSortHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/RagfairSortHelper.d.ts index e983569..d20e10c 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/RagfairSortHelper.d.ts +++ b/Faupi-MunitionsExpert/server/types/helpers/RagfairSortHelper.d.ts @@ -1,8 +1,10 @@ import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { LocaleService } from "../services/LocaleService"; export declare class RagfairSortHelper { protected databaseServer: DatabaseServer; - constructor(databaseServer: DatabaseServer); + protected localeService: LocaleService; + constructor(databaseServer: DatabaseServer, localeService: LocaleService); sortOffers(offers: IRagfairOffer[], type: number, direction?: number): IRagfairOffer[]; protected sortOffersByID(a: IRagfairOffer, b: IRagfairOffer): number; protected sortOffersByRating(a: IRagfairOffer, b: IRagfairOffer): number; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/RagfairTaxHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/RagfairTaxHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/RagfairTaxHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/RagfairTaxHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/RepairHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/RepairHelper.d.ts similarity index 81% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/RepairHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/RepairHelper.d.ts index 650c1aa..545108e 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/helpers/RepairHelper.d.ts +++ b/Faupi-MunitionsExpert/server/types/helpers/RepairHelper.d.ts @@ -1,6 +1,5 @@ -import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; -import { Props } from "../models/eft/common/tables/ITemplateItem"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; import { IRepairConfig } from "../models/spt/config/IRepairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; @@ -15,7 +14,7 @@ export declare class RepairHelper { protected configServer: ConfigServer; protected repairConfig: IRepairConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); - updateItemDurability(itemToRepairId: string, amountToRepair: number, pmcData: IPmcData, useRepairKit?: boolean): Item; + updateItemDurability(itemToRepair: Item, itemToRepairDetails: ITemplateItem, isArmor: boolean, amountToRepair: number, useRepairKit?: boolean): Item; protected getRandomisedArmorRepairDegredationValue(armorMaterial: string, isRepairKit: boolean, armorMax: number): number; protected getRandomisedWeaponRepairDegredationValue(itemProps: Props, isRepairKit: boolean, armorMax: number): number; isWeaponTemplate(tpl: string): boolean; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/SecureContainerHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/SecureContainerHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/SecureContainerHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/SecureContainerHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/TradeHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/TradeHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/TradeHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/TradeHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/TraderAssortHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/TraderAssortHelper.d.ts similarity index 62% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/TraderAssortHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/TraderAssortHelper.d.ts index 4f41ac2..91ba6b9 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/helpers/TraderAssortHelper.d.ts +++ b/Faupi-MunitionsExpert/server/types/helpers/TraderAssortHelper.d.ts @@ -2,24 +2,32 @@ import { RagfairAssortGenerator } from "../generators/RagfairAssortGenerator"; import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; import { Item } from "../models/eft/common/tables/IItem"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +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 { FenceService } from "../services/FenceService"; import { TraderAssortService } from "../services/TraderAssortService"; import { JsonUtil } from "../utils/JsonUtil"; +import { MathUtil } from "../utils/MathUtil"; import { AssortHelper } from "./AssortHelper"; +import { PaymentHelper } from "./PaymentHelper"; import { ProfileHelper } from "./ProfileHelper"; export declare class TraderAssortHelper { protected logger: ILogger; protected jsonUtil: JsonUtil; + protected mathUtil: MathUtil; protected databaseServer: DatabaseServer; protected profileHelper: ProfileHelper; protected assortHelper: AssortHelper; + protected paymentHelper: PaymentHelper; protected ragfairAssortGenerator: RagfairAssortGenerator; protected ragfairOfferGenerator: RagfairOfferGenerator; protected traderAssortService: TraderAssortService; protected fenceService: FenceService; - constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, fenceService: FenceService); + protected configServer: ConfigServer; + protected traderConfig: ITraderConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, mathUtil: MathUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, fenceService: FenceService, configServer: ConfigServer); /** * Get a traders assorts * Can be used for returning ragfair / fence assorts @@ -29,7 +37,12 @@ export declare class TraderAssortHelper { */ getAssort(sessionId: string, traderId: string): ITraderAssort; /** - * Get an array of pristine trader items prior to any alteration by player + * Iterate over all assorts barter_scheme values, find barters selling for money and multiply by multipler in config + * @param traderAssort Assorts to multiple price of + */ + protected multiplyItemPricesByConfigMultipler(traderAssort: ITraderAssort): void; + /** + * Get an array of pristine trader items prior to any alteration by player (as they were on server start) * @param traderId trader id * @returns array of Items */ diff --git a/Faupi-MunitionsExpert/server/types/helpers/TraderHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/TraderHelper.d.ts new file mode 100644 index 0000000..b2e9d38 --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/helpers/TraderHelper.d.ts @@ -0,0 +1,109 @@ +import { FenceLevel } from "../models/eft/common/IGlobals"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; +import { IBarterScheme, ITraderAssort, ITraderBase, LoyaltyLevel } from "../models/eft/common/tables/ITrader"; +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 { SaveServer } from "../servers/SaveServer"; +import { FenceService } from "../services/FenceService"; +import { PlayerService } from "../services/PlayerService"; +import { HandbookHelper } from "./HandbookHelper"; +import { ItemHelper } from "./ItemHelper"; +import { PaymentHelper } from "./PaymentHelper"; +import { ProfileHelper } from "./ProfileHelper"; +export declare class TraderHelper { + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; + protected paymentHelper: PaymentHelper; + protected itemHelper: ItemHelper; + protected handbookHelper: HandbookHelper; + protected playerService: PlayerService; + protected fenceService: FenceService; + protected configServer: ConfigServer; + protected traderConfig: ITraderConfig; + constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemHelper: ItemHelper, handbookHelper: HandbookHelper, playerService: PlayerService, fenceService: FenceService, configServer: ConfigServer); + getTrader(traderID: string, sessionID: string): ITraderBase; + getTraderAssortsById(traderId: string): ITraderAssort; + /** + * Reset a profiles trader data back to its initial state as seen by a level 1 player + * Does NOT take into account different profile levels + * @param sessionID session id + * @param traderID trader id to reset + */ + resetTrader(sessionID: string, traderID: string): void; + /** + * Alter a traders unlocked status + * @param traderID Trader to alter + * @param status New status to use + * @param sessionID Session id + */ + setTraderUnlockedState(traderID: string, status: boolean, sessionID: string): void; + /** + * Get a list of items and their prices from player inventory that can be sold to a trader + * @param traderID trader id being traded with + * @param sessionID session id + * @returns IBarterScheme[][] + */ + getPurchasesData(traderID: string, sessionID: string): Record; + /** + * Should item be skipped when selling to trader according to its sell categories and other checks + * @param pmcData + * @param item + * @param sellCategory + * @returns true if should NOT be sold to trader + */ + protected isItemUnSellableToTrader(pmcData: IPmcData, item: Item, sellCategory: string[]): boolean; + /** + * Can this weapon be sold to a trader with its current durabiltiy level + * @param traderID + * @param item + * @returns boolean + */ + protected isWeaponAndBelowTraderBuyDurability(traderID: string, item: Item): boolean; + /** + * Get the price of an item and all of its attached children + * Take into account bonuses/adjsutments e.g. discounts + * @param pmcData profile data + * @param item item to calculate price of + * @param buyPriceCoefficient + * @param fenceInfo fence data + * @param traderBase trader details + * @param currencyTpl Currency to get price as + * @returns price of item + children + */ + protected getAdjustedItemPrice(pmcData: IPmcData, item: Item, buyPriceCoefficient: number, fenceInfo: FenceLevel, traderBase: ITraderBase, currencyTpl: string): number; + /** + * Get the raw price of item+child items from handbook without any modification + * @param pmcData profile data + * @param item item to calculate price of + * @returns price as number + */ + protected getRawItemPrice(pmcData: IPmcData, item: Item): number; + protected getTraderDiscount(trader: ITraderBase, buyPriceCoefficient: number, fenceInfo: FenceLevel, traderID: string): number; + /** + * Add standing to a trader and level them up if exp goes over level threshold + * @param sessionID Session id + * @param traderId traders id + * @param standingToAdd Standing value to add to trader + */ + addStandingToTrader(sessionID: string, traderId: string, standingToAdd: number): void; + /** + * Calculate traders level based on exp amount and increments level if over threshold + * @param traderID trader to process + * @param sessionID session id + */ + lvlUp(traderID: string, sessionID: string): void; + getTraderUpdateSeconds(traderId: string): number; + /** + * check if an item is allowed to be sold to a trader + * @param traderFilters array of allowed categories + * @param tplToCheck itemTpl of inventory + * @returns boolean + */ + traderFilter(traderFilters: string[], tplToCheck: string): boolean; + getLoyaltyLevel(traderID: string, pmcData: IPmcData): LoyaltyLevel; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/UtilityHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/UtilityHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/UtilityHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/UtilityHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/WeightedRandomHelper.d.ts b/Faupi-MunitionsExpert/server/types/helpers/WeightedRandomHelper.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/helpers/WeightedRandomHelper.d.ts rename to Faupi-MunitionsExpert/server/types/helpers/WeightedRandomHelper.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/ide/BleedingEdgeEntry.d.ts b/Faupi-MunitionsExpert/server/types/ide/BleedingEdgeEntry.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/ide/BleedingEdgeEntry.d.ts rename to Faupi-MunitionsExpert/server/types/ide/BleedingEdgeEntry.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/ide/Compiler.d.ts b/Faupi-MunitionsExpert/server/types/ide/Compiler.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/ide/Compiler.d.ts rename to Faupi-MunitionsExpert/server/types/ide/Compiler.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/ide/DebugEntry.d.ts b/Faupi-MunitionsExpert/server/types/ide/DebugEntry.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/ide/DebugEntry.d.ts rename to Faupi-MunitionsExpert/server/types/ide/DebugEntry.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/ide/ReleaseEntry.d.ts b/Faupi-MunitionsExpert/server/types/ide/ReleaseEntry.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/ide/ReleaseEntry.d.ts rename to Faupi-MunitionsExpert/server/types/ide/ReleaseEntry.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/ide/TestEntry.d.ts b/Faupi-MunitionsExpert/server/types/ide/TestEntry.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/ide/TestEntry.d.ts rename to Faupi-MunitionsExpert/server/types/ide/TestEntry.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/loaders/BundleLoader.d.ts b/Faupi-MunitionsExpert/server/types/loaders/BundleLoader.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/loaders/BundleLoader.d.ts rename to Faupi-MunitionsExpert/server/types/loaders/BundleLoader.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/loaders/DelayedModLoader.d.ts b/Faupi-MunitionsExpert/server/types/loaders/DelayedModLoader.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/loaders/DelayedModLoader.d.ts rename to Faupi-MunitionsExpert/server/types/loaders/DelayedModLoader.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/loaders/InitialModLoader.d.ts b/Faupi-MunitionsExpert/server/types/loaders/InitialModLoader.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/loaders/InitialModLoader.d.ts rename to Faupi-MunitionsExpert/server/types/loaders/InitialModLoader.d.ts diff --git a/Faupi-MunitionsExpert/server/types/loaders/PostAkiModLoader.d.ts b/Faupi-MunitionsExpert/server/types/loaders/PostAkiModLoader.d.ts new file mode 100644 index 0000000..edc6e5d --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/loaders/PostAkiModLoader.d.ts @@ -0,0 +1,21 @@ +import { DependencyContainer } from "tsyringe"; +import { HandbookController } from "../controllers/HandbookController"; +import { IModLoader } from "../models/spt/mod/IModLoader"; +import { ModCompilerService } from "../services/ModCompilerService"; +import { VFS } from "../utils/VFS"; +import { BundleLoader } from "./BundleLoader"; +import { PreAkiModLoader } from "./PreAkiModLoader"; +export declare class PostAkiModLoader implements IModLoader { + protected bundleLoader: BundleLoader; + protected handbookController: HandbookController; + protected vfs: VFS; + protected modCompilerService: ModCompilerService; + protected preAkiModLoader: PreAkiModLoader; + constructor(bundleLoader: BundleLoader, handbookController: HandbookController, vfs: VFS, modCompilerService: ModCompilerService, preAkiModLoader: PreAkiModLoader); + getBundles(local: boolean): string; + getBundle(key: string, local: boolean): void; + getModPath(mod: string): string; + load(): void; + protected executeMods(container: DependencyContainer): void; + protected addBundles(): void; +} diff --git a/Faupi-MunitionsExpert/server/types/loaders/PostDBModLoader.d.ts b/Faupi-MunitionsExpert/server/types/loaders/PostDBModLoader.d.ts new file mode 100644 index 0000000..5101b7b --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/loaders/PostDBModLoader.d.ts @@ -0,0 +1,11 @@ +import { DependencyContainer } from "tsyringe"; +import { OnLoad } from "../di/OnLoad"; +import { PreAkiModLoader } from "./PreAkiModLoader"; +export declare class PostDBModLoader implements OnLoad { + protected preAkiModLoader: PreAkiModLoader; + constructor(preAkiModLoader: PreAkiModLoader); + onLoad(): void; + getRoute(): string; + getModPath(mod: string): string; + protected executeMods(container: DependencyContainer): void; +} diff --git a/Faupi-MunitionsExpert/server/types/loaders/PreAkiModLoader.d.ts b/Faupi-MunitionsExpert/server/types/loaders/PreAkiModLoader.d.ts new file mode 100644 index 0000000..6ded3c6 --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/loaders/PreAkiModLoader.d.ts @@ -0,0 +1,64 @@ +import { DependencyContainer } from "tsyringe"; +import { ICoreConfig } from "../models/spt/config/ICoreConfig"; +import { ModLoader } from "../models/spt/mod/IMod"; +import { IModLoader } from "../models/spt/mod/IModLoader"; +import { IPackageJsonData } from "../models/spt/mod/IPackageJsonData"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { ModCompilerService } from "../services/ModCompilerService"; +import { JsonUtil } from "../utils/JsonUtil"; +import { VFS } from "../utils/VFS"; +import { BundleLoader } from "./BundleLoader"; +export declare class PreAkiModLoader implements IModLoader { + protected logger: ILogger; + protected vfs: VFS; + protected jsonUtil: JsonUtil; + protected modCompilerService: ModCompilerService; + protected bundleLoader: BundleLoader; + protected configServer: ConfigServer; + protected static container: DependencyContainer; + protected readonly basepath = "user/mods/"; + protected imported: Record; + protected akiConfig: ICoreConfig; + constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, bundleLoader: BundleLoader, configServer: ConfigServer); + load(container: DependencyContainer): Promise; + getBundles(local: boolean): string; + getBundle(key: string, local: boolean): void; + /** + * Returns a list of mods with preserved load order + * @returns Array of mod names in load order + */ + getImportedModsNames(): string[]; + getModPath(mod: string): string; + protected importClass(name: string, filepath: string, container: DependencyContainer): void; + protected importMods(): Promise; + /** + * + * @param mods Get an array of broken/invalid mods by name + * @returns Mod names array + */ + protected getBrokenMods(mods: string[]): string[]; + /** + * Get packageJson data for mods + * @param mods mods to get packageJson for + * @returns dictionary + */ + protected getModsPackageData(mods: string[]): Record; + /** + * Does mod have "delayedLoad(" string in its entry class + * @param modFolderName folder name + * @param modToValidate package.json details + * @returns boolean + */ + protected isModSpt3XXCompatible(modFolderName: string, modToValidate: IPackageJsonData): boolean; + protected isModCombatibleWithAki(mod: IPackageJsonData): boolean; + protected executeMods(container: DependencyContainer): void; + sortModsLoadOrder(): string[]; + protected addMod(mod: string): Promise; + protected areModDependenciesFulfilled(pkg: IPackageJsonData, loadedMods: Record): boolean; + protected isModCompatible(mod: IPackageJsonData, loadedMods: Record): boolean; + protected validMod(mod: string): boolean; + protected getLoadOrderRecursive(mod: string, result: Record, visited: Record): void; + protected getLoadOrder(mods: Record): Record; + getContainer(): DependencyContainer; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/bot/IGenerateBotsRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/bot/IGenerateBotsRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/bot/IGenerateBotsRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/bot/IGenerateBotsRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/IEmptyRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/common/IEmptyRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/IEmptyRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/common/IEmptyRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/IGlobals.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/common/IGlobals.d.ts similarity index 99% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/IGlobals.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/common/IGlobals.d.ts index 456895c..9d28dbc 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/IGlobals.d.ts +++ b/Faupi-MunitionsExpert/server/types/models/eft/common/IGlobals.d.ts @@ -1128,8 +1128,11 @@ export interface Inertia { SprintAccelerationLimits: xyz; SideTime: xyz; DiagonalTime: xyz; + MaxTimeWithoutInput: xyz; MinDirectionBlendTime: number; - MoveTime: number; + MoveTimeRange: xyz; + ProneDirectionAccelerationRange: xyz; + ProneSpeedAccelerationRange: xyz; MinMovementAccelerationRangeRight: xyz; MaxMovementAccelerationRangeRight: xyz; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/ILocation.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/common/ILocation.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/ILocation.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/common/ILocation.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/ILocationBase.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/common/ILocationBase.d.ts similarity index 94% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/ILocationBase.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/common/ILocationBase.d.ts index ad48d32..b1dd448 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/ILocationBase.d.ts +++ b/Faupi-MunitionsExpert/server/types/models/eft/common/ILocationBase.d.ts @@ -26,6 +26,7 @@ export interface ILocationBase { DisabledForScav: boolean; DisabledScavExits: string; Enabled: boolean; + EnableCoop: boolean; GlobalLootChanceModifier: number; IconX: number; IconY: number; @@ -41,6 +42,7 @@ export interface ILocationBase { MinDistToFreePoint: number; MinMaxBots: MinMaxBot[]; MinPlayers: number; + MaxCoopGroup: number; Name: string; NewSpawn: boolean; OcculsionCullingEnabled: boolean; @@ -48,6 +50,8 @@ export interface ILocationBase { OpenZones: string; Preview: Preview; RequiredPlayerLevel: number; + PmcMaxPlayersInGroup: number; + ScavMaxPlayersInGroup: number; Rules: string; SafeLocation: boolean; Scene: Scene; @@ -55,7 +59,8 @@ export interface ILocationBase { UnixDateTime: number; _Id: string; doors: any[]; - escape_time_limit: number; + EscapeTimeLimit: number; + EscapeTimeLimitCoop: number; exit_access_time: number; exit_count: number; exit_time: number; @@ -63,6 +68,7 @@ export interface ILocationBase { filter_ex: string[]; limits: ILimit[]; matching_min_seconds: number; + GenerateLocalLootCache: boolean; maxItemCountInLocation: MaxItemCountInLocation[]; sav_summon_seconds: number; tmp_location_field_remove_me: number; @@ -106,6 +112,7 @@ export interface BossLocationSpawn { BossName: string; BossPlayer: boolean; BossZone: string; + RandomTimeSpawn: boolean; Time: number; TriggerId: string; TriggerName: string; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/ILocationsSourceDestinationBase.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/common/ILocationsSourceDestinationBase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/ILocationsSourceDestinationBase.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/common/ILocationsSourceDestinationBase.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/ILooseLoot.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/common/ILooseLoot.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/ILooseLoot.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/common/ILooseLoot.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/IMetricsTableData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/common/IMetricsTableData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/IMetricsTableData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/common/IMetricsTableData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/IPmcData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/common/IPmcData.d.ts similarity index 97% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/IPmcData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/common/IPmcData.d.ts index adc2aa5..56bf07f 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/common/IPmcData.d.ts +++ b/Faupi-MunitionsExpert/server/types/models/eft/common/IPmcData.d.ts @@ -6,7 +6,7 @@ import { MemberCategory } from "../../enums/MemberCategory"; export interface IPmcData { _id: string; aid: string; - savage: string; + savage?: string; Info: Info; Customization: Customization; Health: Health; @@ -28,13 +28,6 @@ export interface IPmcData { CarExtractCounts: CarExtractCounts; SurvivorClass: SurvivorClass; } -export declare enum SurvivorClass { - Unknown = 0, - Neutralizer = 1, - Marauder = 2, - Paramedic = 3, - Survivor = 4 -} export interface Info { EntryPoint: string; Nickname: string; @@ -56,6 +49,9 @@ export interface Info { Bans: IBan[]; BannedState: boolean; BannedUntil: number; + NeedWipeOptions: any[]; + lastCompletedWipe: LastCompleted; + lastCompletedEvent?: LastCompleted; } export interface Settings { Role: string; @@ -339,3 +335,13 @@ export interface RagfairInfo { } export interface CarExtractCounts { } +export declare enum SurvivorClass { + Unknown = 0, + Neutralizer = 1, + Marauder = 2, + Paramedic = 3, + Survivor = 4 +} +export interface LastCompleted { + $oid: string; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/MemberCategory.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/common/MemberCategory.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/MemberCategory.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/common/MemberCategory.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/request/IBaseInteractionRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/common/request/IBaseInteractionRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/request/IBaseInteractionRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/common/request/IBaseInteractionRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/tables/IBotBase.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/common/tables/IBotBase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/tables/IBotBase.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/common/tables/IBotBase.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/tables/IBotCore.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/common/tables/IBotCore.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/tables/IBotCore.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/common/tables/IBotCore.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/tables/IBotType.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/common/tables/IBotType.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/tables/IBotType.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/common/tables/IBotType.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/tables/ICustomizationItem.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/common/tables/ICustomizationItem.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/tables/ICustomizationItem.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/common/tables/ICustomizationItem.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/tables/IHandbookBase.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/common/tables/IHandbookBase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/tables/IHandbookBase.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/common/tables/IHandbookBase.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/tables/IItem.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/common/tables/IItem.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/tables/IItem.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/common/tables/IItem.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/tables/ILocationsBase.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/common/tables/ILocationsBase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/tables/ILocationsBase.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/common/tables/ILocationsBase.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/tables/ILootBase.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/common/tables/ILootBase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/tables/ILootBase.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/common/tables/ILootBase.d.ts diff --git a/Faupi-MunitionsExpert/server/types/models/eft/common/tables/IMatch.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/common/tables/IMatch.d.ts new file mode 100644 index 0000000..c30cb48 --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/models/eft/common/tables/IMatch.d.ts @@ -0,0 +1,10 @@ +export interface IMatch { + metrics: Metrics; +} +export interface Metrics { + Keys: number[]; + NetProcessingBins: number[]; + RenderBins: number[]; + GameUpdateBins: number[]; + MemoryMeasureInterval: number; +} diff --git a/Faupi-MunitionsExpert/server/types/models/eft/common/tables/IProfileTemplate.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/common/tables/IProfileTemplate.d.ts new file mode 100644 index 0000000..fbcd81a --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -0,0 +1,25 @@ +import { Dialogue, WeaponBuild } from "../../profile/IAkiProfile"; +import { IPmcData } from "../IPmcData"; +export interface IProfileTemplates { + Standard: IProfileSides; + "Left Behind": IProfileSides; + "Prepare To Escape": IProfileSides; + "Edge Of Darkness": IProfileSides; +} +export interface IProfileSides { + usec: TemplateSide; + bear: TemplateSide; +} +export interface TemplateSide { + character: IPmcData; + suits: string[]; + dialogues: Record; + weaponbuilds: WeaponBuild[]; + trader: ProfileTraderTemplate; +} +export interface ProfileTraderTemplate { + initialLoyaltyLevel: number; + initialStanding: number; + initialSalesSum: number; + jaegerUnlocked: boolean; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/tables/IQuest.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/common/tables/IQuest.d.ts similarity index 94% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/tables/IQuest.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/common/tables/IQuest.d.ts index e1fc888..a349a6d 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/eft/common/tables/IQuest.d.ts +++ b/Faupi-MunitionsExpert/server/types/models/eft/common/tables/IQuest.d.ts @@ -1,3 +1,4 @@ +import { QuestRewardType } from "../../../enums/QuestRewardType"; import { Item } from "./IItem"; export interface IQuest { QuestName: string; @@ -23,6 +24,7 @@ export interface IQuest { status: string; KeyQuest: boolean; changeQuestMessageText: string; + side: string; } export interface Conditions { Started: AvailableForConditions[]; @@ -56,6 +58,7 @@ export interface AvailableForProps { plantTime?: number; zoneId?: string; type?: boolean; + countInRaid?: boolean; } export interface AvailableForCounter { id: string; @@ -97,9 +100,9 @@ export interface Rewards { Expired: Reward[]; } export interface Reward { - value?: string; + value?: string | number; id: string; - type: string; + type: QuestRewardType; index: number; target?: string; items?: Item[]; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/tables/IRepeatableQuests.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/common/tables/IRepeatableQuests.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/tables/IRepeatableQuests.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/common/tables/IRepeatableQuests.d.ts diff --git a/Faupi-MunitionsExpert/server/types/models/eft/common/tables/ITemplateItem.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/common/tables/ITemplateItem.d.ts new file mode 100644 index 0000000..23a1a14 --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/models/eft/common/tables/ITemplateItem.d.ts @@ -0,0 +1,455 @@ +export interface ITemplateItem { + _id: string; + _name: string; + _parent: string; + _type: string; + _props: Props; + _proto: string; +} +export interface Props { + Name?: string; + ShortName?: string; + Description?: string; + Weight?: number; + BackgroundColor?: string; + Width?: number; + Height?: number; + StackMaxSize?: number; + Rarity?: string; + SpawnChance?: number; + CreditsPrice?: number; + ItemSound?: string; + Prefab?: Prefab; + UsePrefab?: Prefab; + StackObjectsCount?: number; + NotShownInSlot?: boolean; + ExaminedByDefault?: boolean; + ExamineTime?: number; + IsUndiscardable?: boolean; + IsUnsaleable?: boolean; + IsUnbuyable?: boolean; + IsUngivable?: boolean; + IsLockedafterEquip?: boolean; + QuestItem?: boolean; + LootExperience?: number; + ExamineExperience?: number; + HideEntrails?: boolean; + RepairCost?: number; + RepairSpeed?: number; + ExtraSizeLeft?: number; + ExtraSizeRight?: number; + ExtraSizeUp?: number; + ExtraSizeDown?: number; + ExtraSizeForceAdd?: boolean; + MergesWithChildren?: boolean; + CanSellOnRagfair?: boolean; + CanRequireOnRagfair?: boolean; + ConflictingItems?: string[]; + Unlootable?: boolean; + UnlootableFromSlot?: string; + UnlootableFromSide?: string[]; + AnimationVariantsNumber?: number; + DiscardingBlock?: boolean; + DropSoundType?: string; + RagFairCommissionModifier?: number; + IsAlwaysAvailableForInsurance?: boolean; + DiscardLimit?: number; + MaxResource?: number; + Resource?: number; + DogTagQualities?: boolean; + Grids?: Grid[]; + Slots?: Slot[]; + CanPutIntoDuringTheRaid?: boolean; + CantRemoveFromSlotsDuringRaid?: string[]; + KeyIds?: string[]; + TagColor?: number; + TagName?: string; + Durability?: number; + Accuracy?: number; + Recoil?: number; + Loudness?: number; + EffectiveDistance?: number; + Ergonomics?: number; + Velocity?: number; + RaidModdable?: boolean; + ToolModdable?: boolean; + BlocksFolding?: boolean; + BlocksCollapsible?: boolean; + IsAnimated?: boolean; + HasShoulderContact?: boolean; + SightingRange?: number; + DoubleActionAccuracyPenaltyMult?: number; + ModesCount: any; + DurabilityBurnModificator?: number; + HeatFactor?: number; + CoolFactor?: number; + muzzleModType?: string; + CustomAimPlane?: string; + sightModType?: string; + aimingSensitivity?: number; + SightModesCount?: number; + OpticCalibrationDistances?: number[]; + ScopesCount?: number; + AimSensitivity?: number | number[][]; + Zooms?: number[][]; + CalibrationDistances?: number[][]; + Intensity?: number; + Mask?: string; + MaskSize?: number; + NoiseIntensity?: number; + NoiseScale?: number; + Color?: Color; + DiffuseIntensity?: number; + HasHinge?: boolean; + RampPalette?: string; + DepthFade?: number; + RoughnessCoef?: number; + SpecularCoef?: number; + MainTexColorCoef?: number; + MinimumTemperatureValue?: number; + RampShift?: number; + HeatMin?: number; + ColdMax?: number; + IsNoisy?: boolean; + IsFpsStuck?: boolean; + IsGlitch?: boolean; + IsMotionBlurred?: boolean; + IsPixelated?: boolean; + PixelationBlockCount?: number; + ShiftsAimCamera?: number; + magAnimationIndex?: number; + Cartridges?: Slot[]; + CanFast?: boolean; + CanHit?: boolean; + CanAdmin?: boolean; + LoadUnloadModifier?: number; + CheckTimeModifier?: number; + CheckOverride?: number; + ReloadMagType?: string; + VisibleAmmoRangesString?: string; + MalfunctionChance?: number; + IsShoulderContact?: boolean; + Foldable?: boolean; + Retractable?: boolean; + SizeReduceRight?: number; + CenterOfImpact?: number; + ShotgunDispersion?: number; + IsSilencer?: boolean; + DeviationCurve?: number; + DeviationMax?: number; + SearchSound?: string; + BlocksArmorVest?: boolean; + speedPenaltyPercent?: number; + GridLayoutName?: string; + SpawnFilter?: any[]; + containType?: any[]; + sizeWidth?: number; + sizeHeight?: number; + isSecured?: boolean; + spawnTypes?: string; + lootFilter?: any[]; + spawnRarity?: string; + minCountSpawn?: number; + maxCountSpawn?: number; + openedByKeyID?: any[]; + RigLayoutName?: string; + MaxDurability?: number; + armorZone?: string[]; + armorClass: any; + mousePenalty?: number; + weaponErgonomicPenalty?: number; + BluntThroughput?: number; + ArmorMaterial?: string; + weapClass?: string; + weapUseType?: string; + ammoCaliber?: string; + OperatingResource?: number; + RepairComplexity?: number; + durabSpawnMin?: number; + durabSpawnMax?: number; + isFastReload?: boolean; + RecoilForceUp?: number; + RecoilForceBack?: number; + Convergence?: number; + RecoilAngle?: number; + weapFireType?: string[]; + RecolDispersion?: number; + SingleFireRate?: number; + CanQueueSecondShot?: boolean; + bFirerate?: number; + bEffDist?: number; + bHearDist?: number; + isChamberLoad?: boolean; + chamberAmmoCount?: number; + isBoltCatch?: boolean; + defMagType?: string; + defAmmo?: string; + AdjustCollimatorsToTrajectory?: boolean; + shotgunDispersion?: number; + Chambers?: Slot[]; + CameraRecoil?: number; + CameraSnap?: number; + ReloadMode?: string; + AimPlane?: number; + TacticalReloadStiffnes?: Xyz; + TacticalReloadFixation?: number; + RecoilCenter?: Xyz; + RotationCenter?: Xyz; + RotationCenterNoStock?: Xyz; + FoldedSlot?: string; + CompactHandling?: boolean; + MinRepairDegradation?: number; + MaxRepairDegradation?: number; + IronSightRange?: number; + IsFlareGun?: boolean; + IsGrenadeLauncher?: boolean; + IsOneoff?: boolean; + MustBoltBeOpennedForExternalReload?: boolean; + MustBoltBeOpennedForInternalReload?: boolean; + BoltAction?: boolean; + HipAccuracyRestorationDelay?: number; + HipAccuracyRestorationSpeed?: number; + HipInnaccuracyGain?: number; + ManualBoltCatch?: boolean; + BurstShotsCount?: number; + BaseMalfunctionChance?: number; + AllowJam?: boolean; + AllowFeed?: boolean; + AllowMisfire?: boolean; + AllowSlide?: boolean; + DurabilityBurnRatio?: number; + HeatFactorGun?: number; + CoolFactorGun?: number; + CoolFactorGunMods?: number; + HeatFactorByShot?: number; + AllowOverheat?: boolean; + DoubleActionAccuracyPenalty?: number; + RecoilPosZMult?: number; + MinRepairKitDegradation?: number; + MaxRepairKitDegradation?: number; + BlocksEarpiece?: boolean; + BlocksEyewear?: boolean; + BlocksHeadwear?: boolean; + BlocksFaceCover?: boolean; + Indestructibility?: number; + headSegments?: string[]; + FaceShieldComponent?: boolean; + FaceShieldMask?: string; + MaterialType?: string; + RicochetParams?: Xyz; + DeafStrength?: string; + BlindnessProtection?: number; + Distortion?: number; + CompressorTreshold?: number; + CompressorAttack?: number; + CompressorRelease?: number; + CompressorGain?: number; + CutoffFreq?: number; + Resonance?: number; + CompressorVolume?: number; + AmbientVolume?: number; + DryVolume?: number; + foodUseTime?: number; + foodEffectType?: string; + StimulatorBuffs?: string; + effects_health: any; + effects_damage: any; + MaximumNumberOfUsage?: number; + knifeHitDelay?: number; + knifeHitSlashRate?: number; + knifeHitStabRate?: number; + knifeHitRadius?: number; + knifeHitSlashDam?: number; + knifeHitStabDam?: number; + knifeDurab?: number; + PrimaryDistance?: number; + SecondryDistance?: number; + SlashPenetration?: number; + StabPenetration?: number; + PrimaryConsumption?: number; + SecondryConsumption?: number; + DeflectionConsumption?: number; + AppliedTrunkRotation?: Xyz; + AppliedHeadRotation?: Xyz; + DisplayOnModel?: boolean; + AdditionalAnimationLayer?: number; + StaminaBurnRate?: number; + ColliderScaleMultiplier?: Xyz; + ConfigPathStr?: string; + MaxMarkersCount?: number; + scaleMin?: number; + scaleMax?: number; + medUseTime?: number; + medEffectType?: string; + MaxHpResource?: number; + hpResourceRate?: number; + apResource?: number; + krResource?: number; + MaxOpticZoom?: number; + MaxRepairResource?: number; + TargetItemFilter?: string[]; + RepairQuality?: number; + RepairType?: string; + StackMinRandom?: number; + StackMaxRandom?: number; + ammoType?: string; + InitialSpeed?: number; + BallisticCoeficient?: number; + BulletMassGram?: number; + BulletDiameterMilimeters?: number; + Damage?: number; + ammoAccr?: number; + ammoRec?: number; + ammoDist?: number; + buckshotBullets?: number; + PenetrationPower?: number; + PenetrationPowerDiviation?: number; + ammoHear?: number; + ammoSfx?: string; + MisfireChance?: number; + MinFragmentsCount?: number; + MaxFragmentsCount?: number; + ammoShiftChance?: number; + casingName?: string; + casingEjectPower?: number; + casingMass?: number; + casingSounds?: string; + ProjectileCount?: number; + PenetrationChance?: number; + RicochetChance?: number; + FragmentationChance?: number; + Deterioration?: number; + SpeedRetardation?: number; + Tracer?: boolean; + TracerColor?: string; + TracerDistance?: number; + ArmorDamage?: number; + Caliber?: string; + StaminaBurnPerDamage?: number; + HeavyBleedingDelta?: number; + LightBleedingDelta?: number; + ShowBullet?: boolean; + HasGrenaderComponent?: boolean; + FuzeArmTimeSec?: number; + ExplosionStrength?: number; + MinExplosionDistance?: number; + MaxExplosionDistance?: number; + FragmentsCount?: number; + FragmentType?: string; + ShowHitEffectOnExplode?: boolean; + ExplosionType?: string; + AmmoLifeTimeSec?: number; + Contusion?: Xyz; + ArmorDistanceDistanceDamage?: Xyz; + Blindness?: Xyz; + IsLightAndSoundShot?: boolean; + LightAndSoundShotAngle?: number; + LightAndSoundShotSelfContusionTime?: number; + LightAndSoundShotSelfContusionStrength?: number; + MalfMisfireChance?: number; + MalfFeedChance?: number; + StackSlots?: StackSlot[]; + type?: string; + eqMin?: number; + eqMax?: number; + rate?: number; + ThrowType?: string; + ExplDelay?: number; + Strength?: number; + ContusionDistance?: number; + throwDamMax?: number; + explDelay?: number; + EmitTime?: number; + CanBeHiddenDuringThrow?: boolean; + MinTimeToContactExplode?: number; + ExplosionEffectType?: string; +} +export interface Prefab { + path: string; + rcid: string; +} +export interface Grid { + _name: string; + _id: string; + _parent: string; + _props: GridProps; + _proto: string; +} +export interface GridProps { + filters: GridFilter[]; + cellsH: number; + cellsV: number; + minCount: number; + maxCount: number; + maxWeight: number; + isSortingTable: boolean; +} +export interface GridFilter { + Filter: string[]; + ExcludedFilter: string[]; +} +export interface Slot { + _name: string; + _id: string; + _parent: string; + _props: SlotProps; + _max_count?: number; + _required: boolean; + _mergeSlotWithChildren: boolean; + _proto: string; +} +export interface SlotProps { + filters: SlotFilter[]; +} +export interface SlotFilter { + Shift?: number; + Filter: string[]; + AnimationIndex?: number; +} +export interface Xyz { + x: number; + y: number; + z: number; +} +export interface StackSlot { + _name?: string; + _id: string; + _parent: string; + _max_count: number; + _props: StackSlotProps; + _proto: string; + upd: any; +} +export interface StackSlotProps { + filters: SlotFilter[]; +} +export interface EffectsHealth { + Energy: EffectsHealthProps; + Hydration: EffectsHealthProps; +} +export interface EffectsHealthProps { + value: number; +} +export interface EffectsDamage { + Pain: EffectDamageProps; + LightBleeding: EffectDamageProps; + HeavyBleeding: EffectDamageProps; + Contusion: EffectDamageProps; + RadExposure: EffectDamageProps; + Fracture: EffectDamageProps; + DestroyedPart: EffectDamageProps; +} +export interface EffectDamageProps { + delay: number; + duration: number; + fadeOut: number; + cost?: number; + healthPenaltyMin?: number; + healthPenaltyMax?: number; +} +export interface Color { + r: number; + g: number; + b: number; + a: number; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/tables/ITrader.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/common/tables/ITrader.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/common/tables/ITrader.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/common/tables/ITrader.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/customization/IBuyClothingRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/customization/IBuyClothingRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/customization/IBuyClothingRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/customization/IBuyClothingRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/customization/IWearClothingRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/customization/IWearClothingRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/customization/IWearClothingRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/customization/IWearClothingRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/dialog/IFriendRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/dialog/IFriendRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/dialog/IFriendRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/dialog/IFriendRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/dialog/IGetChatServerListRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/dialog/IGetChatServerListRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/dialog/IGetChatServerListRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/dialog/IGetChatServerListRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/dialog/IGetFriendListDataResponse.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/dialog/IGetFriendListDataResponse.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/dialog/IGetFriendListDataResponse.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/dialog/IGetFriendListDataResponse.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/dialog/IPinDialogRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/dialog/IPinDialogRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/dialog/IPinDialogRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/dialog/IPinDialogRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/dialog/IRemoveDialogRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/dialog/IRemoveDialogRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/dialog/IRemoveDialogRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/dialog/IRemoveDialogRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/dialog/ISendMessageRequest.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/dialog/ISendMessageRequest.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/dialog/ISendMessageRequest.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/dialog/ISendMessageRequest.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/dialog/ISetDialogReadRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/dialog/ISetDialogReadRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/dialog/ISetDialogReadRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/dialog/ISetDialogReadRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/game/IGameConfigResponse.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/game/IGameConfigResponse.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/game/IGameConfigResponse.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/game/IGameConfigResponse.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/game/IGameEmptyCrcRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/game/IGameEmptyCrcRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/game/IGameEmptyCrcRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/game/IGameEmptyCrcRequestData.d.ts diff --git a/Faupi-MunitionsExpert/server/types/models/eft/game/IReportNicknameRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/game/IReportNicknameRequestData.d.ts new file mode 100644 index 0000000..087c58b --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/models/eft/game/IReportNicknameRequestData.d.ts @@ -0,0 +1,3 @@ +export interface IReportNicknameRequestData { + uid: string; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/game/IVersionValidateRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/game/IVersionValidateRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/game/IVersionValidateRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/game/IVersionValidateRequestData.d.ts diff --git a/Faupi-MunitionsExpert/server/types/models/eft/health/Effect.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/health/Effect.d.ts new file mode 100644 index 0000000..2f0adac --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/models/eft/health/Effect.d.ts @@ -0,0 +1,5 @@ +export declare enum Effect { + Fracture = "Fracture", + LightBleeding = "LightBleeding", + HeavyBleeding = "HeavyBleeding" +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/health/IHealthTreatmentRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/health/IHealthTreatmentRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/health/IHealthTreatmentRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/health/IHealthTreatmentRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/health/IOffraidEatRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/health/IOffraidEatRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/health/IOffraidEatRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/health/IOffraidEatRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/health/IOffraidHealRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/health/IOffraidHealRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/health/IOffraidHealRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/health/IOffraidHealRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/health/ISyncHealthRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/health/ISyncHealthRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/health/ISyncHealthRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/health/ISyncHealthRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/hideout/HideoutAreasEnum.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/hideout/HideoutAreasEnum.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/hideout/HideoutAreasEnum.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/hideout/HideoutAreasEnum.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/hideout/IHideoutArea.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/hideout/IHideoutArea.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/hideout/IHideoutArea.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/hideout/IHideoutArea.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/hideout/IHideoutProduction.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/hideout/IHideoutProduction.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/hideout/IHideoutProduction.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/hideout/IHideoutProduction.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/hideout/IHideoutScavCase.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/hideout/IHideoutScavCase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/hideout/IHideoutScavCase.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/hideout/IHideoutScavCase.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/hideout/IHideoutSettingsBase.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/hideout/IHideoutSettingsBase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/hideout/IHideoutSettingsBase.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/hideout/IHideoutSettingsBase.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/httpResponse/IGetBodyResponseData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/httpResponse/IGetBodyResponseData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/httpResponse/IGetBodyResponseData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/httpResponse/IGetBodyResponseData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/httpResponse/INullResponseData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/httpResponse/INullResponseData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/httpResponse/INullResponseData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/httpResponse/INullResponseData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inRaid/ISaveProgressRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/inRaid/ISaveProgressRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inRaid/ISaveProgressRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/inRaid/ISaveProgressRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts diff --git a/Faupi-MunitionsExpert/server/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts new file mode 100644 index 0000000..bf209c6 --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts @@ -0,0 +1 @@ +export declare type IGetInsuranceCostResponseData = Record>; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/insurance/IInsureRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/insurance/IInsureRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/insurance/IInsureRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/insurance/IInsureRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IAddItemRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/inventory/IAddItemRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IAddItemRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/inventory/IAddItemRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventoryAddRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventoryAddRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventoryAddRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventoryAddRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventoryBindRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventoryBindRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventoryBindRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventoryBindRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventoryExamineRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventoryExamineRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventoryExamineRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventoryExamineRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventoryFoldRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventoryFoldRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventoryFoldRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventoryFoldRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventoryMergeRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventoryMergeRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventoryMergeRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventoryMergeRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventoryMoveRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventoryMoveRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventoryMoveRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventoryMoveRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventorySortRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventorySortRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventorySortRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventorySortRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventorySplitRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventorySplitRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventorySplitRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventorySplitRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventorySwapRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventorySwapRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventorySwapRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventorySwapRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventoryTagRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventoryTagRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventoryTagRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventoryTagRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventoryToggleRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventoryToggleRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventoryToggleRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventoryToggleRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventoryTransferRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventoryTransferRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/inventory/IInventoryTransferRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/inventory/IInventoryTransferRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/itemEvent/IItemEventRouterBase.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/itemEvent/IItemEventRouterBase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/itemEvent/IItemEventRouterBase.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/itemEvent/IItemEventRouterBase.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/launcher/IChangeRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/launcher/IChangeRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/launcher/IChangeRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/launcher/IChangeRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/launcher/ILoginRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/launcher/ILoginRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/launcher/ILoginRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/launcher/ILoginRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/launcher/IMiniProfile.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/launcher/IMiniProfile.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/launcher/IMiniProfile.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/launcher/IMiniProfile.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/launcher/IRegisterData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/launcher/IRegisterData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/launcher/IRegisterData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/launcher/IRegisterData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/launcher/IRemoveProfileData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/launcher/IRemoveProfileData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/launcher/IRemoveProfileData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/launcher/IRemoveProfileData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/location/IGetLocationRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/location/IGetLocationRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/location/IGetLocationRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/location/IGetLocationRequestData.d.ts diff --git a/Faupi-MunitionsExpert/server/types/models/eft/match/ICreateGroupRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/match/ICreateGroupRequestData.d.ts new file mode 100644 index 0000000..7413a8a --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/models/eft/match/ICreateGroupRequestData.d.ts @@ -0,0 +1,6 @@ +import { RaidMode } from "../../enums/RaidMode"; +export interface ICreateGroupRequestData { + location: string; + raidMode: RaidMode; + startInGroup: boolean; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/match/IEndOfflineRaidRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/match/IEndOfflineRaidRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/match/IEndOfflineRaidRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/match/IEndOfflineRaidRequestData.d.ts diff --git a/Faupi-MunitionsExpert/server/types/models/eft/match/IGetGroupStatusRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/match/IGetGroupStatusRequestData.d.ts new file mode 100644 index 0000000..55d7079 --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/models/eft/match/IGetGroupStatusRequestData.d.ts @@ -0,0 +1,9 @@ +import { RaidMode } from "../../enums/RaidMode"; +export interface IGetGroupStatusRequestData { + location: string; + savage: boolean; + dt: string; + keyId: string; + raidMode: RaidMode; + startInGroup: boolean; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/match/IGetProfileRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/match/IGetProfileRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/match/IGetProfileRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/match/IGetProfileRequestData.d.ts diff --git a/Faupi-MunitionsExpert/server/types/models/eft/match/IJoinMatchRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/match/IJoinMatchRequestData.d.ts new file mode 100644 index 0000000..cd34f7b --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/models/eft/match/IJoinMatchRequestData.d.ts @@ -0,0 +1,12 @@ +export interface IJoinMatchRequestData { + location: string; + savage: boolean; + dt: string; + servers: Server[]; + keyId: string; +} +export interface Server { + ping: number; + ip: string; + port: string; +} diff --git a/Faupi-MunitionsExpert/server/types/models/eft/match/IJoinMatchResult.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/match/IJoinMatchResult.d.ts new file mode 100644 index 0000000..df695f4 --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/models/eft/match/IJoinMatchResult.d.ts @@ -0,0 +1,11 @@ +export interface IJoinMatchResult { + profileid: string; + status: string; + sid: string; + ip: string; + port: number; + version: string; + location: string; + gamemode: string; + shortid: string; +} diff --git a/Faupi-MunitionsExpert/server/types/models/eft/match/IPutMetricsRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/match/IPutMetricsRequestData.d.ts new file mode 100644 index 0000000..d9ed214 --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/models/eft/match/IPutMetricsRequestData.d.ts @@ -0,0 +1,10 @@ +export interface IPutMetricsRequestData { + sid: string; + settings: any; + SharedSettings: any; + HardwareDescription: any; + Location: string; + Metrics: any; + ClientEvents: any; + SpikeSamples: any[]; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/match/IStartOffineRaidRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/match/IStartOffineRaidRequestData.d.ts similarity index 74% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/match/IStartOffineRaidRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/match/IStartOffineRaidRequestData.d.ts index 84bccc8..af0625e 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/match/IStartOffineRaidRequestData.d.ts +++ b/Faupi-MunitionsExpert/server/types/models/eft/match/IStartOffineRaidRequestData.d.ts @@ -1,6 +1,7 @@ +import { BotAmount } from "../../enums/BotAmount"; +import { BotDifficulty } from "../../enums/BotDifficulty"; export interface IStartOfflineRaidRequestData { locationName: string; - entryPoint: string; startTime: number; dateTime: string; gameSettings: GameSettings; @@ -17,11 +18,11 @@ export interface TimeAndWeatherSettings { export interface BotsSettings { isEnabled: boolean; isScavWars: boolean; - botAmount: string; + botAmount: BotAmount; } export interface WavesSettings { - botDifficulty: string; + botDifficulty: BotDifficulty; isBosses: boolean; isTaggedAndCursed: boolean; - wavesBotAmount: string; + wavesBotAmount: BotAmount; } diff --git a/Faupi-MunitionsExpert/server/types/models/eft/match/IUpdatePingRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/match/IUpdatePingRequestData.d.ts new file mode 100644 index 0000000..defbd66 --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/models/eft/match/IUpdatePingRequestData.d.ts @@ -0,0 +1,3 @@ +export interface IUpdatePingRequestData { + servers: any[]; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/notes/INoteActionData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/notes/INoteActionData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/notes/INoteActionData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/notes/INoteActionData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/notifier/INotifier.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/notifier/INotifier.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/notifier/INotifier.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/notifier/INotifier.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/notifier/ISelectProfileRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/notifier/ISelectProfileRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/notifier/ISelectProfileRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/notifier/ISelectProfileRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts diff --git a/Faupi-MunitionsExpert/server/types/models/eft/profile/GetProfileStatusResponseData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/profile/GetProfileStatusResponseData.d.ts new file mode 100644 index 0000000..eee9b4f --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/models/eft/profile/GetProfileStatusResponseData.d.ts @@ -0,0 +1,11 @@ +export interface GetProfileStatusResponseData { + maxPveCountExceeded: false; + profiles: ProfileData[]; +} +export interface ProfileData { + profileid: string; + status: string; + sid: string; + ip: string; + port: number; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/profile/IAkiProfile.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/profile/IAkiProfile.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/profile/IAkiProfile.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/profile/IAkiProfile.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/profile/IProfileCreateRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/profile/IProfileCreateRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/profile/IProfileCreateRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/profile/IProfileCreateRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/profile/ISearchFriendRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/profile/ISearchFriendRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/profile/ISearchFriendRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/profile/ISearchFriendRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/profile/ISearchFriendResponse.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/profile/ISearchFriendResponse.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/profile/ISearchFriendResponse.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/profile/ISearchFriendResponse.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/profile/IValidateNicknameRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/profile/IValidateNicknameRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/profile/IValidateNicknameRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/profile/IValidateNicknameRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/quests/IAcceptQuestRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/quests/IAcceptQuestRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/quests/IAcceptQuestRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/quests/IAcceptQuestRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/quests/ICompleteQuestRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/quests/ICompleteQuestRequestData.d.ts similarity index 85% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/quests/ICompleteQuestRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/quests/ICompleteQuestRequestData.d.ts index cc67404..36a6db3 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/quests/ICompleteQuestRequestData.d.ts +++ b/Faupi-MunitionsExpert/server/types/models/eft/quests/ICompleteQuestRequestData.d.ts @@ -1,5 +1,6 @@ export interface ICompleteQuestRequestData { Action: string; + /** Quest Id */ qid: string; removeExcessItems: boolean; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/quests/IHandoverQuestRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/quests/IHandoverQuestRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/quests/IHandoverQuestRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/quests/IHandoverQuestRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/quests/IListQuestsRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/quests/IListQuestsRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/quests/IListQuestsRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/quests/IListQuestsRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/ragfair/IAddOfferRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/ragfair/IAddOfferRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/ragfair/IAddOfferRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/ragfair/IAddOfferRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/ragfair/IExtendOfferRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/ragfair/IExtendOfferRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/ragfair/IExtendOfferRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/ragfair/IExtendOfferRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/ragfair/IGetItemPriceResult.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/ragfair/IGetItemPriceResult.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/ragfair/IGetItemPriceResult.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/ragfair/IGetItemPriceResult.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/ragfair/IGetOffersResult.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/ragfair/IGetOffersResult.d.ts similarity index 80% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/ragfair/IGetOffersResult.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/ragfair/IGetOffersResult.d.ts index 1c11422..fbc631d 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/eft/ragfair/IGetOffersResult.d.ts +++ b/Faupi-MunitionsExpert/server/types/models/eft/ragfair/IGetOffersResult.d.ts @@ -1,6 +1,6 @@ import { IRagfairOffer } from "./IRagfairOffer"; export interface IGetOffersResult { - categories: Record; + categories?: Record; offers: IRagfairOffer[]; offersCount: number; selectedCategory: string; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/ragfair/IRagfairOffer.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/ragfair/IRagfairOffer.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/ragfair/IRagfairOffer.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/ragfair/IRagfairOffer.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/ragfair/ISearchRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/ragfair/ISearchRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/ragfair/ISearchRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/ragfair/ISearchRequestData.d.ts diff --git a/Faupi-MunitionsExpert/server/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts new file mode 100644 index 0000000..2d14d20 --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts @@ -0,0 +1,3 @@ +export interface ISendRagfairReportRequestData { + offerId: number; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/repair/IRepairActionDataRequest.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/repair/IRepairActionDataRequest.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/repair/IRepairActionDataRequest.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/repair/IRepairActionDataRequest.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/trade/IProcessSellTradeRequestData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/trade/IProcessSellTradeRequestData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/trade/IProcessSellTradeRequestData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/trade/IProcessSellTradeRequestData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/weather/IWeatherData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/weather/IWeatherData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/weather/IWeatherData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/weather/IWeatherData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/wishlist/IWishlistActionData.d.ts b/Faupi-MunitionsExpert/server/types/models/eft/wishlist/IWishlistActionData.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/eft/wishlist/IWishlistActionData.d.ts rename to Faupi-MunitionsExpert/server/types/models/eft/wishlist/IWishlistActionData.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/enums/BaseClasses.d.ts b/Faupi-MunitionsExpert/server/types/models/enums/BaseClasses.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/enums/BaseClasses.d.ts rename to Faupi-MunitionsExpert/server/types/models/enums/BaseClasses.d.ts diff --git a/Faupi-MunitionsExpert/server/types/models/enums/BotAmount.d.ts b/Faupi-MunitionsExpert/server/types/models/enums/BotAmount.d.ts new file mode 100644 index 0000000..d0e1df1 --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/models/enums/BotAmount.d.ts @@ -0,0 +1,7 @@ +export declare enum BotAmount { + AsOnline = "AsOnline", + Low = "Low", + Medium = "Medium", + High = "High", + Horde = "Horde" +} diff --git a/Faupi-MunitionsExpert/server/types/models/enums/BotDifficulty.d.ts b/Faupi-MunitionsExpert/server/types/models/enums/BotDifficulty.d.ts new file mode 100644 index 0000000..c901bcf --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/models/enums/BotDifficulty.d.ts @@ -0,0 +1,8 @@ +export declare enum BotDifficulty { + AsOnline = "AsOnline", + Easy = "Easy", + Medium = "Medium", + Hard = "Hard", + Impossible = "Impossible", + Random = "Random" +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/enums/ConfigTypes.d.ts b/Faupi-MunitionsExpert/server/types/models/enums/ConfigTypes.d.ts similarity index 94% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/enums/ConfigTypes.d.ts rename to Faupi-MunitionsExpert/server/types/models/enums/ConfigTypes.d.ts index 6bd31e8..1c49e62 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/enums/ConfigTypes.d.ts +++ b/Faupi-MunitionsExpert/server/types/models/enums/ConfigTypes.d.ts @@ -8,6 +8,7 @@ export declare enum ConfigTypes { IN_RAID = "aki-inraid", INSURANCE = "aki-insurance", INVENTORY = "aki-inventory", + LOCALE = "aki-locale", LOCATION = "aki-location", MATCH = "aki-match", QUEST = "aki-quest", diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/enums/ELocationName.d.ts b/Faupi-MunitionsExpert/server/types/models/enums/ELocationName.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/enums/ELocationName.d.ts rename to Faupi-MunitionsExpert/server/types/models/enums/ELocationName.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/enums/EquipmentSlots.d.ts b/Faupi-MunitionsExpert/server/types/models/enums/EquipmentSlots.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/enums/EquipmentSlots.d.ts rename to Faupi-MunitionsExpert/server/types/models/enums/EquipmentSlots.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/enums/HideoutAreas.d.ts b/Faupi-MunitionsExpert/server/types/models/enums/HideoutAreas.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/enums/HideoutAreas.d.ts rename to Faupi-MunitionsExpert/server/types/models/enums/HideoutAreas.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/enums/MemberCategory.d.ts b/Faupi-MunitionsExpert/server/types/models/enums/MemberCategory.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/enums/MemberCategory.d.ts rename to Faupi-MunitionsExpert/server/types/models/enums/MemberCategory.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/enums/MessageType.d.ts b/Faupi-MunitionsExpert/server/types/models/enums/MessageType.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/enums/MessageType.d.ts rename to Faupi-MunitionsExpert/server/types/models/enums/MessageType.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/enums/Money.d.ts b/Faupi-MunitionsExpert/server/types/models/enums/Money.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/enums/Money.d.ts rename to Faupi-MunitionsExpert/server/types/models/enums/Money.d.ts diff --git a/Faupi-MunitionsExpert/server/types/models/enums/QuestRewardType.d.ts b/Faupi-MunitionsExpert/server/types/models/enums/QuestRewardType.d.ts new file mode 100644 index 0000000..1d3db86 --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/models/enums/QuestRewardType.d.ts @@ -0,0 +1,8 @@ +export declare enum QuestRewardType { + Skill = "Skill", + Experience = "Experience", + TraderStanding = "TraderStanding", + TraderUnlock = "TraderUnlock", + Item = "Item", + AssortmentUnlock = "AssortmentUnlock" +} diff --git a/Faupi-MunitionsExpert/server/types/models/enums/QuestStatus.d.ts b/Faupi-MunitionsExpert/server/types/models/enums/QuestStatus.d.ts new file mode 100644 index 0000000..6335c73 --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/models/enums/QuestStatus.d.ts @@ -0,0 +1,10 @@ +export declare enum QuestStatus { + Locked = 0, + AvailableForStart = 1, + Started = 2, + AvailableForFinish = 3, + Success = 4, + Fail = 5, + FailRestartable = 6, + MarkedAsFailed = 7 +} diff --git a/Faupi-MunitionsExpert/server/types/models/enums/RaidMode.d.ts b/Faupi-MunitionsExpert/server/types/models/enums/RaidMode.d.ts new file mode 100644 index 0000000..c5a8cff --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/models/enums/RaidMode.d.ts @@ -0,0 +1,5 @@ +export declare enum RaidMode { + Online = "Online", + Local = "Local", + Coop = "Coop" +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/enums/Traders.d.ts b/Faupi-MunitionsExpert/server/types/models/enums/Traders.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/enums/Traders.d.ts rename to Faupi-MunitionsExpert/server/types/models/enums/Traders.d.ts diff --git a/Faupi-MunitionsExpert/server/types/models/external/IPostAkiLoadMod.d.ts b/Faupi-MunitionsExpert/server/types/models/external/IPostAkiLoadMod.d.ts new file mode 100644 index 0000000..f6950e8 --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/models/external/IPostAkiLoadMod.d.ts @@ -0,0 +1,4 @@ +import { DependencyContainer } from "./tsyringe"; +export interface IPostAkiLoadMod { + postAkiLoad(container: DependencyContainer): void; +} diff --git a/Faupi-MunitionsExpert/server/types/models/external/IPostDBLoadMod.d.ts b/Faupi-MunitionsExpert/server/types/models/external/IPostDBLoadMod.d.ts new file mode 100644 index 0000000..ca7c682 --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/models/external/IPostDBLoadMod.d.ts @@ -0,0 +1,4 @@ +import { DependencyContainer } from "./tsyringe"; +export interface IPostDBLoadMod { + postDBLoad(container: DependencyContainer): void; +} diff --git a/Faupi-MunitionsExpert/server/types/models/external/IPreAkiLoadMod.d.ts b/Faupi-MunitionsExpert/server/types/models/external/IPreAkiLoadMod.d.ts new file mode 100644 index 0000000..ae7579e --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/models/external/IPreAkiLoadMod.d.ts @@ -0,0 +1,4 @@ +import { DependencyContainer } from "./tsyringe"; +export interface IPreAkiLoadMod { + preAkiLoad(container: DependencyContainer): void; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/external/mod.d.ts b/Faupi-MunitionsExpert/server/types/models/external/mod.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/external/mod.d.ts rename to Faupi-MunitionsExpert/server/types/models/external/mod.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/external/tsyringe.d.ts b/Faupi-MunitionsExpert/server/types/models/external/tsyringe.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/external/tsyringe.d.ts rename to Faupi-MunitionsExpert/server/types/models/external/tsyringe.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/bindings/Route.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/bindings/Route.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/bindings/Route.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/bindings/Route.d.ts diff --git a/Faupi-MunitionsExpert/server/types/models/spt/bots/BotLootCache.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/bots/BotLootCache.d.ts new file mode 100644 index 0000000..e185315 --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/models/spt/bots/BotLootCache.d.ts @@ -0,0 +1,23 @@ +import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; +export declare class BotLootCache { + backpackLoot: ITemplateItem[]; + pocketLoot: ITemplateItem[]; + vestLoot: ITemplateItem[]; + combinedPoolLoot: ITemplateItem[]; + specialItems: ITemplateItem[]; + healingItems: ITemplateItem[]; + drugItems: ITemplateItem[]; + stimItems: ITemplateItem[]; + grenadeItems: ITemplateItem[]; +} +export declare enum LootCacheType { + Special = "Special", + Backpack = "Backpack", + Pocket = "Pocket", + Vest = "Vest", + Combined = "Combined", + HealingItems = "HealingItems", + DrugItems = "DrugItems", + StimItems = "StimItems", + GrenadeItems = "GrenadeItems" +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IBotCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/IBotCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IBotCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/IBotCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IBundleCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/IBundleCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IBundleCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/IBundleCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/ICustomizationCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/ICustomizationCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/ICustomizationCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/ICustomizationCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IDataCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/IDataCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IDataCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/IDataCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IDialogueCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/IDialogueCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IDialogueCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/IDialogueCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IGameCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/IGameCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IGameCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/IGameCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IHandbookCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/IHandbookCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IHandbookCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/IHandbookCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IHealthCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/IHealthCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IHealthCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/IHealthCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IHideoutCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/IHideoutCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IHideoutCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/IHideoutCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IHttpCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/IHttpCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IHttpCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/IHttpCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IInraidCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/IInraidCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IInraidCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/IInraidCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IInsuranceCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/IInsuranceCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IInsuranceCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/IInsuranceCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IInventoryCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/IInventoryCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IInventoryCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/IInventoryCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IItemEventCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/IItemEventCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IItemEventCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/IItemEventCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/ILauncherCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/ILauncherCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/ILauncherCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/ILauncherCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/ILocationCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/ILocationCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/ILocationCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/ILocationCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IMatchCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/IMatchCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IMatchCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/IMatchCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IModCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/IModCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IModCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/IModCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/INoteCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/INoteCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/INoteCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/INoteCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/INotifierCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/INotifierCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/INotifierCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/INotifierCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IPresetCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/IPresetCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IPresetCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/IPresetCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IProfileCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/IProfileCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IProfileCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/IProfileCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IQuestCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/IQuestCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IQuestCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/IQuestCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IRagfairCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/IRagfairCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IRagfairCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/IRagfairCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IRepairCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/IRepairCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IRepairCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/IRepairCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/ISaveCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/ISaveCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/ISaveCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/ISaveCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/ITradeCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/ITradeCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/ITradeCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/ITradeCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/ITraderCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/ITraderCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/ITraderCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/ITraderCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IWeatherCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/IWeatherCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IWeatherCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/IWeatherCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IWishlistCallbacks.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/callbacks/IWishlistCallbacks.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/callbacks/IWishlistCallbacks.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/callbacks/IWishlistCallbacks.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IAirdropConfig.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/config/IAirdropConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IAirdropConfig.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/config/IAirdropConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IBaseConfig.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/config/IBaseConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IBaseConfig.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/config/IBaseConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IBotConfig.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/config/IBotConfig.d.ts similarity index 97% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IBotConfig.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/config/IBotConfig.d.ts index 5fb9d93..f8cf39b 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IBotConfig.d.ts +++ b/Faupi-MunitionsExpert/server/types/models/spt/config/IBotConfig.d.ts @@ -18,6 +18,7 @@ export interface PresetBatch { bossKojaniy: number; bossSanitar: number; bossTagilla: number; + bossKnight: number; bossTest: number; cursedAssault: number; followerBully: number; @@ -28,6 +29,8 @@ export interface PresetBatch { followerKojaniy: number; followerSanitar: number; followerTagilla: number; + followerBirdEye: number; + followerBigPipe: number; followerTest: number; marksman: number; pmcBot: number; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/ICoreConfig.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/config/ICoreConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/ICoreConfig.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/config/ICoreConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IHealthConfig.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/config/IHealthConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IHealthConfig.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/config/IHealthConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IHideoutConfig.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/config/IHideoutConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IHideoutConfig.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/config/IHideoutConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IHttpConfig.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/config/IHttpConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IHttpConfig.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/config/IHttpConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IInRaidConfig.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/config/IInRaidConfig.d.ts similarity index 95% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IInRaidConfig.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/config/IInRaidConfig.d.ts index baaf083..3ae2972 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/config/IInRaidConfig.d.ts +++ b/Faupi-MunitionsExpert/server/types/models/spt/config/IInRaidConfig.d.ts @@ -14,6 +14,7 @@ export interface RaidMenuSettings { bossEnabled: boolean; scavWars: boolean; taggedAndCursed: boolean; + enablePve: boolean; } export interface Save { loot: boolean; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IInsuranceConfig.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/config/IInsuranceConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IInsuranceConfig.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/config/IInsuranceConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IInventoryConfig.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/config/IInventoryConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IInventoryConfig.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/config/IInventoryConfig.d.ts diff --git a/Faupi-MunitionsExpert/server/types/models/spt/config/ILocaleConfig.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/config/ILocaleConfig.d.ts new file mode 100644 index 0000000..fe9abf7 --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/models/spt/config/ILocaleConfig.d.ts @@ -0,0 +1,5 @@ +import { IBaseConfig } from "./IBaseConfig"; +export interface ILocaleConfig extends IBaseConfig { + kind: "aki-locale"; + desiredLocale: string; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/ILocationConfig.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/config/ILocationConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/ILocationConfig.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/config/ILocationConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IMatchConfig.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/config/IMatchConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IMatchConfig.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/config/IMatchConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IQuestConfig.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/config/IQuestConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IQuestConfig.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/config/IQuestConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IRagfairConfig.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/config/IRagfairConfig.d.ts similarity index 98% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IRagfairConfig.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/config/IRagfairConfig.d.ts index 2d151ca..8518252 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/IRagfairConfig.d.ts +++ b/Faupi-MunitionsExpert/server/types/models/spt/config/IRagfairConfig.d.ts @@ -30,6 +30,7 @@ export interface Dynamic { expiredOfferThreshold: number; offerItemCount: MinMax; price: MinMax; + presetPrice: MinMax; endTimeSeconds: MinMax; condition: Condition; stackablePercent: MinMax; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IRepairConfig.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/config/IRepairConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IRepairConfig.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/config/IRepairConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/ITraderConfig.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/config/ITraderConfig.d.ts similarity index 59% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/ITraderConfig.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/config/ITraderConfig.d.ts index dab73e3..c8e8044 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/config/ITraderConfig.d.ts +++ b/Faupi-MunitionsExpert/server/types/models/spt/config/ITraderConfig.d.ts @@ -3,13 +3,17 @@ export interface ITraderConfig extends IBaseConfig { kind: "aki-trader"; updateTime: UpdateTime[]; updateTimeDefault: number; - fenceAssortSize: number; - fenceMaxPresetsCount: number; - fencePresetPriceMult: number; + traderPriceMultipler: number; minDurabilityForSale: number; - fenceItemIgnoreList: string[]; + fence: FenceConfig; } export interface UpdateTime { traderId: string; seconds: number; } +export interface FenceConfig { + assortSize: number; + maxPresetsCount: number; + presetPriceMult: number; + blacklist: string[]; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IWeatherConfig.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/config/IWeatherConfig.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/config/IWeatherConfig.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/config/IWeatherConfig.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/controllers/IBotController.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/controllers/IBotController.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/controllers/IBotController.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/controllers/IBotController.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/generators/IBotGenerator.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/generators/IBotGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/generators/IBotGenerator.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/generators/IBotGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/generators/ILocationGenerator.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/generators/ILocationGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/generators/ILocationGenerator.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/generators/ILocationGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/generators/IPMCLootGenerator.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/generators/IPMCLootGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/generators/IPMCLootGenerator.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/generators/IPMCLootGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/generators/IRagfairAssortGenerator.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/generators/IRagfairAssortGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/generators/IRagfairAssortGenerator.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/generators/IRagfairAssortGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/generators/IRagfairOfferGenerator.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/generators/IRagfairOfferGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/generators/IRagfairOfferGenerator.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/generators/IRagfairOfferGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/helpers/Traders.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/helpers/Traders.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/helpers/Traders.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/helpers/Traders.d.ts diff --git a/Faupi-MunitionsExpert/server/types/models/spt/logging/LogBackgroundColor.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/logging/LogBackgroundColor.d.ts new file mode 100644 index 0000000..87e08a9 --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/models/spt/logging/LogBackgroundColor.d.ts @@ -0,0 +1,11 @@ +export declare enum LogBackgroundColor { + default = "", + black = "blackBG", + red = "redBG", + green = "greenBG", + yellow = "yellowBG", + blue = "blueBG", + magenta = "magentaBG", + cyan = "cyanBG", + white = "whiteBG" +} diff --git a/Faupi-MunitionsExpert/server/types/models/spt/logging/LogTextColor.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/logging/LogTextColor.d.ts new file mode 100644 index 0000000..7147ae3 --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/models/spt/logging/LogTextColor.d.ts @@ -0,0 +1,11 @@ +export declare enum LogTextColor { + black = "black", + red = "red", + green = "green", + yellow = "yellow", + blue = "blue", + magenta = "magenta", + cyan = "cyan", + white = "white", + gray = "" +} diff --git a/Faupi-MunitionsExpert/server/types/models/spt/logging/SptLogger.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/logging/SptLogger.d.ts new file mode 100644 index 0000000..ea1b3d8 --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/models/spt/logging/SptLogger.d.ts @@ -0,0 +1,7 @@ +export interface SptLogger { + error: (msg: string | Record) => void; + warn: (msg: string | Record) => void; + succ?: (msg: string | Record) => void; + info: (msg: string | Record) => void; + debug: (msg: string | Record) => void; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/mod/IMod.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/mod/IMod.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/mod/IMod.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/mod/IMod.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/mod/IModLoader.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/mod/IModLoader.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/mod/IModLoader.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/mod/IModLoader.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/mod/IPackageJsonData.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/mod/IPackageJsonData.d.ts similarity index 84% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/mod/IPackageJsonData.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/mod/IPackageJsonData.d.ts index 09472cd..99e4ef9 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/models/spt/mod/IPackageJsonData.d.ts +++ b/Faupi-MunitionsExpert/server/types/models/spt/mod/IPackageJsonData.d.ts @@ -1,6 +1,7 @@ export interface IPackageJsonData { incompatibilities?: string[]; dependencies?: string[]; + modDependencies?: Record; name: string; author: string; version: string; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/ragfair/IRagfairServerPrices.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/ragfair/IRagfairServerPrices.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/ragfair/IRagfairServerPrices.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/ragfair/IRagfairServerPrices.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/server/IDatabaseTables.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/server/IDatabaseTables.d.ts similarity index 69% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/server/IDatabaseTables.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/server/IDatabaseTables.d.ts index dbb71be..9978459 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/models/spt/server/IDatabaseTables.d.ts +++ b/Faupi-MunitionsExpert/server/types/models/spt/server/IDatabaseTables.d.ts @@ -5,6 +5,8 @@ import { IBotType } from "../../eft/common/tables/IBotType"; import { ICustomizationItem } from "../../eft/common/tables/ICustomizationItem"; import { IHandbookBase } from "../../eft/common/tables/IHandbookBase"; import { ILootBase } from "../../eft/common/tables/ILootBase"; +import { IMatch } from "../../eft/common/tables/IMatch"; +import { IProfileTemplates } from "../../eft/common/tables/IProfileTemplate"; import { IQuest } from "../../eft/common/tables/IQuest"; import { IRepeatableQuestDatabase } from "../../eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; @@ -18,34 +20,37 @@ import { ILocations } from "./ILocations"; import { IServerBase } from "./IServerBase"; import { ISettingsBase } from "./ISettingsBase"; export interface IDatabaseTables { - bots: { + bots?: { types: Record; base: IBotBase; core: IBotCore; }; - hideout: { + hideout?: { areas: IHideoutArea[]; production: IHideoutProduction[]; scavcase: IHideoutScavCase[]; settings: IHideoutSettingsBase; }; - locales: ILocaleBase; - locations: ILocations; - loot: ILootBase; - match: any; - templates: { + locales?: ILocaleBase; + locations?: ILocations; + loot?: ILootBase; + match?: IMatch; + templates?: { character: string[]; items: Record; quests: IQuest[]; repeatableQuests: IRepeatableQuestDatabase; + /** DEPRECATED - Items file found in the client, massivly out of date compared to templates.items, try not to use this, remove ASAP*/ clientItems: Record; handbook: IHandbookBase; customization: Record; - profiles: any; + /** The profile templates listed in the launcher on profile creation, split by account type (e.g. Standard) then side (e.g. bear/usec) */ + profiles: IProfileTemplates; + /** Flea prices of items - gathered from online flea market dump */ prices: Record; }; - traders: Record; - globals: IGlobals; - server: IServerBase; - settings: ISettingsBase; + traders?: Record; + globals?: IGlobals; + server?: IServerBase; + settings?: ISettingsBase; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/server/IHttpServer.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/server/IHttpServer.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/server/IHttpServer.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/server/IHttpServer.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/server/ILocaleBase.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/server/ILocaleBase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/server/ILocaleBase.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/server/ILocaleBase.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/server/ILocations.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/server/ILocations.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/server/ILocations.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/server/ILocations.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/server/IServerBase.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/server/IServerBase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/server/IServerBase.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/server/IServerBase.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/server/ISettingsBase.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/server/ISettingsBase.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/server/ISettingsBase.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/server/ISettingsBase.d.ts diff --git a/Faupi-MunitionsExpert/server/types/models/spt/services/CustomPreset.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/services/CustomPreset.d.ts new file mode 100644 index 0000000..f07382e --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/models/spt/services/CustomPreset.d.ts @@ -0,0 +1,5 @@ +import { Preset } from "../../eft/common/IGlobals"; +export interface CustomPreset { + key: string; + preset: Preset; +} diff --git a/Faupi-MunitionsExpert/server/types/models/spt/services/CustomTraderAssortData.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/services/CustomTraderAssortData.d.ts new file mode 100644 index 0000000..265a26a --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/models/spt/services/CustomTraderAssortData.d.ts @@ -0,0 +1,6 @@ +import { ITraderAssort } from "../../eft/common/tables/ITrader"; +import { Traders } from "../../enums/Traders"; +export interface CustomTraderAssortData { + traderId: Traders; + assorts: ITraderAssort; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/utils/IAsyncQueue.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/utils/IAsyncQueue.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/utils/IAsyncQueue.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/utils/IAsyncQueue.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/utils/ICommand.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/utils/ICommand.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/utils/ICommand.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/utils/ICommand.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/utils/ILogger.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/utils/ILogger.d.ts similarity index 59% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/utils/ILogger.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/utils/ILogger.d.ts index c983701..2af3fac 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/utils/ILogger.d.ts +++ b/Faupi-MunitionsExpert/server/types/models/spt/utils/ILogger.d.ts @@ -1,7 +1,10 @@ import { Daum } from "../../eft/itemEvent/IItemEventRouterRequest"; +import { LogBackgroundColor } from "../logging/LogBackgroundColor"; +import { LogTextColor } from "../logging/LogTextColor"; export interface ILogger { writeToLogFile(data: string | Daum): void; - log(data: string | Record | Error, color: string): void; + log(data: string | Record | Error, color: string, backgroundColor?: string): void; + logWithColor(data: string | Record, textColor: LogTextColor, backgroundColor?: LogBackgroundColor): void; error(data: string): void; warning(data: string): void; success(data: string): void; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/utils/IUuidGenerator.d.ts b/Faupi-MunitionsExpert/server/types/models/spt/utils/IUuidGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/models/spt/utils/IUuidGenerator.d.ts rename to Faupi-MunitionsExpert/server/types/models/spt/utils/IUuidGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/HttpRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/HttpRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/HttpRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/HttpRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/ImageRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/ImageRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/ImageRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/ImageRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/ItemEventRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/ItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/ItemEventRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/ItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/dynamic/BotDynamicRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/dynamic/BotDynamicRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/dynamic/BotDynamicRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/dynamic/BotDynamicRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/dynamic/BundleDynamicRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/dynamic/BundleDynamicRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/dynamic/BundleDynamicRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/dynamic/BundleDynamicRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/dynamic/CustomizationDynamicRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/dynamic/CustomizationDynamicRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/dynamic/CustomizationDynamicRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/dynamic/CustomizationDynamicRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/dynamic/DataDynamicRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/dynamic/DataDynamicRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/dynamic/DataDynamicRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/dynamic/DataDynamicRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/dynamic/HttpDynamicRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/dynamic/HttpDynamicRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/dynamic/HttpDynamicRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/dynamic/HttpDynamicRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/dynamic/InraidDynamicRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/dynamic/InraidDynamicRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/dynamic/InraidDynamicRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/dynamic/InraidDynamicRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/dynamic/LocationDynamicRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/dynamic/LocationDynamicRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/dynamic/LocationDynamicRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/dynamic/LocationDynamicRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/dynamic/NotifierDynamicRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/dynamic/NotifierDynamicRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/dynamic/NotifierDynamicRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/dynamic/NotifierDynamicRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/dynamic/TraderDynamicRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/dynamic/TraderDynamicRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/dynamic/TraderDynamicRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/dynamic/TraderDynamicRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/item_events/CustomizationItemEventRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/item_events/CustomizationItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/item_events/CustomizationItemEventRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/item_events/CustomizationItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/item_events/HealthItemEventRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/item_events/HealthItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/item_events/HealthItemEventRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/item_events/HealthItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/item_events/HideoutItemEventRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/item_events/HideoutItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/item_events/HideoutItemEventRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/item_events/HideoutItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/item_events/InsuranceItemEventRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/item_events/InsuranceItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/item_events/InsuranceItemEventRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/item_events/InsuranceItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/item_events/InventoryItemEventRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/item_events/InventoryItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/item_events/InventoryItemEventRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/item_events/InventoryItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/item_events/NoteItemEventRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/item_events/NoteItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/item_events/NoteItemEventRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/item_events/NoteItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/item_events/PresetBuildItemEventRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/item_events/PresetBuildItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/item_events/PresetBuildItemEventRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/item_events/PresetBuildItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/item_events/QuestItemEventRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/item_events/QuestItemEventRouter.d.ts similarity index 62% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/item_events/QuestItemEventRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/item_events/QuestItemEventRouter.d.ts index db59c25..a092aa6 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/routers/item_events/QuestItemEventRouter.d.ts +++ b/Faupi-MunitionsExpert/server/types/routers/item_events/QuestItemEventRouter.d.ts @@ -1,10 +1,12 @@ -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; import { QuestCallbacks } from "../../callbacks/QuestCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; +import { IPmcData } from "../../models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; +import { ILogger } from "../../models/spt/utils/ILogger"; export declare class QuestItemEventRouter extends ItemEventRouterDefinition { + protected logger: ILogger; protected questCallbacks: QuestCallbacks; - constructor(questCallbacks: QuestCallbacks); + constructor(logger: ILogger, questCallbacks: QuestCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; + handleItemEvent(eventAction: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/item_events/RagfairItemEventRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/item_events/RagfairItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/item_events/RagfairItemEventRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/item_events/RagfairItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/item_events/RepairItemEventRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/item_events/RepairItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/item_events/RepairItemEventRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/item_events/RepairItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/item_events/TradeItemEventRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/item_events/TradeItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/item_events/TradeItemEventRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/item_events/TradeItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/item_events/WishlistItemEventRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/item_events/WishlistItemEventRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/item_events/WishlistItemEventRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/item_events/WishlistItemEventRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/save_load/HealthSaveLoadRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/save_load/HealthSaveLoadRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/save_load/HealthSaveLoadRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/save_load/HealthSaveLoadRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/save_load/InraidSaveLoadRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/save_load/InraidSaveLoadRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/save_load/InraidSaveLoadRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/save_load/InraidSaveLoadRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/save_load/InsuranceSaveLoadRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/save_load/InsuranceSaveLoadRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/save_load/InsuranceSaveLoadRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/save_load/InsuranceSaveLoadRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/save_load/ProfileSaveLoadRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/save_load/ProfileSaveLoadRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/save_load/ProfileSaveLoadRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/save_load/ProfileSaveLoadRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/serializers/BundleSerializer.d.ts b/Faupi-MunitionsExpert/server/types/routers/serializers/BundleSerializer.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/serializers/BundleSerializer.d.ts rename to Faupi-MunitionsExpert/server/types/routers/serializers/BundleSerializer.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/serializers/ImageSerializer.d.ts b/Faupi-MunitionsExpert/server/types/routers/serializers/ImageSerializer.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/serializers/ImageSerializer.d.ts rename to Faupi-MunitionsExpert/server/types/routers/serializers/ImageSerializer.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/serializers/NotifySerializer.d.ts b/Faupi-MunitionsExpert/server/types/routers/serializers/NotifySerializer.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/serializers/NotifySerializer.d.ts rename to Faupi-MunitionsExpert/server/types/routers/serializers/NotifySerializer.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/BotStaticRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/static/BotStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/BotStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/static/BotStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/BundleStaticRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/static/BundleStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/BundleStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/static/BundleStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/CustomizationStaticRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/static/CustomizationStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/CustomizationStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/static/CustomizationStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/DataStaticRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/static/DataStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/DataStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/static/DataStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/DialogStaticRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/static/DialogStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/DialogStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/static/DialogStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/GameStaticRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/static/GameStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/GameStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/static/GameStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/HealthStaticRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/static/HealthStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/HealthStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/static/HealthStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/InraidStaticRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/static/InraidStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/InraidStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/static/InraidStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/InsuranceStaticRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/static/InsuranceStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/InsuranceStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/static/InsuranceStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/ItemEventStaticRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/static/ItemEventStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/ItemEventStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/static/ItemEventStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/LauncherStaticRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/static/LauncherStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/LauncherStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/static/LauncherStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/LocationStaticRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/static/LocationStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/LocationStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/static/LocationStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/MatchStaticRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/static/MatchStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/MatchStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/static/MatchStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/NotifierStaticRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/static/NotifierStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/NotifierStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/static/NotifierStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/PresetStaticRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/static/PresetStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/PresetStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/static/PresetStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/ProfileStaticRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/static/ProfileStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/ProfileStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/static/ProfileStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/QuestStaticRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/static/QuestStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/QuestStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/static/QuestStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/RagfairStaticRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/static/RagfairStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/RagfairStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/static/RagfairStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/TraderStaticRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/static/TraderStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/TraderStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/static/TraderStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/WeatherStaticRouter.d.ts b/Faupi-MunitionsExpert/server/types/routers/static/WeatherStaticRouter.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/routers/static/WeatherStaticRouter.d.ts rename to Faupi-MunitionsExpert/server/types/routers/static/WeatherStaticRouter.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/servers/ConfigServer.d.ts b/Faupi-MunitionsExpert/server/types/servers/ConfigServer.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/servers/ConfigServer.d.ts rename to Faupi-MunitionsExpert/server/types/servers/ConfigServer.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/servers/DatabaseServer.d.ts b/Faupi-MunitionsExpert/server/types/servers/DatabaseServer.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/servers/DatabaseServer.d.ts rename to Faupi-MunitionsExpert/server/types/servers/DatabaseServer.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/servers/HttpServer.d.ts b/Faupi-MunitionsExpert/server/types/servers/HttpServer.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/servers/HttpServer.d.ts rename to Faupi-MunitionsExpert/server/types/servers/HttpServer.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/servers/RagfairServer.d.ts b/Faupi-MunitionsExpert/server/types/servers/RagfairServer.d.ts similarity index 92% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/servers/RagfairServer.d.ts rename to Faupi-MunitionsExpert/server/types/servers/RagfairServer.d.ts index 60c92b5..bc86cdb 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/servers/RagfairServer.d.ts +++ b/Faupi-MunitionsExpert/server/types/servers/RagfairServer.d.ts @@ -17,7 +17,8 @@ export declare class RagfairServer { constructor(logger: ILogger, ragfairOfferGenerator: RagfairOfferGenerator, ragfairOfferService: RagfairOfferService, ragfairCategoriesService: RagfairCategoriesService, ragfairRequiredItemsService: RagfairRequiredItemsService, configServer: ConfigServer); load(): void; update(): void; - getCategories(): Record; + getAllCategories(): Record; + getBespokeCategories(offers: IRagfairOffer[]): Record; /** * Disable/Hide an offer from flea * @param offerId diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/servers/SaveServer.d.ts b/Faupi-MunitionsExpert/server/types/servers/SaveServer.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/servers/SaveServer.d.ts rename to Faupi-MunitionsExpert/server/types/servers/SaveServer.d.ts diff --git a/Faupi-MunitionsExpert/server/types/services/BotLootCacheService.d.ts b/Faupi-MunitionsExpert/server/types/services/BotLootCacheService.d.ts new file mode 100644 index 0000000..72eb332 --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/services/BotLootCacheService.d.ts @@ -0,0 +1,59 @@ +import { PMCLootGenerator } from "../generators/PMCLootGenerator"; +import { Items } from "../models/eft/common/tables/IBotType"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { BotLootCache, LootCacheType } from "../models/spt/bots/BotLootCache"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "../utils/JsonUtil"; +import { RagfairPriceService } from "./RagfairPriceService"; +export declare class BotLootCacheService { + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected pmcLootGenerator: PMCLootGenerator; + protected ragfairPriceService: RagfairPriceService; + protected lootCache: Record; + constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, pmcLootGenerator: PMCLootGenerator, ragfairPriceService: RagfairPriceService); + /** + * Remove all cached bot loot data + */ + clearCache(): void; + /** + * Get the fully created loot array, ordered by price low to high + * @param botRole bot to get loot for + * @param isPmc is the bot a pmc + * @param lootType what type of loot is needed + * @param lootPool the full pool of loot (needed when cache is empty) + * @returns ITemplateItem array + */ + getLootFromCache(botRole: string, isPmc: boolean, lootType: LootCacheType, lootPool: Items): ITemplateItem[]; + /** + * Generate loot for a bot and store inside a private class property + * @param botRole + * @param lootType + * @param lootPool the full pool of loot we use to create the various sub-categories with + * @param isPmc + */ + protected addLootToCache(botRole: string, isPmc: boolean, lootType: LootCacheType, lootPool: Items): void; + /** + * Check if a bot type exists inside the loot cache + * @param botRole role to check for + * @returns true if they exist + */ + protected botRoleExistsInCache(botRole: string): boolean; + /** + * If lootcache is null, init with empty property arrays + * @param botRole Bot role to hydrate + */ + protected initCacheForBotRole(botRole: string): void; + /** + * Compares two item prices by their flea (or handbook if that doesnt exist) price + * -1 when a < b + * 0 when a === b + * 1 when a > b + * @param itemAPrice + * @param itemBPrice + * @returns + */ + protected compareByValue(itemAPrice: number, itemBPrice: number): number; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/FenceService.d.ts b/Faupi-MunitionsExpert/server/types/services/FenceService.d.ts similarity index 95% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/FenceService.d.ts rename to Faupi-MunitionsExpert/server/types/services/FenceService.d.ts index 12723fb..79058c6 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/FenceService.d.ts +++ b/Faupi-MunitionsExpert/server/types/services/FenceService.d.ts @@ -29,8 +29,8 @@ export declare class FenceService { hasExpiredCache(refreshAssort: boolean): boolean; generateFenceAssortCache(pmcData: IPmcData): void; /** - * - * @param pmcData Get the fence level the passed in profile has + * Get the fence level the passed in profile has + * @param pmcData Player profile * @returns FenceLevel */ getFenceInfo(pmcData: IPmcData): FenceLevel; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/HashCacheService.d.ts b/Faupi-MunitionsExpert/server/types/services/HashCacheService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/HashCacheService.d.ts rename to Faupi-MunitionsExpert/server/types/services/HashCacheService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/InsuranceService.d.ts b/Faupi-MunitionsExpert/server/types/services/InsuranceService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/InsuranceService.d.ts rename to Faupi-MunitionsExpert/server/types/services/InsuranceService.d.ts diff --git a/Faupi-MunitionsExpert/server/types/services/LocaleService.d.ts b/Faupi-MunitionsExpert/server/types/services/LocaleService.d.ts new file mode 100644 index 0000000..33bea7b --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/services/LocaleService.d.ts @@ -0,0 +1,14 @@ +import { ILocaleConfig } from "../models/spt/config/ILocaleConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +export declare class LocaleService { + protected logger: ILogger; + protected configServer: ConfigServer; + protected localeConfig: ILocaleConfig; + constructor(logger: ILogger, configServer: ConfigServer); + /** + * Gets the locale key from the locale.json file + * @returns locale e.g en/ge/cz/cn + */ + getDesiredLocale(): string; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/MatchLocationService.d.ts b/Faupi-MunitionsExpert/server/types/services/MatchLocationService.d.ts similarity index 58% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/MatchLocationService.d.ts rename to Faupi-MunitionsExpert/server/types/services/MatchLocationService.d.ts index 2b5fc0e..c027bec 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/MatchLocationService.d.ts +++ b/Faupi-MunitionsExpert/server/types/services/MatchLocationService.d.ts @@ -1,8 +1,9 @@ +import { ICreateGroupRequestData } from "../models/eft/match/ICreateGroupRequestData"; import { TimeUtil } from "../utils/TimeUtil"; export declare class MatchLocationService { protected timeUtil: TimeUtil; protected locations: {}; constructor(timeUtil: TimeUtil); - createGroup(sessionID: string, info: any): any; + createGroup(sessionID: string, info: ICreateGroupRequestData): any; deleteGroup(info: any): void; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/ModCompilerService.d.ts b/Faupi-MunitionsExpert/server/types/services/ModCompilerService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/ModCompilerService.d.ts rename to Faupi-MunitionsExpert/server/types/services/ModCompilerService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/NotificationService.d.ts b/Faupi-MunitionsExpert/server/types/services/NotificationService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/NotificationService.d.ts rename to Faupi-MunitionsExpert/server/types/services/NotificationService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/PaymentService.d.ts b/Faupi-MunitionsExpert/server/types/services/PaymentService.d.ts similarity index 79% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/PaymentService.d.ts rename to Faupi-MunitionsExpert/server/types/services/PaymentService.d.ts index 5834750..a5e538f 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/services/PaymentService.d.ts +++ b/Faupi-MunitionsExpert/server/types/services/PaymentService.d.ts @@ -45,5 +45,22 @@ export declare class PaymentService { * ancestor with slotId=hideout */ protected isItemInStash(pmcData: IPmcData, item: Item): boolean; + /** + * Remove currency from player stash/inventory + * @param pmcData Player profile to find and remove currency from + * @param currencyTpl Type of currency to pay + * @param amountToPay money value to pay + * @param sessionID Sessino id + * @param output output object to send to client + * @returns IItemEventRouterResponse + */ addPaymentToOutput(pmcData: IPmcData, currencyTpl: string, amountToPay: number, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse; + /** + * Prioritise player stash first over player inventory + * Post-raid healing would often take money out of the players pockets/secure container + * @param a Firsat money stack item + * @param b Second money stack item + * @returns sorted item + */ + protected moneySort(a: Item, b: Item): number; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/PlayerService.d.ts b/Faupi-MunitionsExpert/server/types/services/PlayerService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/PlayerService.d.ts rename to Faupi-MunitionsExpert/server/types/services/PlayerService.d.ts diff --git a/Faupi-MunitionsExpert/server/types/services/ProfileFixerService.d.ts b/Faupi-MunitionsExpert/server/types/services/ProfileFixerService.d.ts new file mode 100644 index 0000000..313a907 --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/services/ProfileFixerService.d.ts @@ -0,0 +1,40 @@ +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IPmcDataRepeatableQuest, IRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { Watermark } from "../utils/Watermark"; +export declare class ProfileFixerService { + protected logger: ILogger; + protected watermark: Watermark; + protected databaseServer: DatabaseServer; + constructor(logger: ILogger, watermark: Watermark, databaseServer: DatabaseServer); + /** + * Find issues in the pmc profile data that may cause issues and fix them + * @param pmcProfile profile to check and fix + */ + checkForAndFixPmcProfileIssues(pmcProfile: IPmcData): void; + /** + * Add tag to profile to indicate when it was made + * @param fullProfile + */ + addMissingAkiVersionTagToProfile(fullProfile: IAkiProfile): void; + /** + * TODO - make this non-public - currently used by RepeatableQuestController + * Remove unused condition counters + * @param pmcProfile profile to remove old counters from + */ + removeDanglingConditionCounters(pmcProfile: IPmcData): void; + protected removeDanglingBackendCounters(pmcProfile: IPmcData): void; + protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; + protected addMissingBonusesProperty(pmcProfile: IPmcData): void; + protected addMissingRepeatableQuestsProperty(pmcProfile: IPmcData): void; + protected addMissingWorkbenchWeaponSkills(pmcProfile: IPmcData): void; + /** + * In 18876 bsg changed the pockets tplid to be one that has 3 additional special slots + * @param pmcProfile + */ + protected updateProfilePocketsToNewId(pmcProfile: IPmcData): void; + addMissingArmorRepairSkill(pmcProfile: IPmcData): void; +} diff --git a/Faupi-MunitionsExpert/server/types/services/RagfairCategoriesService.d.ts b/Faupi-MunitionsExpert/server/types/services/RagfairCategoriesService.d.ts new file mode 100644 index 0000000..83910e5 --- /dev/null +++ b/Faupi-MunitionsExpert/server/types/services/RagfairCategoriesService.d.ts @@ -0,0 +1,40 @@ +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { ILogger } from "../models/spt/utils/ILogger"; +export declare class RagfairCategoriesService { + protected logger: ILogger; + protected categories: Record; + constructor(logger: ILogger); + /** + * Get all flea categories and their count of offers + * @returns item categories and count + */ + getAllCategories(): Record; + /** + * With the supplied items, get custom categories + * @returns a custom list of categories + */ + getBespokeCategories(offers: IRagfairOffer[]): Record; + /** + * Take an array of ragfair offers and create a dictionary of items with thier corrisponding offer count + * @param offers ragfair offers + * @returns categories and count + */ + protected processOffersIntoCategories(offers: IRagfairOffer[]): Record; + /** + * Increment or decrement a category array + * @param offer offer to process + * @param categories categories to update + * @param increment should item be incremented or decremented + */ + protected addOrIncrementCategory(offer: IRagfairOffer, categories: Record, increment?: boolean): void; + /** + * Increase category count by 1 + * @param offer + */ + incrementCategory(offer: IRagfairOffer): void; + /** + * Reduce category count by 1 + * @param offer + */ + decrementCategory(offer: IRagfairOffer): void; +} diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/RagfairLinkedItemService.d.ts b/Faupi-MunitionsExpert/server/types/services/RagfairLinkedItemService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/RagfairLinkedItemService.d.ts rename to Faupi-MunitionsExpert/server/types/services/RagfairLinkedItemService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/RagfairOfferService.d.ts b/Faupi-MunitionsExpert/server/types/services/RagfairOfferService.d.ts similarity index 86% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/RagfairOfferService.d.ts rename to Faupi-MunitionsExpert/server/types/services/RagfairOfferService.d.ts index 7afbf8c..7398a8f 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/RagfairOfferService.d.ts +++ b/Faupi-MunitionsExpert/server/types/services/RagfairOfferService.d.ts @@ -11,12 +11,14 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; +import { RagfairCategoriesService } from "./RagfairCategoriesService"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; protected databaseServer: DatabaseServer; protected saveServer: SaveServer; protected ragfairServerHelper: RagfairServerHelper; + protected ragfairCategoriesService: RagfairCategoriesService; protected profileHelper: ProfileHelper; protected itemEventRouter: ItemEventRouter; protected httpResponse: HttpResponseUtil; @@ -26,12 +28,16 @@ export declare class RagfairOfferService { protected expiredOffers: Item[]; protected offers: IRagfairOffer[]; protected ragfairConfig: IRagfairConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, ragfairCategoriesService: RagfairCategoriesService, profileHelper: ProfileHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, configServer: ConfigServer); + /** + * Get all offers + * @returns IRagfairOffer array + */ getOffers(): IRagfairOffer[]; getOfferByOfferId(offerId: string): IRagfairOffer; getOffersOfType(templateId: string): IRagfairOffer[]; addOffer(offer: IRagfairOffer): void; - addOfferToExpired(offer: Item): void; + addOfferToExpired(staleOffer: IRagfairOffer): void; setTraderUpdateStatus(traderId: string, shouldUpdate: boolean): void; shouldTraderBeUpdated(traderID: string): boolean; getExpiredOfferCount(): number; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/RagfairPriceService.d.ts b/Faupi-MunitionsExpert/server/types/services/RagfairPriceService.d.ts similarity index 64% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/RagfairPriceService.d.ts rename to Faupi-MunitionsExpert/server/types/services/RagfairPriceService.d.ts index 5256b99..e33bbb9 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/dist/types/services/RagfairPriceService.d.ts +++ b/Faupi-MunitionsExpert/server/types/services/RagfairPriceService.d.ts @@ -1,6 +1,7 @@ import { HandbookHelper } from "../helpers/HandbookHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { PresetHelper } from "../helpers/PresetHelper"; +import { Preset } from "../models/eft/common/IGlobals"; import { Item } from "../models/eft/common/tables/IItem"; import { IBarterScheme } from "../models/eft/common/tables/ITrader"; import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; @@ -28,5 +29,26 @@ export declare class RagfairPriceService { getFleaPriceForItem(tplId: string): number; getBarterPrice(barterScheme: IBarterScheme[]): number; getDynamicOfferPrice(items: Item[], desiredCurrency: string): number; + /** + * Multiply the price by a randomised curve where n = 2, shift = 2 + * @param existingPrice price to alter + * @param isPreset is the item we're multiplying a preset + * @returns multiplied price + */ + protected randomisePrice(existingPrice: number, isPreset: boolean): number; + /** + * Calculate the cost of a weapon preset by adding together the price of its mods + base price of default weapon preset + * @param item base weapon + * @param items weapon plus mods + * @param existingPrice price of existing base weapon + * @returns + */ getWeaponPresetPrice(item: Item, items: Item[], existingPrice: number): number; + /** + * Attempt to get the default preset for a weapon, failing that get the first preset in the array + * (assumes default = has encyclopedia entry) + * @param presets weapon presets to choose from + * @returns Default preset object + */ + protected getDefaultWeaponPreset(presets: Preset[], weapon: Item): Preset; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/RagfairRequiredItemsService.d.ts b/Faupi-MunitionsExpert/server/types/services/RagfairRequiredItemsService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/RagfairRequiredItemsService.d.ts rename to Faupi-MunitionsExpert/server/types/services/RagfairRequiredItemsService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/TraderAssortService.d.ts b/Faupi-MunitionsExpert/server/types/services/TraderAssortService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/TraderAssortService.d.ts rename to Faupi-MunitionsExpert/server/types/services/TraderAssortService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts b/Faupi-MunitionsExpert/server/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts rename to Faupi-MunitionsExpert/server/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/Faupi-MunitionsExpert/server/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts rename to Faupi-MunitionsExpert/server/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/mod/image/imageRouteService.d.ts b/Faupi-MunitionsExpert/server/types/services/mod/image/imageRouteService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/mod/image/imageRouteService.d.ts rename to Faupi-MunitionsExpert/server/types/services/mod/image/imageRouteService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/mod/onLoad/OnLoadMod.d.ts b/Faupi-MunitionsExpert/server/types/services/mod/onLoad/OnLoadMod.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/mod/onLoad/OnLoadMod.d.ts rename to Faupi-MunitionsExpert/server/types/services/mod/onLoad/OnLoadMod.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/mod/onLoad/OnLoadModService.d.ts b/Faupi-MunitionsExpert/server/types/services/mod/onLoad/OnLoadModService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/mod/onLoad/OnLoadModService.d.ts rename to Faupi-MunitionsExpert/server/types/services/mod/onLoad/OnLoadModService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/mod/onUpdate/OnUpdateMod.d.ts b/Faupi-MunitionsExpert/server/types/services/mod/onUpdate/OnUpdateMod.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/mod/onUpdate/OnUpdateMod.d.ts rename to Faupi-MunitionsExpert/server/types/services/mod/onUpdate/OnUpdateMod.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/mod/onUpdate/OnUpdateModService.d.ts b/Faupi-MunitionsExpert/server/types/services/mod/onUpdate/OnUpdateModService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/mod/onUpdate/OnUpdateModService.d.ts rename to Faupi-MunitionsExpert/server/types/services/mod/onUpdate/OnUpdateModService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/mod/staticRouter/StaticRouterMod.d.ts b/Faupi-MunitionsExpert/server/types/services/mod/staticRouter/StaticRouterMod.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/mod/staticRouter/StaticRouterMod.d.ts rename to Faupi-MunitionsExpert/server/types/services/mod/staticRouter/StaticRouterMod.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/mod/staticRouter/StaticRouterModService.d.ts b/Faupi-MunitionsExpert/server/types/services/mod/staticRouter/StaticRouterModService.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/services/mod/staticRouter/StaticRouterModService.d.ts rename to Faupi-MunitionsExpert/server/types/services/mod/staticRouter/StaticRouterModService.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/App.d.ts b/Faupi-MunitionsExpert/server/types/utils/App.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/App.d.ts rename to Faupi-MunitionsExpert/server/types/utils/App.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/AyncQueue.d.ts b/Faupi-MunitionsExpert/server/types/utils/AyncQueue.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/AyncQueue.d.ts rename to Faupi-MunitionsExpert/server/types/utils/AyncQueue.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/DatabaseImporter.d.ts b/Faupi-MunitionsExpert/server/types/utils/DatabaseImporter.d.ts similarity index 69% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/DatabaseImporter.d.ts rename to Faupi-MunitionsExpert/server/types/utils/DatabaseImporter.d.ts index 0857b67..483e135 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/DatabaseImporter.d.ts +++ b/Faupi-MunitionsExpert/server/types/utils/DatabaseImporter.d.ts @@ -1,9 +1,10 @@ -import { VFS } from "./VFS"; -import { JsonUtil } from "./JsonUtil"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ImageRouter } from "../routers/ImageRouter"; import { OnLoad } from "../di/OnLoad"; +import { IDatabaseTables } from "../models/spt/server/IDatabaseTables"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ImageRouter } from "../routers/ImageRouter"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "./JsonUtil"; +import { VFS } from "./VFS"; export declare class DatabaseImporter extends OnLoad { protected logger: ILogger; protected vfs: VFS; @@ -12,7 +13,12 @@ export declare class DatabaseImporter extends OnLoad { protected imageRouter: ImageRouter; constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, databaseServer: DatabaseServer, imageRouter: ImageRouter); onLoad(): void; + /** + * Read all json files in database folder and map into a json object + * @param filepath path to database folder + */ + protected hydrateDatabase(filepath: string): void; getRoute(): string; - loadRecursive(filepath: string): any; + loadRecursive(filepath: string): IDatabaseTables; loadImages(filepath: string): void; } diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/HashUtil.d.ts b/Faupi-MunitionsExpert/server/types/utils/HashUtil.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/HashUtil.d.ts rename to Faupi-MunitionsExpert/server/types/utils/HashUtil.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/HttpResponseUtil.d.ts b/Faupi-MunitionsExpert/server/types/utils/HttpResponseUtil.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/HttpResponseUtil.d.ts rename to Faupi-MunitionsExpert/server/types/utils/HttpResponseUtil.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/JsonUtil.d.ts b/Faupi-MunitionsExpert/server/types/utils/JsonUtil.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/JsonUtil.d.ts rename to Faupi-MunitionsExpert/server/types/utils/JsonUtil.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/Logger.d.ts b/Faupi-MunitionsExpert/server/types/utils/Logger.d.ts similarity index 67% rename from Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/Logger.d.ts rename to Faupi-MunitionsExpert/server/types/utils/Logger.d.ts index f5b774b..3d9013f 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/Built/Faupi-MunitionsExpert 1.5.0/user/mods/Faupi-MunitionsExpert 1.5.0/types/utils/Logger.d.ts +++ b/Faupi-MunitionsExpert/server/types/utils/Logger.d.ts @@ -1,17 +1,13 @@ /// -import { Daum } from "../models/eft/itemEvent/IItemEventRouterRequest"; -import { ILogger } from "../models/spt/utils/ILogger"; -import winston from "winston"; -import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; -import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; import fs from "fs"; -interface SptLogger { - error: (msg: string | Record) => void; - warn: (msg: string | Record) => void; - succ?: (msg: string | Record) => void; - info: (msg: string | Record) => void; - debug: (msg: string | Record) => void; -} +import winston from "winston"; +import { Daum } from "../models/eft/itemEvent/IItemEventRouterRequest"; +import { LogBackgroundColor } from "../models/spt/logging/LogBackgroundColor"; +import { LogTextColor } from "../models/spt/logging/LogTextColor"; +import { SptLogger } from "../models/spt/logging/SptLogger"; +import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; export declare class WinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected uuidGenerator: IUUidGenerator; @@ -36,16 +32,27 @@ export declare class WinstonLogger implements ILogger { custom: string; debug: string; }; + bgColors: { + default: string; + blackBG: string; + redBG: string; + greenBG: string; + yellowBG: string; + blueBG: string; + magentaBG: string; + cyanBG: string; + whiteBG: string; + }; }; protected logger: winston.Logger & SptLogger; - writeFilePromisify: (path: fs.PathLike, data: string, options?: any) => Promise; + protected writeFilePromisify: (path: fs.PathLike, data: string, options?: any) => Promise; constructor(asyncQueue: IAsyncQueue, uuidGenerator: IUUidGenerator); writeToLogFile(data: string | Daum): Promise; - log(data: string | Error | Record, color: string): Promise; + log(data: string | Error | Record, color: string, backgroundColor?: string): Promise; error(data: string | Record): Promise; warning(data: string | Record): Promise; success(data: string | Record): Promise; info(data: string | Record): Promise; + logWithColor(data: string | Record, textColor: LogTextColor, backgroundColor?: LogBackgroundColor): Promise; debug(data: string | Record, onlyShowInConsole?: boolean): Promise; } -export {}; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/MathUtil.d.ts b/Faupi-MunitionsExpert/server/types/utils/MathUtil.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/MathUtil.d.ts rename to Faupi-MunitionsExpert/server/types/utils/MathUtil.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/ObjectId.d.ts b/Faupi-MunitionsExpert/server/types/utils/ObjectId.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/ObjectId.d.ts rename to Faupi-MunitionsExpert/server/types/utils/ObjectId.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/RandomUtil.d.ts b/Faupi-MunitionsExpert/server/types/utils/RandomUtil.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/RandomUtil.d.ts rename to Faupi-MunitionsExpert/server/types/utils/RandomUtil.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/TimeUtil.d.ts b/Faupi-MunitionsExpert/server/types/utils/TimeUtil.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/TimeUtil.d.ts rename to Faupi-MunitionsExpert/server/types/utils/TimeUtil.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/UUidGenerator.d.ts b/Faupi-MunitionsExpert/server/types/utils/UUidGenerator.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/UUidGenerator.d.ts rename to Faupi-MunitionsExpert/server/types/utils/UUidGenerator.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/VFS.d.ts b/Faupi-MunitionsExpert/server/types/utils/VFS.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/VFS.d.ts rename to Faupi-MunitionsExpert/server/types/utils/VFS.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/Watermark.d.ts b/Faupi-MunitionsExpert/server/types/utils/Watermark.d.ts similarity index 83% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/Watermark.d.ts rename to Faupi-MunitionsExpert/server/types/utils/Watermark.d.ts index 111bdd0..c6dc120 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/Watermark.d.ts +++ b/Faupi-MunitionsExpert/server/types/utils/Watermark.d.ts @@ -28,7 +28,12 @@ export declare class Watermark { protected text: string[]; protected versionLabel: string; initialize(): void; - getVersionTag(): string; + /** + * Get a version string (x.x.x) or (x.x.x-BLEEDINGEDGE) OR (X.X.X (18xxx)) + * @param withEftVersion Include the eft version this spt version was made for + * @returns string + */ + getVersionTag(withEftVersion?: boolean): string; getVersionLabel(): string; /** Set window title */ setTitle(): void; diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/decorators/Singleton.d.ts b/Faupi-MunitionsExpert/server/types/utils/decorators/Singleton.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/decorators/Singleton.d.ts rename to Faupi-MunitionsExpert/server/types/utils/decorators/Singleton.d.ts diff --git a/Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/decorators/constructor.d.ts b/Faupi-MunitionsExpert/server/types/utils/decorators/constructor.d.ts similarity index 100% rename from Faupi-MunitionsExpert/MunitionsExpert/src/server/types/utils/decorators/constructor.d.ts rename to Faupi-MunitionsExpert/server/types/utils/decorators/constructor.d.ts diff --git a/KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.4.0/user/mods/KcY-SeeItemValue 1.4.0/package.json b/KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.4.0/user/mods/KcY-SeeItemValue 1.4.0/package.json index a96f326..41a787d 100644 --- a/KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.4.0/user/mods/KcY-SeeItemValue 1.4.0/package.json +++ b/KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.4.0/user/mods/KcY-SeeItemValue 1.4.0/package.json @@ -4,7 +4,7 @@ "version": "1.4.0", "license": "NCSA Open Source", "main": "src/mod.js", - "akiVersion": "3.1.0", + "akiVersion": "3.1.1", "UpdatedBy": "CWX", "scripts": { "setup:environment": "npm i", diff --git a/KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.4.0/user/mods/KcY-SeeItemValue 1.4.0/src/mod.ts b/KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.4.0/user/mods/KcY-SeeItemValue 1.4.0/src/mod.ts index 5d03a53..a343218 100644 --- a/KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.4.0/user/mods/KcY-SeeItemValue 1.4.0/src/mod.ts +++ b/KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.4.0/user/mods/KcY-SeeItemValue 1.4.0/src/mod.ts @@ -1,7 +1,6 @@ import type { DependencyContainer } from "tsyringe"; import { IPreAkiLoadMod } from "@spt-aki/models/external/IPreAkiLoadMod"; import { IPostAkiLoadMod } from "@spt-aki/models/external/IPostAkiLoadMod"; -import { IPostDBLoadMod } from "@spt-aki/models/external/IPostDBLoadMod"; import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; import { DynamicRouterModService } from "@spt-aki/services/mod/dynamicRouter/DynamicRouterModService" import { DatabaseServer } from "@spt-aki/servers/DatabaseServer" @@ -9,8 +8,10 @@ import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil" import { IDatabaseTables } from "@spt-aki/models/spt/server/IDatabaseTables"; import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; import { IHandbookBase } from "@spt-aki/models/eft/common/tables/IHandbookBase"; +import { LogTextColor } from "@spt-aki/models/spt/logging/LogTextColor"; +import { LogBackgroundColor } from "@spt-aki/models/spt/logging/LogBackgroundColor"; -class SeeItemValue implements IPreAkiLoadMod, IPostAkiLoadMod, IPostDBLoadMod +class SeeItemValue implements IPreAkiLoadMod, IPostAkiLoadMod { private pkg; @@ -33,16 +34,17 @@ class SeeItemValue implements IPreAkiLoadMod, IPostAkiLoadMod, IPostDBLoadMod private tradersArr; private cfg; - preAkiLoad(container: DependencyContainer): void { + public preAkiLoad(container: DependencyContainer): void { this.pkg = require("../package.json"); this.router = container.resolve("DynamicRouterModService"); this.logger = container.resolve("WinstonLogger"); this.http = container.resolve("HttpResponseUtil"); this.logger.info(`loading: ${this.pkg.author}: ${this.pkg.name} ${this.pkg.version}`); this.cfg = require("./config.json"); + this.addRoute() } - postAkiLoad(container: DependencyContainer): void { + public postAkiLoad(container: DependencyContainer): void { this.database = container.resolve("DatabaseServer"); this.table = this.database.getTables(); this.items = this.table.templates.items; @@ -57,9 +59,7 @@ class SeeItemValue implements IPreAkiLoadMod, IPostAkiLoadMod, IPostDBLoadMod this.skier = this.table.traders["58330581ace78e27b8b10cee"].base; this.fence = this.table.traders["579dc571d53a0658a154fbec"].base; this.tradersArr = [this.therapist, this.ragman, this.jaeger, this.mechanic, this.prapor, this.skier, this.peacekeeper, this.fence]; - } - postDBLoad(container: DependencyContainer): void { - return; + } private addRoute() : void @@ -94,25 +94,25 @@ class SeeItemValue implements IPreAkiLoadMod, IPostAkiLoadMod, IPostDBLoadMod let parentId = ""; let origiMax = 1; + let result = { + multiplier: 1, + price: 1, + originalMax: 1 + }; + if (id === "5449016a4bdc2d6f028b456f") { - const result = { - multiplier: 1, - price: 1, - originalMax: 1 - }; this.debugMode("Item was Roubles - returning 1 as price", "yellow"); return result; } if (this.cfg.TraderPrice === false) { - const result = { - multiplier: 1, - price: this.livePrice[id], - originalMax: 1 - }; - if (typeof result != "undefined") + result.multiplier = 1; + result.price = this.livePrice[id]; + result.originalMax = 1; + + if (this.livePrice[id]) { this.debugMode("Config setting false for traders - returning livePrice AVG", "yellow"); return result @@ -125,23 +125,27 @@ class SeeItemValue implements IPreAkiLoadMod, IPostAkiLoadMod, IPostDBLoadMod { parentId = this.handbookTable.Items[i].ParentId; this.debugMode(`ID was found in handbook - parentID = ${parentId}`, "yellow"); + sMutli = this.getBestTraderMulti(parentId); this.debugMode(`Multi returned from getBestTraderMulti method was = ${sMutli}`, "yellow"); + sPrice = this.handbookTable.Items[i].Price; this.debugMode(`Price taken from handbook.items = ${sPrice}`, "yellow"); + origiMax = this.getOrigiDura(id); this.debugMode(`Original max is: ${origiMax}`, "yellow"); - const result = { - multiplier: sMutli, - price: sPrice, - originalMax: origiMax - } + + result.multiplier = sMutli; + result.price = sPrice; + result.originalMax = origiMax; + this.debugMode(`Object built to return to client = ${result.multiplier} and ${result.price}`, "yellow"); return result; } } + this.debugMode(`No item found in handbook, returning default ${sPrice}`, "yellow"); - return sPrice; + return result; } private getBestTraderMulti(parentId: string): number @@ -155,8 +159,10 @@ class SeeItemValue implements IPreAkiLoadMod, IPostAkiLoadMod, IPostDBLoadMod if (this.handbookTable.Categories[i].Id === parentId) { this.debugMode("Found category from item parent ID", "yellow"); + traderSellCat = this.handbookTable.Categories[i].Id; this.debugMode(`Storing trader sell category = ${traderSellCat}`, "yellow"); + altTraderSellCat = this.handbookTable.Categories[i].ParentId; this.debugMode(`Storing trader Alt sell category = ${altTraderSellCat}`, "yellow"); @@ -166,6 +172,7 @@ class SeeItemValue implements IPreAkiLoadMod, IPostAkiLoadMod, IPostDBLoadMod { altAltTraderSellCat = this.handbookTable.Categories[a].ParentId; this.debugMode(`Alt sell category has parent, storing that = ${altAltTraderSellCat}`, "yellow"); + break; } } @@ -185,7 +192,6 @@ class SeeItemValue implements IPreAkiLoadMod, IPostAkiLoadMod, IPostDBLoadMod { this.debugMode(`alt sell category found for trader number ${iter} - category is = ${altTraderSellCat}`, "yellow"); return this.getBestTraderInfo(iter); - } if (this.tradersArr[iter].sell_category.includes(altAltTraderSellCat)) diff --git a/KcY-SeeItemValue/itemValue/server/dist/package.json b/KcY-SeeItemValue/itemValue/server/dist/package.json index a96f326..41a787d 100644 --- a/KcY-SeeItemValue/itemValue/server/dist/package.json +++ b/KcY-SeeItemValue/itemValue/server/dist/package.json @@ -4,7 +4,7 @@ "version": "1.4.0", "license": "NCSA Open Source", "main": "src/mod.js", - "akiVersion": "3.1.0", + "akiVersion": "3.1.1", "UpdatedBy": "CWX", "scripts": { "setup:environment": "npm i", diff --git a/KcY-SeeItemValue/itemValue/server/dist/src/mod.ts b/KcY-SeeItemValue/itemValue/server/dist/src/mod.ts index 5d03a53..a343218 100644 --- a/KcY-SeeItemValue/itemValue/server/dist/src/mod.ts +++ b/KcY-SeeItemValue/itemValue/server/dist/src/mod.ts @@ -1,7 +1,6 @@ import type { DependencyContainer } from "tsyringe"; import { IPreAkiLoadMod } from "@spt-aki/models/external/IPreAkiLoadMod"; import { IPostAkiLoadMod } from "@spt-aki/models/external/IPostAkiLoadMod"; -import { IPostDBLoadMod } from "@spt-aki/models/external/IPostDBLoadMod"; import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; import { DynamicRouterModService } from "@spt-aki/services/mod/dynamicRouter/DynamicRouterModService" import { DatabaseServer } from "@spt-aki/servers/DatabaseServer" @@ -9,8 +8,10 @@ import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil" import { IDatabaseTables } from "@spt-aki/models/spt/server/IDatabaseTables"; import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; import { IHandbookBase } from "@spt-aki/models/eft/common/tables/IHandbookBase"; +import { LogTextColor } from "@spt-aki/models/spt/logging/LogTextColor"; +import { LogBackgroundColor } from "@spt-aki/models/spt/logging/LogBackgroundColor"; -class SeeItemValue implements IPreAkiLoadMod, IPostAkiLoadMod, IPostDBLoadMod +class SeeItemValue implements IPreAkiLoadMod, IPostAkiLoadMod { private pkg; @@ -33,16 +34,17 @@ class SeeItemValue implements IPreAkiLoadMod, IPostAkiLoadMod, IPostDBLoadMod private tradersArr; private cfg; - preAkiLoad(container: DependencyContainer): void { + public preAkiLoad(container: DependencyContainer): void { this.pkg = require("../package.json"); this.router = container.resolve("DynamicRouterModService"); this.logger = container.resolve("WinstonLogger"); this.http = container.resolve("HttpResponseUtil"); this.logger.info(`loading: ${this.pkg.author}: ${this.pkg.name} ${this.pkg.version}`); this.cfg = require("./config.json"); + this.addRoute() } - postAkiLoad(container: DependencyContainer): void { + public postAkiLoad(container: DependencyContainer): void { this.database = container.resolve("DatabaseServer"); this.table = this.database.getTables(); this.items = this.table.templates.items; @@ -57,9 +59,7 @@ class SeeItemValue implements IPreAkiLoadMod, IPostAkiLoadMod, IPostDBLoadMod this.skier = this.table.traders["58330581ace78e27b8b10cee"].base; this.fence = this.table.traders["579dc571d53a0658a154fbec"].base; this.tradersArr = [this.therapist, this.ragman, this.jaeger, this.mechanic, this.prapor, this.skier, this.peacekeeper, this.fence]; - } - postDBLoad(container: DependencyContainer): void { - return; + } private addRoute() : void @@ -94,25 +94,25 @@ class SeeItemValue implements IPreAkiLoadMod, IPostAkiLoadMod, IPostDBLoadMod let parentId = ""; let origiMax = 1; + let result = { + multiplier: 1, + price: 1, + originalMax: 1 + }; + if (id === "5449016a4bdc2d6f028b456f") { - const result = { - multiplier: 1, - price: 1, - originalMax: 1 - }; this.debugMode("Item was Roubles - returning 1 as price", "yellow"); return result; } if (this.cfg.TraderPrice === false) { - const result = { - multiplier: 1, - price: this.livePrice[id], - originalMax: 1 - }; - if (typeof result != "undefined") + result.multiplier = 1; + result.price = this.livePrice[id]; + result.originalMax = 1; + + if (this.livePrice[id]) { this.debugMode("Config setting false for traders - returning livePrice AVG", "yellow"); return result @@ -125,23 +125,27 @@ class SeeItemValue implements IPreAkiLoadMod, IPostAkiLoadMod, IPostDBLoadMod { parentId = this.handbookTable.Items[i].ParentId; this.debugMode(`ID was found in handbook - parentID = ${parentId}`, "yellow"); + sMutli = this.getBestTraderMulti(parentId); this.debugMode(`Multi returned from getBestTraderMulti method was = ${sMutli}`, "yellow"); + sPrice = this.handbookTable.Items[i].Price; this.debugMode(`Price taken from handbook.items = ${sPrice}`, "yellow"); + origiMax = this.getOrigiDura(id); this.debugMode(`Original max is: ${origiMax}`, "yellow"); - const result = { - multiplier: sMutli, - price: sPrice, - originalMax: origiMax - } + + result.multiplier = sMutli; + result.price = sPrice; + result.originalMax = origiMax; + this.debugMode(`Object built to return to client = ${result.multiplier} and ${result.price}`, "yellow"); return result; } } + this.debugMode(`No item found in handbook, returning default ${sPrice}`, "yellow"); - return sPrice; + return result; } private getBestTraderMulti(parentId: string): number @@ -155,8 +159,10 @@ class SeeItemValue implements IPreAkiLoadMod, IPostAkiLoadMod, IPostDBLoadMod if (this.handbookTable.Categories[i].Id === parentId) { this.debugMode("Found category from item parent ID", "yellow"); + traderSellCat = this.handbookTable.Categories[i].Id; this.debugMode(`Storing trader sell category = ${traderSellCat}`, "yellow"); + altTraderSellCat = this.handbookTable.Categories[i].ParentId; this.debugMode(`Storing trader Alt sell category = ${altTraderSellCat}`, "yellow"); @@ -166,6 +172,7 @@ class SeeItemValue implements IPreAkiLoadMod, IPostAkiLoadMod, IPostDBLoadMod { altAltTraderSellCat = this.handbookTable.Categories[a].ParentId; this.debugMode(`Alt sell category has parent, storing that = ${altAltTraderSellCat}`, "yellow"); + break; } } @@ -185,7 +192,6 @@ class SeeItemValue implements IPreAkiLoadMod, IPostAkiLoadMod, IPostDBLoadMod { this.debugMode(`alt sell category found for trader number ${iter} - category is = ${altTraderSellCat}`, "yellow"); return this.getBestTraderInfo(iter); - } if (this.tradersArr[iter].sell_category.includes(altAltTraderSellCat)) diff --git a/KcY-SeeItemValue/itemValue/server/package.json b/KcY-SeeItemValue/itemValue/server/package.json index a96f326..41a787d 100644 --- a/KcY-SeeItemValue/itemValue/server/package.json +++ b/KcY-SeeItemValue/itemValue/server/package.json @@ -4,7 +4,7 @@ "version": "1.4.0", "license": "NCSA Open Source", "main": "src/mod.js", - "akiVersion": "3.1.0", + "akiVersion": "3.1.1", "UpdatedBy": "CWX", "scripts": { "setup:environment": "npm i", diff --git a/KcY-SeeItemValue/itemValue/server/src/mod.ts b/KcY-SeeItemValue/itemValue/server/src/mod.ts index 8697011..a343218 100644 --- a/KcY-SeeItemValue/itemValue/server/src/mod.ts +++ b/KcY-SeeItemValue/itemValue/server/src/mod.ts @@ -8,6 +8,8 @@ import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil" import { IDatabaseTables } from "@spt-aki/models/spt/server/IDatabaseTables"; import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; import { IHandbookBase } from "@spt-aki/models/eft/common/tables/IHandbookBase"; +import { LogTextColor } from "@spt-aki/models/spt/logging/LogTextColor"; +import { LogBackgroundColor } from "@spt-aki/models/spt/logging/LogBackgroundColor"; class SeeItemValue implements IPreAkiLoadMod, IPostAkiLoadMod { @@ -39,6 +41,7 @@ class SeeItemValue implements IPreAkiLoadMod, IPostAkiLoadMod this.http = container.resolve("HttpResponseUtil"); this.logger.info(`loading: ${this.pkg.author}: ${this.pkg.name} ${this.pkg.version}`); this.cfg = require("./config.json"); + this.addRoute() } public postAkiLoad(container: DependencyContainer): void { @@ -56,6 +59,7 @@ class SeeItemValue implements IPreAkiLoadMod, IPostAkiLoadMod this.skier = this.table.traders["58330581ace78e27b8b10cee"].base; this.fence = this.table.traders["579dc571d53a0658a154fbec"].base; this.tradersArr = [this.therapist, this.ragman, this.jaeger, this.mechanic, this.prapor, this.skier, this.peacekeeper, this.fence]; + } private addRoute() : void @@ -90,25 +94,25 @@ class SeeItemValue implements IPreAkiLoadMod, IPostAkiLoadMod let parentId = ""; let origiMax = 1; + let result = { + multiplier: 1, + price: 1, + originalMax: 1 + }; + if (id === "5449016a4bdc2d6f028b456f") { - const result = { - multiplier: 1, - price: 1, - originalMax: 1 - }; this.debugMode("Item was Roubles - returning 1 as price", "yellow"); return result; } if (this.cfg.TraderPrice === false) { - const result = { - multiplier: 1, - price: this.livePrice[id], - originalMax: 1 - }; - if (typeof result != "undefined") + result.multiplier = 1; + result.price = this.livePrice[id]; + result.originalMax = 1; + + if (this.livePrice[id]) { this.debugMode("Config setting false for traders - returning livePrice AVG", "yellow"); return result @@ -121,23 +125,27 @@ class SeeItemValue implements IPreAkiLoadMod, IPostAkiLoadMod { parentId = this.handbookTable.Items[i].ParentId; this.debugMode(`ID was found in handbook - parentID = ${parentId}`, "yellow"); + sMutli = this.getBestTraderMulti(parentId); this.debugMode(`Multi returned from getBestTraderMulti method was = ${sMutli}`, "yellow"); + sPrice = this.handbookTable.Items[i].Price; this.debugMode(`Price taken from handbook.items = ${sPrice}`, "yellow"); + origiMax = this.getOrigiDura(id); this.debugMode(`Original max is: ${origiMax}`, "yellow"); - const result = { - multiplier: sMutli, - price: sPrice, - originalMax: origiMax - } + + result.multiplier = sMutli; + result.price = sPrice; + result.originalMax = origiMax; + this.debugMode(`Object built to return to client = ${result.multiplier} and ${result.price}`, "yellow"); return result; } } + this.debugMode(`No item found in handbook, returning default ${sPrice}`, "yellow"); - return sPrice; + return result; } private getBestTraderMulti(parentId: string): number @@ -151,8 +159,10 @@ class SeeItemValue implements IPreAkiLoadMod, IPostAkiLoadMod if (this.handbookTable.Categories[i].Id === parentId) { this.debugMode("Found category from item parent ID", "yellow"); + traderSellCat = this.handbookTable.Categories[i].Id; this.debugMode(`Storing trader sell category = ${traderSellCat}`, "yellow"); + altTraderSellCat = this.handbookTable.Categories[i].ParentId; this.debugMode(`Storing trader Alt sell category = ${altTraderSellCat}`, "yellow"); @@ -162,6 +172,7 @@ class SeeItemValue implements IPreAkiLoadMod, IPostAkiLoadMod { altAltTraderSellCat = this.handbookTable.Categories[a].ParentId; this.debugMode(`Alt sell category has parent, storing that = ${altAltTraderSellCat}`, "yellow"); + break; } } @@ -181,7 +192,6 @@ class SeeItemValue implements IPreAkiLoadMod, IPostAkiLoadMod { this.debugMode(`alt sell category found for trader number ${iter} - category is = ${altTraderSellCat}`, "yellow"); return this.getBestTraderInfo(iter); - } if (this.tradersArr[iter].sell_category.includes(altAltTraderSellCat))