diff --git a/Live/CWX_BushWhacker/BushWhacker.cs b/Live/CWX_BushWhacker/BushWhacker.cs index 7c94270..396089b 100644 --- a/Live/CWX_BushWhacker/BushWhacker.cs +++ b/Live/CWX_BushWhacker/BushWhacker.cs @@ -5,7 +5,7 @@ using UnityEngine; namespace CWX_BushWhacker { - [BepInPlugin("com.cwx.bushwhacker", "cwx-bushwhacker", "1.2.8")] + [BepInPlugin("com.cwx.bushwhacker", "cwx-bushwhacker", "1.2.9")] public class BushWhacker : BaseUnityPlugin { public void Start() diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.8/bepInEx/plugins/CWX-BushWhacker.dll b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.9/bepInEx/plugins/CWX-BushWhacker.dll similarity index 72% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.8/bepInEx/plugins/CWX-BushWhacker.dll rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.9/bepInEx/plugins/CWX-BushWhacker.dll index dd49a64..8554c38 100644 Binary files a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.8/bepInEx/plugins/CWX-BushWhacker.dll and b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.9/bepInEx/plugins/CWX-BushWhacker.dll differ diff --git a/Live/CWX_BushWhacker/CWX_BushWhacker.csproj b/Live/CWX_BushWhacker/CWX_BushWhacker.csproj index c2a4160..63a78c6 100644 --- a/Live/CWX_BushWhacker/CWX_BushWhacker.csproj +++ b/Live/CWX_BushWhacker/CWX_BushWhacker.csproj @@ -3,7 +3,7 @@ net472 CWX-BushWhacker - 1.2.8 + 1.2.9 diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.8/bepInEx/plugins/CWX-DeSharpener.dll b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.9/bepInEx/plugins/CWX-DeSharpener.dll similarity index 84% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.8/bepInEx/plugins/CWX-DeSharpener.dll rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.9/bepInEx/plugins/CWX-DeSharpener.dll index ebae012..73ed681 100644 Binary files a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.8/bepInEx/plugins/CWX-DeSharpener.dll and b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.9/bepInEx/plugins/CWX-DeSharpener.dll differ diff --git a/Live/CWX_DeSharpener/CWX_DeSharpener.csproj b/Live/CWX_DeSharpener/CWX_DeSharpener.csproj index 0dd916c..e68b899 100644 --- a/Live/CWX_DeSharpener/CWX_DeSharpener.csproj +++ b/Live/CWX_DeSharpener/CWX_DeSharpener.csproj @@ -2,7 +2,7 @@ net472 - 1.4.8 + 1.4.9 CWX-DeSharpener diff --git a/Live/CWX_DeSharpener/DeSharpener.cs b/Live/CWX_DeSharpener/DeSharpener.cs index f99f747..7d41482 100644 --- a/Live/CWX_DeSharpener/DeSharpener.cs +++ b/Live/CWX_DeSharpener/DeSharpener.cs @@ -2,7 +2,7 @@ namespace CWX_DeSharpener { - [BepInPlugin("com.CWX.DeSharpener", "CWX-DeSharpener", "1.4.8")] + [BepInPlugin("com.CWX.DeSharpener", "CWX-DeSharpener", "1.4.9")] public class DeSharpener : BaseUnityPlugin { private void Awake() diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.4.0/bepInEx/plugins/CWX-MasterKey.dll b/Live/CWX_MasterKey/CWX_MasterKey 1.4.0/bepInEx/plugins/CWX-MasterKey.dll deleted file mode 100644 index 219f2bb..0000000 Binary files a/Live/CWX_MasterKey/CWX_MasterKey 1.4.0/bepInEx/plugins/CWX-MasterKey.dll and /dev/null differ diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.4.1/bepInEx/plugins/CWX-MasterKey.dll b/Live/CWX_MasterKey/CWX_MasterKey 1.4.1/bepInEx/plugins/CWX-MasterKey.dll new file mode 100644 index 0000000..d9423f6 Binary files /dev/null and b/Live/CWX_MasterKey/CWX_MasterKey 1.4.1/bepInEx/plugins/CWX-MasterKey.dll differ diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.4.0/user/mods/CWX-MasterKey 1.4.0/LICENSE.txt b/Live/CWX_MasterKey/CWX_MasterKey 1.4.1/user/mods/CWX-MasterKey 1.4.1/LICENSE.txt similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.4.0/user/mods/CWX-MasterKey 1.4.0/LICENSE.txt rename to Live/CWX_MasterKey/CWX_MasterKey 1.4.1/user/mods/CWX-MasterKey 1.4.1/LICENSE.txt diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.4.0/user/mods/CWX-MasterKey 1.4.0/package.json b/Live/CWX_MasterKey/CWX_MasterKey 1.4.1/user/mods/CWX-MasterKey 1.4.1/package.json similarity index 91% rename from Live/CWX_MasterKey/CWX_MasterKey 1.4.0/user/mods/CWX-MasterKey 1.4.0/package.json rename to Live/CWX_MasterKey/CWX_MasterKey 1.4.1/user/mods/CWX-MasterKey 1.4.1/package.json index 955217d..40a0933 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.4.0/user/mods/CWX-MasterKey 1.4.0/package.json +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.4.1/user/mods/CWX-MasterKey 1.4.1/package.json @@ -1,10 +1,10 @@ { "name": "MasterKey", "author": "CWX", - "version": "1.4.0", + "version": "1.4.1", "license": "NCSA", "main": "src/mod.js", - "akiVersion": "3.4.0", + "akiVersion": "3.5.0", "scripts": { "setup": "npm i", "build": "node ./packageBuild.ts" diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.4.0/user/mods/CWX-MasterKey 1.4.0/src/config.json b/Live/CWX_MasterKey/CWX_MasterKey 1.4.1/user/mods/CWX-MasterKey 1.4.1/src/config.json similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.4.0/user/mods/CWX-MasterKey 1.4.0/src/config.json rename to Live/CWX_MasterKey/CWX_MasterKey 1.4.1/user/mods/CWX-MasterKey 1.4.1/src/config.json diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.4.0/user/mods/CWX-MasterKey 1.4.0/src/mod.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.4.1/user/mods/CWX-MasterKey 1.4.1/src/mod.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.4.0/user/mods/CWX-MasterKey 1.4.0/src/mod.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.4.1/user/mods/CWX-MasterKey 1.4.1/src/mod.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey.csproj b/Live/CWX_MasterKey/CWX_MasterKey.csproj index d77a906..890be4d 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey.csproj +++ b/Live/CWX_MasterKey/CWX_MasterKey.csproj @@ -3,7 +3,7 @@ net472 CWX-MasterKey - 1.4.0 + 1.4.1 diff --git a/Live/CWX_MasterKey/MasterKey.cs b/Live/CWX_MasterKey/MasterKey.cs index 452f5b8..63ff50a 100644 --- a/Live/CWX_MasterKey/MasterKey.cs +++ b/Live/CWX_MasterKey/MasterKey.cs @@ -2,7 +2,7 @@ namespace CWX_MasterKey { - [BepInPlugin("com.CWX.MasterKey", "CWX-MasterKey", "1.4.0")] + [BepInPlugin("com.CWX.MasterKey", "CWX-MasterKey", "1.4.1")] public class MasterKey : BaseUnityPlugin { private void Awake() diff --git a/Live/CWX_MasterKey/server/dist/package.json b/Live/CWX_MasterKey/server/dist/package.json index 955217d..40a0933 100644 --- a/Live/CWX_MasterKey/server/dist/package.json +++ b/Live/CWX_MasterKey/server/dist/package.json @@ -1,10 +1,10 @@ { "name": "MasterKey", "author": "CWX", - "version": "1.4.0", + "version": "1.4.1", "license": "NCSA", "main": "src/mod.js", - "akiVersion": "3.4.0", + "akiVersion": "3.5.0", "scripts": { "setup": "npm i", "build": "node ./packageBuild.ts" diff --git a/Live/CWX_MasterKey/server/package.json b/Live/CWX_MasterKey/server/package.json index 955217d..40a0933 100644 --- a/Live/CWX_MasterKey/server/package.json +++ b/Live/CWX_MasterKey/server/package.json @@ -1,10 +1,10 @@ { "name": "MasterKey", "author": "CWX", - "version": "1.4.0", + "version": "1.4.1", "license": "NCSA", "main": "src/mod.js", - "akiVersion": "3.4.0", + "akiVersion": "3.5.0", "scripts": { "setup": "npm i", "build": "node ./packageBuild.ts" diff --git a/Live/CWX_MasterKey/server/types/callbacks/DataCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/DataCallbacks.d.ts index 1f359e5..26f5899 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/DataCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/DataCallbacks.d.ts @@ -1,8 +1,11 @@ +import { HideoutController } from "../controllers/HideoutController"; +import { RagfairController } from "../controllers/RagfairController"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGlobals } from "../models/eft/common/IGlobals"; import { ICustomizationItem } from "../models/eft/common/tables/ICustomizationItem"; import { IHandbookBase } from "../models/eft/common/tables/IHandbookBase"; import { IQuest } from "../models/eft/common/tables/IQuest"; +import { IGetItemPricesResponse } from "../models/eft/game/IGetItemPricesResponse"; import { IHideoutArea } from "../models/eft/hideout/IHideoutArea"; import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction"; import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; @@ -17,7 +20,9 @@ import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class DataCallbacks { protected httpResponse: HttpResponseUtil; protected databaseServer: DatabaseServer; - constructor(httpResponse: HttpResponseUtil, databaseServer: DatabaseServer); + protected ragfairController: RagfairController; + protected hideoutController: HideoutController; + constructor(httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, ragfairController: RagfairController, hideoutController: HideoutController); /** * Handles client/settings * @returns ISettingsBase @@ -56,4 +61,14 @@ export declare class DataCallbacks { getLocalesLanguages(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData>; getLocalesMenu(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getLocalesGlobal(url: string, info: IEmptyRequestData, sessionID: string): string; + /** + * Handle client/hideout/qte/list + */ + getQteList(url: string, info: IEmptyRequestData, sessionID: string): string; + /** + * Handle client/items/prices/ + * Called when viewing a traders assorts + * TODO - fully implement this + */ + getItemPrices(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; } diff --git a/Live/CWX_MasterKey/server/types/callbacks/DialogueCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/DialogueCallbacks.d.ts index 862c029..63d7163 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/DialogueCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/DialogueCallbacks.d.ts @@ -21,7 +21,7 @@ import { DialogueInfo } from "../models/eft/profile/IAkiProfile"; import { HashUtil } from "../utils/HashUtil"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; -export declare class DialogueCallbacks extends OnUpdate { +export declare class DialogueCallbacks implements OnUpdate { protected hashUtil: HashUtil; protected timeUtil: TimeUtil; protected httpResponse: HttpResponseUtil; diff --git a/Live/CWX_MasterKey/server/types/callbacks/HandbookCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/HandbookCallbacks.d.ts index 1bb6241..6bd3909 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/HandbookCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/HandbookCallbacks.d.ts @@ -1,6 +1,6 @@ import { HandbookController } from "../controllers/HandbookController"; import { OnLoad } from "../di/OnLoad"; -export declare class HandbookCallbacks extends OnLoad { +export declare class HandbookCallbacks implements OnLoad { protected handbookController: HandbookController; constructor(handbookController: HandbookController); onLoad(): Promise; diff --git a/Live/CWX_MasterKey/server/types/callbacks/HealthCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/HealthCallbacks.d.ts index 7edf03e..bd3e507 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/HealthCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/HealthCallbacks.d.ts @@ -7,6 +7,7 @@ import { IOffraidHealRequestData } from "../models/eft/health/IOffraidHealReques import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IWorkoutData } from "../models/eft/health/IWorkoutData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class HealthCallbacks { protected httpResponse: HttpResponseUtil; @@ -21,6 +22,14 @@ export declare class HealthCallbacks { * @returns empty response, no data sent back to client */ syncHealth(url: string, info: ISyncHealthRequestData, sessionID: string): IGetBodyResponseData; + /** + * Custom aki server request found in modules/QTEPatch.cs + * @param url + * @param info HealthListener.Instance.CurrentHealth class + * @param sessionID session id + * @returns empty response, no data sent back to client + */ + handleWorkoutEffects(url: string, info: IWorkoutData, sessionID: string): IGetBodyResponseData; /** * Handle Eat * @returns IItemEventRouterResponse diff --git a/Live/CWX_MasterKey/server/types/callbacks/HideoutCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/HideoutCallbacks.d.ts index 56450a9..d0247f9 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/HideoutCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/HideoutCallbacks.d.ts @@ -1,7 +1,9 @@ import { HideoutController } from "../controllers/HideoutController"; import { OnUpdate } from "../di/OnUpdate"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; +import { IHandleQTEEventRequestData } from "../models/eft/hideout/IHandleQTEEventRequestData"; +import { IHideoutContinuousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinuousProductionStartRequestData"; +import { IHideoutImproveAreaRequestData } from "../models/eft/hideout/IHideoutImproveAreaRequestData"; import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData"; import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; @@ -10,10 +12,11 @@ import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideou import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutToggleAreaRequestData"; import { IHideoutUpgradeCompleteRequestData } from "../models/eft/hideout/IHideoutUpgradeCompleteRequestData"; import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; +import { IRecordShootingRangePoints } from "../models/eft/hideout/IRecordShootingRangePoints"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IHideoutConfig } from "../models/spt/config/IHideoutConfig"; import { ConfigServer } from "../servers/ConfigServer"; -export declare class HideoutCallbacks extends OnUpdate { +export declare class HideoutCallbacks implements OnUpdate { protected hideoutController: HideoutController; protected configServer: ConfigServer; protected hideoutConfig: IHideoutConfig; @@ -21,76 +24,52 @@ export declare class HideoutCallbacks extends OnUpdate { configServer: ConfigServer); /** * Handle HideoutUpgrade - * @param pmcData - * @param body - * @param sessionID - * @returns */ upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; /** * Handle HideoutUpgradeComplete - * @param pmcData - * @param body - * @param sessionID - * @returns */ upgradeComplete(pmcData: IPmcData, body: IHideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse; /** * Handle HideoutPutItemsInAreaSlots - * @param pmcData - * @param body - * @param sessionID - * @returns */ putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; /** * Handle HideoutTakeItemsFromAreaSlots - * @param pmcData - * @param body - * @param sessionID - * @returns */ takeItemsFromAreaSlots(pmcData: IPmcData, body: IHideoutTakeItemOutRequestData, sessionID: string): IItemEventRouterResponse; /** * Handle HideoutToggleArea - * @param pmcData - * @param body - * @param sessionID - * @returns */ toggleArea(pmcData: IPmcData, body: IHideoutToggleAreaRequestData, sessionID: string): IItemEventRouterResponse; /** * Handle HideoutSingleProductionStart - * @param pmcData - * @param body - * @param sessionID - * @returns */ singleProductionStart(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData, sessionID: string): IItemEventRouterResponse; /** * Handle HideoutScavCaseProductionStart - * @param pmcData - * @param body - * @param sessionID - * @returns */ scavCaseProductionStart(pmcData: IPmcData, body: IHideoutScavCaseStartRequestData, sessionID: string): IItemEventRouterResponse; /** * Handle HideoutContinuousProductionStart - * @param pmcData - * @param body - * @param sessionID - * @returns */ - continuousProductionStart(pmcData: IPmcData, body: IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; + continuousProductionStart(pmcData: IPmcData, body: IHideoutContinuousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; /** * Handle HideoutTakeProduction - * @param pmcData - * @param body - * @param sessionID - * @returns */ takeProduction(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Handle HideoutQuickTimeEvent + */ + handleQTEEvent(pmcData: IPmcData, request: IHandleQTEEventRequestData, sessionId: string): IItemEventRouterResponse; + /** + * Handle client/game/profile/items/moving - RecordShootingRangePoints + */ + recordShootingRangePoints(pmcData: IPmcData, request: IRecordShootingRangePoints, sessionId: string): IItemEventRouterResponse; + /** + * Handle client/game/profile/items/moving - RecordShootingRangePoints + */ + improveArea(pmcData: IPmcData, request: IHideoutImproveAreaRequestData, sessionId: string): IItemEventRouterResponse; onUpdate(timeSinceLastRun: number): Promise; getRoute(): string; } diff --git a/Live/CWX_MasterKey/server/types/callbacks/HttpCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/HttpCallbacks.d.ts index 299a32c..10794fa 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/HttpCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/HttpCallbacks.d.ts @@ -1,6 +1,6 @@ import { OnLoad } from "../di/OnLoad"; import { HttpServer } from "../servers/HttpServer"; -export declare class HttpCallbacks extends OnLoad { +export declare class HttpCallbacks implements OnLoad { protected httpServer: HttpServer; constructor(httpServer: HttpServer); onLoad(): Promise; diff --git a/Live/CWX_MasterKey/server/types/callbacks/InsuranceCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/InsuranceCallbacks.d.ts index 11aef4a..aea0756 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/InsuranceCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/InsuranceCallbacks.d.ts @@ -10,7 +10,7 @@ import { IInsuranceConfig } from "../models/spt/config/IInsuranceConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { InsuranceService } from "../services/InsuranceService"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -export declare class InsuranceCallbacks extends OnUpdate { +export declare class InsuranceCallbacks implements OnUpdate { protected insuranceController: InsuranceController; protected insuranceService: InsuranceService; protected httpResponse: HttpResponseUtil; diff --git a/Live/CWX_MasterKey/server/types/callbacks/MatchCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/MatchCallbacks.d.ts index 10fbc44..52e3290 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/MatchCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/MatchCallbacks.d.ts @@ -7,10 +7,10 @@ import { ICreateGroupRequestData } from "../models/eft/match/ICreateGroupRequest import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; import { IGetGroupStatusRequestData } from "../models/eft/match/IGetGroupStatusRequestData"; import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData"; +import { IGetRaidConfigurationRequestData } from "../models/eft/match/IGetRaidConfigurationRequestData"; import { IJoinMatchRequestData } from "../models/eft/match/IJoinMatchRequestData"; import { IJoinMatchResult } from "../models/eft/match/IJoinMatchResult"; import { IPutMetricsRequestData } from "../models/eft/match/IPutMetricsRequestData"; -import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; import { IUpdatePingRequestData } from "../models/eft/match/IUpdatePingRequestData"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; @@ -41,6 +41,6 @@ export declare class MatchCallbacks { 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; + getRaidConfiguration(url: string, info: IGetRaidConfigurationRequestData, sessionID: string): INullResponseData; } diff --git a/Live/CWX_MasterKey/server/types/callbacks/ModCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/ModCallbacks.d.ts index 9ebb750..d1ec7f7 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/ModCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/ModCallbacks.d.ts @@ -6,7 +6,7 @@ import { ConfigServer } from "../servers/ConfigServer"; import { LocalisationService } from "../services/LocalisationService"; import { HttpFileUtil } from "../utils/HttpFileUtil"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -declare class ModCallbacks extends OnLoad { +declare class ModCallbacks implements OnLoad { protected logger: ILogger; protected httpResponse: HttpResponseUtil; protected httpFileUtil: HttpFileUtil; @@ -17,8 +17,5 @@ declare class ModCallbacks extends OnLoad { constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpFileUtil: HttpFileUtil, postAkiModLoader: PostAkiModLoader, localisationService: LocalisationService, configServer: ConfigServer); onLoad(): Promise; getRoute(): string; - sendBundle(sessionID: string, req: any, resp: any, body: any): void; - getBundles(url: string, info: any, sessionID: string): string; - getBundle(url: string, info: any, sessionID: string): string; } export { ModCallbacks }; diff --git a/Live/CWX_MasterKey/server/types/callbacks/PresetCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/PresetCallbacks.d.ts index 681bb99..37bf4e8 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/PresetCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/PresetCallbacks.d.ts @@ -1,6 +1,6 @@ import { PresetController } from "../controllers/PresetController"; import { OnLoad } from "../di/OnLoad"; -export declare class PresetCallbacks extends OnLoad { +export declare class PresetCallbacks implements OnLoad { protected presetController: PresetController; constructor(presetController: PresetController); onLoad(): Promise; diff --git a/Live/CWX_MasterKey/server/types/callbacks/RagfairCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/RagfairCallbacks.d.ts index 15597bf..97713e7 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/RagfairCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/RagfairCallbacks.d.ts @@ -1,5 +1,6 @@ +import { OnLoad } from "../di/OnLoad"; +import { OnUpdate } from "../di/OnUpdate"; import { RagfairController } from "../controllers/RagfairController"; -import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; @@ -21,7 +22,7 @@ import { JsonUtil } from "../utils/JsonUtil"; /** * Handle ragfair related callback events */ -export declare class RagfairCallbacks extends OnLoadOnUpdate { +export declare class RagfairCallbacks implements OnLoad, OnUpdate { protected httpResponse: HttpResponseUtil; protected jsonUtil: JsonUtil; protected ragfairServer: RagfairServer; @@ -33,10 +34,14 @@ export declare class RagfairCallbacks extends OnLoadOnUpdate { getRoute(): string; 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; + /** + * Handle /client/items/prices + * Called when clicking an item to list on flea + */ + getFleaPrices(url: string, request: IEmptyRequestData, sessionID: string): IGetBodyResponseData>; onUpdate(timeSinceLastRun: number): Promise; sendReport(url: string, info: ISendRagfairReportRequestData, sessionID: string): INullResponseData; } diff --git a/Live/CWX_MasterKey/server/types/callbacks/SaveCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/SaveCallbacks.d.ts index ab29ddc..93ffd96 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/SaveCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/SaveCallbacks.d.ts @@ -1,6 +1,7 @@ -import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; +import { OnLoad } from "../di/OnLoad"; +import { OnUpdate } from "../di/OnUpdate"; import { SaveServer } from "../servers/SaveServer"; -export declare class SaveCallbacks extends OnLoadOnUpdate { +export declare class SaveCallbacks implements OnLoad, OnUpdate { protected saveServer: SaveServer; constructor(saveServer: SaveServer); onLoad(): Promise; diff --git a/Live/CWX_MasterKey/server/types/callbacks/TradeCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/TradeCallbacks.d.ts index 272ae46..4291da8 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/TradeCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/TradeCallbacks.d.ts @@ -6,6 +6,9 @@ import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRag export declare class TradeCallbacks { protected tradeController: TradeController; constructor(tradeController: TradeController); + /** + * Handle client/game/profile/items/moving TradingConfirm + */ processTrade(pmcData: IPmcData, body: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; processRagfairTrade(pmcData: IPmcData, body: IProcessRagfairTradeRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_MasterKey/server/types/callbacks/TraderCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/TraderCallbacks.d.ts index 1efde87..8df1049 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/TraderCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/TraderCallbacks.d.ts @@ -1,10 +1,11 @@ +import { OnLoad } from "../di/OnLoad"; +import { OnUpdate } from "../di/OnUpdate"; import { TraderController } from "../controllers/TraderController"; -import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IBarterScheme, ITraderAssort, ITraderBase } from "../models/eft/common/tables/ITrader"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -export declare class TraderCallbacks extends OnLoadOnUpdate { +export declare class TraderCallbacks implements OnLoad, OnUpdate { protected httpResponse: HttpResponseUtil; protected traderController: TraderController; constructor(httpResponse: HttpResponseUtil, traderController: TraderController); diff --git a/Live/CWX_MasterKey/server/types/context/ApplicationContext.d.ts b/Live/CWX_MasterKey/server/types/context/ApplicationContext.d.ts index a155bcd..28bbdf7 100644 --- a/Live/CWX_MasterKey/server/types/context/ApplicationContext.d.ts +++ b/Live/CWX_MasterKey/server/types/context/ApplicationContext.d.ts @@ -3,6 +3,15 @@ import { ContextVariableType } from "./ContextVariableType"; export declare class ApplicationContext { private variables; private static holderMaxSize; + /** + * Called like: + * + * const registerPlayerInfo = this.applicationContext.getLatestValue(ContextVariableType.REGISTER_PLAYER_REQUEST).getValue(); + * + * const matchInfo = this.applicationContext.getLatestValue(ContextVariableType.MATCH_INFO).getValue(); + * @param type + * @returns + */ getLatestValue(type: ContextVariableType): ContextVariable; getValues(type: ContextVariableType): ContextVariable[]; addValue(type: ContextVariableType, value: any): void; diff --git a/Live/CWX_MasterKey/server/types/context/ContextVariableType.d.ts b/Live/CWX_MasterKey/server/types/context/ContextVariableType.d.ts index a7dd9b5..49f3267 100644 --- a/Live/CWX_MasterKey/server/types/context/ContextVariableType.d.ts +++ b/Live/CWX_MasterKey/server/types/context/ContextVariableType.d.ts @@ -2,7 +2,9 @@ export declare enum ContextVariableType { /** Logged in users session id */ SESSION_ID = 0, /** Currently acive raid information */ - MATCH_INFO = 1, + RAID_CONFIGURATION = 1, /** Timestamp when client first connected */ - CLIENT_START_TIMESTAMP = 2 + CLIENT_START_TIMESTAMP = 2, + /** When player is loading into map and loot is requested */ + REGISTER_PLAYER_REQUEST = 3 } diff --git a/Live/CWX_MasterKey/server/types/controllers/BotController.d.ts b/Live/CWX_MasterKey/server/types/controllers/BotController.d.ts index a80aaed..1d7eb9d 100644 --- a/Live/CWX_MasterKey/server/types/controllers/BotController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/BotController.d.ts @@ -3,7 +3,6 @@ import { BotGenerator } from "../generators/BotGenerator"; import { BotDifficultyHelper } from "../helpers/BotDifficultyHelper"; import { BotHelper } from "../helpers/BotHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; import { IBotBase } from "../models/eft/common/tables/IBotBase"; import { IBotCore } from "../models/eft/common/tables/IBotCore"; @@ -23,14 +22,13 @@ export declare class BotController { protected botDifficultyHelper: BotDifficultyHelper; protected botGenerationCacheService: BotGenerationCacheService; protected localisationService: LocalisationService; - protected weightedRandomHelper: WeightedRandomHelper; protected profileHelper: ProfileHelper; protected configServer: ConfigServer; protected applicationContext: ApplicationContext; protected jsonUtil: JsonUtil; protected botConfig: IBotConfig; static readonly pmcTypeLabel = "PMC"; - constructor(logger: ILogger, databaseServer: DatabaseServer, botGenerator: BotGenerator, botHelper: BotHelper, botDifficultyHelper: BotDifficultyHelper, botGenerationCacheService: BotGenerationCacheService, localisationService: LocalisationService, weightedRandomHelper: WeightedRandomHelper, profileHelper: ProfileHelper, configServer: ConfigServer, applicationContext: ApplicationContext, jsonUtil: JsonUtil); + constructor(logger: ILogger, databaseServer: DatabaseServer, botGenerator: BotGenerator, botHelper: BotHelper, botDifficultyHelper: BotDifficultyHelper, botGenerationCacheService: BotGenerationCacheService, localisationService: LocalisationService, profileHelper: ProfileHelper, configServer: ConfigServer, applicationContext: ApplicationContext, jsonUtil: JsonUtil); /** * Return the number of bot loadout varieties to be generated * @param type bot Type we want the loadout gen count for diff --git a/Live/CWX_MasterKey/server/types/controllers/GameController.d.ts b/Live/CWX_MasterKey/server/types/controllers/GameController.d.ts index b23ccf7..44264dc 100644 --- a/Live/CWX_MasterKey/server/types/controllers/GameController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/GameController.d.ts @@ -1,4 +1,5 @@ import { ApplicationContext } from "../context/ApplicationContext"; +import { HideoutHelper } from "../helpers/HideoutHelper"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { PreAkiModLoader } from "../loaders/PreAkiModLoader"; @@ -10,27 +11,50 @@ import { IServerDetails } from "../models/eft/game/IServerDetails"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; import { ICoreConfig } from "../models/spt/config/ICoreConfig"; import { IHttpConfig } from "../models/spt/config/IHttpConfig"; +import { ILocationConfig } from "../models/spt/config/ILocationConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { CustomLocationWaveService } from "../services/CustomLocationWaveService"; import { LocalisationService } from "../services/LocalisationService"; +import { OpenZoneService } from "../services/OpenZoneService"; import { ProfileFixerService } from "../services/ProfileFixerService"; import { SeasonalEventService } from "../services/SeasonalEventService"; +import { TimeUtil } from "../utils/TimeUtil"; export declare class GameController { protected logger: ILogger; protected databaseServer: DatabaseServer; + protected timeUtil: TimeUtil; protected preAkiModLoader: PreAkiModLoader; protected httpServerHelper: HttpServerHelper; + protected hideoutHelper: HideoutHelper; protected profileHelper: ProfileHelper; protected profileFixerService: ProfileFixerService; protected localisationService: LocalisationService; + protected customLocationWaveService: CustomLocationWaveService; + protected openZoneService: OpenZoneService; protected seasonalEventService: SeasonalEventService; protected applicationContext: ApplicationContext; protected configServer: ConfigServer; protected httpConfig: IHttpConfig; protected coreConfig: ICoreConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, preAkiModLoader: PreAkiModLoader, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, localisationService: LocalisationService, seasonalEventService: SeasonalEventService, applicationContext: ApplicationContext, configServer: ConfigServer); + protected locationConfig: ILocationConfig; + constructor(logger: ILogger, databaseServer: DatabaseServer, timeUtil: TimeUtil, preAkiModLoader: PreAkiModLoader, httpServerHelper: HttpServerHelper, hideoutHelper: HideoutHelper, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, localisationService: LocalisationService, customLocationWaveService: CustomLocationWaveService, openZoneService: OpenZoneService, seasonalEventService: SeasonalEventService, applicationContext: ApplicationContext, configServer: ConfigServer); gameStart(_url: string, _info: IEmptyRequestData, sessionID: string, startTimeStampMS: number): void; + /** + * When player logs in, iterate over all active effects and reduce timer + * TODO - add body part HP regen + * @param pmcProfile + */ + protected updateProfileHealthValues(pmcProfile: IPmcData): void; + /** + * Waves with an identical min/max values spawn nothing, the number of bots that spawn is the difference between min and max + */ + protected fixBrokenOfflineMapWaves(): void; + /** + * Make Rogues spawn later to allow for scavs to spawn first instead of rogues filling up all spawn positions + */ + protected fixRoguesSpawningInstantlyOnLighthouse(): void; /** * Get a list of installed mods and save their details to the profile being used * @param fullProfile Profile to add mod details to diff --git a/Live/CWX_MasterKey/server/types/controllers/HealthController.d.ts b/Live/CWX_MasterKey/server/types/controllers/HealthController.d.ts index 97cf7ef..7c149cc 100644 --- a/Live/CWX_MasterKey/server/types/controllers/HealthController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/HealthController.d.ts @@ -6,20 +6,23 @@ import { IHealthTreatmentRequestData } from "../models/eft/health/IHealthTreatme import { IOffraidEatRequestData } from "../models/eft/health/IOffraidEatRequestData"; import { IOffraidHealRequestData } from "../models/eft/health/IOffraidHealRequestData"; import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; +import { IWorkoutData } from "../models/eft/health/IWorkoutData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ILogger } from "../models/spt/utils/ILogger"; import { EventOutputHolder } from "../routers/EventOutputHolder"; import { LocalisationService } from "../services/LocalisationService"; import { PaymentService } from "../services/PaymentService"; +import { JsonUtil } from "../utils/JsonUtil"; export declare class HealthController { protected logger: ILogger; + protected jsonUtil: JsonUtil; protected eventOutputHolder: EventOutputHolder; protected itemHelper: ItemHelper; protected paymentService: PaymentService; protected inventoryHelper: InventoryHelper; protected localisationService: LocalisationService; protected healthHelper: HealthHelper; - constructor(logger: ILogger, eventOutputHolder: EventOutputHolder, itemHelper: ItemHelper, paymentService: PaymentService, inventoryHelper: InventoryHelper, localisationService: LocalisationService, healthHelper: HealthHelper); + constructor(logger: ILogger, jsonUtil: JsonUtil, eventOutputHolder: EventOutputHolder, itemHelper: ItemHelper, paymentService: PaymentService, inventoryHelper: InventoryHelper, localisationService: LocalisationService, healthHelper: HealthHelper); /** * stores in-raid player health * @param pmcData Player profile @@ -27,7 +30,7 @@ export declare class HealthController { * @param sessionID * @param addEffects Should effects found be added or removed from profile */ - saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string, addEffects?: boolean): void; + saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string, addEffects?: boolean, deleteExistingEffects?: boolean): void; /** * When healing in menu * @param pmcData @@ -36,13 +39,35 @@ export declare class HealthController { * @returns */ offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Consume food/water outside of a raid + * @param pmcData Player profile + * @param body request Object + * @param sessionID Session id + * @returns 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 healthTreatmentRequest Request data from client * @param sessionID Session id * @returns */ - healthTreatment(pmcData: IPmcData, info: IHealthTreatmentRequestData, sessionID: string): IItemEventRouterResponse; + healthTreatment(pmcData: IPmcData, healthTreatmentRequest: IHealthTreatmentRequestData, sessionID: string): IItemEventRouterResponse; + /** + * applies skills from hideout workout. + * @param pmcData Player profile + * @param info Request data + * @param sessionID + */ + applyWorkoutChanges(pmcData: IPmcData, info: IWorkoutData, sessionId: string): void; + /** + * Iterate over treatment request diff and find effects to remove from player limbs + * @param sessionId + * @param profile Profile to update + * @param treatmentRequest client request + * @param output response to send to client + */ + protected removeEffectsAfterPostRaidHeal(sessionId: string, profile: IPmcData, treatmentRequest: IHealthTreatmentRequestData, output: IItemEventRouterResponse): void; } diff --git a/Live/CWX_MasterKey/server/types/controllers/HideoutController.d.ts b/Live/CWX_MasterKey/server/types/controllers/HideoutController.d.ts index 5b6507b..e6e0243 100644 --- a/Live/CWX_MasterKey/server/types/controllers/HideoutController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/HideoutController.d.ts @@ -7,7 +7,9 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { HideoutArea, Product } from "../models/eft/common/tables/IBotBase"; import { HideoutUpgradeCompleteRequestData } from "../models/eft/hideout/HideoutUpgradeCompleteRequestData"; -import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; +import { IHandleQTEEventRequestData } from "../models/eft/hideout/IHandleQTEEventRequestData"; +import { IHideoutContinuousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinuousProductionStartRequestData"; +import { IHideoutImproveAreaRequestData } from "../models/eft/hideout/IHideoutImproveAreaRequestData"; import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction"; import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData"; import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; @@ -16,6 +18,8 @@ import { IHideoutTakeItemOutRequestData } from "../models/eft/hideout/IHideoutTa import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutToggleAreaRequestData"; import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; +import { IQteData } from "../models/eft/hideout/IQteData"; +import { IRecordShootingRangePoints } from "../models/eft/hideout/IRecordShootingRangePoints"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IHideoutConfig } from "../models/spt/config/IHideoutConfig"; import { ILogger } from "../models/spt/utils/ILogger"; @@ -23,6 +27,7 @@ import { EventOutputHolder } from "../routers/EventOutputHolder"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { FenceService } from "../services/FenceService"; import { LocalisationService } from "../services/LocalisationService"; import { PlayerService } from "../services/PlayerService"; import { HashUtil } from "../utils/HashUtil"; @@ -49,12 +54,28 @@ export declare class HideoutController { protected localisationService: LocalisationService; protected configServer: ConfigServer; protected jsonUtil: JsonUtil; + protected fenceService: FenceService; protected static nameBackendCountersCrafting: string; protected hideoutConfig: IHideoutConfig; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, scavCaseRewardGenerator: ScavCaseRewardGenerator, localisationService: LocalisationService, configServer: ConfigServer, jsonUtil: JsonUtil); - upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; - upgradeComplete(pmcData: IPmcData, body: HideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse; + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, scavCaseRewardGenerator: ScavCaseRewardGenerator, localisationService: LocalisationService, configServer: ConfigServer, jsonUtil: JsonUtil, fenceService: FenceService); /** + * Start a hideout area upgrade + * @param pmcData Player profile + * @param request upgrade start request + * @param sessionID Session id + * @returns IItemEventRouterResponse + */ + startUpgrade(pmcData: IPmcData, request: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Complete a hideout area upgrade + * @param pmcData Player profile + * @param request Completed upgrade request + * @param sessionID Session id + * @returns IItemEventRouterResponse + */ + upgradeComplete(pmcData: IPmcData, request: HideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Handle HideoutPutItemsInAreaSlots * Create item in hideout slot item array, remove item from player inventory * @param pmcData Profile data * @param addItemToHideoutRequest reqeust from client to place item in area slot @@ -62,7 +83,14 @@ export declare class HideoutController { * @returns IItemEventRouterResponse object */ putItemsInAreaSlots(pmcData: IPmcData, addItemToHideoutRequest: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; - takeItemsFromAreaSlots(pmcData: IPmcData, body: IHideoutTakeItemOutRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Remove item from hideout area and place into player inventory + * @param pmcData Player profile + * @param request Take item out of area request + * @param sessionID Session id + * @returns IItemEventRouterResponse + */ + takeItemsFromAreaSlots(pmcData: IPmcData, request: IHideoutTakeItemOutRequestData, sessionID: string): IItemEventRouterResponse; /** * Find resource item in hideout area, add copy to player inventory, remove Item from hideout slot * @param sessionID Session id @@ -73,7 +101,21 @@ export declare class HideoutController { * @returns IItemEventRouterResponse response */ protected removeResourceFromArea(sessionID: string, pmcData: IPmcData, removeResourceRequest: IHideoutTakeItemOutRequestData, output: IItemEventRouterResponse, hideoutArea: HideoutArea): IItemEventRouterResponse; - toggleArea(pmcData: IPmcData, body: IHideoutToggleAreaRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Toggle area on/off + * @param pmcData Player profile + * @param request Toggle area request + * @param sessionID Session id + * @returns IItemEventRouterResponse + */ + toggleArea(pmcData: IPmcData, request: IHideoutToggleAreaRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Start production for an item from hideout area + * @param pmcData Player profile + * @param body Start prodution of single item request + * @param sessionID Session id + * @returns IItemEventRouterResponse + */ singleProductionStart(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData, sessionID: string): IItemEventRouterResponse; /** * Handles event after clicking 'start' on the scav case hideout page @@ -83,24 +125,96 @@ export declare class HideoutController { * @returns item event router response */ scavCaseProductionStart(pmcData: IPmcData, body: IHideoutScavCaseStartRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Adjust scav case time based on fence standing + * + * @param pmcData Player profile + * @param productionTime Time to complete scav case in seconds + * @returns Adjusted scav case time in seconds + */ + protected getScavCaseTime(pmcData: IPmcData, productionTime: number): number; /** * Add generated scav case rewards to player profile * @param pmcData player profile to add rewards to * @param rewards reward items to add to profile + * @param recipieId recipie id to save into Production dict */ - protected addScavCaseRewardsToProfile(pmcData: IPmcData, rewards: Product[]): void; - 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 addScavCaseRewardsToProfile(pmcData: IPmcData, rewards: Product[], recipieId: string): void; + /** + * Start production of continuously created item + * @param pmcData Player profile + * @param request Continious production request + * @param sessionID Session id + * @returns IItemEventRouterResponse + */ + continuousProductionStart(pmcData: IPmcData, request: IHideoutContinuousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Take completed item out of hideout area and place into player inventory + * @param pmcData Player profile + * @param request Remove production from area request + * @param sessionID Session id + * @returns IItemEventRouterResponse + */ + takeProduction(pmcData: IPmcData, request: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Take recipie-type production out of hideout area and place into player inventory + * @param sessionID Session id + * @param recipe Completed recipie of item + * @param pmcData Player profile + * @param request Remove production from area request + * @param output Output object to update + * @returns IItemEventRouterResponse + */ + protected handleRecipie(sessionID: string, recipe: IHideoutProduction, pmcData: IPmcData, request: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; /** * Handles giving rewards stored in player profile to player after clicking 'get rewards' - * @param sessionID - * @param pmcData - * @param body - * @param output - * @returns + * @param sessionID Session id + * @param pmcData Player profile + * @param request Get rewards from scavcase craft request + * @param output Output object to update + * @returns IItemEventRouterResponse + */ + protected handleScavCase(sessionID: string, pmcData: IPmcData, request: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; + /** + * Start area production for item + * @param pmcData Player profile + * @param request Start production request + * @param sessionID Session id + * @returns IItemEventRouterResponse + */ + registerProduction(pmcData: IPmcData, request: IHideoutSingleProductionStartRequestData | IHideoutContinuousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Get quick time event list for hideout + * // TODO - implement this + * @param sessionId Session id + * @returns IQteData array + */ + getQteList(sessionId: string): IQteData[]; + /** + * Handle HideoutQuickTimeEvent on client/game/profile/items/moving + * Called after completing workout at gym + * @param sessionId Session id + * @param pmcData Profile to adjust + * @param request QTE result object + */ + handleQTEEventOutcome(sessionId: string, pmcData: IPmcData, request: IHandleQTEEventRequestData): IItemEventRouterResponse; + /** + * Record a high score from the shooting range into a player profiles overallcounters + * @param sessionId Session id + * @param pmcData Profile to update + * @param request shooting range score request + * @returns IItemEventRouterResponse + */ + recordShootingRangePoints(sessionId: string, pmcData: IPmcData, request: IRecordShootingRangePoints): IItemEventRouterResponse; + /** + * Handle client/game/profile/items/moving - HideoutImproveArea + * @param sessionId Session id + * @param pmcData profile to improve area in + * @param request improve area request data + */ + improveArea(sessionId: string, pmcData: IPmcData, request: IHideoutImproveAreaRequestData): IItemEventRouterResponse; + /** + * Function called every x seconds as part of onUpdate event */ - 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/Live/CWX_MasterKey/server/types/controllers/InraidController.d.ts b/Live/CWX_MasterKey/server/types/controllers/InraidController.d.ts index 39a6396..f954eff 100644 --- a/Live/CWX_MasterKey/server/types/controllers/InraidController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/InraidController.d.ts @@ -1,3 +1,4 @@ +import { ApplicationContext } from "../context/ApplicationContext"; import { PlayerScavGenerator } from "../generators/PlayerScavGenerator"; import { HealthHelper } from "../helpers/HealthHelper"; import { InRaidHelper } from "../helpers/InRaidHelper"; @@ -35,12 +36,13 @@ export declare class InraidController { protected traderHelper: TraderHelper; protected insuranceService: InsuranceService; protected inRaidHelper: InRaidHelper; + protected applicationContext: ApplicationContext; protected configServer: ConfigServer; protected airdropConfig: IAirdropConfig; protected inraidConfig: IInRaidConfig; - constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, profileHelper: ProfileHelper, playerScavGenerator: PlayerScavGenerator, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); + constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, profileHelper: ProfileHelper, playerScavGenerator: PlayerScavGenerator, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, applicationContext: ApplicationContext, configServer: ConfigServer); /** - * Save locationid to active profiles inraid object + * Save locationId to active profiles inraid object AND app context * @param sessionID Session id * @param info Register player request */ diff --git a/Live/CWX_MasterKey/server/types/controllers/InsuranceController.d.ts b/Live/CWX_MasterKey/server/types/controllers/InsuranceController.d.ts index 54f31b5..af6e68d 100644 --- a/Live/CWX_MasterKey/server/types/controllers/InsuranceController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/InsuranceController.d.ts @@ -31,13 +31,23 @@ export declare class InsuranceController { protected configServer: ConfigServer; protected insuranceConfig: IInsuranceConfig; constructor(logger: ILogger, randomUtil: RandomUtil, eventOutputHolder: EventOutputHolder, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileHelper: ProfileHelper, dialogueHelper: DialogueHelper, paymentService: PaymentService, insuranceService: InsuranceService, configServer: ConfigServer); + /** + * Process insurance items prior to being given to player in mail + */ processReturn(): void; + /** + * Add insurance to an item + * @param pmcData Player profile + * @param body Insurance request + * @param sessionID Session id + * @returns IItemEventRouterResponse object to send to client + */ insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse; /** * Calculate insurance cost * @param info request object * @param sessionID session id - * @returns response object to send to client + * @returns IGetInsuranceCostResponseData object to send to client */ cost(info: IGetInsuranceCostRequestData, sessionID: string): IGetInsuranceCostResponseData; } diff --git a/Live/CWX_MasterKey/server/types/controllers/InventoryController.d.ts b/Live/CWX_MasterKey/server/types/controllers/InventoryController.d.ts index e1c08c0..129ede3 100644 --- a/Live/CWX_MasterKey/server/types/controllers/InventoryController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/InventoryController.d.ts @@ -129,9 +129,14 @@ export declare class InventoryController { protected getExaminedItemTpl(body: IInventoryExamineRequestData): string; readEncyclopedia(pmcData: IPmcData, body: IInventoryReadEncyclopediaRequestData, sessionID: string): IItemEventRouterResponse; /** - * Handles sorting of Inventory. + * Handle ApplyInventoryChanges + * Sorts supplied items. + * @param pmcData Player profile + * @param request sort request + * @param sessionID Session id + * @returns IItemEventRouterResponse */ - sortInventory(pmcData: IPmcData, body: IInventorySortRequestData, sessionID: string): IItemEventRouterResponse; + sortInventory(pmcData: IPmcData, request: IInventorySortRequestData, sessionID: string): IItemEventRouterResponse; createMapMarker(pmcData: IPmcData, body: IInventoryCreateMarkerRequestData, sessionID: string): IItemEventRouterResponse; deleteMapMarker(pmcData: IPmcData, body: IInventoryDeleteMarkerRequestData, sessionID: string): IItemEventRouterResponse; editMapMarker(pmcData: IPmcData, body: IInventoryEditMarkerRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/types/controllers/MatchController.d.ts b/Live/CWX_MasterKey/server/types/controllers/MatchController.d.ts index 2c78405..cb0c755 100644 --- a/Live/CWX_MasterKey/server/types/controllers/MatchController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/MatchController.d.ts @@ -6,10 +6,9 @@ import { ICreateGroupRequestData } from "../models/eft/match/ICreateGroupRequest import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; import { IGetGroupStatusRequestData } from "../models/eft/match/IGetGroupStatusRequestData"; import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData"; +import { IGetRaidConfigurationRequestData } from "../models/eft/match/IGetRaidConfigurationRequestData"; import { IJoinMatchRequestData } from "../models/eft/match/IJoinMatchRequestData"; import { IJoinMatchResult } from "../models/eft/match/IJoinMatchResult"; -import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; -import { BotDifficulty } from "../models/enums/BotDifficulty"; import { IBotConfig } from "../models/spt/config/IBotConfig"; import { IInRaidConfig } from "../models/spt/config/IInRaidConfig"; import { IMatchConfig } from "../models/spt/config/IMatchConfig"; @@ -18,9 +17,7 @@ import { ConfigServer } from "../servers/ConfigServer"; import { SaveServer } from "../servers/SaveServer"; import { BotGenerationCacheService } from "../services/BotGenerationCacheService"; import { BotLootCacheService } from "../services/BotLootCacheService"; -import { CustomLocationWaveService } from "../services/CustomLocationWaveService"; import { MatchLocationService } from "../services/MatchLocationService"; -import { OpenZoneService } from "../services/OpenZoneService"; import { ProfileSnapshotService } from "../services/ProfileSnapshotService"; export declare class MatchController { protected logger: ILogger; @@ -31,14 +28,12 @@ export declare class MatchController { protected botLootCacheService: BotLootCacheService; protected configServer: ConfigServer; protected profileSnapshotService: ProfileSnapshotService; - protected customLocationWaveService: CustomLocationWaveService; - protected openZoneService: OpenZoneService; protected botGenerationCacheService: BotGenerationCacheService; protected applicationContext: ApplicationContext; protected matchConfig: IMatchConfig; protected inraidConfig: IInRaidConfig; protected botConfig: IBotConfig; - constructor(logger: ILogger, saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer, profileSnapshotService: ProfileSnapshotService, customLocationWaveService: CustomLocationWaveService, openZoneService: OpenZoneService, botGenerationCacheService: BotGenerationCacheService, applicationContext: ApplicationContext); + constructor(logger: ILogger, saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer, profileSnapshotService: ProfileSnapshotService, botGenerationCacheService: BotGenerationCacheService, applicationContext: ApplicationContext); getEnabled(): boolean; getProfile(info: IGetProfileRequestData): IPmcData[]; createGroup(sessionID: string, info: ICreateGroupRequestData): any; @@ -46,12 +41,17 @@ export declare class MatchController { joinMatch(info: IJoinMatchRequestData, sessionID: string): IJoinMatchResult[]; protected getMatch(location: string): any; getGroupStatus(info: IGetGroupStatusRequestData): any; - startOfflineRaid(info: IStartOfflineRaidRequestData, sessionID: string): void; + /** + * Handle /client/raid/configuration + * @param request + * @param sessionID + */ + startOfflineRaid(request: IGetRaidConfigurationRequestData, sessionID: string): void; /** * Convert a difficulty value from pre-raid screen to a bot difficulty - * @param botDifficulty dropdown difficulty + * @param botDifficulty dropdown difficulty value * @returns bot difficulty */ - protected convertDifficultyDropdownIntoBotDifficulty(botDifficulty: BotDifficulty): string; + protected convertDifficultyDropdownIntoBotDifficulty(botDifficulty: string): string; endOfflineRaid(info: IEndOfflineRaidRequestData, sessionID: string): void; } diff --git a/Live/CWX_MasterKey/server/types/controllers/ProfileController.d.ts b/Live/CWX_MasterKey/server/types/controllers/ProfileController.d.ts index 8c89a02..e76785a 100644 --- a/Live/CWX_MasterKey/server/types/controllers/ProfileController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/ProfileController.d.ts @@ -1,6 +1,7 @@ import { PlayerScavGenerator } from "../generators/PlayerScavGenerator"; import { ItemHelper } from "../helpers/ItemHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; +import { QuestHelper } from "../helpers/QuestHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IMiniProfile } from "../models/eft/launcher/IMiniProfile"; @@ -24,8 +25,9 @@ export declare class ProfileController { protected profileFixerService: ProfileFixerService; protected playerScavGenerator: PlayerScavGenerator; protected traderHelper: TraderHelper; + protected questHelper: QuestHelper; protected profileHelper: ProfileHelper; - constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileFixerService: ProfileFixerService, playerScavGenerator: PlayerScavGenerator, traderHelper: TraderHelper, profileHelper: ProfileHelper); + constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileFixerService: ProfileFixerService, playerScavGenerator: PlayerScavGenerator, traderHelper: TraderHelper, questHelper: QuestHelper, profileHelper: ProfileHelper); getMiniProfiles(): IMiniProfile[]; getMiniProfile(sessionID: string): any; getCompleteProfile(sessionID: string): IPmcData[]; diff --git a/Live/CWX_MasterKey/server/types/controllers/QuestController.d.ts b/Live/CWX_MasterKey/server/types/controllers/QuestController.d.ts index b57eb40..fe1754d 100644 --- a/Live/CWX_MasterKey/server/types/controllers/QuestController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/QuestController.d.ts @@ -95,13 +95,20 @@ export declare class QuestController { */ completeQuest(pmcData: IPmcData, body: ICompleteQuestRequestData, sessionID: string): IItemEventRouterResponse; /** - * Send a popup to player on completion of a quest + * Send a popup to player on successful completion of a quest * @param sessionID session id - * @param pmcData player profile - * @param completedQuestId completed quest id - * @param questRewards rewards given to player + * @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; + protected sendSuccessDialogMessageOnQuestComplete(sessionID: string, pmcData: IPmcData, completedQuestId: string, questRewards: Reward[]): void; + /** + * Look for newly available quests after completing a quest with a requirement to wait x minutes (time-locked) before being available and add data to profile + * @param pmcData Player profile to update + * @param quests Quests to look for wait conditions in + * @param completedQuestId Quest just completed + */ + protected addTimeLockedQuestsToProfile(pmcData: IPmcData, quests: IQuest[], completedQuestId: string): void; /** * Returns a list of quests that should be failed when a quest is completed * @param completedQuestId quest completed id diff --git a/Live/CWX_MasterKey/server/types/controllers/RagfairController.d.ts b/Live/CWX_MasterKey/server/types/controllers/RagfairController.d.ts index 36a919f..fffcaa3 100644 --- a/Live/CWX_MasterKey/server/types/controllers/RagfairController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/RagfairController.d.ts @@ -103,6 +103,11 @@ export declare class RagfairController { * @param profile full profile of player */ protected setTraderOfferPurchaseLimits(offer: IRagfairOffer, profile: IAkiProfile): void; + /** + * Adjust ragfair offer stack count to match same value as traders assort stack count + * @param offer Flea offer to adjust + */ + protected setTraderOfferStackSize(offer: IRagfairOffer): void; protected isLinkedSearch(info: ISearchRequestData): boolean; protected isRequiredSearch(info: ISearchRequestData): boolean; update(): void; @@ -115,6 +120,7 @@ export declare class RagfairController { addPlayerOffer(pmcData: IPmcData, info: IAddOfferRequestData, sessionID: string): IItemEventRouterResponse; createPlayerOffer(profile: IAkiProfile, requirements: Requirement[], items: Item[], sellInOnePiece: boolean, amountToSend: number): IRagfairOffer; getAllFleaPrices(): Record; + getStaticPrices(): Record; removeOffer(offerId: string, sessionID: string): IItemEventRouterResponse; extendOffer(info: IExtendOfferRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_MasterKey/server/types/controllers/RepeatableQuestController.d.ts b/Live/CWX_MasterKey/server/types/controllers/RepeatableQuestController.d.ts index fee4d44..dd8dc40 100644 --- a/Live/CWX_MasterKey/server/types/controllers/RepeatableQuestController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/RepeatableQuestController.d.ts @@ -1,3 +1,4 @@ +import { HandbookHelper } from "../helpers/HandbookHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; @@ -65,6 +66,7 @@ export declare class RepeatableQuestController { protected presetHelper: PresetHelper; protected profileHelper: ProfileHelper; protected profileFixerService: ProfileFixerService; + protected handbookHelper: HandbookHelper; protected ragfairServerHelper: RagfairServerHelper; protected eventOutputHolder: EventOutputHolder; protected localisationService: LocalisationService; @@ -73,7 +75,7 @@ export declare class RepeatableQuestController { protected itemFilterService: ItemFilterService; protected configServer: ConfigServer; protected questConfig: IQuestConfig; - constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, httpResponse: HttpResponseUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, ragfairServerHelper: RagfairServerHelper, eventOutputHolder: EventOutputHolder, localisationService: LocalisationService, paymentService: PaymentService, objectId: ObjectId, itemFilterService: ItemFilterService, configServer: ConfigServer); + constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, httpResponse: HttpResponseUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, handbookHelper: HandbookHelper, ragfairServerHelper: RagfairServerHelper, eventOutputHolder: EventOutputHolder, localisationService: LocalisationService, paymentService: PaymentService, objectId: ObjectId, itemFilterService: ItemFilterService, configServer: ConfigServer); /** * 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. @@ -115,17 +117,18 @@ export declare class RepeatableQuestController { /** * Just for debug reasons. Draws dailies a random assort of dailies extracted from dumps */ - generateDebugDailies(dailiesPool: any, factory: any, number: any): any; + generateDebugDailies(dailiesPool: any, factory: any, number: number): any; /** * Generates the base object of quest type format given as templates in assets/database/templates/repeatableQuests.json * The templates include Elimination, Completion and Extraction quest types * * @param {string} type quest type: "Elimination", "Completion" or "Extraction" * @param {string} traderId trader from which the quest will be provided + * @param {string} side scav daily or pmc daily/weekly quest * @returns {object} a object which contains the base elements for repeatable quests of the requests type * (needs to be filled with reward and conditions by called to make a valid quest) */ - generateRepeatableTemplate(type: string, traderId: string): IRepeatableQuest; + generateRepeatableTemplate(type: string, traderId: string, side: string): IRepeatableQuest; /** * Generates a valid Exploration quest * @@ -236,16 +239,17 @@ export declare class RepeatableQuestController { generateRewardItem(tpl: string, value: number, index: number, preset?: any): IReward; debugLogRepeatableQuestIds(pmcData: IPmcData): void; probabilityObjectArray(configArrayInput: ProbabilityObject[]): ProbabilityObjectArray; - changeRepeatableQuest(pmcDataIn: IPmcData, body: IRepeatableQuestChangeRequest, sessionID: string): IItemEventRouterResponse; + changeRepeatableQuest(pmcData: IPmcData, body: IRepeatableQuestChangeRequest, sessionID: string): IItemEventRouterResponse; /** - * Picks rewardable items from items.json. This means they need to fit into the inventory and they shouldn't be keys (debatable) - * @returns a list of rewardable items [[_tpl, itemTemplate],...] + * Picks rewardable items from items.json. This means they need to fit into the inventory and they shouldn't be keys (debatable) + * @param repeatableQuestConfig config file + * @returns a list of rewardable items [[_tpl, itemTemplate],...] */ protected getRewardableItems(repeatableQuestConfig: IRepeatableQuestConfig): [string, ITemplateItem][]; /** * Checks if an id is a valid item. Valid meaning that it's an item that may be a reward * or content of bot loot. Items that are tested as valid may be in a player backpack or stash. - * @param {*} tpl template id of item to check + * @param {string} tpl template id of item to check * @returns boolean: true if item is valid reward */ isValidRewardItem(tpl: string, repeatableQuestConfig: IRepeatableQuestConfig): boolean; diff --git a/Live/CWX_MasterKey/server/types/controllers/TradeController.d.ts b/Live/CWX_MasterKey/server/types/controllers/TradeController.d.ts index 6c35d66..dc7de19 100644 --- a/Live/CWX_MasterKey/server/types/controllers/TradeController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/TradeController.d.ts @@ -1,22 +1,30 @@ -import { RagfairServer } from "../servers/RagfairServer"; +import { ItemHelper } from "../helpers/ItemHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { TradeHelper } from "../helpers/TradeHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { Upd } from "../models/eft/common/tables/IItem"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData"; -import { EventOutputHolder } from "../routers/EventOutputHolder"; +import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; +import { EventOutputHolder } from "../routers/EventOutputHolder"; +import { ConfigServer } from "../servers/ConfigServer"; +import { RagfairServer } from "../servers/RagfairServer"; +import { LocalisationService } from "../services/LocalisationService"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; declare class TradeController { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; protected tradeHelper: TradeHelper; + protected itemHelper: ItemHelper; protected profileHelper: ProfileHelper; protected ragfairServer: RagfairServer; protected httpResponse: HttpResponseUtil; - constructor(logger: ILogger, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, profileHelper: ProfileHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil); + protected localisationService: LocalisationService; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; + constructor(logger: ILogger, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); confirmTrading(pmcData: IPmcData, body: IProcessBaseTradeRequestData, sessionID: string, foundInRaid?: boolean, upd?: Upd): IItemEventRouterResponse; confirmRagfairTrading(pmcData: IPmcData, body: IProcessRagfairTradeRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_MasterKey/server/types/controllers/WishlistController.d.ts b/Live/CWX_MasterKey/server/types/controllers/WishlistController.d.ts index 83be4b3..60c4a15 100644 --- a/Live/CWX_MasterKey/server/types/controllers/WishlistController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/WishlistController.d.ts @@ -1,7 +1,7 @@ import { EventOutputHolder } from "../routers/EventOutputHolder"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IWishlistActionData } from "../models/eft/wishlist/IWishlistActionData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IWishlistActionData } from "../models/eft/wishlist/IWishlistActionData"; export declare class WishlistController { protected eventOutputHolder: EventOutputHolder; constructor(eventOutputHolder: EventOutputHolder); diff --git a/Live/CWX_MasterKey/server/types/di/OnLoad.d.ts b/Live/CWX_MasterKey/server/types/di/OnLoad.d.ts index 4a28f13..a5cdea3 100644 --- a/Live/CWX_MasterKey/server/types/di/OnLoad.d.ts +++ b/Live/CWX_MasterKey/server/types/di/OnLoad.d.ts @@ -1,4 +1,4 @@ -export declare class OnLoad { +export interface OnLoad { onLoad(): Promise; getRoute(): string; } diff --git a/Live/CWX_MasterKey/server/types/di/OnLoadOnUpdate.d.ts b/Live/CWX_MasterKey/server/types/di/OnLoadOnUpdate.d.ts deleted file mode 100644 index eaa297c..0000000 --- a/Live/CWX_MasterKey/server/types/di/OnLoadOnUpdate.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { OnLoad } from "./OnLoad"; -import { OnUpdate } from "./OnUpdate"; -export declare class OnLoadOnUpdate implements OnLoad, OnUpdate { - onUpdate(timeSinceLastRun: number): Promise; - onLoad(): Promise; - getRoute(): string; -} diff --git a/Live/CWX_MasterKey/server/types/di/OnUpdate.d.ts b/Live/CWX_MasterKey/server/types/di/OnUpdate.d.ts index 6839719..e1ce375 100644 --- a/Live/CWX_MasterKey/server/types/di/OnUpdate.d.ts +++ b/Live/CWX_MasterKey/server/types/di/OnUpdate.d.ts @@ -1,4 +1,4 @@ -export declare class OnUpdate { +export interface OnUpdate { onUpdate(timeSinceLastRun: number): Promise; getRoute(): string; } diff --git a/Live/CWX_MasterKey/server/types/generators/BotEquipmentModGenerator.d.ts b/Live/CWX_MasterKey/server/types/generators/BotEquipmentModGenerator.d.ts index 5b937ca..6703a36 100644 --- a/Live/CWX_MasterKey/server/types/generators/BotEquipmentModGenerator.d.ts +++ b/Live/CWX_MasterKey/server/types/generators/BotEquipmentModGenerator.d.ts @@ -145,7 +145,7 @@ export declare class BotEquipmentModGenerator { * @param modToAdd template of mod to check * @param itemSlot slot the item will be placed in * @param modSlot slot the mod will fill - * @param parentTemplate tempalte of the mods parent item + * @param parentTemplate template of the mods parent item * @returns true if valid */ protected isModValidForSlot(modToAdd: [boolean, ITemplateItem], itemSlot: Slot, modSlot: string, parentTemplate: ITemplateItem): boolean; diff --git a/Live/CWX_MasterKey/server/types/generators/BotGenerator.d.ts b/Live/CWX_MasterKey/server/types/generators/BotGenerator.d.ts index 2675146..9581259 100644 --- a/Live/CWX_MasterKey/server/types/generators/BotGenerator.d.ts +++ b/Live/CWX_MasterKey/server/types/generators/BotGenerator.d.ts @@ -2,7 +2,7 @@ import { BotDifficultyHelper } from "../helpers/BotDifficultyHelper"; import { BotHelper } from "../helpers/BotHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { Health as PmcHealth, IBotBase, Skills } from "../models/eft/common/tables/IBotBase"; +import { Health as PmcHealth, IBotBase, Info, Skills } from "../models/eft/common/tables/IBotBase"; import { Health, IBotType } from "../models/eft/common/tables/IBotType"; import { BotGenerationDetails } from "../models/spt/bots/BotGenerationDetails"; import { IBotConfig } from "../models/spt/config/IBotConfig"; @@ -90,6 +90,13 @@ export declare class BotGenerator { */ protected generateId(bot: IBotBase): IBotBase; protected generateInventoryID(profile: IBotBase): IBotBase; + /** + * Randomise a bots game version and account category + * Chooses from all the game versions (standard, eod etc) + * Chooses account type (default, Sherpa, etc) + * @param botInfo bot info object to update + */ + protected getRandomisedGameVersionAndCategory(botInfo: Info): void; /** * Add a side-specific (usec/bear) dogtag item to a bots inventory * @param bot bot to add dogtag to diff --git a/Live/CWX_MasterKey/server/types/generators/BotWeaponGenerator.d.ts b/Live/CWX_MasterKey/server/types/generators/BotWeaponGenerator.d.ts index 938d61c..a68b82f 100644 --- a/Live/CWX_MasterKey/server/types/generators/BotWeaponGenerator.d.ts +++ b/Live/CWX_MasterKey/server/types/generators/BotWeaponGenerator.d.ts @@ -89,9 +89,10 @@ export declare class BotWeaponGenerator { /** * Checks if all required slots are occupied on a weapon and all it's mods * @param weaponItemArray Weapon + mods + * @param botRole role of bot weapon is for * @returns true if valid */ - protected isWeaponValid(weaponItemArray: Item[]): boolean; + protected isWeaponValid(weaponItemArray: Item[], botRole: string): boolean; /** * Generates extra magazines or bullets (if magazine is internal) and adds them to TacticalVest and Pockets. * Additionally, adds extra bullets to SecuredContainer @@ -101,6 +102,13 @@ export declare class BotWeaponGenerator { * @param botRole The bot type we're getting generating extra mags for */ addExtraMagazinesToInventory(generatedWeaponResult: GenerateWeaponResult, magCounts: MinMax, inventory: PmcInventory, botRole: string): void; + /** + * Add Grendaes for UBGL to bots vest and secure container + * @param weaponMods Weapon array with mods + * @param generatedWeaponResult result of weapon generation + * @param inventory bot inventory to add grenades to + */ + protected addUbglGrenadesToBotInventory(weaponMods: Item[], generatedWeaponResult: GenerateWeaponResult, inventory: PmcInventory): void; /** * Add ammo to the secure container * @param stackCount How many stacks of ammo to add @@ -137,6 +145,13 @@ export declare class BotWeaponGenerator { * @param ammoTpl */ protected fillExistingMagazines(weaponMods: Item[], magazine: Item, ammoTpl: string): void; + /** + * Add desired ammo tpl as item to weaponmods array, placed as child to UBGL + * @param weaponMods + * @param ubglMod + * @param ubglAmmoTpl + */ + protected fillUbgl(weaponMods: Item[], ubglMod: Item, ubglAmmoTpl: string): void; /** * Add cartridge item to weapon Item array, if it already exists, update * @param weaponMods Weapon items array to amend diff --git a/Live/CWX_MasterKey/server/types/generators/LocationGenerator.d.ts b/Live/CWX_MasterKey/server/types/generators/LocationGenerator.d.ts index a80ae3c..a617048 100644 --- a/Live/CWX_MasterKey/server/types/generators/LocationGenerator.d.ts +++ b/Live/CWX_MasterKey/server/types/generators/LocationGenerator.d.ts @@ -49,7 +49,8 @@ export declare class LocationGenerator { * Add forced spawn point loot into loot parameter array * @param loot array to add forced loot to * @param forcedSpawnPoints forced loot to add + * @param name of map currently generating forced loot for */ - protected addForcedLoot(loot: SpawnpointTemplate[], forcedSpawnPoints: SpawnpointsForced[]): void; + protected addForcedLoot(loot: SpawnpointTemplate[], forcedSpawnPoints: SpawnpointsForced[], locationName: string): void; protected createItem(tpl: string, staticAmmoDist: Record, parentId?: string): IContainerItem; } diff --git a/Live/CWX_MasterKey/server/types/generators/PMCLootGenerator.d.ts b/Live/CWX_MasterKey/server/types/generators/PMCLootGenerator.d.ts index b9f2a83..10918e3 100644 --- a/Live/CWX_MasterKey/server/types/generators/PMCLootGenerator.d.ts +++ b/Live/CWX_MasterKey/server/types/generators/PMCLootGenerator.d.ts @@ -3,6 +3,7 @@ import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemFilterService } from "../services/ItemFilterService"; +import { SeasonalEventService } from "../services/SeasonalEventService"; /** * Handle the generation of dynamic PMC loot in pockets and backpacks * and the removal of blacklisted items @@ -12,10 +13,19 @@ export declare class PMCLootGenerator { protected databaseServer: DatabaseServer; protected configServer: ConfigServer; protected itemFilterService: ItemFilterService; + protected seasonalEventService: SeasonalEventService; protected pocketLootPool: string[]; protected backpackLootPool: string[]; protected botConfig: IBotConfig; - constructor(itemHelper: ItemHelper, databaseServer: DatabaseServer, configServer: ConfigServer, itemFilterService: ItemFilterService); + constructor(itemHelper: ItemHelper, databaseServer: DatabaseServer, configServer: ConfigServer, itemFilterService: ItemFilterService, seasonalEventService: SeasonalEventService); + /** + * Create an array of loot items a PMC can have in their pockets + * @returns string array of tpls + */ generatePMCPocketLootPool(): string[]; + /** + * Create an array of loot items a PMC can have in their backpack + * @returns string array of tpls + */ generatePMCBackpackLootPool(): string[]; } diff --git a/Live/CWX_MasterKey/server/types/generators/PlayerScavGenerator.d.ts b/Live/CWX_MasterKey/server/types/generators/PlayerScavGenerator.d.ts index 9fee88b..3641268 100644 --- a/Live/CWX_MasterKey/server/types/generators/PlayerScavGenerator.d.ts +++ b/Live/CWX_MasterKey/server/types/generators/PlayerScavGenerator.d.ts @@ -1,4 +1,7 @@ +import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; import { BotHelper } from "../helpers/BotHelper"; +import { BotWeaponGeneratorHelper } from "../helpers/BotWeaponGeneratorHelper"; +import { ItemHelper } from "../helpers/ItemHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { Skills, Stats } from "../models/eft/common/tables/IBotBase"; @@ -11,11 +14,18 @@ import { SaveServer } from "../servers/SaveServer"; import { BotLootCacheService } from "../services/BotLootCacheService"; import { FenceService } from "../services/FenceService"; import { LocalisationService } from "../services/LocalisationService"; +import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; +import { RandomUtil } from "../utils/RandomUtil"; import { BotGenerator } from "./BotGenerator"; export declare class PlayerScavGenerator { protected logger: ILogger; + protected randomUtil: RandomUtil; protected databaseServer: DatabaseServer; + protected hashUtil: HashUtil; + protected itemHelper: ItemHelper; + protected botWeaponGeneratorHelper: BotWeaponGeneratorHelper; + protected botGeneratorHelper: BotGeneratorHelper; protected saveServer: SaveServer; protected profileHelper: ProfileHelper; protected botHelper: BotHelper; @@ -26,7 +36,7 @@ export declare class PlayerScavGenerator { protected botGenerator: BotGenerator; protected configServer: ConfigServer; protected playerScavConfig: IPlayerScavConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, botHelper: BotHelper, jsonUtil: JsonUtil, fenceService: FenceService, botLootCacheService: BotLootCacheService, localisationService: LocalisationService, botGenerator: BotGenerator, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, hashUtil: HashUtil, itemHelper: ItemHelper, botWeaponGeneratorHelper: BotWeaponGeneratorHelper, botGeneratorHelper: BotGeneratorHelper, saveServer: SaveServer, profileHelper: ProfileHelper, botHelper: BotHelper, jsonUtil: JsonUtil, fenceService: FenceService, botLootCacheService: BotLootCacheService, localisationService: LocalisationService, botGenerator: BotGenerator, configServer: ConfigServer); /** * Update a player profile to include a new player scav profile * @param sessionID session id to specify what profile is updated diff --git a/Live/CWX_MasterKey/server/types/generators/RagfairAssortGenerator.d.ts b/Live/CWX_MasterKey/server/types/generators/RagfairAssortGenerator.d.ts index db4811d..630e863 100644 --- a/Live/CWX_MasterKey/server/types/generators/RagfairAssortGenerator.d.ts +++ b/Live/CWX_MasterKey/server/types/generators/RagfairAssortGenerator.d.ts @@ -4,6 +4,7 @@ import { Item } from "../models/eft/common/tables/IItem"; import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { SeasonalEventService } from "../services/SeasonalEventService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class RagfairAssortGenerator { @@ -11,10 +12,11 @@ export declare class RagfairAssortGenerator { protected hashUtil: HashUtil; protected itemHelper: ItemHelper; protected databaseServer: DatabaseServer; + protected seasonalEventService: SeasonalEventService; protected configServer: ConfigServer; protected generatedAssortItems: Item[]; protected ragfairConfig: IRagfairConfig; - constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseServer: DatabaseServer, configServer: ConfigServer); + constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseServer: DatabaseServer, seasonalEventService: SeasonalEventService, configServer: ConfigServer); /** * Get an array of unique items that can be sold on the flea * @returns array of unique items diff --git a/Live/CWX_MasterKey/server/types/generators/RagfairOfferGenerator.d.ts b/Live/CWX_MasterKey/server/types/generators/RagfairOfferGenerator.d.ts index 338cd5c..35fceff 100644 --- a/Live/CWX_MasterKey/server/types/generators/RagfairOfferGenerator.d.ts +++ b/Live/CWX_MasterKey/server/types/generators/RagfairOfferGenerator.d.ts @@ -103,7 +103,34 @@ export declare class RagfairOfferGenerator { * @param traderID Trader to generate offers for */ generateFleaOffersForTrader(traderID: string): void; - protected getItemCondition(userID: string, items: Item[], itemDetails: ITemplateItem): Item[]; + /** + * Get array of an item with its mods + condition properties (e.g durability) + * Apply randomisation adjustments to condition if item base is found in ragfair.json/dynamic/condition + * @param userID id of owner of item + * @param itemWithMods Item and mods, get condition of first item (only first array item is used) + * @param itemDetails db details of first item + * @returns + */ + protected getItemCondition(userID: string, itemWithMods: Item[], itemDetails: ITemplateItem): Item[]; + /** + * Get the relevant condition id if item tpl matches in ragfair.json/condition + * @param tpl Item to look for matching condition object + * @returns condition id + */ + protected getDynamicConditionIdForTpl(tpl: string): string; + /** + * Alter an items condition based on its item base type + * @param conditionSettingsId also the parentId of item being altered + * @param item Item to adjust condition details of + * @param itemDetails db item details of first item in array + */ + protected randomiseItemCondition(conditionSettingsId: string, item: Item, itemDetails: ITemplateItem): void; + /** + * Adjust an items durability/maxDurability value + * @param item item (weapon/armor) to adjust + * @param multiplier Value to multiple durability by + */ + protected randomiseDurabilityValues(item: Item, multiplier: number): void; /** * Add missing conditions to an item if needed * Durabiltiy for repairable items @@ -111,7 +138,7 @@ export declare class RagfairOfferGenerator { * @param item item to add conditions to * @returns Item with conditions added */ - protected addMissingCondition(item: Item): Item; + protected addMissingConditions(item: Item): Item; /** * Create a barter-based barter scheme, if not possible, fall back to making barter scheme currency based * @param offerItems Items for sale in offer diff --git a/Live/CWX_MasterKey/server/types/generators/ScavCaseRewardGenerator.d.ts b/Live/CWX_MasterKey/server/types/generators/ScavCaseRewardGenerator.d.ts index f9ac623..394eeb0 100644 --- a/Live/CWX_MasterKey/server/types/generators/ScavCaseRewardGenerator.d.ts +++ b/Live/CWX_MasterKey/server/types/generators/ScavCaseRewardGenerator.d.ts @@ -2,7 +2,6 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { Product } from "../models/eft/common/tables/IBotBase"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; -import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; import { IScavCaseConfig } from "../models/spt/config/IScavCaseConfig"; import { RewardCountAndPriceDetails, ScavCaseRewardCountsAndPrices } from "../models/spt/hideout/ScavCaseRewardCountsAndPrices"; import { ILogger } from "../models/spt/utils/ILogger"; @@ -28,10 +27,10 @@ export declare class ScavCaseRewardGenerator { constructor(logger: ILogger, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemFilterService: ItemFilterService, configServer: ConfigServer); /** * Create an array of rewards that will be given to the player upon completing their scav case build - * @param body client request + * @param recipeId recipe of the scav case craft * @returns Product array */ - generate(body: IHideoutScavCaseStartRequestData): Product[]; + generate(recipeId: string): Product[]; /** * Get all db items that are not blacklisted in scavcase config * @returns filtered array of db items diff --git a/Live/CWX_MasterKey/server/types/generators/weapongen/implementations/UbglExternalMagGen.d.ts b/Live/CWX_MasterKey/server/types/generators/weapongen/implementations/UbglExternalMagGen.d.ts new file mode 100644 index 0000000..75395be --- /dev/null +++ b/Live/CWX_MasterKey/server/types/generators/weapongen/implementations/UbglExternalMagGen.d.ts @@ -0,0 +1,10 @@ +import { BotWeaponGeneratorHelper } from "../../../helpers/BotWeaponGeneratorHelper"; +import { IInventoryMagGen } from "../IInventoryMagGen"; +import { InventoryMagGen } from "../InventoryMagGen"; +export declare class UbglExternalMagGen implements IInventoryMagGen { + protected botWeaponGeneratorHelper: BotWeaponGeneratorHelper; + constructor(botWeaponGeneratorHelper: BotWeaponGeneratorHelper); + getPriority(): number; + canHandleInventoryMagGen(inventoryMagGen: InventoryMagGen): boolean; + process(inventoryMagGen: InventoryMagGen): void; +} diff --git a/Live/CWX_MasterKey/server/types/helpers/AssortHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/AssortHelper.d.ts index de8b5bf..13512b2 100644 --- a/Live/CWX_MasterKey/server/types/helpers/AssortHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/AssortHelper.d.ts @@ -17,15 +17,16 @@ export declare class AssortHelper { * @param pmcProfile player profile * @param traderId traders id * @param assort assort items from a trader + * @param mergedQuestAssorts An object of quest assort to quest id unlocks for all traders * @returns assort items minus locked quest assorts */ - stripLockedQuestAssort(pmcProfile: IPmcData, traderId: string, assort: ITraderAssort, flea?: boolean): ITraderAssort; + stripLockedQuestAssort(pmcProfile: IPmcData, traderId: string, assort: ITraderAssort, mergedQuestAssorts: Record>, flea?: boolean): ITraderAssort; /** * Remove assorts from a trader that have not been unlocked yet * @param pmcProfile player profile * @param traderId traders id * @param assort traders assorts - * @returns traders assorts minus locked loyality assorts + * @returns traders assorts minus locked loyalty assorts */ stripLockedLoyaltyAssort(pmcProfile: IPmcData, traderId: string, assort: ITraderAssort): ITraderAssort; /** diff --git a/Live/CWX_MasterKey/server/types/helpers/BotDifficultyHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/BotDifficultyHelper.d.ts index a58ebdb..df2c269 100644 --- a/Live/CWX_MasterKey/server/types/helpers/BotDifficultyHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/BotDifficultyHelper.d.ts @@ -20,7 +20,7 @@ export declare class BotDifficultyHelper { getPmcDifficultySettings(pmcType: "bear" | "usec", difficulty: string, usecType: string, bearType: string): Difficulty; /** * Get difficulty settings for desired bot type, if not found use assault bot types - * @param type bot type to retreive difficulty of + * @param type bot type to retrieve difficulty of * @param difficulty difficulty to get settings for (easy/normal etc) * @returns Difficulty object */ diff --git a/Live/CWX_MasterKey/server/types/helpers/BotGeneratorHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/BotGeneratorHelper.d.ts index d9ce968..c7dd606 100644 --- a/Live/CWX_MasterKey/server/types/helpers/BotGeneratorHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/BotGeneratorHelper.d.ts @@ -23,7 +23,7 @@ export declare class BotGeneratorHelper { * Adds properties to an item * e.g. Repairable / HasHinge / Foldable / MaxDurability * @param itemTemplate Item extra properties are being generated for - * @param botRole Used by weapons to randomise the durability values. Null for non-equipped items + * @param botRole Used by weapons to randomize the durability values. Null for non-equipped items * @returns Item Upd object with extra properties */ generateExtraPropertiesForItem(itemTemplate: ITemplateItem, botRole?: string): { @@ -53,10 +53,10 @@ export declare class BotGeneratorHelper { protected generateArmorRepairableProperties(itemTemplate: ITemplateItem, botRole: string): Repairable; /** * Can item be added to another item without conflict - * @param items Items to check compatiblilities with + * @param items Items to check compatibilities with * @param tplToCheck Tpl of the item to check for incompatibilities * @param equipmentSlot Slot the item will be placed into - * @returns false if no incompatibilties, also has incompatibility reason + * @returns false if no incompatibilities, also has incompatibility reason */ isItemIncompatibleWithCurrentItems(items: Item[], tplToCheck: string, equipmentSlot: string): { incompatible: boolean; diff --git a/Live/CWX_MasterKey/server/types/helpers/BotHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/BotHelper.d.ts index 9a43b8e..3b49501 100644 --- a/Live/CWX_MasterKey/server/types/helpers/BotHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/BotHelper.d.ts @@ -23,11 +23,11 @@ export declare class BotHelper { */ getBotTemplate(role: string): IBotType; /** - * Randomise the chance the PMC will attack their own side + * Randomize the chance the PMC will attack their own side * Look up value in bot.json/chanceSameSideIsHostilePercent * @param difficultySettings pmc difficulty settings */ - randomisePmcHostility(difficultySettings: Difficulty): void; + randomizePmcHostility(difficultySettings: Difficulty): void; /** * Is the passed in bot role a PMC (usec/bear/pmc) * @param botRole bot role to check @@ -63,26 +63,26 @@ export declare class BotHelper { rollChanceToBePmc(role: string, botConvertMinMax: MinMax): boolean; botRoleIsPmc(botRole: string): boolean; /** - * Get randomisation settings for bot from config/bot.json + * Get randomization settings for bot from config/bot.json * @param botLevel level of bot * @param botEquipConfig bot equipment json * @returns RandomisationDetails */ - getBotRandomisationDetails(botLevel: number, botEquipConfig: EquipmentFilters): RandomisationDetails; + getBotRandomizationDetails(botLevel: number, botEquipConfig: EquipmentFilters): RandomisationDetails; /** * Choose between sptBear and sptUsec at random based on the % defined in botConfig.pmc.isUsec * @returns pmc role */ - getRandomisedPmcRole(): string; + getRandomizedPmcRole(): string; /** - * Get the corrisponding side when sptBear or sptUsec is passed in + * Get the corresponding side when sptBear or sptUsec is passed in * @param botRole role to get side for * @returns side (usec/bear) */ getPmcSideByRole(botRole: string): string; /** - * Get a randomised PMC side based on bot config value 'isUsec' + * Get a randomized PMC side based on bot config value 'isUsec' * @returns pmc side as string */ - protected getRandomisedPmcSide(): string; + protected getRandomizedPmcSide(): string; } diff --git a/Live/CWX_MasterKey/server/types/helpers/BotWeaponGeneratorHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/BotWeaponGeneratorHelper.d.ts index b087fa9..cefc3bd 100644 --- a/Live/CWX_MasterKey/server/types/helpers/BotWeaponGeneratorHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/BotWeaponGeneratorHelper.d.ts @@ -2,6 +2,7 @@ import { MinMax } from "../models/common/MinMax"; import { Inventory } from "../models/eft/common/tables/IBotBase"; import { Item } from "../models/eft/common/tables/IItem"; import { Grid, ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { EquipmentSlots } from "../models/enums/EquipmentSlots"; import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { LocalisationService } from "../services/LocalisationService"; @@ -21,18 +22,18 @@ export declare class BotWeaponGeneratorHelper { protected containerHelper: ContainerHelper; constructor(logger: ILogger, databaseServer: DatabaseServer, itemHelper: ItemHelper, randomUtil: RandomUtil, hashUtil: HashUtil, inventoryHelper: InventoryHelper, localisationService: LocalisationService, containerHelper: ContainerHelper); /** - * Get a randomised number of bullets for a specific magazine + * Get a randomized 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 */ - getRandomisedBulletCount(magCounts: MinMax, magTemplate: ITemplateItem): number; + getRandomizedBulletCount(magCounts: MinMax, magTemplate: ITemplateItem): number; /** - * Get a randomised count of magazines + * Get a randomized count of magazines * @param magCounts min and max value returned value can be between - * @returns numberical value of magazine count + * @returns numerical value of magazine count */ - getRandomisedMagazineCount(magCounts: MinMax): number; + getRandomizedMagazineCount(magCounts: MinMax): number; /** * Is this magazine cylinder related (revolvers and grenade launchers) * @param magazineParentName the name of the magazines parent @@ -48,12 +49,13 @@ export declare class BotWeaponGeneratorHelper { */ createMagazine(magazineTpl: string, ammoTpl: string, magTemplate: ITemplateItem): Item[]; /** - * Add a specific number of cartrdiges to a bots inventory (vest/pocket) + * Add a specific number of cartridges to a bots inventory (defaults to vest and pockets) * @param ammoTpl Ammo tpl to add to vest/pockets * @param cartridgeCount number of cartridges to add to vest/pockets * @param inventory bot inventory to add cartridges to + * @param equipmentSlotsToAddTo what equipment slots should bullets be added into */ - addBulletsToVestAndPockets(ammoTpl: string, cartridgeCount: number, inventory: Inventory): void; + addAmmoIntoEquipmentSlots(ammoTpl: string, cartridgeCount: number, inventory: Inventory, equipmentSlotsToAddTo?: EquipmentSlots[]): void; /** * Get a weapons default magazine template id * @param weaponTemplate weapon to get default magazine for @@ -61,7 +63,8 @@ export declare class BotWeaponGeneratorHelper { */ getWeaponsDefaultMagazineTpl(weaponTemplate: ITemplateItem): string; /** - * Adds an item with all its childern into specified equipmentSlots, wherever it fits. + * TODO - move into BotGeneratorHelper, this is not the class for it + * Adds an item with all its children into specified equipmentSlots, wherever it fits. * @param equipmentSlots * @param parentId * @param parentTpl diff --git a/Live/CWX_MasterKey/server/types/helpers/DurabilityLimitsHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/DurabilityLimitsHelper.d.ts index 07a5db1..7122376 100644 --- a/Live/CWX_MasterKey/server/types/helpers/DurabilityLimitsHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/DurabilityLimitsHelper.d.ts @@ -9,10 +9,10 @@ export declare class DurabilityLimitsHelper { protected configServer: ConfigServer; protected botConfig: IBotConfig; constructor(randomUtil: RandomUtil, botHelper: BotHelper, configServer: ConfigServer); - getRandomisedMaxWeaponDurability(itemTemplate: ITemplateItem, botRole: string): number; - getRandomisedMaxArmorDurability(itemTemplate: ITemplateItem, botRole: string): number; - getRandomisedWeaponDurability(itemTemplate: ITemplateItem, botRole: string, maxDurability: number): number; - getRandomisedArmorDurability(itemTemplate: ITemplateItem, botRole: string, maxDurability: number): number; + getRandomizedMaxWeaponDurability(itemTemplate: ITemplateItem, botRole: string): number; + getRandomizedMaxArmorDurability(itemTemplate: ITemplateItem, botRole: string): number; + getRandomizedWeaponDurability(itemTemplate: ITemplateItem, botRole: string, maxDurability: number): number; + getRandomizedArmorDurability(itemTemplate: ITemplateItem, botRole: string, maxDurability: number): number; protected generateMaxWeaponDurability(botRole: string): number; protected generateMaxPmcArmorDurability(itemMaxDurability: number): number; protected getLowestMaxWeaponFromConfig(botRole: string): number; @@ -23,4 +23,6 @@ export declare class DurabilityLimitsHelper { protected getMaxWeaponDeltaFromConfig(botRole: string): number; protected getMinArmorDeltaFromConfig(botRole: string): number; protected getMaxArmorDeltaFromConfig(botRole: string): number; + protected getMinArmorLimitPercentFromConfig(botRole: string): number; + protected getMinWeaponLimitPercentFromConfig(botRole: string): number; } diff --git a/Live/CWX_MasterKey/server/types/helpers/HealthHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/HealthHelper.d.ts index 50b7559..7a6d41d 100644 --- a/Live/CWX_MasterKey/server/types/helpers/HealthHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/HealthHelper.d.ts @@ -1,7 +1,6 @@ import { IPmcData } from "../models/eft/common/IPmcData"; -import { Effect } from "../models/eft/health/Effect"; import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; -import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { Effects, 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"; @@ -17,7 +16,7 @@ export declare class HealthHelper { 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 + * Resets the profiles vitality/health and vitality/effects properties to their defaults * @param sessionID Session Id * @returns updated profile */ @@ -25,28 +24,34 @@ export declare class HealthHelper { /** * Update player profile with changes from request object * @param pmcData Player profile - * @param info Request object + * @param request Heal request * @param sessionID Session id * @param addEffects Should effects be added or removed (default - add) */ - saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string, addEffects?: boolean): void; + saveVitality(pmcData: IPmcData, request: ISyncHealthRequestData, sessionID: string, addEffects?: boolean, deleteExistingEffects?: boolean): void; + /** + * Adjust hydration/energy/temperate and body part hp values in player profile to values in profile.vitality + * @param pmcData Profile to update + * @param sessionId Session id + */ 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 + * Removes empty 'Effects' objects if found * @param pmcData Player profile - * @param sessionID Session id + * @param sessionId Session id + * @param bodyPartsWithEffects dict of body parts with effects that should be added to profile * @param addEffects Should effects be added back to profile - * @returns */ - protected saveEffects(pmcData: IPmcData, sessionID: string, addEffects: boolean): void; + protected saveEffects(pmcData: IPmcData, sessionId: string, bodyPartsWithEffects: Effects, deleteExistingEffects?: 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 + * @param duration How long the effect has left in seconds (-1 by default, no duration). */ - protected addEffect(pmcData: IPmcData, effectBodyPart: string, effectType: Effect): void; + protected addEffect(pmcData: IPmcData, effectBodyPart: string, effectType: string, duration?: number): void; protected isEmpty(map: any): boolean; } diff --git a/Live/CWX_MasterKey/server/types/helpers/HideoutHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/HideoutHelper.d.ts index 9d51fed..a5849e3 100644 --- a/Live/CWX_MasterKey/server/types/helpers/HideoutHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/HideoutHelper.d.ts @@ -1,8 +1,9 @@ import { IPmcData } from "../models/eft/common/IPmcData"; -import { Common, HideoutArea, Production, Productive } from "../models/eft/common/tables/IBotBase"; +import { Common, HideoutArea, IHideoutImprovement, Production, Productive } from "../models/eft/common/tables/IBotBase"; import { Upd } from "../models/eft/common/tables/IItem"; import { StageBonus } from "../models/eft/hideout/IHideoutArea"; -import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; +import { IHideoutContinuousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinuousProductionStartRequestData"; +import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction"; import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; @@ -15,7 +16,6 @@ import { LocalisationService } from "../services/LocalisationService"; import { PlayerService } from "../services/PlayerService"; import { HashUtil } from "../utils/HashUtil"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { InventoryHelper } from "./InventoryHelper"; import { ProfileHelper } from "./ProfileHelper"; @@ -23,7 +23,6 @@ export declare class HideoutHelper { protected logger: ILogger; protected hashUtil: HashUtil; protected timeUtil: TimeUtil; - protected randomUtil: RandomUtil; protected databaseServer: DatabaseServer; protected eventOutputHolder: EventOutputHolder; protected httpResponse: HttpResponseUtil; @@ -36,11 +35,13 @@ export declare class HideoutHelper { static waterCollector: string; static bitcoin: string; static expeditionaryFuelTank: string; + static maxSkillPoint: number; + private static generatorOffMultipler; protected hideoutConfig: IHideoutConfig; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, inventoryHelper: InventoryHelper, playerService: PlayerService, localisationService: LocalisationService, configServer: ConfigServer); - registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, inventoryHelper: InventoryHelper, playerService: PlayerService, localisationService: LocalisationService, configServer: ConfigServer); + registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinuousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; /** - * This convinience function intialies new Production Object + * This convenience function initializes new Production Object * with all the constants. */ initProduction(recipeId: string, productionTime: number): Production; @@ -81,6 +82,26 @@ export declare class HideoutHelper { isGeneratorOn: boolean; waterCollectorHasFilter: boolean; }): void; + /** + * Update a productions progress value based on the amount of time that has passed + * @param pmcData Player profile + * @param prodId Production id being crafted + * @param recipe Recipe data being crafted + * @param hideoutProperties + */ + protected updateProductionProgress(pmcData: IPmcData, prodId: string, recipe: IHideoutProduction, hideoutProperties: { + btcFarmCGs?: number; + isGeneratorOn: boolean; + waterCollectorHasFilter?: boolean; + }): void; + /** + * Check if a productions progress value matches its corresponding recipes production time value + * @param pmcData Player profile + * @param prodId Production id + * @param recipe Recipe being crafted + * @returns progress matches productionTime from recipe + */ + protected doesProgressMatchProductionTime(pmcData: IPmcData, prodId: string): boolean; /** * Update progress timer for scav case * @param pmcData Profile to update @@ -105,7 +126,7 @@ export declare class HideoutHelper { * Adjust water filter objects resourceValue or delete when they reach 0 resource * @param waterFilterArea water filter area to update * @param production production object - * @param isGeneratorOn is generatory enabled + * @param isGeneratorOn is generator enabled * @param pmcData Player profile * @returns Updated HideoutArea object */ @@ -113,11 +134,53 @@ export declare class HideoutHelper { protected getAreaUpdObject(stackCount: number, resourceValue: number, resourceUnitsConsumed: number): Upd; protected updateAirFilters(airFilterArea: HideoutArea, pmcData: IPmcData): void; protected updateBitcoinFarm(pmcData: IPmcData, btcFarmCGs: number, isGeneratorOn: boolean): Production; + /** + * Get a count of how many BTC can be gathered by the profile + * @param pmcData Profile to look up + * @returns coin slot count + */ protected getBTCSlots(pmcData: IPmcData): number; protected getManagementSkillsSlots(): number; protected hasManagementSkillSlots(pmcData: IPmcData): boolean; protected getHideoutManagementSkill(pmcData: IPmcData): Common; protected getHideoutManagementConsumptionBonus(pmcData: IPmcData): number; + /** + * Get the crafting skill details from player profile + * @param pmcData Player profile + * @returns crafting skill, null if not found + */ + protected getCraftingSkill(pmcData: IPmcData): Common; + /** + * Adjust craft time based on crafting skill level found in player profile + * @param pmcData Player profile + * @param productionTime Time to complete hideout craft in seconds + * @returns Adjusted craft time in seconds + */ + protected getCraftingSkillProductionTimeReduction(pmcData: IPmcData, productionTime: number): number; isProduction(productive: Productive): productive is Production; - getBTC(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Gather crafted BTC from hideout area and add to inventory + * Reset production start timestamp if hideout area at full coin capacity + * @param pmcData Player profile + * @param request Take production request + * @param sessionId Session id + * @returns IItemEventRouterResponse + */ + getBTC(pmcData: IPmcData, request: IHideoutTakeProductionRequestData, sessionId: string): IItemEventRouterResponse; + /** + * Upgrade hideout wall from starting level to interactable level if enough time has passed + * @param pmcProfile Profile to upgrade wall in + */ + unlockHideoutWallInProfile(pmcProfile: IPmcData): void; + /** + * Hideout improvement is flagged as complete + * @param improvement hideout improvement object + * @returns true if complete + */ + protected hideoutImprovementIsComplete(improvement: IHideoutImprovement): boolean; + /** + * Iterate over hideout improvements not completed and check if they need to be adjusted + * @param pmcProfile Profile to adjust + */ + setHideoutImprovementsToCompleted(pmcProfile: IPmcData): void; } diff --git a/Live/CWX_MasterKey/server/types/helpers/InRaidHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/InRaidHelper.d.ts index c7b7329..c69a810 100644 --- a/Live/CWX_MasterKey/server/types/helpers/InRaidHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/InRaidHelper.d.ts @@ -40,10 +40,16 @@ export declare class InRaidHelper { * Remove Labs keycard * @param profileData Profile to update * @param saveProgressRequest post raid save data request data - * @param sessionID Sessino id + * @param sessionID Session id * @returns Reset profile object */ updateProfileBaseStats(profileData: IPmcData, saveProgressRequest: ISaveProgressRequestData, sessionID: string): IPmcData; + /** + * Take body part effects from client profile and apply to server profile + * @param saveProgressRequest post-raid request + * @param profileData player profile on server + */ + protected transferPostRaidLimbEffectsToProfile(saveProgressRequest: ISaveProgressRequestData, profileData: IPmcData): void; /** * Some maps have one-time-use keys (e.g. Labs * Remove the relevant key from an inventory based on the post-raid request data passed in @@ -60,7 +66,7 @@ export declare class InRaidHelper { * Adds SpawnedInSession property to items found in a raid * Removes SpawnedInSession for non-scav players if item was taken into raid with SpawnedInSession = true * @param preRaidProfile profile to update - * @param postRaidProfile profile to upate inventory contents of + * @param postRaidProfile profile to update inventory contents of * @param isPlayerScav Was this a p scav raid * @returns */ diff --git a/Live/CWX_MasterKey/server/types/helpers/InventoryHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/InventoryHelper.d.ts index 6419f93..8855d1e 100644 --- a/Live/CWX_MasterKey/server/types/helpers/InventoryHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/InventoryHelper.d.ts @@ -1,6 +1,7 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; -import { IAddItemRequestData } from "../models/eft/inventory/IAddItemRequestData"; +import { AddItem, IAddItemRequestData } from "../models/eft/inventory/IAddItemRequestData"; +import { IAddItemTempObject } from "../models/eft/inventory/IAddItemTempObject"; import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; @@ -43,7 +44,44 @@ export declare class InventoryHelper { protected configServer: ConfigServer; protected inventoryConfig: IInventoryConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, httpResponse: HttpResponseUtil, fenceService: FenceService, databaseServer: DatabaseServer, paymentHelper: PaymentHelper, traderAssortHelper: TraderAssortHelper, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, containerHelper: ContainerHelper, profileHelper: ProfileHelper, localisationService: LocalisationService, configServer: ConfigServer); - addItem(pmcData: IPmcData, body: IAddItemRequestData, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; + /** + * BUG: Passing the same item multiple times with a count of 1 will cause multiples of that item to be added (e.g. x3 separate objects of tar cola with count of 1 = 9 tarcolas being added to inventory) + * @param pmcData Profile to add items to + * @param request request data to add items + * @param output response to send back to client + * @param sessionID Session id + * @param callback Code to execute later (function) + * @param foundInRaid Will results added to inventory be set as found in raid + * @param addUpd Additional upd properties for items being added to inventory + * @returns IItemEventRouterResponse + */ + addItem(pmcData: IPmcData, request: IAddItemRequestData, output: IItemEventRouterResponse, sessionID: string, callback: { + (): void; + }, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; + /** + * Add ammo to ammo boxes + * @param itemToAdd Item to check is ammo box + * @param toDo + * @param output IItemEventRouterResponse object + * @param sessionID Session id + * @param pmcData Profile to add ammobox to + */ + protected hydrateAmmoBoxWithAmmo(pmcData: IPmcData, itemToAdd: IAddItemTempObject, toDo: string[][], sessionID: string, output: IItemEventRouterResponse): void; + /** + * + * @param assortItems Items to add to inventory + * @param requestItem Details of purchased item to add to inventory + * @param result Array split stacks are added to + */ + protected splitStackIntoSmallerStacks(assortItems: Item[], requestItem: AddItem, result: IAddItemTempObject[]): void; + /** + * Remove item from player inventory + * @param pmcData Profile to remove item from + * @param itemId Items id to remove + * @param sessionID Session id + * @param output Existing IItemEventRouterResponse object to append data to, creates new one by default if not supplied + * @returns IItemEventRouterResponse + */ removeItem(pmcData: IPmcData, itemId: string, sessionID: string, output?: IItemEventRouterResponse): IItemEventRouterResponse; removeItemByCount(pmcData: IPmcData, itemId: string, count: number, sessionID: string, output?: IItemEventRouterResponse): IItemEventRouterResponse; getItemSize(itemTpl: string, itemID: string, inventoryItem: Item[]): Record; diff --git a/Live/CWX_MasterKey/server/types/helpers/ItemHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/ItemHelper.d.ts index 9639923..de424d2 100644 --- a/Live/CWX_MasterKey/server/types/helpers/ItemHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/ItemHelper.d.ts @@ -30,7 +30,7 @@ declare class ItemHelper { /** * Checks if an id is a valid item. Valid meaning that it's an item that be stored in stash * @param {string} tpl the template id / tpl - * @returns boolean; true for items that may be in player posession and not quest items + * @returns boolean; true for items that may be in player possession and not quest items */ isValidItem(tpl: string, invalidBaseTypes?: string[]): boolean; /** @@ -42,7 +42,7 @@ declare class ItemHelper { */ isOfBaseclass(tpl: string, baseClassTpl: string): boolean; /** - * Check if item has any of the supplied base clases + * Check if item has any of the supplied base classes * @param tpl Item to check base classes of * @param baseClassTpls base classes to check for * @returns true if any supplied base classes match @@ -165,7 +165,7 @@ declare class ItemHelper { */ getChildId(item: Item): string; /** - * Can the pased in item be stacked + * Can the passed in item be stacked * @param tpl item to check * @returns true if it can be stacked */ @@ -192,7 +192,7 @@ declare class ItemHelper { */ replaceIDs(pmcData: IPmcData, items: Item[], insuredItems?: InsuredItem[], fastPanel?: any): any[]; /** - * WARNING, SLOW. Recursivly loop down through an items hierarchy to see if any of the ids match the supplied list, return true if any do + * WARNING, SLOW. Recursively loop down through an items hierarchy to see if any of the ids match the supplied list, return true if any do * @param {string} tpl * @param {Array} tplsToCheck * @returns boolean @@ -220,7 +220,15 @@ declare class ItemHelper { createRandomMagCartridges(magTemplate: ITemplateItem, parentId: string, staticAmmoDist: Record, caliber?: string): Item; protected getRandomValidCaliber(magTemplate: ITemplateItem): string; protected drawAmmoTpl(caliber: string, staticAmmoDist: Record): string; - createCartidges(parentId: string, ammoTpl: string, stackCount: number): Item; + /** + * + * @param parentId container cartridges will be placed in + * @param ammoTpl Cartridge to insert + * @param stackCount Count of cartridges inside parent + * @param location Location inside parent (e.g. 0, 1) + * @returns Item + */ + createCartridges(parentId: string, ammoTpl: string, stackCount: number, location: number): Item; /** * Get the size of a stack, return 1 if no stack object count property found * @param item Item to get stack size of diff --git a/Live/CWX_MasterKey/server/types/helpers/NotificationSendHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/NotificationSendHelper.d.ts index 014ac95..c80f22d 100644 --- a/Live/CWX_MasterKey/server/types/helpers/NotificationSendHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/NotificationSendHelper.d.ts @@ -6,7 +6,7 @@ export declare class NotificationSendHelper { protected notificationService: NotificationService; constructor(webSocketServer: WebSocketServer, notificationService: NotificationService); /** - * Send notification message to the appropiate channel + * Send notification message to the appropriate channel */ sendMessage(sessionID: string, notificationMessage: INotification): void; } diff --git a/Live/CWX_MasterKey/server/types/helpers/ProfileHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/ProfileHelper.d.ts index 7c1b12a..79652ad 100644 --- a/Live/CWX_MasterKey/server/types/helpers/ProfileHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/ProfileHelper.d.ts @@ -44,7 +44,7 @@ export declare class ProfileHelper { /** * Add experience to a PMC inside the players profile * @param sessionID Session id - * @param experienceToAdd Experiecne to add to PMC character + * @param experienceToAdd Experience to add to PMC character */ addExperienceToPmc(sessionID: string, experienceToAdd: number): void; getProfileByPmcId(pmcId: string): IPmcData; diff --git a/Live/CWX_MasterKey/server/types/helpers/QuestHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/QuestHelper.d.ts index 6bd1444..de7cba2 100644 --- a/Live/CWX_MasterKey/server/types/helpers/QuestHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/QuestHelper.d.ts @@ -1,8 +1,9 @@ import { IPmcData } from "../models/eft/common/IPmcData"; +import { Quest } from "../models/eft/common/tables/IBotBase"; import { AvailableForConditions, AvailableForProps, 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"; +import { IFailQuestRequestData } from "../models/eft/quests/IFailQuestRequestData"; import { QuestStatus } from "../models/enums/QuestStatus"; import { IQuestConfig } from "../models/spt/config/IQuestConfig"; import { ILogger } from "../models/spt/utils/ILogger"; @@ -42,7 +43,7 @@ export declare class QuestHelper { * Get status of a quest by quest id * @param pmcData Profile to search * @param questID Quest id to look up - * @returns QuestStauts enum + * @returns QuestStatus enum */ getQuestStatus(pmcData: IPmcData, questID: string): QuestStatus; /** @@ -54,7 +55,7 @@ export declare class QuestHelper { doesPlayerLevelFulfilCondition(playerLevel: number, condition: AvailableForConditions): boolean; /** * Get the quests found in both arrays (inner join) - * @param before Array of qeusts #1 + * @param before Array of quests #1 * @param after Array of quests #2 * @returns Reduction of cartesian product between two quest arrays */ @@ -63,11 +64,10 @@ export declare class QuestHelper { * Increase skill points of a skill on player profile * @param sessionID Session id * @param pmcData Player profile - * @param output output object to send back to client * @param skillName Name of skill to increase skill points of * @param progressAmount Amount of skill points to add to skill */ - rewardSkillPoints(sessionID: string, pmcData: IPmcData, output: IItemEventRouterResponse, skillName: string, progressAmount: number): void; + rewardSkillPoints(sessionID: string, pmcData: IPmcData, skillName: string, progressAmount: number): void; /** * Get quest name by quest id * @param questId id to get @@ -75,10 +75,10 @@ export declare class QuestHelper { */ getQuestNameFromLocale(questId: string): string; /** - * Check if trader has sufficient loyalty to fullfill quest requirement + * Check if trader has sufficient loyalty to fulfill quest requirement * @param questProperties Quest props * @param profile Player profile - * @returns true if loyalty is high enough to fulfil quest requirement + * @returns true if loyalty is high enough to fulfill quest requirement */ traderStandingRequirementCheck(questProperties: AvailableForProps, profile: IPmcData): boolean; protected processReward(reward: Reward): Reward[]; @@ -90,12 +90,12 @@ export declare class QuestHelper { */ getQuestRewardItems(quest: IQuest, state: QuestStatus): Reward[]; /** - * Update player profile with quest status (e.g. Fail/Success) - * @param pmcData profile to add quest to - * @param newState state the new quest should be in when added - * @param acceptedQuest Details of quest being added + * Look up quest in db by accepted quest id and construct a profile-ready object ready to store in profile + * @param pmcData Player profile + * @param newState State the new quest should be in when returned + * @param acceptedQuest Details of accepted quest from client */ - addQuestToPMCData(pmcData: IPmcData, newState: QuestStatus, acceptedQuest: IAcceptQuestRequestData): void; + getQuestReadyForProfile(pmcData: IPmcData, newState: QuestStatus, acceptedQuest: IAcceptQuestRequestData): Quest; /** * TODO: what is going on here * @param acceptedQuestId Quest to add to profile @@ -111,12 +111,12 @@ export declare class QuestHelper { */ failedUnlocked(failedQuestId: string, sessionID: string): IQuest[]; /** - * Adjust quest money rewards by passed in multipler + * Adjust quest money rewards by passed in multiplier * @param quest Quest to multiple money rewards - * @param multipler Value to adjust money rewards by + * @param multiplier Value to adjust money rewards by * @returns Updated quest */ - applyMoneyBoost(quest: IQuest, multipler: number): IQuest; + applyMoneyBoost(quest: IQuest, multiplier: number): IQuest; /** * Sets the item stack to new value, or delete the item if value <= 0 * // TODO maybe merge this function and the one from customization @@ -127,12 +127,6 @@ export declare class QuestHelper { * @param output ItemEvent router response */ changeItemStack(pmcData: IPmcData, itemId: string, newStackSize: number, sessionID: string, output: IItemEventRouterResponse): void; - /** - * Get List of All Quests from db - * NOT CLONED - * @returns Array of IQuest objects - */ - getQuestsFromDb(): IQuest[]; /** * Get quests, strip all requirement conditions except level * @param quests quests to process @@ -147,45 +141,62 @@ export declare class QuestHelper { getQuestWithOnlyLevelRequirementStartCondition(quest: IQuest): IQuest; /** * Fail a quest in a player profile - * @param pmcData Profile - * @param failRequest fail quest request data + * @param pmcData Player profile + * @param failRequest Fail quest request data * @param sessionID Session id * @returns Item event router response */ - failQuest(pmcData: IPmcData, failRequest: any, sessionID: string): IItemEventRouterResponse; + failQuest(pmcData: IPmcData, failRequest: IFailQuestRequestData, sessionID: string): IItemEventRouterResponse; /** - * Get quest by id from database - * @param questId questid to look for - * @param pmcData player profile + * Get List of All Quests from db + * NOT CLONED + * @returns Array of IQuest objects + */ + getQuestsFromDb(): IQuest[]; + /** + * Get quest by id from database (repeatables are stored in profile, check there if questId not found) + * @param questId Id of quest to find + * @param pmcData Player profile * @returns IQuest object */ getQuestFromDb(questId: string, pmcData: IPmcData): IQuest; /** * Get the locale Id from locale db for a quest message - * @param questMessageId Quest mesage id to look up + * @param questMessageId Quest message id to look up * @returns Locale Id from locale db */ getQuestLocaleIdFromDb(questMessageId: string): string; /** - * Alter a quests state + Add a record to tis status timers object + * Alter a quests state + Add a record to its status timers object * @param pmcData Profile to update - * @param newQuestState new state the qeust should be in - * @param questId id of the quest to alter the status of + * @param newQuestState New state the quest should be in + * @param questId Id of the quest to alter the status of */ updateQuestState(pmcData: IPmcData, newQuestState: QuestStatus, questId: string): void; /** - * Give player quest rewards - Skills/exp/trader standing/items/assort unlocks + * Give player quest rewards - Skills/exp/trader standing/items/assort unlocks - Returns reward items player earned * @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 + * @param questId questId of quest to get rewards for + * @param state State of the quest to get rewards for + * @param sessionId Session id + * @param questResponse Response to send back to client + * @returns Array of reward objects */ - applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: QuestStatus, sessionID: string): Reward[]; + applyQuestReward(pmcData: IPmcData, questId: string, state: QuestStatus, sessionId: string, questResponse: IItemEventRouterResponse): Reward[]; /** - * Get the intel center bonus a player has + * WIP - Find hideout craft id and add to unlockedProductionRecipe array in player profile + * also update client response recipeUnlocked array with craft id + * @param pmcData Player profile + * @param craftUnlockReward Reward item from quest with craft unlock details + * @param questDetails Quest with craft unlock reward + * @param sessionID Session id + * @param response Response to send back to client + */ + protected findAndAddHideoutProductionIdToProfile(pmcData: IPmcData, craftUnlockReward: Reward, questDetails: IQuest, sessionID: string, response: IItemEventRouterResponse): void; + /** + * Get players intel center bonus from profile * @param pmcData player profile - * @returns bonus in percent + * @returns bonus as a percent */ protected getIntelCenterRewardBonus(pmcData: IPmcData): number; /** @@ -194,4 +205,10 @@ export declare class QuestHelper { * @returns 'FindItem' condition id */ getFindItemIdForQuestHandIn(itemTpl: string): string; + /** + * Add all quests to a profile with the provided statuses + * @param pmcProfile profile to update + * @param statuses statuses quests should have + */ + addAllQuestsToProfile(pmcProfile: IPmcData, statuses: QuestStatus[]): void; } diff --git a/Live/CWX_MasterKey/server/types/helpers/RagfairOfferHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/RagfairOfferHelper.d.ts index 95be986..3d0d570 100644 --- a/Live/CWX_MasterKey/server/types/helpers/RagfairOfferHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/RagfairOfferHelper.d.ts @@ -48,6 +48,12 @@ export declare class RagfairOfferHelper { constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, traderHelper: TraderHelper, 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(searchRequest: ISearchRequestData, itemsToAdd: string[], traderAssorts: Record, pmcProfile: IPmcData): IRagfairOffer[]; getOffersForBuild(info: ISearchRequestData, itemsToAdd: string[], assorts: Record, pmcProfile: IPmcData): IRagfairOffer[]; + /** + * Has a traders offer ran out of stock to sell to player + * @param offer Offer to check stock of + * @returns true if out of stock + */ + protected traderOutOfStock(offer: IRagfairOffer): boolean; /** * Check if trader offers' BuyRestrictionMax value has been reached * @param offer offer to check restriction properties of diff --git a/Live/CWX_MasterKey/server/types/helpers/RagfairSellHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/RagfairSellHelper.d.ts index 60809b5..bf7aeb6 100644 --- a/Live/CWX_MasterKey/server/types/helpers/RagfairSellHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/RagfairSellHelper.d.ts @@ -30,7 +30,7 @@ export declare class RagfairSellHelper { * Determine if the offer being listed will be sold * @param sellChancePercent chance item will sell * @param itemSellCount count of items to sell - * @returns Array of purchases of item(s) lsited + * @returns Array of purchases of item(s) listed */ rollForSale(sellChancePercent: number, itemSellCount: number): SellResult[]; } diff --git a/Live/CWX_MasterKey/server/types/helpers/RagfairSortHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/RagfairSortHelper.d.ts index 4669ce6..6a06528 100644 --- a/Live/CWX_MasterKey/server/types/helpers/RagfairSortHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/RagfairSortHelper.d.ts @@ -7,7 +7,7 @@ export declare class RagfairSortHelper { protected localeService: LocaleService; constructor(databaseServer: DatabaseServer, localeService: LocaleService); /** - * Sort a list of ragfair offers by something (id/rating/offer name/price/expirty time) + * Sort a list of ragfair offers by something (id/rating/offer name/price/expiry time) * @param offers Offers to sort * @param type How to sort it * @param direction Ascending/descending diff --git a/Live/CWX_MasterKey/server/types/helpers/RepairHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/RepairHelper.d.ts index 9983d4d..0d0257a 100644 --- a/Live/CWX_MasterKey/server/types/helpers/RepairHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/RepairHelper.d.ts @@ -24,7 +24,12 @@ export declare class RepairHelper { * @param applyMaxDurabilityDegradation should item have max durability reduced */ updateItemDurability(itemToRepair: Item, itemToRepairDetails: ITemplateItem, isArmor: boolean, amountToRepair: number, useRepairKit: boolean, traderQualityMultipler: number, applyMaxDurabilityDegradation?: boolean): void; - protected getRandomisedArmorRepairDegredationValue(armorMaterial: string, isRepairKit: boolean, armorMax: number, traderQualityMultipler: number): number; - protected getRandomisedWeaponRepairDegredationValue(itemProps: Props, isRepairKit: boolean, weaponMax: number, traderQualityMultipler: number): number; + protected getRandomisedArmorRepairDegradationValue(armorMaterial: string, isRepairKit: boolean, armorMax: number, traderQualityMultipler: number): number; + protected getRandomisedWeaponRepairDegradationValue(itemProps: Props, isRepairKit: boolean, weaponMax: number, traderQualityMultipler: number): number; + /** + * Is the supplied tpl a weapon + * @param tpl tplId to check is a weapon + * @returns true if tpl is a weapon + */ isWeaponTemplate(tpl: string): boolean; } diff --git a/Live/CWX_MasterKey/server/types/helpers/TradeHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/TradeHelper.d.ts index 218a461..6811dd1 100644 --- a/Live/CWX_MasterKey/server/types/helpers/TradeHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/TradeHelper.d.ts @@ -27,25 +27,25 @@ export declare class TradeHelper { constructor(logger: ILogger, eventOutputHolder: EventOutputHolder, traderHelper: TraderHelper, itemHelper: ItemHelper, paymentService: PaymentService, fenceService: FenceService, inventoryHelper: InventoryHelper, ragfairServer: RagfairServer, configServer: ConfigServer); /** * Buy item from flea or trader - * @param pmcData + * @param pmcData Player profile * @param buyRequestData data from client - * @param sessionID - * @param foundInRaid + * @param sessionID Session id + * @param foundInRaid Should item be found in raid * @param upd optional item details used when buying from flea * @returns */ buyItem(pmcData: IPmcData, buyRequestData: IProcessBuyTradeRequestData, sessionID: string, foundInRaid: boolean, upd: Upd): IItemEventRouterResponse; /** * Sell item to trader - * @param pmcData - * @param body - * @param sessionID - * @returns + * @param pmcData Profile to update + * @param sellRequest request data + * @param sessionID Session id + * @returns IItemEventRouterResponse */ - sellItem(pmcData: IPmcData, body: IProcessSellTradeRequestData, sessionID: string): IItemEventRouterResponse; + sellItem(pmcData: IPmcData, sellRequest: IProcessSellTradeRequestData, sessionID: string): IItemEventRouterResponse; /** * Increment the assorts buy count by number of items purchased - * Show error on screen if player attepts to buy more than what the buy max allows + * Show error on screen if player attempts to buy more than what the buy max allows * @param assortBeingPurchased assort being bought * @param itemsPurchasedCount number of items being bought */ diff --git a/Live/CWX_MasterKey/server/types/helpers/TraderAssortHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/TraderAssortHelper.d.ts index c3915c6..a0294a1 100644 --- a/Live/CWX_MasterKey/server/types/helpers/TraderAssortHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/TraderAssortHelper.d.ts @@ -35,6 +35,8 @@ export declare class TraderAssortHelper { protected fenceService: FenceService; protected configServer: ConfigServer; protected traderConfig: ITraderConfig; + protected mergedQuestAssorts: Record>; + protected createdMergedQuestAssorts: boolean; constructor(logger: ILogger, jsonUtil: JsonUtil, mathUtil: MathUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer); /** * Get a traders assorts @@ -45,6 +47,10 @@ export declare class TraderAssortHelper { * @returns a traders' assorts */ getAssort(sessionId: string, traderId: string, flea?: boolean): ITraderAssort; + /** + * Create a dict of all assort id = quest id mappings used to work out what items should be shown to player based on the quests they've started/completed/failed + */ + protected hydrateMergedQuestAssorts(): void; /** * Reset a traders assorts and move nextResupply value to future * Flag trader as needing a flea offer reset to be picked up by flea update() function @@ -61,7 +67,7 @@ export declare class TraderAssortHelper { * 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; + protected multiplyItemPricesByConfigMultiplier(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 diff --git a/Live/CWX_MasterKey/server/types/helpers/TraderHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/TraderHelper.d.ts index 62a3492..49aea28 100644 --- a/Live/CWX_MasterKey/server/types/helpers/TraderHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/TraderHelper.d.ts @@ -29,6 +29,8 @@ export declare class TraderHelper { protected timeUtil: TimeUtil; protected configServer: ConfigServer; protected traderConfig: ITraderConfig; + /** Dictionary of item tpl and the highest trader rouble price */ + protected highestTraderPriceItems: Record; constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemHelper: ItemHelper, handbookHelper: HandbookHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, configServer: ConfigServer); getTrader(traderID: string, sessionID: string): ITraderBase; getTraderAssortsById(traderId: string): ITraderAssort; @@ -41,11 +43,11 @@ export declare class TraderHelper { resetTrader(sessionID: string, traderID: string): void; /** * Alter a traders unlocked status - * @param traderID Trader to alter + * @param traderId Trader to alter * @param status New status to use - * @param sessionID Session id + * @param sessionId Session id */ - setTraderUnlockedState(traderID: string, status: boolean, sessionID: string): void; + 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 @@ -76,8 +78,8 @@ export declare class TraderHelper { */ protected getTraderDurabiltyPurchaseThreshold(traderId: string): number; /** - * Get the price of an item and all of its attached children - * Take into account bonuses/adjsutments e.g. discounts + * Get the price of passed in item and all of its attached children (mods) + * Take into account bonuses/adjustments e.g. discounts * @param pmcData profile data * @param item item to calculate price of * @param buyPriceCoefficient @@ -94,14 +96,21 @@ export declare class TraderHelper { * @returns price as number */ protected getRawItemPrice(pmcData: IPmcData, item: Item): number; - protected getTraderDiscount(trader: ITraderBase, buyPriceCoefficient: number, fenceInfo: FenceLevel, traderID: string): number; + /** + * Get discount modifier for desired trader + * @param trader Trader to get discount for + * @param buyPriceCoefficient + * @param fenceInfo fence info, needed if getting fence modifier value + * @returns discount modifier value + */ + protected getTraderDiscount(trader: ITraderBase, buyPriceCoefficient: number, fenceInfo: FenceLevel): 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 sessionId Session id + * @param traderId Traders id * @param standingToAdd Standing value to add to trader */ - addStandingToTrader(sessionID: string, traderId: string, standingToAdd: number): void; + 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 @@ -140,4 +149,10 @@ export declare class TraderHelper { }[]; tid: string; }): void; + /** + * Get the highest rouble price for an item from traders + * @param tpl Item to look up highest pride for + * @returns highest rouble cost for item + */ + getHighestTraderPriceRouble(tpl: string): number; } diff --git a/Live/CWX_MasterKey/server/types/loaders/BundleLoader.d.ts b/Live/CWX_MasterKey/server/types/loaders/BundleLoader.d.ts index 06ad698..b88723c 100644 --- a/Live/CWX_MasterKey/server/types/loaders/BundleLoader.d.ts +++ b/Live/CWX_MasterKey/server/types/loaders/BundleLoader.d.ts @@ -19,4 +19,11 @@ export declare class BundleLoader { getBundle(key: string, local: boolean): BundleInfo; addBundles(modpath: string): void; } +export interface BundleManifest { + manifest: Array; +} +export interface BundleManifestEntry { + key: string; + path: string; +} export {}; diff --git a/Live/CWX_MasterKey/server/types/loaders/ModTypeCheck.d.ts b/Live/CWX_MasterKey/server/types/loaders/ModTypeCheck.d.ts new file mode 100644 index 0000000..e907341 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/loaders/ModTypeCheck.d.ts @@ -0,0 +1,43 @@ +import { IPostAkiLoadMod } from "../models/external/IPostAkiLoadMod"; +import { IPostAkiLoadModAsync } from "../models/external/IPostAkiLoadModAsync"; +import { IPostDBLoadMod } from "../models/external/IPostDBLoadMod"; +import { IPostDBLoadModAsync } from "../models/external/IPostDBLoadModAsync"; +import { IPreAkiLoadMod } from "../models/external/IPreAkiLoadMod"; +import { IPreAkiLoadModAsync } from "../models/external/IPreAkiLoadModAsync"; +export declare class ModTypeCheck { + /** + * Use defined safe guard to check if the mod is a IPreAkiLoadMod + * @returns boolean + */ + isPreAkiLoad(mod: any): mod is IPreAkiLoadMod; + /** + * Use defined safe guard to check if the mod is a IPostAkiLoadMod + * @returns boolean + */ + isPostAkiLoad(mod: any): mod is IPostAkiLoadMod; + /** + * Use defined safe guard to check if the mod is a IPostDBLoadMod + * @returns boolean + */ + isPostDBAkiLoad(mod: any): mod is IPostDBLoadMod; + /** + * Use defined safe guard to check if the mod is a IPreAkiLoadModAsync + * @returns boolean + */ + isPreAkiLoadAsync(mod: any): mod is IPreAkiLoadModAsync; + /** + * Use defined safe guard to check if the mod is a IPostAkiLoadModAsync + * @returns boolean + */ + isPostAkiLoadAsync(mod: any): mod is IPostAkiLoadModAsync; + /** + * Use defined safe guard to check if the mod is a IPostDBLoadModAsync + * @returns boolean + */ + isPostDBAkiLoadAsync(mod: any): mod is IPostDBLoadModAsync; + /** + * Checks for mod to be compatible with 3.X+ + * @returns boolean + */ + isPostV3Compatible(mod: any): boolean; +} diff --git a/Live/CWX_MasterKey/server/types/loaders/PostAkiModLoader.d.ts b/Live/CWX_MasterKey/server/types/loaders/PostAkiModLoader.d.ts index edc6e5d..5df8c6c 100644 --- a/Live/CWX_MasterKey/server/types/loaders/PostAkiModLoader.d.ts +++ b/Live/CWX_MasterKey/server/types/loaders/PostAkiModLoader.d.ts @@ -1,21 +1,17 @@ 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 { ModTypeCheck } from "./ModTypeCheck"; 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; + protected modTypeCheck: ModTypeCheck; + constructor(bundleLoader: BundleLoader, vfs: VFS, preAkiModLoader: PreAkiModLoader, modTypeCheck: ModTypeCheck); getModPath(mod: string): string; - load(): void; - protected executeMods(container: DependencyContainer): void; + load(): Promise; + protected executeMods(container: DependencyContainer): Promise; protected addBundles(): void; } diff --git a/Live/CWX_MasterKey/server/types/loaders/PostDBModLoader.d.ts b/Live/CWX_MasterKey/server/types/loaders/PostDBModLoader.d.ts index 87b60f9..c4cda5c 100644 --- a/Live/CWX_MasterKey/server/types/loaders/PostDBModLoader.d.ts +++ b/Live/CWX_MasterKey/server/types/loaders/PostDBModLoader.d.ts @@ -1,11 +1,13 @@ import { DependencyContainer } from "tsyringe"; import { OnLoad } from "../di/OnLoad"; +import { ModTypeCheck } from "./ModTypeCheck"; import { PreAkiModLoader } from "./PreAkiModLoader"; export declare class PostDBModLoader implements OnLoad { protected preAkiModLoader: PreAkiModLoader; - constructor(preAkiModLoader: PreAkiModLoader); + protected modTypeCheck: ModTypeCheck; + constructor(preAkiModLoader: PreAkiModLoader, modTypeCheck: ModTypeCheck); onLoad(): Promise; getRoute(): string; getModPath(mod: string): string; - protected executeMods(container: DependencyContainer): void; + protected executeMods(container: DependencyContainer): Promise; } diff --git a/Live/CWX_MasterKey/server/types/loaders/PreAkiModLoader.d.ts b/Live/CWX_MasterKey/server/types/loaders/PreAkiModLoader.d.ts index 212aaf3..1949696 100644 --- a/Live/CWX_MasterKey/server/types/loaders/PreAkiModLoader.d.ts +++ b/Live/CWX_MasterKey/server/types/loaders/PreAkiModLoader.d.ts @@ -1,9 +1,5 @@ import { DependencyContainer } from "tsyringe"; -import { IPostAkiLoadMod } from "../models/external/IPostAkiLoadMod"; -import { IPostDBLoadMod } from "../models/external/IPostDBLoadMod"; -import { IPreAkiLoadMod } from "../models/external/IPreAkiLoadMod"; 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"; @@ -13,6 +9,7 @@ import { ModCompilerService } from "../services/ModCompilerService"; import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; import { BundleLoader } from "./BundleLoader"; +import { ModTypeCheck } from "./ModTypeCheck"; export declare class PreAkiModLoader implements IModLoader { protected logger: ILogger; protected vfs: VFS; @@ -21,22 +18,22 @@ export declare class PreAkiModLoader implements IModLoader { protected bundleLoader: BundleLoader; protected localisationService: LocalisationService; protected configServer: ConfigServer; + protected modTypeCheck: ModTypeCheck; protected static container: DependencyContainer; protected readonly basepath = "user/mods/"; - protected imported: Record; + protected readonly modOrderPath = "user/mods/order.json"; + protected order: Record; + protected imported: Record; protected akiConfig: ICoreConfig; - constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, bundleLoader: BundleLoader, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, bundleLoader: BundleLoader, localisationService: LocalisationService, configServer: ConfigServer, modTypeCheck: ModTypeCheck); 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[]; - getImportedModDetails(): Record; + getImportedModDetails(): Record; getModPath(mod: string): string; - protected importClass(name: string, filepath: string, container: DependencyContainer): void; protected importMods(): Promise; /** * Check for duplciate mods loaded, show error if duplicate mod found @@ -61,29 +58,8 @@ export declare class PreAkiModLoader implements IModLoader { * @returns dictionary */ protected getModsPackageData(mods: string[]): Record; - /** - * Use defined safe guard to check if the mod is a IPreAkiLoadMod - * @returns boolean - */ - protected isPreAkiLoad(mod: any): mod is IPreAkiLoadMod; - /** - * Use defined safe guard to check if the mod is a IPostAkiLoadMod - * @returns boolean - */ - protected isPostAkiLoad(mod: any): mod is IPostAkiLoadMod; - /** - * Use defined safe guard to check if the mod is a IPostDBLoadMod - * @returns boolean - */ - protected isPostDBAkiLoad(mod: any): mod is IPostDBLoadMod; - /** - * Check that the mod is compatible with SPT 3.X.X - * @param mod the mod to check - * @returns boolean - */ - protected isModSpt3XXCompatible(mod: any): boolean; protected isModCombatibleWithAki(mod: IPackageJsonData): boolean; - protected executeMods(container: DependencyContainer): void; + protected executeMods(container: DependencyContainer): Promise; sortModsLoadOrder(): string[]; protected addMod(mod: string): Promise; protected areModDependenciesFulfilled(pkg: IPackageJsonData, loadedMods: Record): boolean; @@ -95,6 +71,6 @@ export declare class PreAkiModLoader implements IModLoader { */ protected validMod(modName: string): boolean; protected getLoadOrderRecursive(mod: string, result: Record, visited: Record): void; - protected getLoadOrder(mods: Record): Record; + protected getLoadOrder(mods: Record): Record; getContainer(): DependencyContainer; } diff --git a/Live/CWX_MasterKey/server/types/models/eft/common/IGlobals.d.ts b/Live/CWX_MasterKey/server/types/models/eft/common/IGlobals.d.ts index b53f106..b5ed401 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/common/IGlobals.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/common/IGlobals.d.ts @@ -29,6 +29,9 @@ export interface Config { GlobalLootChanceModifier: number; TimeBeforeDeploy: number; TimeBeforeDeployLocal: number; + TradingSetting: number; + TradingSettings: ITradingSettings; + ItemsCommonSettings: IItemsCommonSettings; LoadTimeSpeedProgress: number; BaseLoadTime: number; BaseUnloadTime: number; @@ -36,6 +39,7 @@ export interface Config { Customization: Customization; UncheckOnShot: boolean; BotsEnabled: boolean; + BufferZone: IBufferZone; ArmorMaterials: ArmorMaterials; LegsOverdamage: number; HandsOverdamage: number; @@ -55,7 +59,6 @@ export interface Config { StaminaRestoration: StaminaRestoration; StaminaDrain: StaminaDrain; RequirementReferences: RequirementReferences; - RepairKitSettings: RepairKitSettings; RestrictionsInRaid: RestrictionsInRaid[]; SkillMinEffectiveness: number; SkillFatiguePerPoint: number; @@ -82,6 +85,23 @@ export interface Config { TestValue: number; Inertia: Inertia; Ballistic: Ballistic; + RepairSettings: RepairSettings; +} +export interface IBufferZone { + CustomerAccessTime: number; + CustomerCriticalTimeStart: number; + CustomerKickNotifTime: number; +} +export interface IItemsCommonSettings { + ItemRemoveAfterInterruptionTime: number; +} +export interface ITradingSettings { + BuyoutRestrictions: IBuyoutRestrictions; +} +export interface IBuyoutRestrictions { + MinDurability: number; + MinFoodDrinkResource: number; + MinMedsResource: number; } export interface Content { ip: string; @@ -321,6 +341,8 @@ export interface Effects { Pain: Pain; PainKiller: PainKiller; SandingScreen: SandingScreen; + MildMusclePain: IMusclePainEffect; + SevereMusclePain: IMusclePainEffect; Stimulator: Stimulator; Tremor: Tremor; ChronicStaminaFatigue: ChronicStaminaFatigue; @@ -457,6 +479,12 @@ export interface PainKiller { export interface SandingScreen { Dummy: number; } +export interface IMusclePainEffect { + GymEffectivity: number; + OfflineDurationMax: number; + OfflineDurationMin: number; + TraumaChance: number; +} export interface Stimulator { BuffLoopTime: number; Buffs: Buffs; @@ -803,7 +831,7 @@ export interface SkillsSettings { HMG: any[]; Launcher: any[]; AttachedLauncher: any[]; - Melee: any[]; + Melee: IMeleeSkill; DMR: WeaponSkills; BearAssaultoperations: any[]; BearAuthority: any[]; @@ -847,10 +875,25 @@ export interface SkillsSettings { BotSound: any[]; TroubleShooting: TroubleShooting; } +export interface IMeleeSkill { + BuffSettings: IBuffSettings; +} export interface ArmorSkills { + BuffMaxCount: number; + BuffSettings: IBuffSettings; + Counters: IArmorCounters; + MoveSpeedPenaltyReductionHVestsReducePerLevel: number; + RicochetChanceHVestsCurrentDurabilityThreshold: number; + RicochetChanceHVestsEliteLevel: number; + RicochetChanceHVestsMaxDurabilityThreshold: number; + MeleeDamageLVestsReducePerLevel: number; + MoveSpeedPenaltyReductionLVestsReducePerLevel: number; WearAmountRepairLVestsReducePerLevel: number; WearChanceRepairLVestsReduceEliteLevel: number; } +export interface IArmorCounters { + armorDurability: ISkillCounter; +} export interface HideoutManagement { SkillPointsPerAreaUpgrade: number; SkillPointsPerCraft: number; @@ -907,6 +950,7 @@ export interface Endurance { MovementAction: number; SprintAction: number; GainPerFatigueStack: number; + QTELevelMultipliers: Record>; } export interface Strength { SprintActionMin: number; @@ -915,9 +959,14 @@ export interface Strength { MovementActionMax: number; PushUpMin: number; PushUpMax: number; + QTELevelMultipliers: IQTELevelMultiplier[]; FistfightAction: number; ThrowAction: number; } +export interface IQTELevelMultiplier { + Level: number; + Multiplier: number; +} export interface Vitality { DamageTakenAction: number; HealthNegativeEffect: number; @@ -950,22 +999,42 @@ export interface Search { FindAction: number; } export interface WeaponTreatment { + BuffMaxCount: number; + BuffSettings: IBuffSettings; + Counters: IWeaponTreatmentCounters; DurLossReducePerLevel: number; SkillPointsPerRepair: number; Filter: any[]; WearAmountRepairGunsReducePerLevel: number; WearChanceRepairGunsReduceEliteLevel: number; } +export interface IWeaponTreatmentCounters { + firearmsDurability: ISkillCounter; +} +export interface IBuffSettings { + CommonBuffChanceLevelBonus: number; + CommonBuffMinChanceValue: number; + CurrentDurabilityLossToRemoveBuff?: number; + MaxDurabilityLossToRemoveBuff?: number; + RareBuffChanceCoff: number; + ReceivedDurabilityMaxPercent: number; +} export interface MagDrills { RaidLoadedAmmoAction: number; RaidUnloadedAmmoAction: number; MagazineCheckAction: number; } export interface Perception { + DependentSkillRatios: ISkillRatio[]; OnlineAction: number; UniqueLoot: number; } +export interface ISkillRatio { + Ratio: number; + SkillId: string; +} export interface Intellect { + Counters: IIntellectCounters; ExamineAction: number; SkillProgress: number; RepairAction: number; @@ -973,16 +1042,52 @@ export interface Intellect { WearChanceReduceEliteLevel: number; RepairPointsCostReduction: number; } +export interface IIntellectCounters { + armorDurability: ISkillCounter; + firearmsDurability: ISkillCounter; + meleeWeaponDurability: ISkillCounter; +} +export interface ISkillCounter { + divisor: number; + points: number; +} export interface Attention { + DependentSkillRatios: ISkillRatio[]; ExamineWithInstruction: number; FindActionFalse: number; FindActionTrue: number; } export interface Charisma { + BonusSettings: IBonusSettings; + Counters: ICharismaSkillCounters; SkillProgressInt: number; SkillProgressAtn: number; SkillProgressPer: number; } +export interface ICharismaSkillCounters { + insuranceCost: ISkillCounter; + repairCost: ISkillCounter; + repeatableQuestCompleteCount: ISkillCounter; + restoredHealthCost: ISkillCounter; + scavCaseCost: ISkillCounter; +} +export interface IBonusSettings { + EliteBonusSettings: IEliteBonusSettings; + LevelBonusSettings: ILevelBonusSettings; +} +export interface IEliteBonusSettings { + FenceStandingLossDiscount: number; + RepeatableQuestExtraCount: number; + ScavCaseDiscount: number; +} +export interface ILevelBonusSettings { + HealthRestoreDiscount: number; + HealthRestoreTraderDiscount: number; + InsuranceDiscount: number; + InsuranceTraderDiscount: number; + PaidExitDiscount: number; + RepeatableQuestChangeDiscount: number; +} export interface Memory { AnySkillUp: number; SkillProgress: number; @@ -1145,11 +1250,30 @@ export interface xyz { export interface Ballistic { GlobalDamageDegradationCoefficient: number; } -export interface RepairKitSettings { +export interface RepairSettings { + ItemEnhancementSettings: IItemEnhancementSettings; + MinimumLevelToApplyBuff: number; + RepairStrategies: IRepairStrategies; armorClassDivisor: number; durabilityPointCostArmor: number; durabilityPointCostGuns: number; } +export interface IItemEnhancementSettings { + DamageReduction: IPriceModifier; + MalfunctionProtections: IPriceModifier; + WeaponSpread: IPriceModifier; +} +export interface IPriceModifier { + PriceModifier: number; +} +export interface IRepairStrategies { + Armor: IRepairStrategy; + Firearms: IRepairStrategy; +} +export interface IRepairStrategy { + BuffTypes: string[]; + Filter: string[]; +} export interface BotPreset { UseThis: boolean; Role: string; diff --git a/Live/CWX_MasterKey/server/types/models/eft/common/ILocationBase.d.ts b/Live/CWX_MasterKey/server/types/models/eft/common/ILocationBase.d.ts index 78ade9a..1c3a2fa 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/common/ILocationBase.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/common/ILocationBase.d.ts @@ -118,6 +118,7 @@ export interface BossLocationSpawn { TriggerName: string; Delay?: number; Supports?: BossSupport[]; + sptId?: string; } export interface BossSupport { BossEscortAmount: string; @@ -179,6 +180,7 @@ export interface Exit { EntryPoints: string; ExfiltrationTime: number; ExfiltrationType: string; + RequiredSlot?: string; Id: string; MaxTime: number; MinTime: number; @@ -202,6 +204,7 @@ export interface Wave { slots_min: number; time_max: number; time_min: number; + sptId?: string; } export declare enum WildSpawnType { ASSAULT = "assault", diff --git a/Live/CWX_MasterKey/server/types/models/eft/common/tables/IBotBase.d.ts b/Live/CWX_MasterKey/server/types/models/eft/common/tables/IBotBase.d.ts index 1c28ae0..dd7c478 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/common/tables/IBotBase.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/common/tables/IBotBase.d.ts @@ -21,6 +21,7 @@ export interface IBotBase { Hideout: Hideout; Quests: Quest[]; TradersInfo: Record; + UnlockedInfo: IUnlockedInfo; RagfairInfo: RagfairInfo; RepeatableQuests: IPmcDataRepeatableQuest[]; Bonuses: Bonus[]; @@ -31,6 +32,9 @@ export interface IBotBase { /** SPT specific property used during bot generation in raid */ sptIsPmc?: boolean; } +export interface IUnlockedInfo { + unlockedProductionRecipe: string[]; +} export interface Info { EntryPoint: string; Nickname: string; @@ -100,7 +104,10 @@ export interface BodyPartsHealth { } export interface BodyPartHealth { Health: CurrentMax; - Effects?: Record; + Effects?: Record; +} +export interface BodyPartEffectProperties { + Time: number; } export interface CurrentMax { Current: number; @@ -120,7 +127,6 @@ export interface FastPanel { export interface Skills { Common: Common[]; Mastering: Mastering[]; - Bonuses?: any[]; Points: number; } export interface Common { @@ -265,12 +271,24 @@ export interface InsuredItem { export interface Hideout { Production: Record; Areas: HideoutArea[]; + Improvements: Record; + sptUpdateLastRunTimestamp: number; +} +export interface IHideoutImprovement { + completed: boolean; + improveCompleteTimestamp: number; } export interface Productive { Products: Product[]; + /** Seconds passed of production */ Progress?: number; + /** Is craft in some state of being worked on by client (crafting/ready to pick up) */ inProgress?: boolean; StartTimestamp?: number; + SkipTime?: number; + /** Seconds needed to fully craft */ + ProductionTime?: number; + sptIsScavCase?: boolean; } export interface Production extends Productive { RecipeId: string; @@ -327,10 +345,12 @@ export interface Quest { statusTimers?: Record; /** SPT specific property */ completedConditions?: string[]; + availableAfter?: number; } export interface TraderInfo { loyaltyLevel: number; salesSum: number; + disabled: boolean; standing: number; nextResupply: number; unlocked: boolean; diff --git a/Live/CWX_MasterKey/server/types/models/eft/common/tables/IItem.d.ts b/Live/CWX_MasterKey/server/types/models/eft/common/tables/IItem.d.ts index 2dd2c03..ce00ae9 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/common/tables/IItem.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/common/tables/IItem.d.ts @@ -7,6 +7,7 @@ export interface Item { upd?: Upd; } export interface Upd { + Buff?: Buff; OriginalStackObjectsCount?: number; Togglable?: Togglable; Map?: Map; @@ -16,6 +17,7 @@ export interface Upd { StackObjectsCount?: number; UnlimitedCount?: boolean; Repairable?: Repairable; + RecodableComponent?: RecodableComponent; FireMode?: FireMode; SpawnedInSession?: boolean; Light?: Light; @@ -31,6 +33,12 @@ export interface Upd { SideEffect?: SideEffect; RepairKit?: RepairKit; } +export interface Buff { + rarity: string; + buffType: string; + value: number; + thresholdDurability?: number; +} export interface Togglable { On: boolean; } @@ -52,6 +60,9 @@ export interface Repairable { Durability: number; MaxDurability: number; } +export interface RecodableComponent { + IsEncoded: boolean; +} export interface MedKit { HpResource: number; } @@ -98,7 +109,8 @@ export interface Location { y: number; r: string | number; isSearched?: boolean; - rotation?: string; + /** SPT property? */ + rotation?: string | boolean; } export interface SideEffect { Value: number; diff --git a/Live/CWX_MasterKey/server/types/models/eft/common/tables/IProfileTemplate.d.ts b/Live/CWX_MasterKey/server/types/models/eft/common/tables/IProfileTemplate.d.ts index fbcd81a..66ebbe8 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/common/tables/IProfileTemplate.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -19,6 +19,8 @@ export interface TemplateSide { } export interface ProfileTraderTemplate { initialLoyaltyLevel: number; + setQuestsAvailableForStart?: boolean; + setQuestsAvailableForFinish?: boolean; initialStanding: number; initialSalesSum: number; jaegerUnlocked: boolean; diff --git a/Live/CWX_MasterKey/server/types/models/eft/common/tables/IQuest.d.ts b/Live/CWX_MasterKey/server/types/models/eft/common/tables/IQuest.d.ts index d538126..5c939e1 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/common/tables/IQuest.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/common/tables/IQuest.d.ts @@ -2,7 +2,7 @@ import { QuestRewardType } from "../../../enums/QuestRewardType"; import { QuestStatus } from "../../../enums/QuestStatus"; import { Item } from "./IItem"; export interface IQuest { - QuestName: string; + QuestName?: string; _id: string; canShowNotificationsInGame: boolean; conditions: Conditions; @@ -15,6 +15,7 @@ export interface IQuest { image: string; type: string; isKey: boolean; + questStatus: any; restartable: boolean; instantComplete: boolean; secretQuest: boolean; @@ -22,7 +23,7 @@ export interface IQuest { successMessageText: string; templateId: string; rewards: Rewards; - status: string; + status: string | number; KeyQuest: boolean; changeQuestMessageText: string; side: string; @@ -43,12 +44,15 @@ export interface AvailableForProps { id: string; index: number; parentId: string; + isEncoded: boolean; dynamicLocale: boolean; value?: number; compareMethod?: string; visibilityConditions?: VisibilityCondition[]; target?: string | string[]; status?: QuestStatus[]; + availableAfter?: number; + dispersion?: number; onlyFoundInRaid?: boolean; oneSessionOnly?: boolean; doNotResetIfCounterCompleted?: boolean; diff --git a/Live/CWX_MasterKey/server/types/models/eft/common/tables/IRepeatableQuests.d.ts b/Live/CWX_MasterKey/server/types/models/eft/common/tables/IRepeatableQuests.d.ts index 6a02958..3a33f2e 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/common/tables/IRepeatableQuests.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/common/tables/IRepeatableQuests.d.ts @@ -47,6 +47,7 @@ export interface IRepeatableQuest { canShowNotificationsInGame: boolean; rewards: IRewards; conditions: IConditions; + side: string; name: string; note: string; description: string; diff --git a/Live/CWX_MasterKey/server/types/models/eft/common/tables/ITemplateItem.d.ts b/Live/CWX_MasterKey/server/types/models/eft/common/tables/ITemplateItem.d.ts index 0fa7e18..cbad0a6 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/common/tables/ITemplateItem.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/common/tables/ITemplateItem.d.ts @@ -29,8 +29,11 @@ export interface Props { IsUnsaleable?: boolean; IsUnbuyable?: boolean; IsUngivable?: boolean; + IsUnremovable?: boolean; IsLockedafterEquip?: boolean; + IsSpecialSlotOnly?: boolean; QuestItem?: boolean; + QuestStashMaxCount?: number; LootExperience?: number; ExamineExperience?: number; HideEntrails?: boolean; @@ -156,11 +159,12 @@ export interface Props { RigLayoutName?: string; MaxDurability?: number; armorZone?: string[]; - armorClass?: any; + armorClass?: string | number; mousePenalty?: number; weaponErgonomicPenalty?: number; BluntThroughput?: number; ArmorMaterial?: string; + ArmorType?: string; weapClass?: string; weapUseType?: string; ammoCaliber?: string; @@ -365,6 +369,8 @@ export interface Props { CanBeHiddenDuringThrow?: boolean; MinTimeToContactExplode?: number; ExplosionEffectType?: string; + LinkedWeapon?: string; + UseAmmoWithoutShell?: boolean; } export interface IHealthEffect { type: string; diff --git a/Live/CWX_MasterKey/server/types/models/eft/common/tables/ITrader.d.ts b/Live/CWX_MasterKey/server/types/models/eft/common/tables/ITrader.d.ts index 246a5b8..1fcfbaa 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/common/tables/ITrader.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/common/tables/ITrader.d.ts @@ -9,6 +9,7 @@ export interface ITrader { export interface ITraderBase { refreshTraderRagfairOffers: boolean; _id: string; + availableInRaid: boolean; avatar: string; balance_dol: number; balance_eur: number; @@ -20,6 +21,8 @@ export interface ITraderBase { discount_end: number; gridHeight: number; insurance: Insurance; + items_buy: IItemBuyData; + items_buy_prohibited: IItemBuyData; location: string; loyaltyLevels: LoyaltyLevel[]; medic: boolean; @@ -31,6 +34,10 @@ export interface ITraderBase { surname: string; unlockedByDefault: boolean; } +export interface IItemBuyData { + category: string[]; + id_list: string[]; +} export interface Insurance { availability: boolean; excluded_category: string[]; diff --git a/Live/CWX_MasterKey/server/types/models/eft/game/IGetItemPricesResponse.d.ts b/Live/CWX_MasterKey/server/types/models/eft/game/IGetItemPricesResponse.d.ts new file mode 100644 index 0000000..ab6e818 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/eft/game/IGetItemPricesResponse.d.ts @@ -0,0 +1,5 @@ +export interface IGetItemPricesResponse { + supplyNextTime: number; + prices: Record; + currencyCourses: Record; +} diff --git a/Live/CWX_MasterKey/server/types/models/eft/health/Effect.d.ts b/Live/CWX_MasterKey/server/types/models/eft/health/Effect.d.ts index 7eb3ffc..62d95a8 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/health/Effect.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/health/Effect.d.ts @@ -1,5 +1,7 @@ export declare enum Effect { FRACTURE = "Fracture", LIGHT_BLEEDING = "LightBleeding", - HEAVY_BLEEDING = "HeavyBleeding" + HEAVY_BLEEDING = "HeavyBleeding", + MILD_MUSCLE_PAIN = "MildMusclePain", + SEVERE_MUSCLE_PAIN = "SevereMusclePain" } diff --git a/Live/CWX_MasterKey/server/types/models/eft/health/IWorkoutData.d.ts b/Live/CWX_MasterKey/server/types/models/eft/health/IWorkoutData.d.ts new file mode 100644 index 0000000..ba629d2 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/eft/health/IWorkoutData.d.ts @@ -0,0 +1,4 @@ +export interface IWorkoutData extends Record { + skills: any; + effects: any; +} diff --git a/Live/CWX_MasterKey/server/types/models/eft/hideout/IHandleQTEEventRequestData.d.ts b/Live/CWX_MasterKey/server/types/models/eft/hideout/IHandleQTEEventRequestData.d.ts new file mode 100644 index 0000000..5dda485 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/eft/hideout/IHandleQTEEventRequestData.d.ts @@ -0,0 +1,8 @@ +export interface IHandleQTEEventRequestData { + Action: string; + /** true if QTE was successful, otherwise false */ + results: boolean[]; + /** Id of the QTE object used from db/hideout/qte.json */ + id: string; + timestamp: number; +} diff --git a/Live/CWX_MasterKey/server/types/models/eft/hideout/IHideoutArea.d.ts b/Live/CWX_MasterKey/server/types/models/eft/hideout/IHideoutArea.d.ts index d9fd2bf..fa5ca20 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/hideout/IHideoutArea.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/hideout/IHideoutArea.d.ts @@ -3,23 +3,55 @@ export interface IHideoutArea { type: number; enabled: boolean; needsFuel: boolean; + requirements: IAreaRequirement[]; takeFromSlotLocked: boolean; craftGivesExp: boolean; + displayLevel: boolean; + enableAreaRequirements: boolean; stages: Record; } +export interface IAreaRequirement { + areaType: number; + requiredlevel: number; + type: string; +} export interface Stage { - requirements: Requirement[]; + autoUpgrade: boolean; bonuses: StageBonus[]; - slots: number; constructionTime: number; description: string; + displayInterface: boolean; + improvements: IStageImprovement[]; + requirements: IStageRequirement[]; + slots: number; } -export interface Requirement { +export interface IStageImprovement { + id: string; + bonuses: IStageImprovementBonus[]; + improvementTime: number; + requirements: IStageImprovementRequirement[]; +} +export interface IStageImprovementBonus { + passive: boolean; + production: boolean; + type: string; + value: number; + visible: boolean; +} +export interface IStageImprovementRequirement { + count: number; + isEncoded: boolean; + isFunctional: boolean; + templateId: string; + type: string; +} +export interface IStageRequirement { areaType?: number; requiredLevel?: number; type: string; templateId?: string; count?: number; + isEncoded: false; isFunctional?: boolean; traderId?: string; loyaltyLevel?: number; diff --git a/Live/CWX_MasterKey/server/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts b/Live/CWX_MasterKey/server/types/models/eft/hideout/IHideoutContinuousProductionStartRequestData.d.ts similarity index 59% rename from Live/CWX_MasterKey/server/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts rename to Live/CWX_MasterKey/server/types/models/eft/hideout/IHideoutContinuousProductionStartRequestData.d.ts index dba83eb..3ef00c6 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/hideout/IHideoutContinuousProductionStartRequestData.d.ts @@ -1,4 +1,4 @@ -export interface IHideoutContinousProductionStartRequestData { +export interface IHideoutContinuousProductionStartRequestData { Action: "HideoutContinuousProductionStart"; recipeId: string; timestamp: number; diff --git a/Live/CWX_MasterKey/server/types/models/eft/hideout/IHideoutImproveAreaRequestData.d.ts b/Live/CWX_MasterKey/server/types/models/eft/hideout/IHideoutImproveAreaRequestData.d.ts new file mode 100644 index 0000000..7e927bf --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/eft/hideout/IHideoutImproveAreaRequestData.d.ts @@ -0,0 +1,13 @@ +export interface IHideoutImproveAreaRequestData { + Action: "HideoutImproveArea"; + /** Hideout area id from areas.json */ + id: string; + areaType: number; + items: HideoutItem[]; + timestamp: number; +} +export interface HideoutItem { + /** Hideout inventory id that was used by improvement action */ + id: string; + count: number; +} diff --git a/Live/CWX_MasterKey/server/types/models/eft/hideout/IHideoutProduction.d.ts b/Live/CWX_MasterKey/server/types/models/eft/hideout/IHideoutProduction.d.ts index 9295fb1..2367e08 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/hideout/IHideoutProduction.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/hideout/IHideoutProduction.d.ts @@ -3,8 +3,10 @@ export interface IHideoutProduction { areaType: number; requirements: Requirement[]; productionTime: number; - boosters?: any; endProduct: string; + isEncoded: boolean; + locked: boolean; + needFuelForAllProductionTime: boolean; continuous: boolean; count: number; productionLimitCount: number; @@ -12,6 +14,7 @@ export interface IHideoutProduction { export interface Requirement { templateId?: string; count?: number; + isEncoded?: boolean; isFunctional?: boolean; type: string; areaType?: number; diff --git a/Live/CWX_MasterKey/server/types/models/eft/hideout/IQteData.d.ts b/Live/CWX_MasterKey/server/types/models/eft/hideout/IQteData.d.ts new file mode 100644 index 0000000..f842b84 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/eft/hideout/IQteData.d.ts @@ -0,0 +1,38 @@ +export interface IQteData { + Id: string; + Type: string; + Area: string; + AreaLevel: number; + QuickTimeEvents: IQuickTimeEvent[]; + Requirements: IQteRequirement[]; + Results: Record; +} +export interface IQuickTimeEvent { + Type: string; + Position: number; + StartDelay: number; + EndDelay: number; + Speed: number; + SuccessRange: string; + Key: string; +} +export interface IQteRequirement { + type: string; +} +export interface IQteResult { + Energy: number; + Hydration: number; + RewardsRange: IQteEffect[]; +} +export interface IQteEffect { + Type: string; + SkillId: string; + levelMultipliers: ISkillLevelMultiplier[]; + Time: number; + Weight: number; + Result: string; +} +export interface ISkillLevelMultiplier { + level: number; + multiplier: number; +} diff --git a/Live/CWX_MasterKey/server/types/models/eft/hideout/IRecordShootingRangePoints.d.ts b/Live/CWX_MasterKey/server/types/models/eft/hideout/IRecordShootingRangePoints.d.ts new file mode 100644 index 0000000..5bfd2fd --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/eft/hideout/IRecordShootingRangePoints.d.ts @@ -0,0 +1,4 @@ +export interface IRecordShootingRangePoints { + Action: "RecordShootingRangePoints"; + points: number; +} diff --git a/Live/CWX_MasterKey/server/types/models/eft/inventory/IAddItemTempObject.d.ts b/Live/CWX_MasterKey/server/types/models/eft/inventory/IAddItemTempObject.d.ts new file mode 100644 index 0000000..62d4b64 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/eft/inventory/IAddItemTempObject.d.ts @@ -0,0 +1,7 @@ +import { Item, Location } from "../common/tables/IItem"; +export interface IAddItemTempObject { + itemRef: Item; + count: number; + isPreset: boolean; + location?: Location; +} diff --git a/Live/CWX_MasterKey/server/types/models/eft/itemEvent/IItemEventRouterBase.d.ts b/Live/CWX_MasterKey/server/types/models/eft/itemEvent/IItemEventRouterBase.d.ts index 6b18df3..dbf6330 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/itemEvent/IItemEventRouterBase.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/itemEvent/IItemEventRouterBase.d.ts @@ -1,4 +1,5 @@ -import { Skills } from "../common/tables/IBotBase"; +import { QuestStatus } from "../../../models/enums/QuestStatus"; +import { Health, Productive, Skills, TraderInfo } from "../common/tables/IBotBase"; import { Item, Upd } from "../common/tables/IItem"; import { IQuest } from "../common/tables/IQuest"; import { IPmcDataRepeatableQuest } from "../common/tables/IRepeatableQuests"; @@ -21,10 +22,23 @@ export interface ProfileChange { ragFairOffers: IRagfairOffer[]; builds: BuildChange[]; items: ItemChanges; - production: Record; + production: Record; + /** Hideout area improvement id */ + improvements: Record; skills: Skills; - traderRelations: Record; + health: Health; + traderRelations: Record; repeatableQuests?: IPmcDataRepeatableQuest[]; + recipeUnlocked: Record; + questsStatus: QuestStatusChange[]; +} +export interface QuestStatusChange { + qid: string; + startTime: number; + status: QuestStatus; + statusTimers: Record; + completedConditions: string[]; + availableAfter: number; } export interface BuildChange { id: string; @@ -37,13 +51,9 @@ export interface ItemChanges { change: Product[]; del: Product[]; } -export interface Production { - Progress: number; - StartTimestamp: number; - ProductionTime: number; - inProgress: boolean; - RecipeId: string; - Products: Product[]; +export interface Improvement { + completed: boolean; + improveCompleteTimestamp: number; } export interface Product { _id: string; @@ -59,10 +69,3 @@ export interface ItemChangeLocation { r: number; isSearched?: boolean; } -export interface TraderRelations { - salesSum?: number; - standing?: number; - loyalty?: number; - unlocked?: boolean; - disabled?: boolean; -} diff --git a/Live/CWX_MasterKey/server/types/models/eft/match/IGetRaidConfigurationRequestData.d.ts b/Live/CWX_MasterKey/server/types/models/eft/match/IGetRaidConfigurationRequestData.d.ts new file mode 100644 index 0000000..cbcc2f6 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/eft/match/IGetRaidConfigurationRequestData.d.ts @@ -0,0 +1,30 @@ +export interface IGetRaidConfigurationRequestData { + timeVariant: string; + raidMode: string; + metabolismDisabled: boolean; + playersSpawnPlace: string; + timeAndWeatherSettings: TimeAndWeatherSettings; + botSettings: BotSettings; + wavesSettings: WavesSettings; + location: string; +} +export interface TimeAndWeatherSettings { + isRandomTime: boolean; + isRandomWeather: boolean; + cloudinessType: string; + rainType: string; + windType: string; + fogType: string; + timeFlowType: string; + hourOfDay: number; +} +export interface BotSettings { + isScavWars: boolean; + botAmount: string; +} +export interface WavesSettings { + botAmount: string; + botDifficulty: string; + isBosses: boolean; + isTaggedAndCursed: boolean; +} diff --git a/Live/CWX_MasterKey/server/types/models/eft/match/IJoinMatchResult.d.ts b/Live/CWX_MasterKey/server/types/models/eft/match/IJoinMatchResult.d.ts index df695f4..81c9055 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/match/IJoinMatchResult.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/match/IJoinMatchResult.d.ts @@ -6,6 +6,8 @@ export interface IJoinMatchResult { port: number; version: string; location: string; - gamemode: string; + raidMode: string; + mode: string; shortid: string; + additional_info: any[]; } diff --git a/Live/CWX_MasterKey/server/types/models/eft/match/IStartOffineRaidRequestData.d.ts b/Live/CWX_MasterKey/server/types/models/eft/match/IStartOffineRaidRequestData.d.ts deleted file mode 100644 index 1983728..0000000 --- a/Live/CWX_MasterKey/server/types/models/eft/match/IStartOffineRaidRequestData.d.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { BotAmount } from "../../enums/BotAmount"; -import { BotDifficulty } from "../../enums/BotDifficulty"; -export interface IStartOfflineRaidRequestData { - locationName: string; - /** Current time, not in-game time */ - startTime: number; - /** CURR = am, past = pm */ - dateTime: "CURR" | "PAST"; - gameSettings: GameSettings; -} -export interface GameSettings { - timeAndWeatherSettings: TimeAndWeatherSettings; - botsSettings: BotsSettings; - wavesSettings: WavesSettings; -} -export interface TimeAndWeatherSettings { - isRandomTime: boolean; - isRandomWeather: boolean; -} -export interface BotsSettings { - isEnabled: boolean; - isScavWars: boolean; - botAmount: BotAmount; -} -export interface WavesSettings { - botDifficulty: BotDifficulty; - isBosses: boolean; - isTaggedAndCursed: boolean; - wavesBotAmount: BotAmount; -} diff --git a/Live/CWX_MasterKey/server/types/models/eft/profile/GetProfileStatusResponseData.d.ts b/Live/CWX_MasterKey/server/types/models/eft/profile/GetProfileStatusResponseData.d.ts index cb7368c..1228c2e 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/profile/GetProfileStatusResponseData.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/profile/GetProfileStatusResponseData.d.ts @@ -6,7 +6,13 @@ export interface ProfileData { profileid: string; profileToken: string; status: string; - sid: string; ip: string; port: number; + sid: string; + version?: string; + location?: string; + raidMode?: string; + mode?: string; + shortId?: string; + additional_info?: any[]; } diff --git a/Live/CWX_MasterKey/server/types/models/eft/quests/IFailQuestRequestData.d.ts b/Live/CWX_MasterKey/server/types/models/eft/quests/IFailQuestRequestData.d.ts new file mode 100644 index 0000000..5881d91 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/eft/quests/IFailQuestRequestData.d.ts @@ -0,0 +1,5 @@ +export interface IFailQuestRequestData { + Action: "QuestComplete"; + qid: string; + removeExcessItems: boolean; +} diff --git a/Live/CWX_MasterKey/server/types/models/eft/ragfair/IRagfairOffer.d.ts b/Live/CWX_MasterKey/server/types/models/eft/ragfair/IRagfairOffer.d.ts index 792ec7d..6b28718 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/ragfair/IRagfairOffer.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/ragfair/IRagfairOffer.d.ts @@ -23,6 +23,7 @@ export interface IRagfairOffer { summaryCost: number; user: IRagfairOfferUser; notAvailable: boolean; + /** TODO - implement this value - not currently used */ CurrentItemCount: number; priority: boolean; } diff --git a/Live/CWX_MasterKey/server/types/models/eft/trade/IProcessSellTradeRequestData.d.ts b/Live/CWX_MasterKey/server/types/models/eft/trade/IProcessSellTradeRequestData.d.ts index f1d555f..dee0cd5 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/trade/IProcessSellTradeRequestData.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/trade/IProcessSellTradeRequestData.d.ts @@ -3,6 +3,7 @@ export interface IProcessSellTradeRequestData extends IProcessBaseTradeRequestDa Action: "sell_to_trader"; type: string; tid: string; + price: number; items: Item[]; } export interface Item { diff --git a/Live/CWX_MasterKey/server/types/models/enums/BaseClasses.d.ts b/Live/CWX_MasterKey/server/types/models/enums/BaseClasses.d.ts index 7d11510..c6e880a 100644 --- a/Live/CWX_MasterKey/server/types/models/enums/BaseClasses.d.ts +++ b/Live/CWX_MasterKey/server/types/models/enums/BaseClasses.d.ts @@ -1,11 +1,13 @@ export declare enum BaseClasses { WEAPON = "5422acb9af1c889c16000029", + UBGL = "55818b014bdc2ddc698b456b", ARMOR = "5448e54d4bdc2dcc718b4568", ARMOREDEQUIPMENT = "57bef4c42459772e8d35a53b", HEADWEAR = "5a341c4086f77401f2541505", FACECOVER = "5a341c4686f77469e155819e", VEST = "5448e5284bdc2dcb718b4567", BACKPACK = "5448e53e4bdc2d60728b4567", + COMPOUND = "566162e44bdc2d3f298b4573", VISORS = "5448e5724bdc2ddf718b4568", FOOD = "5448e8d04bdc2ddf718b4569", GAS_BLOCK = "56ea9461d2720b67698b456f", @@ -29,6 +31,7 @@ export declare enum BaseClasses { MUZZLE = "5448fe394bdc2d0d028b456c", SIGHTS = "5448fe7a4bdc2d6f028b456b", MEDS = "543be5664bdc2dd4348b4569", + MAP = "567849dd4bdc2d150f8b456e", MONEY = "543be5dd4bdc2deb348b4569", NIGHTVISION = "5a2c3a9486f774688b05e574", KEY = "543be5e94bdc2df1348b4568", diff --git a/Live/CWX_MasterKey/server/types/models/enums/ELocationName.d.ts b/Live/CWX_MasterKey/server/types/models/enums/ELocationName.d.ts index 7ae7caa..c52ae87 100644 --- a/Live/CWX_MasterKey/server/types/models/enums/ELocationName.d.ts +++ b/Live/CWX_MasterKey/server/types/models/enums/ELocationName.d.ts @@ -8,5 +8,6 @@ export declare enum ELocationName { LIGHTHOUSE = "Lighthouse", LABORATORY = "laboratory", RESERVE = "RezervBase", + STREETS = "TarkovStreets", ANY = "any" } diff --git a/Live/CWX_MasterKey/server/types/models/enums/HideoutAreas.d.ts b/Live/CWX_MasterKey/server/types/models/enums/HideoutAreas.d.ts index b44a20a..c8313d9 100644 --- a/Live/CWX_MasterKey/server/types/models/enums/HideoutAreas.d.ts +++ b/Live/CWX_MasterKey/server/types/models/enums/HideoutAreas.d.ts @@ -21,5 +21,7 @@ export declare enum HideoutAreas { SOLAR_POWER = 18, BOOZE_GENERATOR = 19, BITCOIN_FARM = 20, - CHRISTMAS_TREE = 21 + CHRISTMAS_TREE = 21, + EMERGENCY_WALL = 22, + GYM = 23 } diff --git a/Live/CWX_MasterKey/server/types/models/enums/HideoutEventActions.d.ts b/Live/CWX_MasterKey/server/types/models/enums/HideoutEventActions.d.ts index e441477..aa04131 100644 --- a/Live/CWX_MasterKey/server/types/models/enums/HideoutEventActions.d.ts +++ b/Live/CWX_MasterKey/server/types/models/enums/HideoutEventActions.d.ts @@ -7,5 +7,7 @@ export declare enum HideoutEventActions { HIDEOUT_SINGLE_PRODUCTION_START = "HideoutSingleProductionStart", HIDEOUT_SCAV_CASE_PRODUCTION_START = "HideoutScavCaseProductionStart", HIDEOUT_CONTINUOUS_PRODUCTION_START = "HideoutContinuousProductionStart", - HIDEOUT_TAKE_PRODUCTION = "HideoutTakeProduction" + HIDEOUT_TAKE_PRODUCTION = "HideoutTakeProduction", + HIDEOUT_RECORD_SHOOTING_RANGE_POINTS = "RecordShootingRangePoints", + HIDEOUT_IMPROVE_AREA = "HideoutImproveArea" } diff --git a/Live/CWX_MasterKey/server/types/models/enums/ItemEventActions.d.ts b/Live/CWX_MasterKey/server/types/models/enums/ItemEventActions.d.ts index 0e65453..94061f8 100644 --- a/Live/CWX_MasterKey/server/types/models/enums/ItemEventActions.d.ts +++ b/Live/CWX_MasterKey/server/types/models/enums/ItemEventActions.d.ts @@ -15,5 +15,6 @@ export declare enum ItemEventActions { CREATE_MAP_MARKER = "CreateMapMarker", DELETE_MAP_MARKER = "DeleteMapMarker", EDIT_MAP_MARKER = "EditMapMarker", - OPEN_RANDOM_LOOT_CONTAINER = "OpenRandomLootContainer" + OPEN_RANDOM_LOOT_CONTAINER = "OpenRandomLootContainer", + HIDEOUT_QTE_EVENT = "HideoutQuickTimeEvent" } diff --git a/Live/CWX_MasterKey/server/types/models/enums/QuestRewardType.d.ts b/Live/CWX_MasterKey/server/types/models/enums/QuestRewardType.d.ts index 16f7e39..ff8c5f4 100644 --- a/Live/CWX_MasterKey/server/types/models/enums/QuestRewardType.d.ts +++ b/Live/CWX_MasterKey/server/types/models/enums/QuestRewardType.d.ts @@ -4,5 +4,6 @@ export declare enum QuestRewardType { TRADER_STANDING = "TraderStanding", TRADER_UNLOCK = "TraderUnlock", ITEM = "Item", - ASSORTMENT_UNLOCK = "AssortmentUnlock" + ASSORTMENT_UNLOCK = "AssortmentUnlock", + PRODUCTIONS_SCHEME = "ProductionScheme" } diff --git a/Live/CWX_MasterKey/server/types/models/enums/QuestStatus.d.ts b/Live/CWX_MasterKey/server/types/models/enums/QuestStatus.d.ts index ba65933..e706c05 100644 --- a/Live/CWX_MasterKey/server/types/models/enums/QuestStatus.d.ts +++ b/Live/CWX_MasterKey/server/types/models/enums/QuestStatus.d.ts @@ -7,5 +7,6 @@ export declare enum QuestStatus { Fail = 5, FailRestartable = 6, MarkedAsFailed = 7, - Expired = 8 + Expired = 8, + AvailableAfter = 9 } diff --git a/Live/CWX_MasterKey/server/types/models/enums/Traders.d.ts b/Live/CWX_MasterKey/server/types/models/enums/Traders.d.ts index 163cd71..ffea725 100644 --- a/Live/CWX_MasterKey/server/types/models/enums/Traders.d.ts +++ b/Live/CWX_MasterKey/server/types/models/enums/Traders.d.ts @@ -6,5 +6,6 @@ export declare enum Traders { PEACEKEEPER = "5935c25fb3acc3127c3d8cd9", MECHANIC = "5a7c2eca46aef81a7ca2145d", RAGMAN = "5ac3b934156ae10c4430e83c", - JAEGER = "5c0647fdd443bc2504c2d371" + JAEGER = "5c0647fdd443bc2504c2d371", + LIGHTHOUSEKEEPER = "638f541a29ffd1183d187f57" } diff --git a/Live/CWX_MasterKey/server/types/models/external/IPostAkiLoadModAsync.d.ts b/Live/CWX_MasterKey/server/types/models/external/IPostAkiLoadModAsync.d.ts new file mode 100644 index 0000000..073ce6e --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/external/IPostAkiLoadModAsync.d.ts @@ -0,0 +1,4 @@ +import { DependencyContainer } from "./tsyringe"; +export interface IPostAkiLoadModAsync { + postAkiLoadAsync(container: DependencyContainer): Promise; +} diff --git a/Live/CWX_MasterKey/server/types/models/external/IPostDBLoadModAsync.d.ts b/Live/CWX_MasterKey/server/types/models/external/IPostDBLoadModAsync.d.ts new file mode 100644 index 0000000..b23825a --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/external/IPostDBLoadModAsync.d.ts @@ -0,0 +1,4 @@ +import { DependencyContainer } from "./tsyringe"; +export interface IPostDBLoadModAsync { + postDBLoadAsync(container: DependencyContainer): Promise; +} diff --git a/Live/CWX_MasterKey/server/types/models/external/IPreAkiLoadModAsync.d.ts b/Live/CWX_MasterKey/server/types/models/external/IPreAkiLoadModAsync.d.ts new file mode 100644 index 0000000..1249ff1 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/external/IPreAkiLoadModAsync.d.ts @@ -0,0 +1,4 @@ +import { DependencyContainer } from "./tsyringe"; +export interface IPreAkiLoadModAsync { + preAkiLoadAsync(container: DependencyContainer): Promise; +} diff --git a/Live/CWX_MasterKey/server/types/models/spt/bots/GenerateWeaponResult.d.ts b/Live/CWX_MasterKey/server/types/models/spt/bots/GenerateWeaponResult.d.ts index f099752..56fa481 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/bots/GenerateWeaponResult.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/bots/GenerateWeaponResult.d.ts @@ -3,7 +3,8 @@ import { Item } from "../../eft/common/tables/IItem"; import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; export declare class GenerateWeaponResult { weapon: Item[]; - chosenAmmo: string; + chosenAmmoTpl: string; + chosenUbglAmmoTpl: string; weaponMods: Mods; weaponTemplate: ITemplateItem; } diff --git a/Live/CWX_MasterKey/server/types/models/spt/callbacks/IHideoutCallbacks.d.ts b/Live/CWX_MasterKey/server/types/models/spt/callbacks/IHideoutCallbacks.d.ts index e9badb6..ad2af48 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/callbacks/IHideoutCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/callbacks/IHideoutCallbacks.d.ts @@ -6,7 +6,7 @@ import { IHideoutPutItemInRequestData } from "../../eft/hideout/IHideoutPutItemI import { IHideoutTakeItemOutRequestData } from "../../eft/hideout/IHideoutTakeItemOutRequestData"; import { IHideoutToggleAreaRequestData } from "../../eft/hideout/IHideoutToggleAreaRequestData"; import { IHideoutSingleProductionStartRequestData } from "../../eft/hideout/IHideoutSingleProductionStartRequestData"; -import { IHideoutContinousProductionStartRequestData } from "../../eft/hideout/IHideoutContinousProductionStartRequestData"; +import { IHideoutContinuousProductionStartRequestData } from "../../eft/hideout/IHideoutContinuousProductionStartRequestData"; import { IHideoutTakeProductionRequestData } from "../../eft/hideout/IHideoutTakeProductionRequestData"; import { IItemEventRouterResponse } from "../../eft/itemEvent/IItemEventRouterResponse"; export interface IHideoutCallbacks { @@ -17,7 +17,7 @@ export interface IHideoutCallbacks { toggleArea(pmcData: IPmcData, body: IHideoutToggleAreaRequestData, sessionID: string): IItemEventRouterResponse; singleProductionStart(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData, sessionID: string): IItemEventRouterResponse; scavCaseProductionStart(pmcData: IPmcData, body: IHideoutScavCaseStartRequestData, sessionID: string): IItemEventRouterResponse; - continuousProductionStart(pmcData: IPmcData, body: IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; + continuousProductionStart(pmcData: IPmcData, body: IHideoutContinuousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; takeProduction(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; update(timeSinceLastRun: number): boolean; } diff --git a/Live/CWX_MasterKey/server/types/models/spt/callbacks/IMatchCallbacks.d.ts b/Live/CWX_MasterKey/server/types/models/spt/callbacks/IMatchCallbacks.d.ts deleted file mode 100644 index fcbf173..0000000 --- a/Live/CWX_MasterKey/server/types/models/spt/callbacks/IMatchCallbacks.d.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { IStartOfflineRaidRequestData } from "../../eft/match/IStartOffineRaidRequestData"; -import { IEndOfflineRaidRequestData } from "../../eft/match/IEndOfflineRaidRequestData"; -import { INullResponseData } from "../../eft/httpResponse/INullResponseData"; -import { IGetBodyResponseData } from "../../eft/httpResponse/IGetBodyResponseData"; -import { IPmcData } from "../../eft/common/IPmcData"; -export interface IMatchCallbacks { - 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; - 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; - getProfile(url: string, info: any, sessionID: string): IGetBodyResponseData; - serverAvailable(url: string, info: any, sessionID: string): IGetBodyResponseData | IGetBodyResponseData; - joinMatch(url: string, info: any, 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; - 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/Live/CWX_MasterKey/server/types/models/spt/config/IAirdropConfig.d.ts b/Live/CWX_MasterKey/server/types/models/spt/config/IAirdropConfig.d.ts index 53df991..627b603 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/config/IAirdropConfig.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/config/IAirdropConfig.d.ts @@ -6,6 +6,8 @@ export interface IAirdropConfig extends IBaseConfig { planeMinFlyHeight: number; planeMaxFlyHeight: number; planeVolume: number; + planeSpeed: number; + crateFallSpeed: number; airdropMinStartTimeSeconds: number; airdropMaxStartTimeSeconds: number; loot: AirdropLoot; @@ -17,6 +19,7 @@ export interface AirdropChancePercent { shoreline: number; interchange: number; reserve: number; + tarkovStreets: number; } export interface AirdropLoot { presetCount: MinMax; diff --git a/Live/CWX_MasterKey/server/types/models/spt/config/IBotConfig.d.ts b/Live/CWX_MasterKey/server/types/models/spt/config/IBotConfig.d.ts index 4b1a621..fcbc179 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/config/IBotConfig.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/config/IBotConfig.d.ts @@ -25,6 +25,7 @@ export interface IBotConfig extends IBaseConfig { showTypeInNickname: boolean; /** Max number of bots that can be spawned in a raid at any one time */ maxBotCap: Record; + chanceAssaultScavHasPlayerScavName: number; /** How many stacks of secret ammo should a bot have in its bot secure container */ secureContainerAmmoStackCount: number; /** Batch generation size when type not available in cache */ @@ -84,6 +85,7 @@ export interface ModLimits { } export interface RandomisationDetails { levelRange: MinMax; + generation?: Record; randomisedWeaponModSlots?: string[]; randomisedArmorSlots?: string[]; /** Equipment chances */ diff --git a/Live/CWX_MasterKey/server/types/models/spt/config/IBotDurability.d.ts b/Live/CWX_MasterKey/server/types/models/spt/config/IBotDurability.d.ts index 38a47cc..a4ff53c 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/config/IBotDurability.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/config/IBotDurability.d.ts @@ -14,19 +14,9 @@ export interface IBotDurability { } /** Durability values to be used when a more specific bot type cant be found */ export interface DefaultDurability { - armor: DefaultArmor; + armor: ArmorDurability; weapon: WeaponDurability; } -export interface DefaultArmor { - maxDelta: number; - minDelta: number; -} -export interface WeaponDurability { - lowestMax: number; - highestMax: number; - maxDelta: number; - minDelta: number; -} export interface PmcDurability { armor: PmcDurabilityArmor; weapon: WeaponDurability; @@ -44,4 +34,12 @@ export interface BotDurability { export interface ArmorDurability { maxDelta: number; minDelta: number; + minLimitPercent: number; +} +export interface WeaponDurability { + lowestMax: number; + highestMax: number; + maxDelta: number; + minDelta: number; + minLimitPercent: number; } diff --git a/Live/CWX_MasterKey/server/types/models/spt/config/ICoreConfig.d.ts b/Live/CWX_MasterKey/server/types/models/spt/config/ICoreConfig.d.ts index cfcaf61..b2819a4 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/config/ICoreConfig.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/config/ICoreConfig.d.ts @@ -4,4 +4,5 @@ export interface ICoreConfig extends IBaseConfig { akiVersion: string; projectName: string; compatibleTarkovVersion: string; + commit: string; } diff --git a/Live/CWX_MasterKey/server/types/models/spt/config/IHideoutConfig.d.ts b/Live/CWX_MasterKey/server/types/models/spt/config/IHideoutConfig.d.ts index f232052..0785f1e 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/config/IHideoutConfig.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/config/IHideoutConfig.d.ts @@ -3,9 +3,5 @@ export interface IHideoutConfig extends IBaseConfig { kind: "aki-hideout"; runIntervalSeconds: number; hoursForSkillCrafting: number; - generatorSpeedWithoutFuel: number; - generatorFuelFlowRate: number; - airFilterUnitFlowRate: number; - /** SEE HIDEOUTHELPER BEFORE CHANGING CONFIG */ - gpuBoostRate: number; + hideoutWallAppearTimeSeconds: number; } diff --git a/Live/CWX_MasterKey/server/types/models/spt/config/IInsuranceConfig.d.ts b/Live/CWX_MasterKey/server/types/models/spt/config/IInsuranceConfig.d.ts index b27e753..fd498bc 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/config/IInsuranceConfig.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/config/IInsuranceConfig.d.ts @@ -5,5 +5,6 @@ export interface IInsuranceConfig extends IBaseConfig { returnChancePercent: Record; blacklistedEquipment: string[]; slotIdsWithChanceOfNotReturning: string[]; + returnTimeOverrideSeconds: number; runIntervalSeconds: number; } diff --git a/Live/CWX_MasterKey/server/types/models/spt/config/ILocationConfig.d.ts b/Live/CWX_MasterKey/server/types/models/spt/config/ILocationConfig.d.ts index a012fae..f808ad8 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/config/ILocationConfig.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/config/ILocationConfig.d.ts @@ -2,11 +2,16 @@ import { BossLocationSpawn, Wave } from "../../../models/eft/common/ILocationBas import { IBaseConfig } from "./IBaseConfig"; export interface ILocationConfig extends IBaseConfig { kind: "aki-location"; + fixEmptyBotWaves: boolean; + fixRoguesTakingAllSpawnsOnLighthouse: boolean; + lighthouseRogueSpawnTimeSeconds: number; looseLootMultiplier: LootMultiplier; staticLootMultiplier: LootMultiplier; customWaves: CustomWaves; /** Open zones to add to map */ openZones: Record; + /** Key = map id, value = item tpls that should only have one forced loot spawn position */ + forcedLootSingleSpawnById: Record; } export interface CustomWaves { boss: Record; diff --git a/Live/CWX_MasterKey/server/types/models/spt/config/IPlayerScavConfig.d.ts b/Live/CWX_MasterKey/server/types/models/spt/config/IPlayerScavConfig.d.ts index 5ac3966..3a65e83 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/config/IPlayerScavConfig.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/config/IPlayerScavConfig.d.ts @@ -9,6 +9,7 @@ export interface KarmaLevel { modifiers: Modifiers; itemLimits: ItemLimits; equipmentBlacklist: Record; + labsAccessCardChancePercent: number; } export interface Modifiers { equipment: Record; diff --git a/Live/CWX_MasterKey/server/types/models/spt/config/IQuestConfig.d.ts b/Live/CWX_MasterKey/server/types/models/spt/config/IQuestConfig.d.ts index 951f1a7..9adfaba 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/config/IQuestConfig.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/config/IQuestConfig.d.ts @@ -3,13 +3,24 @@ import { IBaseConfig } from "./IBaseConfig"; export interface IQuestConfig extends IBaseConfig { kind: "aki-quest"; redeemTime: number; + questTemplateIds: IPlayerTypeQuestIds; repeatableQuests: IRepeatableQuestConfig[]; locationIdMap: Record; bearOnlyQuests: string[]; usecOnlyQuests: string[]; } +export interface IPlayerTypeQuestIds { + pmc: IQuestTypeIds; + scav: IQuestTypeIds; +} +export interface IQuestTypeIds { + Elimination: string; + Completion: string; + Exploration: string; +} export interface IRepeatableQuestConfig { name: string; + side: string; types: string[]; resetTime: number; numQuests: number; @@ -17,11 +28,12 @@ export interface IRepeatableQuestConfig { rewardScaling: IRewardScaling; locations: Record; traderWhitelist: ITraderWhitelist[]; - questConfig: IQuestConfig; + questConfig: IRepeatableQuestTypesConfig; /** Item base types to block when generating rewards */ rewardBaseTypeBlacklist: string[]; /** Item tplIds to ignore when generating rewards */ rewardBlacklist: string[]; + rewardAmmoStackMinSize: number; } export interface IRewardScaling { levels: number[]; @@ -35,7 +47,7 @@ export interface ITraderWhitelist { traderId: string; questTypes: string[]; } -export interface IQuestConfig { +export interface IRepeatableQuestTypesConfig { Exploration: IExploration; Completion: ICompletion; Elimination: IElimination; diff --git a/Live/CWX_MasterKey/server/types/models/spt/config/IRagfairConfig.d.ts b/Live/CWX_MasterKey/server/types/models/spt/config/IRagfairConfig.d.ts index 6786417..3fa04de 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/config/IRagfairConfig.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/config/IRagfairConfig.d.ts @@ -16,7 +16,7 @@ export interface Sell { } export interface Chance { base: number; - overprices: number; + overpriced: number; underpriced: number; } export interface Time { @@ -29,6 +29,7 @@ export interface Reputation { loss: number; } export interface Dynamic { + purchasesAreFoundInRaid: boolean; barter: Barter; offerAdjustment: OfferAdjustment; expiredOfferThreshold: number; @@ -43,9 +44,10 @@ export interface Dynamic { rating: MinMax; currencies: Record; showAsSingleStack: string[]; + removeSeasonalItemsWhenNotInEvent: boolean; blacklist: Blacklist; } -export declare class Barter { +export interface Barter { enable: boolean; chancePercent: number; itemCountMin: number; @@ -54,7 +56,7 @@ export declare class Barter { minRoubleCostToBecomeBarter: number; itemTypeBlacklist: string[]; } -export declare class OfferAdjustment { +export interface OfferAdjustment { maxPriceDifferenceBelowHandbookPercent: number; handbookPriceMultipier: number; priceThreshholdRub: number; diff --git a/Live/CWX_MasterKey/server/types/models/spt/config/IRepairConfig.d.ts b/Live/CWX_MasterKey/server/types/models/spt/config/IRepairConfig.d.ts index 23e6838..b6db332 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/config/IRepairConfig.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/config/IRepairConfig.d.ts @@ -1,7 +1,25 @@ +import { MinMax } from "../../../models/common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IRepairConfig extends IBaseConfig { kind: "aki-repair"; priceMultiplier: number; applyRandomizeDurabilityLoss: boolean; weaponSkillRepairGain: number; + armorKitSkillPointGainPerRepairPointMultiplier: number; + repairKit: RepairKit; +} +export interface RepairKit { + armor: BonusSettings; + weapon: BonusSettings; +} +export interface BonusSettings { + rarityWeight: Record; + bonusTypeWeight: Record; + common: Record; + rare: Record; +} +export interface BonusValues { + valuesMinMax: MinMax; + /** What dura is buff active between (min max of current max) */ + activeDurabilityPercentMinMax: MinMax; } diff --git a/Live/CWX_MasterKey/server/types/models/spt/config/ISeasonalEventConfig.d.ts b/Live/CWX_MasterKey/server/types/models/spt/config/ISeasonalEventConfig.d.ts index e410925..cedf9a9 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/config/ISeasonalEventConfig.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/config/ISeasonalEventConfig.d.ts @@ -5,6 +5,7 @@ export interface ISeasonalEventConfig extends IBaseConfig { /** event / botType / equipSlot / itemid */ eventGear: Record>>>; events: ISeasonalEvent[]; + gifterSettings: GifterSetting[]; } export interface ISeasonalEvent { name: string; @@ -13,3 +14,8 @@ export interface ISeasonalEvent { endDay: number; endMonth: number; } +export interface GifterSetting { + map: string; + zones: string; + spawnChance: number; +} diff --git a/Live/CWX_MasterKey/server/types/models/spt/config/ITraderConfig.d.ts b/Live/CWX_MasterKey/server/types/models/spt/config/ITraderConfig.d.ts index b1ec484..56c7d35 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/config/ITraderConfig.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/config/ITraderConfig.d.ts @@ -15,15 +15,21 @@ export interface UpdateTime { seconds: number; } export interface FenceConfig { + discountOptions: DiscountOptions; partialRefreshTimeSeconds: number; partialRefreshChangePercent: number; assortSize: number; maxPresetsPercent: number; + itemPriceMult: number; presetPriceMult: number; armorMaxDurabilityPercentMinMax: MinMax; presetMaxDurabilityPercentMinMax: MinMax; - itemPriceMult: number; - regenerateAssortsOnRefresh: boolean; itemTypeLimits: Record; + regenerateAssortsOnRefresh: boolean; blacklist: string[]; } +export interface DiscountOptions { + assortSize: number; + itemPriceMult: number; + presetPriceMult: number; +} diff --git a/Live/CWX_MasterKey/server/types/models/spt/mod/IMod.d.ts b/Live/CWX_MasterKey/server/types/models/spt/mod/IMod.d.ts deleted file mode 100644 index e6eec79..0000000 --- a/Live/CWX_MasterKey/server/types/models/spt/mod/IMod.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -export declare namespace ModLoader { - interface IMod { - name: string; - version: string; - main?: string; - author?: string; - license: string; - dependencies?: Record; - } -} diff --git a/Live/CWX_MasterKey/server/types/models/spt/mod/IModLoader.d.ts b/Live/CWX_MasterKey/server/types/models/spt/mod/IModLoader.d.ts index 40a5e19..9a71f61 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/mod/IModLoader.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/mod/IModLoader.d.ts @@ -1,7 +1,5 @@ import { DependencyContainer } from "tsyringe"; export interface IModLoader { load(container: DependencyContainer): void; - getBundles(local: boolean): string; - getBundle(key: string, local: boolean): void; getModPath(mod: string): string; } diff --git a/Live/CWX_MasterKey/server/types/models/spt/mod/IPackageJsonData.d.ts b/Live/CWX_MasterKey/server/types/models/spt/mod/IPackageJsonData.d.ts index 99e4ef9..06f7454 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/mod/IPackageJsonData.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/mod/IPackageJsonData.d.ts @@ -1,6 +1,6 @@ export interface IPackageJsonData { incompatibilities?: string[]; - dependencies?: string[]; + dependencies?: Record; modDependencies?: Record; name: string; author: string; @@ -8,5 +8,6 @@ export interface IPackageJsonData { akiVersion: string; licence: string; main: string; + isBundleMod: boolean; contributors: string[]; } diff --git a/Live/CWX_MasterKey/server/types/models/spt/server/IDatabaseTables.d.ts b/Live/CWX_MasterKey/server/types/models/spt/server/IDatabaseTables.d.ts index 9978459..582d9e2 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/server/IDatabaseTables.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/server/IDatabaseTables.d.ts @@ -1,3 +1,4 @@ +import { IQteData } from "../../../models/eft/hideout/IQteData"; import { IGlobals } from "../../eft/common/IGlobals"; import { IBotBase } from "../../eft/common/tables/IBotBase"; import { IBotCore } from "../../eft/common/tables/IBotCore"; @@ -30,6 +31,7 @@ export interface IDatabaseTables { production: IHideoutProduction[]; scavcase: IHideoutScavCase[]; settings: IHideoutSettingsBase; + qte: IQteData[]; }; locales?: ILocaleBase; locations?: ILocations; @@ -38,10 +40,8 @@ export interface IDatabaseTables { templates?: { character: string[]; items: Record; - quests: IQuest[]; + quests: Record; 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; /** The profile templates listed in the launcher on profile creation, split by account type (e.g. Standard) then side (e.g. bear/usec) */ diff --git a/Live/CWX_MasterKey/server/types/models/spt/server/ISettingsBase.d.ts b/Live/CWX_MasterKey/server/types/models/spt/server/ISettingsBase.d.ts index 625ad5c..2870cfb 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/server/ISettingsBase.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/server/ISettingsBase.d.ts @@ -10,6 +10,7 @@ export interface Config { FirstCycleDelaySeconds: number; FramerateLimit: FramerateLimit; GroupStatusInterval: number; + GroupStatusButtonInterval: number; KeepAliveInterval: number; LobbyKeepAliveInterval: number; Mark502and504AsNonImportant: boolean; diff --git a/Live/CWX_MasterKey/server/types/routers/EventOutputHolder.d.ts b/Live/CWX_MasterKey/server/types/routers/EventOutputHolder.d.ts index 7a2387b..9a34219 100644 --- a/Live/CWX_MasterKey/server/types/routers/EventOutputHolder.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/EventOutputHolder.d.ts @@ -1,11 +1,41 @@ -import { JsonUtil } from "../utils/JsonUtil"; import { ProfileHelper } from "../helpers/ProfileHelper"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IHideoutImprovement, Productive } from "../models/eft/common/tables/IBotBase"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { JsonUtil } from "../utils/JsonUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export declare class EventOutputHolder { protected jsonUtil: JsonUtil; protected profileHelper: ProfileHelper; - constructor(jsonUtil: JsonUtil, profileHelper: ProfileHelper); + protected timeUtil: TimeUtil; + /** What has client been informed of this game session */ + protected clientActiveSessionStorage: Record; + constructor(jsonUtil: JsonUtil, profileHelper: ProfileHelper, timeUtil: TimeUtil); protected output: IItemEventRouterResponse; getOutput(sessionID: string): IItemEventRouterResponse; + /** + * Reset the response object to a default state + * Occurs prior to event being handled by server + * @param sessionID Players id + */ resetOutput(sessionID: string): void; + /** + * Update output object with most recent values from player profile + * @param sessionId Session id + */ + updateOutputProperties(sessionId: string): void; + /** + * Return all hideout Improvements from player profile, adjust completed Improvements' completed property to be true + * @param pmcData Player profile + * @returns dictionary of hideout improvements + */ + protected getImprovementsFromProfileAndFlagComplete(pmcData: IPmcData): Record; + /** + * Return productions from player profile except those completed crafts the client has already seen + * @param pmcData Player profile + * @returns dictionary of hideout productions + */ + protected getProductionsFromProfileAndFlagComplete(productions: Record): Record; } diff --git a/Live/CWX_MasterKey/server/types/routers/ItemEventRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/ItemEventRouter.d.ts index a9338ab..9c7f70e 100644 --- a/Live/CWX_MasterKey/server/types/routers/ItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/ItemEventRouter.d.ts @@ -12,5 +12,11 @@ export declare class ItemEventRouter { protected localisationService: LocalisationService; protected eventOutputHolder: EventOutputHolder; constructor(logger: ILogger, profileHelper: ProfileHelper, itemEventRouters: ItemEventRouterDefinition[], localisationService: LocalisationService, eventOutputHolder: EventOutputHolder); + /** + * + * @param info Event request + * @param sessionID Session id + * @returns Item response + */ handleEvents(info: IItemEventRouterRequest, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_MasterKey/server/types/routers/item_events/CustomizationItemEventRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/item_events/CustomizationItemEventRouter.d.ts index e78445e..32519b1 100644 --- a/Live/CWX_MasterKey/server/types/routers/item_events/CustomizationItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/item_events/CustomizationItemEventRouter.d.ts @@ -1,7 +1,7 @@ -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; +import { IPmcData } from "../../models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; export declare class CustomizationItemEventRouter extends ItemEventRouterDefinition { protected customizationCallbacks: CustomizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); diff --git a/Live/CWX_MasterKey/server/types/routers/item_events/HealthItemEventRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/item_events/HealthItemEventRouter.d.ts index 99847c6..2b2b91d 100644 --- a/Live/CWX_MasterKey/server/types/routers/item_events/HealthItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/item_events/HealthItemEventRouter.d.ts @@ -1,7 +1,7 @@ -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; import { HealthCallbacks } from "../../callbacks/HealthCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; +import { IPmcData } from "../../models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; export declare class HealthItemEventRouter extends ItemEventRouterDefinition { protected healthCallbacks: HealthCallbacks; constructor(healthCallbacks: HealthCallbacks); diff --git a/Live/CWX_MasterKey/server/types/routers/item_events/InsuranceItemEventRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/item_events/InsuranceItemEventRouter.d.ts index a922cc0..3b6ae8c 100644 --- a/Live/CWX_MasterKey/server/types/routers/item_events/InsuranceItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/item_events/InsuranceItemEventRouter.d.ts @@ -1,7 +1,7 @@ -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; import { InsuranceCallbacks } from "../../callbacks/InsuranceCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; +import { IPmcData } from "../../models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; export declare class InsuranceItemEventRouter extends ItemEventRouterDefinition { protected insuranceCallbacks: InsuranceCallbacks; constructor(insuranceCallbacks: InsuranceCallbacks); diff --git a/Live/CWX_MasterKey/server/types/routers/item_events/InventoryItemEventRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/item_events/InventoryItemEventRouter.d.ts index 953d322..d6a6ae5 100644 --- a/Live/CWX_MasterKey/server/types/routers/item_events/InventoryItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/item_events/InventoryItemEventRouter.d.ts @@ -1,10 +1,12 @@ +import { HideoutCallbacks } from "../../callbacks/HideoutCallbacks"; import { InventoryCallbacks } from "../../callbacks/InventoryCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; import { IPmcData } from "../../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; export declare class InventoryItemEventRouter extends ItemEventRouterDefinition { protected inventoryCallbacks: InventoryCallbacks; - constructor(inventoryCallbacks: InventoryCallbacks); + protected hideoutCallbacks: HideoutCallbacks; + constructor(inventoryCallbacks: InventoryCallbacks, hideoutCallbacks: HideoutCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_MasterKey/server/types/routers/item_events/NoteItemEventRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/item_events/NoteItemEventRouter.d.ts index 59bf598..71ed5d4 100644 --- a/Live/CWX_MasterKey/server/types/routers/item_events/NoteItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/item_events/NoteItemEventRouter.d.ts @@ -1,7 +1,7 @@ -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; import { NoteCallbacks } from "../../callbacks/NoteCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; +import { IPmcData } from "../../models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; export declare class NoteItemEventRouter extends ItemEventRouterDefinition { protected noteCallbacks: NoteCallbacks; constructor(noteCallbacks: NoteCallbacks); diff --git a/Live/CWX_MasterKey/server/types/routers/item_events/PresetBuildItemEventRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/item_events/PresetBuildItemEventRouter.d.ts index 277db44..f2a7bf3 100644 --- a/Live/CWX_MasterKey/server/types/routers/item_events/PresetBuildItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/item_events/PresetBuildItemEventRouter.d.ts @@ -1,7 +1,7 @@ -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; import { PresetBuildCallbacks } from "../../callbacks/PresetBuildCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; +import { IPmcData } from "../../models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; export declare class PresetBuildItemEventRouter extends ItemEventRouterDefinition { protected presetBuildCallbacks: PresetBuildCallbacks; constructor(presetBuildCallbacks: PresetBuildCallbacks); diff --git a/Live/CWX_MasterKey/server/types/routers/item_events/RagfairItemEventRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/item_events/RagfairItemEventRouter.d.ts index 9216cc5..986d9e7 100644 --- a/Live/CWX_MasterKey/server/types/routers/item_events/RagfairItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/item_events/RagfairItemEventRouter.d.ts @@ -1,7 +1,7 @@ -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; import { RagfairCallbacks } from "../../callbacks/RagfairCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; +import { IPmcData } from "../../models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; export declare class RagfairItemEventRouter extends ItemEventRouterDefinition { protected ragfairCallbacks: RagfairCallbacks; constructor(ragfairCallbacks: RagfairCallbacks); diff --git a/Live/CWX_MasterKey/server/types/routers/item_events/RepairItemEventRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/item_events/RepairItemEventRouter.d.ts index 5196ba9..1c2768c 100644 --- a/Live/CWX_MasterKey/server/types/routers/item_events/RepairItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/item_events/RepairItemEventRouter.d.ts @@ -1,7 +1,7 @@ -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; import { RepairCallbacks } from "../../callbacks/RepairCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; +import { IPmcData } from "../../models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; export declare class RepairItemEventRouter extends ItemEventRouterDefinition { protected repairCallbacks: RepairCallbacks; constructor(repairCallbacks: RepairCallbacks); diff --git a/Live/CWX_MasterKey/server/types/routers/item_events/TradeItemEventRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/item_events/TradeItemEventRouter.d.ts index a43bb0a..5d84559 100644 --- a/Live/CWX_MasterKey/server/types/routers/item_events/TradeItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/item_events/TradeItemEventRouter.d.ts @@ -1,7 +1,7 @@ -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; import { TradeCallbacks } from "../../callbacks/TradeCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; +import { IPmcData } from "../../models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; export declare class TradeItemEventRouter extends ItemEventRouterDefinition { protected tradeCallbacks: TradeCallbacks; constructor(tradeCallbacks: TradeCallbacks); diff --git a/Live/CWX_MasterKey/server/types/routers/item_events/WishlistItemEventRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/item_events/WishlistItemEventRouter.d.ts index 38497fb..9e3c2a0 100644 --- a/Live/CWX_MasterKey/server/types/routers/item_events/WishlistItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/item_events/WishlistItemEventRouter.d.ts @@ -1,7 +1,7 @@ -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; import { WishlistCallbacks } from "../../callbacks/WishlistCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; +import { IPmcData } from "../../models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; export declare class WishlistItemEventRouter extends ItemEventRouterDefinition { protected wishlistCallbacks: WishlistCallbacks; constructor(wishlistCallbacks: WishlistCallbacks); diff --git a/Live/CWX_MasterKey/server/types/routers/save_load/HealthSaveLoadRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/save_load/HealthSaveLoadRouter.d.ts index 114f5b2..26cb07a 100644 --- a/Live/CWX_MasterKey/server/types/routers/save_load/HealthSaveLoadRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/save_load/HealthSaveLoadRouter.d.ts @@ -1,5 +1,5 @@ -import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; +import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; export declare class HealthSaveLoadRouter extends SaveLoadRouter { constructor(); getHandledRoutes(): HandledRoute[]; diff --git a/Live/CWX_MasterKey/server/types/routers/save_load/InraidSaveLoadRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/save_load/InraidSaveLoadRouter.d.ts index 4c00b40..40f388e 100644 --- a/Live/CWX_MasterKey/server/types/routers/save_load/InraidSaveLoadRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/save_load/InraidSaveLoadRouter.d.ts @@ -1,5 +1,5 @@ -import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; +import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; export declare class InraidSaveLoadRouter extends SaveLoadRouter { constructor(); getHandledRoutes(): HandledRoute[]; diff --git a/Live/CWX_MasterKey/server/types/routers/save_load/InsuranceSaveLoadRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/save_load/InsuranceSaveLoadRouter.d.ts index 30ce98e..22d645e 100644 --- a/Live/CWX_MasterKey/server/types/routers/save_load/InsuranceSaveLoadRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/save_load/InsuranceSaveLoadRouter.d.ts @@ -1,5 +1,5 @@ -import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; +import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; export declare class InsuranceSaveLoadRouter extends SaveLoadRouter { constructor(); getHandledRoutes(): HandledRoute[]; diff --git a/Live/CWX_MasterKey/server/types/routers/save_load/ProfileSaveLoadRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/save_load/ProfileSaveLoadRouter.d.ts index 16c7619..f60af15 100644 --- a/Live/CWX_MasterKey/server/types/routers/save_load/ProfileSaveLoadRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/save_load/ProfileSaveLoadRouter.d.ts @@ -1,5 +1,5 @@ -import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; +import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; export declare class ProfileSaveLoadRouter extends SaveLoadRouter { constructor(); getHandledRoutes(): HandledRoute[]; diff --git a/Live/CWX_MasterKey/server/types/routers/serializers/ImageSerializer.d.ts b/Live/CWX_MasterKey/server/types/routers/serializers/ImageSerializer.d.ts index 7f15bcf..5de48ff 100644 --- a/Live/CWX_MasterKey/server/types/routers/serializers/ImageSerializer.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/serializers/ImageSerializer.d.ts @@ -1,7 +1,7 @@ /// +import { IncomingMessage, ServerResponse } from "http"; import { Serializer } from "../../di/Serializer"; import { ImageRouter } from "../ImageRouter"; -import { IncomingMessage, ServerResponse } from "http"; export declare class ImageSerializer extends Serializer { protected imageRouter: ImageRouter; constructor(imageRouter: ImageRouter); diff --git a/Live/CWX_MasterKey/server/types/servers/SaveServer.d.ts b/Live/CWX_MasterKey/server/types/servers/SaveServer.d.ts index 4dca514..402befc 100644 --- a/Live/CWX_MasterKey/server/types/servers/SaveServer.d.ts +++ b/Live/CWX_MasterKey/server/types/servers/SaveServer.d.ts @@ -14,17 +14,71 @@ export declare class SaveServer { protected logger: ILogger; protected profileFilepath: string; protected profiles: {}; - protected onSave: {}; + protected onBeforeSaveCallbacks: {}; protected saveMd5: {}; constructor(vfs: VFS, saveLoadRouters: SaveLoadRouter[], jsonUtil: JsonUtil, hashUtil: HashUtil, localisationService: LocalisationService, logger: ILogger); + /** + * Add callback to occur prior to saving profile changes + * @param id Id for save callback + * @param callback Callback to execute prior to running SaveServer.saveProfile() + */ + addBeforeSaveCallback(id: string, callback: (profile: Partial) => Partial): void; + /** + * Remove a callback from being executed prior to saving profile in SaveServer.saveProfile() + * @param id Id of callback to remove + */ + removeBeforeSaveCallback(id: string): void; + /** + * Load all profiles in /user/profiles folder into memory (this.profiles) + */ load(): void; + /** + * Save changes for each profile from memory into user/profiles json + */ save(): void; + /** + * Get a player profile from memory + * @param sessionId Session id + * @returns IAkiProfile + */ getProfile(sessionId: string): IAkiProfile; + /** + * Get all profiles from memory + * @returns Dictionary of IAkiProfile + */ getProfiles(): Record; + /** + * Delete a profile by id + * @param sessionID Id of profile to remove + * @returns true when deleted, false when profile not found + */ deleteProfileById(sessionID: string): boolean; + /** + * Create a new profile in memory with empty pmc/scav objects + * @param profileInfo Basic profile data + */ createProfile(profileInfo: Info): void; + /** + * Add full profile in memory by key (info.id) + * @param profileDetails Profile to save + */ addProfile(profileDetails: IAkiProfile): void; + /** + * Look up profile json in user/profiles by id and store in memory + * Execute saveLoadRouters callbacks after being loaded into memory + * @param sessionID Id of profile to store in memory + */ loadProfile(sessionID: string): void; + /** + * Save changes from in-memory profile to user/profiles json + * Execute onBeforeSaveCallbacks callbacks prior to being saved to json + * @param sessionID profile id (user/profiles/id.json) + */ saveProfile(sessionID: string): void; + /** + * Remove a physical profile json from user/profiles + * @param sessionID Profile id to remove + * @returns true if file no longer exists + */ removeProfile(sessionID: string): boolean; } diff --git a/Live/CWX_MasterKey/server/types/servers/http/AkiHttpListener.d.ts b/Live/CWX_MasterKey/server/types/servers/http/AkiHttpListener.d.ts index acf92aa..d02861e 100644 --- a/Live/CWX_MasterKey/server/types/servers/http/AkiHttpListener.d.ts +++ b/Live/CWX_MasterKey/server/types/servers/http/AkiHttpListener.d.ts @@ -13,16 +13,18 @@ export declare class AkiHttpListener implements IHttpListener { protected httpRouter: HttpRouter; protected serializers: Serializer[]; protected logger: ILogger; + protected requestsLogger: ILogger; protected jsonUtil: JsonUtil; protected httpResponse: HttpResponseUtil; protected localisationService: LocalisationService; protected httpBufferHandler: HttpBufferHandler; constructor(httpRouter: HttpRouter, // TODO: delay required - serializers: Serializer[], logger: ILogger, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, localisationService: LocalisationService, httpBufferHandler: HttpBufferHandler); + serializers: Serializer[], logger: ILogger, requestsLogger: ILogger, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, localisationService: LocalisationService, httpBufferHandler: HttpBufferHandler); canHandle(_: string, req: IncomingMessage): boolean; handle(sessionId: string, req: IncomingMessage, resp: ServerResponse): void; sendResponse(sessionID: string, req: IncomingMessage, resp: ServerResponse, body: Buffer, output: string): void; getResponse(sessionID: string, req: IncomingMessage, body: Buffer): string; - protected getBodyInfo(body: Buffer): string; - sendZlibJson(resp: ServerResponse, output: any, sessionID: string): void; + protected getBodyInfo(body: Buffer): any; + sendJson(resp: ServerResponse, output: string, sessionID: string): void; + sendZlibJson(resp: ServerResponse, output: string, sessionID: string): void; } diff --git a/Live/CWX_MasterKey/server/types/services/BotEquipmentFilterService.d.ts b/Live/CWX_MasterKey/server/types/services/BotEquipmentFilterService.d.ts index ef3b504..089cfb5 100644 --- a/Live/CWX_MasterKey/server/types/services/BotEquipmentFilterService.d.ts +++ b/Live/CWX_MasterKey/server/types/services/BotEquipmentFilterService.d.ts @@ -1,5 +1,6 @@ import { BotHelper } from "../helpers/BotHelper"; -import { EquipmentChances, IBotType, ModsChances } from "../models/eft/common/tables/IBotType"; +import { MinMax } from "../models/common/MinMax"; +import { EquipmentChances, Generation, IBotType, ModsChances } from "../models/eft/common/tables/IBotType"; import { BotGenerationDetails } from "../models/spt/bots/BotGenerationDetails"; import { AdjustmentDetails, EquipmentFilterDetails, EquipmentFilters, IBotConfig, WeightingAdjustmentDetails } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; @@ -24,6 +25,12 @@ export declare class BotEquipmentFilterService { * @param baseValues Values to update */ protected adjustChances(equipmentChanges: Record, baseValues: EquipmentChances | ModsChances): void; + /** + * Iterate over the Generation changes and alter data in baseValues.Generation + * @param generationChanges Changes to apply + * @param baseBotGeneration dictionary to update + */ + protected adjustGenerationChances(generationChanges: Record, baseBotGeneration: Generation): void; /** * Get equipment settings for bot * @param botEquipmentRole equipment role to return @@ -51,14 +58,14 @@ export declare class BotEquipmentFilterService { */ protected getBotEquipmentWhitelist(botRole: string, playerLevel: number): EquipmentFilterDetails; /** - * Retreive clothing weighting adjustments from bot.json config + * Retrieve clothing weighting adjustments from bot.json config * @param botRole Bot type to get adjustments for * @param playerLevel level of player * @returns Weighting adjustments for bots clothing */ protected getBotClothingAdjustments(botRole: string, playerLevel: number): WeightingAdjustmentDetails; /** - * Retreive item weighting adjustments from bot.json config + * Retrieve item weighting adjustments from bot.json config * @param botRole Bot type to get adjustments for * @param playerLevel level of player * @returns Weighting adjustments for bot items @@ -66,7 +73,7 @@ export declare class BotEquipmentFilterService { protected getBotWeightingAdjustments(botRole: string, playerLevel: number): WeightingAdjustmentDetails; /** * Filter bot equipment based on blacklist and whitelist from config/bot.json - * Prioritises whitelist first, if one is found blacklist is ignored + * Prioritizes whitelist first, if one is found blacklist is ignored * @param baseBotNode bot .json file to update * @param blacklist equipment blacklist * @returns Filtered bot file @@ -74,10 +81,10 @@ export declare class BotEquipmentFilterService { protected filterEquipment(baseBotNode: IBotType, blacklist: EquipmentFilterDetails, whitelist: EquipmentFilterDetails): void; /** * Filter bot cartridges based on blacklist and whitelist from config/bot.json - * Prioritises whitelist first, if one is found blacklist is ignored + * Prioritizes whitelist first, if one is found blacklist is ignored * @param baseBotNode bot .json file to update * @param blacklist equipment on this list should be excluded from the bot - * @param whitelist equipment on this list should be used exclusivly + * @param whitelist equipment on this list should be used exclusively * @returns Filtered bot file */ protected filterCartridges(baseBotNode: IBotType, blacklist: EquipmentFilterDetails, whitelist: EquipmentFilterDetails): void; diff --git a/Live/CWX_MasterKey/server/types/services/FenceService.d.ts b/Live/CWX_MasterKey/server/types/services/FenceService.d.ts index cb20500..d143380 100644 --- a/Live/CWX_MasterKey/server/types/services/FenceService.d.ts +++ b/Live/CWX_MasterKey/server/types/services/FenceService.d.ts @@ -1,7 +1,7 @@ import { HandbookHelper } from "../helpers/HandbookHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { PresetHelper } from "../helpers/PresetHelper"; -import { FenceLevel } from "../models/eft/common/IGlobals"; +import { FenceLevel, Preset } from "../models/eft/common/IGlobals"; import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; @@ -33,11 +33,23 @@ export declare class FenceService { protected itemFilterService: ItemFilterService; protected localisationService: LocalisationService; protected configServer: ConfigServer; + /** Main assorts you see at all rep levels */ protected fenceAssort: ITraderAssort; + /** Assorts shown on a separte tab when you max out fence rep */ + protected fenceDiscountAssort: ITraderAssort; protected traderConfig: ITraderConfig; protected nextMiniRefreshTimestamp: number; constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, timeUtil: TimeUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, itemHelper: ItemHelper, presetHelper: PresetHelper, itemFilterService: ItemFilterService, localisationService: LocalisationService, configServer: ConfigServer); - protected setFenceAssort(fenceAssort: ITraderAssort): void; + /** + * Replace main fence assort with new assort + * @param assort New assorts to replace old with + */ + protected setFenceAssort(assort: ITraderAssort): void; + /** + * Replace high rep level fence assort with new assort + * @param assort New assorts to replace old with + */ + protected setFenceDiscountAssort(assort: ITraderAssort): void; /** * Get assorts player can purchase * Adjust prices based on fence level of player @@ -46,12 +58,27 @@ export declare class FenceService { */ getFenceAssorts(pmcProfile: IPmcData): ITraderAssort; /** - * Adjust assorts price by a modifier - * @param item - * @param assort - * @param modifier + * Adjust all items contained inside an assort by a multiplier + * @param assort Assort that contains items with prices to adjust + * @param itemMultipler multipler to use on items + * @param presetMultiplier preset multipler to use on presets */ - protected adjustItemPriceByModifier(item: Item, assort: ITraderAssort, modifier: number): void; + protected adjustAssortItemPrices(assort: ITraderAssort, itemMultipler: number, presetMultiplier: number): void; + /** + * Merge two trader assort files together + * @param firstAssort assort 1# + * @param secondAssort assort #2 + * @returns merged assort + */ + protected mergeAssorts(firstAssort: ITraderAssort, secondAssort: ITraderAssort): ITraderAssort; + /** + * Adjust assorts price by a modifier + * @param item assort item details + * @param assort assort to be modified + * @param modifier value to multiply item price by + * @param presetModifier value to multiply preset price by + */ + protected adjustItemPriceByModifier(item: Item, assort: ITraderAssort, modifier: number, presetModifier: number): void; /** * Get fence assorts with no price adjustments based on fence rep * @returns ITraderAssort @@ -80,7 +107,7 @@ export declare class FenceService { /** * Choose an item (not mod) at random and remove from assorts */ - protected removeRandomItemFromAssorts(): void; + protected removeRandomItemFromAssorts(assort: ITraderAssort): void; /** * Get an integer rounded count of items to replace based on percentrage from traderConfig value * @param totalItemCount total item count @@ -102,11 +129,23 @@ export declare class FenceService { */ protected createBaseTraderAssortItem(): ITraderAssort; /** - * Hydrate result parameter object with generated assorts + * Hydrate assorts parameter object with generated assorts * @param assortCount Number of assorts to generate - * @param assorts object to add assorts to + * @param assorts object to add created assorts to */ - protected createAssorts(assortCount: number, assorts: ITraderAssort): void; + protected createAssorts(assortCount: number, assorts: ITraderAssort, loyaltyLevel: number): void; + protected addItemAssorts(assortCount: number, fenceAssortIds: string[], assorts: ITraderAssort, fenceAssort: ITraderAssort, itemTypeCounts: Record, loyaltyLevel: number): void; + /** + * Add preset weapons to fence presets + * @param assortCount how many assorts to add to assorts + * @param defaultWeaponPresets a dictionary of default weapon presets + * @param assorts object to add presets to + * @param loyaltyLevel loyalty level to requre item at + */ + protected addPresets(desiredPresetCount: number, defaultWeaponPresets: Record, assorts: ITraderAssort, loyaltyLevel: number): void; /** * Randomise items' upd properties e.g. med packs/weapons/armor * @param itemDetails Item being randomised diff --git a/Live/CWX_MasterKey/server/types/services/InsuranceService.d.ts b/Live/CWX_MasterKey/server/types/services/InsuranceService.d.ts index 9328b54..886a298 100644 --- a/Live/CWX_MasterKey/server/types/services/InsuranceService.d.ts +++ b/Live/CWX_MasterKey/server/types/services/InsuranceService.d.ts @@ -1,3 +1,4 @@ +import { ITraderBase } from "../models/eft/common/tables/ITrader"; import { DialogueHelper } from "../helpers/DialogueHelper"; import { HandbookHelper } from "../helpers/HandbookHelper"; import { SecureContainerHelper } from "../helpers/SecureContainerHelper"; @@ -49,6 +50,13 @@ export declare class InsuranceService { * @param mapId Id of the map player died/exited that caused the insurance to be issued on */ sendInsuredItems(pmcData: IPmcData, sessionID: string, mapId: string): void; + /** + * Get a timestamp of what insurance items should be sent to player based on the type of trader used to insure + * @param pmcData Player profile + * @param trader Trader used to insure items + * @returns Timestamp to return items to player in seconds + */ + protected getInsuranceReturnTimestamp(pmcData: IPmcData, trader: ITraderBase): number; /** * Store lost gear post-raid inside profile * @param pmcData player profile to store gear in diff --git a/Live/CWX_MasterKey/server/types/services/PaymentService.d.ts b/Live/CWX_MasterKey/server/types/services/PaymentService.d.ts index 26f1952..ac131ea 100644 --- a/Live/CWX_MasterKey/server/types/services/PaymentService.d.ts +++ b/Live/CWX_MasterKey/server/types/services/PaymentService.d.ts @@ -25,12 +25,12 @@ export declare class PaymentService { constructor(logger: ILogger, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request - * @param {Object} pmcData - * @param {Object} body + * @param {IPmcData} pmcData Player profile + * @param {IProcessBuyTradeRequestData} request * @param {string} sessionID * @returns Object */ - payMoney(pmcData: IPmcData, body: IProcessBuyTradeRequestData, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse; + payMoney(pmcData: IPmcData, request: IProcessBuyTradeRequestData, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse; /** * Receive money back after selling * @param {IPmcData} pmcData @@ -62,7 +62,15 @@ export declare class PaymentService { * Post-raid healing would often take money out of the players pockets/secure container * @param a First money stack item * @param b Second money stack item + * @param inventoryItems players inventory items * @returns sort order */ - protected prioritiseStashSort(a: Item, b: Item): number; + protected prioritiseStashSort(a: Item, b: Item, inventoryItems: Item[]): number; + /** + * Recursivly check items parents to see if it is inside the players inventory, not stash + * @param itemId item id to check + * @param inventoryItems player inventory + * @returns true if its in inventory + */ + protected isInInventory(itemId: string, inventoryItems: Item[]): boolean; } diff --git a/Live/CWX_MasterKey/server/types/services/PlayerService.d.ts b/Live/CWX_MasterKey/server/types/services/PlayerService.d.ts index 2f364d5..1195b93 100644 --- a/Live/CWX_MasterKey/server/types/services/PlayerService.d.ts +++ b/Live/CWX_MasterKey/server/types/services/PlayerService.d.ts @@ -1,5 +1,4 @@ import { IPmcData } from "../models/eft/common/IPmcData"; -import { IPlayerIncrementSkillLevelRequestData } from "../models/eft/player/IPlayerIncrementSkillLevelRequestData"; import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { LocalisationService } from "./LocalisationService"; @@ -11,11 +10,10 @@ export declare class PlayerService { /** * increases the profile skill and updates any output * @param {Object} pmcData - * @param {Object} output * @param {String} skillName * @param {Number} amount */ - incrementSkillLevel(pmcData: IPmcData, output: IPlayerIncrementSkillLevelRequestData, skillName: string, amount: number): void; + incrementSkillLevel(pmcData: IPmcData, skillName: string, amount: number): void; /** * @param {Object} pmcData * @returns number diff --git a/Live/CWX_MasterKey/server/types/services/ProfileFixerService.d.ts b/Live/CWX_MasterKey/server/types/services/ProfileFixerService.d.ts index 86a6af8..8d23ebc 100644 --- a/Live/CWX_MasterKey/server/types/services/ProfileFixerService.d.ts +++ b/Live/CWX_MasterKey/server/types/services/ProfileFixerService.d.ts @@ -7,6 +7,7 @@ import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; import { HideoutAreas } from "../models/enums/HideoutAreas"; import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { TimeUtil } from "../utils/TimeUtil"; import { Watermark } from "../utils/Watermark"; import { LocalisationService } from "./LocalisationService"; export declare class ProfileFixerService { @@ -14,8 +15,9 @@ export declare class ProfileFixerService { protected watermark: Watermark; protected hideoutHelper: HideoutHelper; protected localisationService: LocalisationService; + protected timeUtil: TimeUtil; protected databaseServer: DatabaseServer; - constructor(logger: ILogger, watermark: Watermark, hideoutHelper: HideoutHelper, localisationService: LocalisationService, databaseServer: DatabaseServer); + constructor(logger: ILogger, watermark: Watermark, hideoutHelper: HideoutHelper, localisationService: LocalisationService, timeUtil: TimeUtil, databaseServer: DatabaseServer); /** * Find issues in the pmc profile data that may cause issues and fix them * @param pmcProfile profile to check and fix @@ -32,6 +34,8 @@ export declare class ProfileFixerService { * @param pmcProfile profile to remove old counters from */ removeDanglingConditionCounters(pmcProfile: IPmcData): void; + addLighthouseKeeperIfMissing(pmcProfile: IPmcData): void; + protected addUnlockedInfoObjectIfMissing(pmcProfile: IPmcData): void; protected removeDanglingBackendCounters(pmcProfile: IPmcData): void; protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; @@ -45,6 +49,11 @@ export declare class ProfileFixerService { protected updateProfileQuestDataValues(pmcProfile: IPmcData): void; protected addMissingRepeatableQuestsProperty(pmcProfile: IPmcData): void; protected addMissingWorkbenchWeaponSkills(pmcProfile: IPmcData): void; + /** + * Some profiles have hideout maxed and therefore no improvements + * @param pmcProfile Profile to add improvement data to + */ + protected addMissingWallImprovements(pmcProfile: IPmcData): void; /** * A new property was added to slot items "locationIndex", if this is missing, the hideout slot item must be removed * @param pmcProfile Profile to find and remove slots from @@ -85,4 +94,19 @@ export declare class ProfileFixerService { * @param pmcProfile Profile to check inventory of */ checkForOrphanedModdedItems(pmcProfile: IPmcData): void; + /** + * Add `Improvements` object to hideout if missing - added in eft 13.0.21469 + * @param pmcProfile profile to update + */ + addMissingUpgradesPropertyToHideout(pmcProfile: IPmcData): void; + /** + * Iterate over associated profile template and check all hideout areas exist, add if not + * @param fullProfile Profile to update + */ + addMissingHideoutAreasToProfile(fullProfile: IAkiProfile): void; + /** + * These used to be used for storing scav case rewards, rewards are now generated on pickup + * @param pmcProfile Profile to update + */ + removeLegacyScavCaseProductionCrafts(pmcProfile: IPmcData): void; } diff --git a/Live/CWX_MasterKey/server/types/services/RagfairLinkedItemService.d.ts b/Live/CWX_MasterKey/server/types/services/RagfairLinkedItemService.d.ts index 6c34ee0..51511f9 100644 --- a/Live/CWX_MasterKey/server/types/services/RagfairLinkedItemService.d.ts +++ b/Live/CWX_MasterKey/server/types/services/RagfairLinkedItemService.d.ts @@ -1,10 +1,21 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; +import { ItemHelper } from "../helpers/ItemHelper"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { DatabaseServer } from "../servers/DatabaseServer"; export declare class RagfairLinkedItemService { protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; protected linkedItemsCache: Record>; - constructor(databaseServer: DatabaseServer); + constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper); getLinkedItems(linkedSearchId: string): Iterable; + /** + * Create Dictionary of every item and the items associated with it + */ protected buildLinkedItemTable(): void; + /** + * Add ammo to revolvers linked item dictionary + * @param cylinder Revolvers cylinder + * @param applyLinkedItems + */ + protected addRevolverCylinderAmmoToLinkedItems(cylinder: ITemplateItem, applyLinkedItems: (items: string[]) => void): void; protected getFilters(item: ITemplateItem, slot: string): string[]; } diff --git a/Live/CWX_MasterKey/server/types/services/RagfairOfferService.d.ts b/Live/CWX_MasterKey/server/types/services/RagfairOfferService.d.ts index 133e6a7..fc08d39 100644 --- a/Live/CWX_MasterKey/server/types/services/RagfairOfferService.d.ts +++ b/Live/CWX_MasterKey/server/types/services/RagfairOfferService.d.ts @@ -1,4 +1,3 @@ -import { RagfairOfferHolder } from "../utils/RagfairOfferHolder"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { Item } from "../models/eft/common/tables/IItem"; @@ -11,6 +10,7 @@ import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { RagfairOfferHolder } from "../utils/RagfairOfferHolder"; import { TimeUtil } from "../utils/TimeUtil"; import { LocalisationService } from "./LocalisationService"; import { RagfairCategoriesService } from "./RagfairCategoriesService"; @@ -53,8 +53,17 @@ export declare class RagfairOfferService { * @returns offer exists - true */ doesOfferExist(offerId: string): boolean; + /** + * Remove an offer from ragfair by offer id + * @param offerId Offer id to remove + */ removeOfferById(offerId: string): void; - removeOfferStack(offerID: string, amount: number): void; + /** + * Reduce size of an offer stack by specified amount + * @param offerId Offer to adjust stack size of + * @param amount How much to deduct from offers stack size + */ + removeOfferStack(offerId: string, amount: number): void; removeAllOffersByTrader(traderId: string): void; /** * Do the trader offers on flea need to be refreshed @@ -64,6 +73,10 @@ export declare class RagfairOfferService { traderOffersNeedRefreshing(traderID: string): boolean; addPlayerOffers(): void; expireStaleOffers(): void; + /** + * Remove stale offer from flea + * @param staleOffer Stale offer to process + */ protected processStaleOffer(staleOffer: IRagfairOffer): void; protected returnPlayerOffer(offer: IRagfairOffer): IItemEventRouterResponse; } diff --git a/Live/CWX_MasterKey/server/types/services/RagfairPriceService.d.ts b/Live/CWX_MasterKey/server/types/services/RagfairPriceService.d.ts index cf0459c..8b68bc4 100644 --- a/Live/CWX_MasterKey/server/types/services/RagfairPriceService.d.ts +++ b/Live/CWX_MasterKey/server/types/services/RagfairPriceService.d.ts @@ -1,6 +1,8 @@ +import { OnLoad } from "../di/OnLoad"; import { HandbookHelper } from "../helpers/HandbookHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { PresetHelper } from "../helpers/PresetHelper"; +import { TraderHelper } from "../helpers/TraderHelper"; import { Preset } from "../models/eft/common/IGlobals"; import { Item } from "../models/eft/common/tables/IItem"; import { IBarterScheme } from "../models/eft/common/tables/ITrader"; @@ -10,7 +12,6 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { RandomUtil } from "../utils/RandomUtil"; -import { OnLoad } from "../di/OnLoad"; /** * Stores flea prices for items as well as methods to interact with them */ @@ -20,13 +21,14 @@ export declare class RagfairPriceService implements OnLoad { protected logger: ILogger; protected itemHelper: ItemHelper; protected presetHelper: PresetHelper; + protected traderHelper: TraderHelper; protected randomUtil: RandomUtil; protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected generatedDynamicPrices: boolean; protected generatedStaticPrices: boolean; protected prices: IRagfairServerPrices; - constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, randomUtil: RandomUtil, configServer: ConfigServer); + constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, configServer: ConfigServer); /** * Generate static (handbook) and dynamic (prices.json) flea prices, store inside class as dictionaries */ @@ -41,7 +43,7 @@ export declare class RagfairPriceService implements OnLoad { */ protected generateDynamicPrices(): void; /** - * Get the dynamic price for an item. If value doesn't exist, use static (handbook0) value. + * Get the dynamic price for an item. If value doesn't exist, use static (handbook) value. * if no static value, return 1 * @param tplId Item tpl id to get price for * @returns price in roubles @@ -65,6 +67,7 @@ export declare class RagfairPriceService implements OnLoad { * @returns Dictionary of item tpls and rouble cost */ getAllFleaPrices(): Record; + getAllStaticPrices(): Record; /** * Get the percentage difference between two values * @param a numerical value a @@ -107,11 +110,20 @@ export declare class RagfairPriceService implements OnLoad { * @returns */ protected getWeaponPresetPrice(item: Item, items: Item[], existingPrice: number): number; + /** + * Get the highest price for an item that is stored in handbook or trader assorts + * @param itemTpl Item to get highest price of + * @returns rouble cost + */ + protected getHighestHandbookOrTraderPriceAsRouble(itemTpl: string): 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; + protected getWeaponPreset(presets: Preset[], weapon: Item): { + isDefault: boolean; + preset: Preset; + }; } diff --git a/Live/CWX_MasterKey/server/types/services/RepairService.d.ts b/Live/CWX_MasterKey/server/types/services/RepairService.d.ts index d3f1b35..a3c6c7a 100644 --- a/Live/CWX_MasterKey/server/types/services/RepairService.d.ts +++ b/Live/CWX_MasterKey/server/types/services/RepairService.d.ts @@ -1,27 +1,33 @@ +import { ItemHelper } from "../helpers/ItemHelper"; import { QuestHelper } from "../helpers/QuestHelper"; import { RepairHelper } from "../helpers/RepairHelper"; import { TraderHelper } from "../helpers/TraderHelper"; +import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { RepairKitsInfo } from "../models/eft/repair/IRepairActionDataRequest"; import { RepairItem } from "../models/eft/repair/ITraderRepairActionDataRequest"; -import { IRepairConfig } from "../models/spt/config/IRepairConfig"; +import { BonusSettings, IRepairConfig } from "../models/spt/config/IRepairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { RandomUtil } from "../utils/RandomUtil"; import { PaymentService } from "./PaymentService"; export declare class RepairService { protected logger: ILogger; protected databaseServer: DatabaseServer; protected questHelper: QuestHelper; + protected randomUtil: RandomUtil; + protected itemHelper: ItemHelper; protected traderHelper: TraderHelper; + protected weightedRandomHelper: WeightedRandomHelper; protected paymentService: PaymentService; protected repairHelper: RepairHelper; protected configServer: ConfigServer; - repairConfig: IRepairConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, questHelper: QuestHelper, traderHelper: TraderHelper, paymentService: PaymentService, repairHelper: RepairHelper, configServer: ConfigServer); + protected repairConfig: IRepairConfig; + constructor(logger: ILogger, databaseServer: DatabaseServer, questHelper: QuestHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, configServer: ConfigServer); /** * Use trader to repair an items durability * @param sessionID Session id @@ -46,9 +52,8 @@ export declare class RepairService { * @param sessionId Session id * @param repairDetails details of item repaired, cost/item * @param pmcData Profile to add points to - * @param output IItemEventRouterResponse */ - addRepairSkillPoints(sessionId: string, repairDetails: RepairDetails, pmcData: IPmcData, output: IItemEventRouterResponse): void; + addRepairSkillPoints(sessionId: string, repairDetails: RepairDetails, pmcData: IPmcData): void; /** * * @param sessionId Session id @@ -59,15 +64,65 @@ export declare class RepairService { * @returns Details of repair, item/price */ repairItemByKit(sessionId: string, pmcData: IPmcData, repairKits: RepairKitsInfo[], itemToRepairId: string, output: IItemEventRouterResponse): RepairDetails; + /** + * Calculate value repairkit points need to be divided by to get the durability points to be added to an item + * @param itemToRepairDetails Item to repair details + * @param isArmor Is the item being repaired armor + * @param pmcData Player profile + * @returns Number to divide kit points by + */ + protected getKitDivisor(itemToRepairDetails: ITemplateItem, isArmor: boolean, pmcData: IPmcData): number; + /** + * Get the bonus multiplier for a skill from a player profile + * @param skillBonusName Name of bonus to get multipler of + * @param pmcData Player profile to look in for skill + * @returns Multiplier value + */ + protected getBonusMultiplierValue(skillBonusName: string, pmcData: IPmcData): number; /** * Update repair kits Resource object if it doesn't exist * @param repairKitDetails Repair kit details from db * @param repairKitInInventory Repair kit to update */ protected addMaxResourceToKitIfMissing(repairKitDetails: ITemplateItem, repairKitInInventory: Item): void; + /** + * Chance to apply buff to an item (Armor/weapon) if repaired by armor kit + * @param repairDetails Repair details of item + * @param pmcData Player profile + */ + addBuffToItem(repairDetails: RepairDetails, pmcData: IPmcData): void; + /** + * Add buff to item + * @param itemConfig weapon/armor config + * @param repairDetails Details for item to repair + */ + protected addBuff(itemConfig: BonusSettings, repairDetails: RepairDetails): void; + /** + * Check if item should be buffed by checking the item type and relevant player skill level + * @param repairDetails Item that was repaired + * @param itemTpl tpl of item to be buffed + * @param pmcData Player profile + * @returns True if item should have buff applied + */ + protected shouldBuffItem(repairDetails: RepairDetails, pmcData: IPmcData): boolean; + /** + * Based on item, what underlying skill does this item use for buff settings + * @param itemTemplate Item to check for skill + * @returns Skill name + */ + protected getItemSkillType(itemTemplate: ITemplateItem): string; + /** + * Ensure multiplier is between 1 and 0.01 + * @param receiveDurabilityMaxPercent Max durabiltiy percent + * @param receiveDurabilityPercent current durability percent + * @returns durability multipler value + */ + protected getDurabilityMultiplier(receiveDurabilityMaxPercent: number, receiveDurabilityPercent: number): number; } export declare class RepairDetails { repairCost?: number; repairedItem: Item; repairedItemIsArmor: boolean; + repairAmount: number; + repairedByKit: boolean; } diff --git a/Live/CWX_MasterKey/server/types/services/SeasonalEventService.d.ts b/Live/CWX_MasterKey/server/types/services/SeasonalEventService.d.ts index ac765ff..7474018 100644 --- a/Live/CWX_MasterKey/server/types/services/SeasonalEventService.d.ts +++ b/Live/CWX_MasterKey/server/types/services/SeasonalEventService.d.ts @@ -16,17 +16,51 @@ export declare class SeasonalEventService { constructor(logger: ILogger, databaseServer: DatabaseServer, localisationService: LocalisationService, botHelper: BotHelper, configServer: ConfigServer); protected get events(): Record; protected get christmasEventItems(): string[]; + protected get halloweenEventItems(): string[]; /** * Get an array of christmas items found in bots inventories as loot * @returns array */ getChristmasEventItems(): string[]; - itemIsChristmasRelated(itemId: string): boolean; + /** + * Get an array of halloween items found in bots inventories as loot + * @returns array + */ + getHalloweenEventItems(): string[]; + itemIsChristmasRelated(itemTpl: string): boolean; + itemIsHalloweenRelated(itemTpl: string): boolean; + /** + * Check if item id exists in christmas or halloween event arrays + * @param itemTpl item tpl to check for + * @returns + */ + itemIsSeasonalRelated(itemTpl: string): boolean; + /** + * Get an array of items that appear during a seasonal event + * returns multiple seasonal event items if they are both active + * @returns array of tpl strings + */ + getAllSeasonalEventItems(): string[]; + /** + * Get an array of seasonal items that should be blocked as seasonal is not active + * @returns Array of tpl strings + */ + getSeasonalEventItemsToBlock(): string[]; + /** + * Is a seasonal event currently active + * @returns true if event is active + */ + seasonalEventEnabled(): boolean; /** * is christmas event active * @returns true if active */ christmasEventEnabled(): boolean; + /** + * is christmas event active + * @returns true if active + */ + halloweenEventEnabled(): boolean; /** * Is detection of seasonal events enabled (halloween / christmas) * @returns true if seasonal events should be checked for @@ -59,14 +93,22 @@ export declare class SeasonalEventService { * @param eventName Name of the event to enable. e.g. Christmas */ protected updateGlobalEvents(globalConfig: Config, eventName: string): void; + /** + * Add lootble items from backpack into patrol.ITEMS_TO_DROP difficulty property + */ + protected addLootItemsToGifterDropItemsList(): void; /** * Read in data from seasonalEvents.json and add found equipment items to bots * @param eventName Name of the event to read equipment in from config */ - protected addEventGearToScavs(eventName: string): void; + protected addEventGearToBots(eventName: string): void; protected addPumpkinsToScavBackpacks(): void; /** * Set Khorovod(dancing tree) chance to 100% on all maps that support it */ protected enableDancingTree(): void; + /** + * Add santa to maps + */ + protected addGifterBotToMaps(): void; } diff --git a/Live/CWX_MasterKey/server/types/services/mod/onLoad/OnLoadMod.d.ts b/Live/CWX_MasterKey/server/types/services/mod/onLoad/OnLoadMod.d.ts index 82909c3..a4b58b5 100644 --- a/Live/CWX_MasterKey/server/types/services/mod/onLoad/OnLoadMod.d.ts +++ b/Live/CWX_MasterKey/server/types/services/mod/onLoad/OnLoadMod.d.ts @@ -1,5 +1,5 @@ import { OnLoad } from "../../../di/OnLoad"; -export declare class OnLoadMod extends OnLoad { +export declare class OnLoadMod implements OnLoad { private onLoadOverride; private getRouteOverride; constructor(onLoadOverride: () => void, getRouteOverride: () => string); diff --git a/Live/CWX_MasterKey/server/types/services/mod/onUpdate/OnUpdateMod.d.ts b/Live/CWX_MasterKey/server/types/services/mod/onUpdate/OnUpdateMod.d.ts index edd2a2c..8dfe6dd 100644 --- a/Live/CWX_MasterKey/server/types/services/mod/onUpdate/OnUpdateMod.d.ts +++ b/Live/CWX_MasterKey/server/types/services/mod/onUpdate/OnUpdateMod.d.ts @@ -1,5 +1,5 @@ import { OnUpdate } from "../../../di/OnUpdate"; -export declare class OnUpdateMod extends OnUpdate { +export declare class OnUpdateMod implements OnUpdate { private onUpdateOverride; private getRouteOverride; constructor(onUpdateOverride: (timeSinceLastRun: number) => boolean, getRouteOverride: () => string); diff --git a/Live/CWX_MasterKey/server/types/utils/DatabaseImporter.d.ts b/Live/CWX_MasterKey/server/types/utils/DatabaseImporter.d.ts index 0c39aa8..c09d63a 100644 --- a/Live/CWX_MasterKey/server/types/utils/DatabaseImporter.d.ts +++ b/Live/CWX_MasterKey/server/types/utils/DatabaseImporter.d.ts @@ -1,37 +1,35 @@ 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 { LocalisationService } from "../services/LocalisationService"; +import { EncodingUtil } from "./EncodingUtil"; +import { HashUtil } from "./HashUtil"; +import { ImporterUtil } from "./ImporterUtil"; import { JsonUtil } from "./JsonUtil"; import { VFS } from "./VFS"; -export declare class DatabaseImporter extends OnLoad { +export declare class DatabaseImporter implements OnLoad { protected logger: ILogger; protected vfs: VFS; protected jsonUtil: JsonUtil; protected localisationService: LocalisationService; protected databaseServer: DatabaseServer; protected imageRouter: ImageRouter; - constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, localisationService: LocalisationService, databaseServer: DatabaseServer, imageRouter: ImageRouter); + protected encodingUtil: EncodingUtil; + protected hashUtil: HashUtil; + protected importerUtil: ImporterUtil; + private hashedFile; + private valid; + private filepath; + constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, localisationService: LocalisationService, databaseServer: DatabaseServer, imageRouter: ImageRouter, encodingUtil: EncodingUtil, hashUtil: HashUtil, importerUtil: ImporterUtil); onLoad(): Promise; /** * Read all json files in database folder and map into a json object * @param filepath path to database folder */ protected hydrateDatabase(filepath: string): Promise; + private onReadValidate; getRoute(): string; - /** - * Load files into js objects recursively (asynchronous) - * @param filepath Path to folder with files - * @returns - */ - loadRecursiveAsync(filepath: string): Promise; - /** - * Load files into js objects recursively (synchronous) - * @param filepath Path to folder with files - * @returns - */ - loadRecursive(filepath: string): IDatabaseTables; + private validateFile; loadImages(filepath: string): void; } diff --git a/Live/CWX_MasterKey/server/types/utils/EncodingUtil.d.ts b/Live/CWX_MasterKey/server/types/utils/EncodingUtil.d.ts new file mode 100644 index 0000000..dabb97a --- /dev/null +++ b/Live/CWX_MasterKey/server/types/utils/EncodingUtil.d.ts @@ -0,0 +1,15 @@ +export declare class EncodingUtil { + encode(value: string, encode: EncodeType): string; + decode(value: string, encode: EncodeType): string; + fromBase64(value: string): string; + toBase64(value: string): string; + fromHex(value: string): string; + toHex(value: string): string; +} +export declare enum EncodeType { + BASE64 = "base64", + HEX = "hex", + ASCII = "ascii", + BINARY = "binary", + UTF8 = "utf8" +} diff --git a/Live/CWX_MasterKey/server/types/utils/ImporterUtil.d.ts b/Live/CWX_MasterKey/server/types/utils/ImporterUtil.d.ts new file mode 100644 index 0000000..75aaf54 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/utils/ImporterUtil.d.ts @@ -0,0 +1,21 @@ +import { JsonUtil } from "./JsonUtil"; +import { VFS } from "./VFS"; +export declare class ImporterUtil { + protected vfs: VFS; + protected jsonUtil: JsonUtil; + constructor(vfs: VFS, jsonUtil: JsonUtil); + /** + * Load files into js objects recursively (asynchronous) + * @param filepath Path to folder with files + * @returns Promise return T type associated with this class + */ + loadRecursiveAsync(filepath: string, onReadCallback?: (fileWithPath: string, data: string) => void, onObjectDeserialized?: (fileWithPath: string, object: any) => void): Promise; + /** + * Load files into js objects recursively (synchronous) + * @param filepath Path to folder with files + * @returns + */ + loadRecursive(filepath: string, onReadCallback?: (fileWithPath: string, data: string) => void, onObjectDeserialized?: (fileWithPath: string, object: any) => void): T; + loadAsync(filepath: string, strippablePath?: string, onReadCallback?: (fileWithPath: string, data: string) => void, onObjectDeserialized?: (fileWithPath: string, object: any) => void): Promise; + protected placeObject(fileDeserialized: any, strippedFilePath: string, result: T, strippablePath: string): void; +} diff --git a/Live/CWX_MasterKey/server/types/utils/JsonUtil.d.ts b/Live/CWX_MasterKey/server/types/utils/JsonUtil.d.ts index 2591142..229dc26 100644 --- a/Live/CWX_MasterKey/server/types/utils/JsonUtil.d.ts +++ b/Live/CWX_MasterKey/server/types/utils/JsonUtil.d.ts @@ -14,13 +14,14 @@ export declare class JsonUtil { * @param prettify Should output be prettified? * @returns string */ - serialize(data: any, prettify?: boolean): string; + serialize(data: T, prettify?: boolean): string; /** * From string to object * @param jsonString json string to turn into object * @returns object */ - deserialize(jsonString: string): any; - deserializeWithCacheCheck(jsonString: string, filePath: string): string; + deserialize(jsonString: string, filename?: string): T; + deserializeWithCacheCheckAsync(jsonString: string, filePath: string): Promise; + deserializeWithCacheCheck(jsonString: string, filePath: string): T; clone(data: T): T; } diff --git a/Live/CWX_MasterKey/server/types/utils/RandomUtil.d.ts b/Live/CWX_MasterKey/server/types/utils/RandomUtil.d.ts index aa556e3..fc0b05d 100644 --- a/Live/CWX_MasterKey/server/types/utils/RandomUtil.d.ts +++ b/Live/CWX_MasterKey/server/types/utils/RandomUtil.d.ts @@ -110,6 +110,7 @@ export declare class RandomUtil { getIntEx(max: number): number; getFloat(min: number, max: number): number; getBool(): boolean; + getPercentOfValue(percent: number, number: number, toFixed?: number): number; /** * Check if number passes a check out of 100 * @param chancePercent value check needs to be above diff --git a/Live/CWX_MasterKey/server/types/utils/UUidGenerator.d.ts b/Live/CWX_MasterKey/server/types/utils/UUidGenerator.d.ts index 000b719..ed1ffa6 100644 --- a/Live/CWX_MasterKey/server/types/utils/UUidGenerator.d.ts +++ b/Live/CWX_MasterKey/server/types/utils/UUidGenerator.d.ts @@ -1,4 +1,4 @@ import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; export declare class UUidGenerator implements IUUidGenerator { - generate: () => string; + generate(): string; } diff --git a/Live/CWX_MasterKey/server/types/utils/VFS.d.ts b/Live/CWX_MasterKey/server/types/utils/VFS.d.ts index e5eaf02..267b10f 100644 --- a/Live/CWX_MasterKey/server/types/utils/VFS.d.ts +++ b/Live/CWX_MasterKey/server/types/utils/VFS.d.ts @@ -1,7 +1,7 @@ /// /// -import "reflect-metadata"; import fs from "fs"; +import "reflect-metadata"; import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; export declare class VFS { @@ -32,8 +32,9 @@ export declare class VFS { createDirAsync(filepath: string): Promise; copyDir(filepath: string, target: string, fileExtensions?: string | string[]): void; copyDirAsync(filepath: string, target: string, fileExtensions: string | string[]): Promise; - readFile(filepath: string): any; - readFileAsync(filepath: string): Promise; + readFile(...args: Parameters): string; + readFileAsync(path: fs.PathLike): Promise; + private isBuffer; writeFile(filepath: any, data?: string, append?: boolean, atomic?: boolean): void; writeFileAsync(filepath: any, data?: string, append?: boolean, atomic?: boolean): Promise; getFiles(filepath: string): string[]; diff --git a/Live/CWX_MasterKey/server/types/utils/collections/queue/Queue.d.ts b/Live/CWX_MasterKey/server/types/utils/collections/queue/Queue.d.ts new file mode 100644 index 0000000..645d462 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/utils/collections/queue/Queue.d.ts @@ -0,0 +1,12 @@ +export declare class Queue { + private elements; + private head; + private tail; + constructor(); + enqueue(element: T): void; + enqueueAll(elements: T[]): void; + dequeue(): T; + peek(): T; + getLength(): number; + isEmpty(): boolean; +} diff --git a/Live/CWX_MasterKey/server/types/utils/decorators/Singleton.d.ts b/Live/CWX_MasterKey/server/types/utils/decorators/Singleton.d.ts deleted file mode 100644 index 7e89026..0000000 --- a/Live/CWX_MasterKey/server/types/utils/decorators/Singleton.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -import type constructor from "./constructor"; -import { InjectionToken } from "tsyringe"; -declare function singleton(token?: InjectionToken): (target: constructor) => void; -export default singleton; diff --git a/Live/CWX_MasterKey/server/types/utils/decorators/constructor.d.ts b/Live/CWX_MasterKey/server/types/utils/decorators/constructor.d.ts deleted file mode 100644 index 416f354..0000000 --- a/Live/CWX_MasterKey/server/types/utils/decorators/constructor.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -declare type constructor = { - new (...args: any[]): T; -}; -export default constructor; diff --git a/Live/CWX_MasterKey/server/types/utils/Logger.d.ts b/Live/CWX_MasterKey/server/types/utils/logging/AbstractWinstonLogger.d.ts similarity index 70% rename from Live/CWX_MasterKey/server/types/utils/Logger.d.ts rename to Live/CWX_MasterKey/server/types/utils/logging/AbstractWinstonLogger.d.ts index 1088701..1ae1100 100644 --- a/Live/CWX_MasterKey/server/types/utils/Logger.d.ts +++ b/Live/CWX_MasterKey/server/types/utils/logging/AbstractWinstonLogger.d.ts @@ -1,19 +1,17 @@ /// import fs from "fs"; 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 { +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 abstract class AbstractWinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected uuidGenerator: IUUidGenerator; protected showDebugInConsole: boolean; - protected folderPath: string; - protected file: string; protected filePath: string; protected logLevels: { levels: { @@ -47,6 +45,13 @@ export declare class WinstonLogger implements ILogger { protected logger: winston.Logger & SptLogger; protected writeFilePromisify: (path: fs.PathLike, data: string, options?: any) => Promise; constructor(asyncQueue: IAsyncQueue, uuidGenerator: IUUidGenerator); + protected abstract isLogToFile(): boolean; + protected abstract isLogToConsole(): boolean; + protected abstract isLogExceptions(): boolean; + protected abstract getFilePath(): string; + protected abstract getFileName(): string; + protected getLogMaxSize(): string; + protected getLogMaxFiles(): string; writeToLogFile(data: string | Daum): Promise; log(data: string | Error | Record, color: string, backgroundColor?: string): Promise; error(data: string | Record): Promise; diff --git a/Live/CWX_MasterKey/server/types/utils/logging/WinstonMainLogger.d.ts b/Live/CWX_MasterKey/server/types/utils/logging/WinstonMainLogger.d.ts new file mode 100644 index 0000000..3c67902 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/utils/logging/WinstonMainLogger.d.ts @@ -0,0 +1,13 @@ +import { IAsyncQueue } from "../../models/spt/utils/IAsyncQueue"; +import { IUUidGenerator } from "../../models/spt/utils/IUuidGenerator"; +import { AbstractWinstonLogger } from "./AbstractWinstonLogger"; +export declare class WinstonMainLogger extends AbstractWinstonLogger { + protected asyncQueue: IAsyncQueue; + protected uuidGenerator: IUUidGenerator; + constructor(asyncQueue: IAsyncQueue, uuidGenerator: IUUidGenerator); + protected isLogExceptions(): boolean; + protected isLogToFile(): boolean; + protected isLogToConsole(): boolean; + protected getFilePath(): string; + protected getFileName(): string; +} diff --git a/Live/CWX_MasterKey/server/types/utils/logging/WinstonRequestLogger.d.ts b/Live/CWX_MasterKey/server/types/utils/logging/WinstonRequestLogger.d.ts new file mode 100644 index 0000000..1475e43 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/utils/logging/WinstonRequestLogger.d.ts @@ -0,0 +1,14 @@ +import { IAsyncQueue } from "../../models/spt/utils/IAsyncQueue"; +import { IUUidGenerator } from "../../models/spt/utils/IUuidGenerator"; +import { AbstractWinstonLogger } from "./AbstractWinstonLogger"; +export declare class WinstonRequestLogger extends AbstractWinstonLogger { + protected asyncQueue: IAsyncQueue; + protected uuidGenerator: IUUidGenerator; + constructor(asyncQueue: IAsyncQueue, uuidGenerator: IUUidGenerator); + protected isLogExceptions(): boolean; + protected isLogToFile(): boolean; + protected isLogToConsole(): boolean; + protected getFilePath(): string; + protected getFileName(): string; + protected getLogMaxSize(): string; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.8/BepInEx/plugins/CWX-WeatherPatcher.dll b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.9/BepInEx/plugins/CWX-WeatherPatcher.dll similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.8/BepInEx/plugins/CWX-WeatherPatcher.dll rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.9/BepInEx/plugins/CWX-WeatherPatcher.dll diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher.csproj b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher.csproj index fb49176..6544cf5 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher.csproj +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher.csproj @@ -3,7 +3,7 @@ net472 CWX-WeatherPatcher - 2.4.8 + 2.4.9 diff --git a/Live/CWX_WeatherPatcher/WeatherPatcher.cs b/Live/CWX_WeatherPatcher/WeatherPatcher.cs index facd787..b1e497d 100644 --- a/Live/CWX_WeatherPatcher/WeatherPatcher.cs +++ b/Live/CWX_WeatherPatcher/WeatherPatcher.cs @@ -3,7 +3,7 @@ using EFT.Weather; namespace CWX_WeatherPatcher { - [BepInPlugin("com.CWX.WeatherPatcher", "CWX-WeatherPatcher", "2.4.8")] + [BepInPlugin("com.CWX.WeatherPatcher", "CWX-WeatherPatcher", "2.4.9")] public class WeatherPatcher : BaseUnityPlugin { private void Awake()