diff --git a/TypeScript/10ScopesAndTypes/types/Config.d.ts b/TypeScript/10ScopesAndTypes/types/Config.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/10ScopesAndTypes/types/Config.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/10ScopesAndTypes/types/callbacks/BotCallbacks.d.ts b/TypeScript/10ScopesAndTypes/types/callbacks/BotCallbacks.d.ts index 358d5e3..9602975 100644 --- a/TypeScript/10ScopesAndTypes/types/callbacks/BotCallbacks.d.ts +++ b/TypeScript/10ScopesAndTypes/types/callbacks/BotCallbacks.d.ts @@ -1,8 +1,8 @@ import { BotController } from "../controllers/BotController"; import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IBotBase } from "../models/eft/common/tables/IBotBase"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class BotCallbacks { private botController; diff --git a/TypeScript/10ScopesAndTypes/types/callbacks/BundleCallbacks.d.ts b/TypeScript/10ScopesAndTypes/types/callbacks/BundleCallbacks.d.ts index 08c33c0..b007ab8 100644 --- a/TypeScript/10ScopesAndTypes/types/callbacks/BundleCallbacks.d.ts +++ b/TypeScript/10ScopesAndTypes/types/callbacks/BundleCallbacks.d.ts @@ -1,8 +1,8 @@ import { BundleLoader } from "../loaders/BundleLoader"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class BundleCallbacks { private logger; private httpResponse; diff --git a/TypeScript/10ScopesAndTypes/types/callbacks/CustomizationCallbacks.d.ts b/TypeScript/10ScopesAndTypes/types/callbacks/CustomizationCallbacks.d.ts index 0a4265b..918b8b6 100644 --- a/TypeScript/10ScopesAndTypes/types/callbacks/CustomizationCallbacks.d.ts +++ b/TypeScript/10ScopesAndTypes/types/callbacks/CustomizationCallbacks.d.ts @@ -1,22 +1,23 @@ -import { SaveServer } from "../servers/SaveServer"; import { CustomizationController } from "../controllers/CustomizationController"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { ISuit } from "../models/eft/common/tables/ITrader"; import { IBuyClothingRequestData } from "../models/eft/customization/IBuyClothingRequestData"; import { IWearClothingRequestData } from "../models/eft/customization/IWearClothingRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { ISuit } from "../models/eft/common/tables/ITrader"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class CustomizationCallbacks { private customizationController; private saveServer; private httpResponse; constructor(customizationController: CustomizationController, saveServer: SaveServer, httpResponse: HttpResponseUtil); - getSuits(url: string, info: any, sessionID: string): IGetBodyResponseData<{ + getSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<{ _id: string; suites: string[]; }>; - getTraderSuits(url: string, info: any, sessionID: string): IGetBodyResponseData; + getTraderSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; wearClothing(pmcData: IPmcData, body: IWearClothingRequestData, sessionID: string): IItemEventRouterResponse; buyClothing(pmcData: IPmcData, body: IBuyClothingRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/10ScopesAndTypes/types/callbacks/DataCallbacks.d.ts b/TypeScript/10ScopesAndTypes/types/callbacks/DataCallbacks.d.ts index ac9cab7..018420e 100644 --- a/TypeScript/10ScopesAndTypes/types/callbacks/DataCallbacks.d.ts +++ b/TypeScript/10ScopesAndTypes/types/callbacks/DataCallbacks.d.ts @@ -1,4 +1,3 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGlobals } from "../models/eft/common/IGlobals"; import { ICustomizationItem } from "../models/eft/common/tables/ICustomizationItem"; @@ -10,6 +9,7 @@ import { IHideoutSettingsBase } from "../models/eft/hideout/IHideoutSettingsBase import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { ILanguageBase } from "../models/spt/server/ILocaleBase"; import { ISettingsBase } from "../models/spt/server/ISettingsBase"; +import { DatabaseServer } from "../servers/DatabaseServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class DataCallbacks { private httpResponse; diff --git a/TypeScript/10ScopesAndTypes/types/callbacks/DialogueCallbacks.d.ts b/TypeScript/10ScopesAndTypes/types/callbacks/DialogueCallbacks.d.ts index e81255c..3b6fbd1 100644 --- a/TypeScript/10ScopesAndTypes/types/callbacks/DialogueCallbacks.d.ts +++ b/TypeScript/10ScopesAndTypes/types/callbacks/DialogueCallbacks.d.ts @@ -1,25 +1,25 @@ -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { HashUtil } from "../utils/HashUtil"; -import { TimeUtil } from "../utils/TimeUtil"; import { DialogueController } from "../controllers/DialogueController"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { DialogueInfo } from "../models/eft/profile/IAkiProfile"; -import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; -import { IGetMailDialogViewRequestData } from "../models/eft/dialog/IGetMailDialogViewRequestData"; -import { IGetMailDialogInfoRequestData } from "../models/eft/dialog/IGetMailDialogInfoRequestData"; -import { IRemoveDialogRequestData } from "../models/eft/dialog/IRemoveDialogRequestData"; -import { IGetMailDialogListRequestData } from "../models/eft/dialog/IGetMailDialogListRequestData"; +import { OnUpdate } from "../di/OnUpdate"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IFriendRequestData } from "../models/eft/dialog/IFriendRequestData"; -import { IPinDialogRequestData } from "../models/eft/dialog/IPinDialogRequestData"; -import { ISetDialogReadRequestData } from "../models/eft/dialog/ISetDialogReadRequestData"; import { IGetAllAttachmentsRequestData } from "../models/eft/dialog/IGetAllAttachmentsRequestData"; +import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachmentsResponse"; import { IGetChatServerListRequestData } from "../models/eft/dialog/IGetChatServerListRequestData"; import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse"; -import { ISendMessageRequest } from "../models/eft/dialog/ISendMessageRequest"; +import { IGetMailDialogInfoRequestData } from "../models/eft/dialog/IGetMailDialogInfoRequestData"; +import { IGetMailDialogListRequestData } from "../models/eft/dialog/IGetMailDialogListRequestData"; +import { IGetMailDialogViewRequestData } from "../models/eft/dialog/IGetMailDialogViewRequestData"; import { IGetMailDialogViewResponseData } from "../models/eft/dialog/IGetMailDialogViewResponseData"; -import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachmentsResponse"; -import { OnUpdate } from "../di/OnUpdate"; +import { IPinDialogRequestData } from "../models/eft/dialog/IPinDialogRequestData"; +import { IRemoveDialogRequestData } from "../models/eft/dialog/IRemoveDialogRequestData"; +import { ISendMessageRequest } from "../models/eft/dialog/ISendMessageRequest"; +import { ISetDialogReadRequestData } from "../models/eft/dialog/ISetDialogReadRequestData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +import { DialogueInfo } from "../models/eft/profile/IAkiProfile"; +import { HashUtil } from "../utils/HashUtil"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export declare class DialogueCallbacks extends OnUpdate { private hashUtil; private timeUtil; diff --git a/TypeScript/10ScopesAndTypes/types/callbacks/GameCallbacks.d.ts b/TypeScript/10ScopesAndTypes/types/callbacks/GameCallbacks.d.ts index 9481129..44a30ea 100644 --- a/TypeScript/10ScopesAndTypes/types/callbacks/GameCallbacks.d.ts +++ b/TypeScript/10ScopesAndTypes/types/callbacks/GameCallbacks.d.ts @@ -1,17 +1,17 @@ import { GameController } from "../controllers/GameController"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; import { IGameEmptyCrcRequestData } from "../models/eft/game/IGameEmptyCrcRequestData"; import { IVersionValidateRequestData } from "../models/eft/game/IVersionValidateRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; -import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { IWatermark } from "../models/spt/utils/IWatermark"; +import { Watermark } from "../utils/Watermark"; declare class GameCallbacks { private httpResponse; private watermark; private gameController; - constructor(httpResponse: HttpResponseUtil, watermark: IWatermark, gameController: GameController); + constructor(httpResponse: HttpResponseUtil, watermark: Watermark, gameController: GameController); versionValidate(url: string, info: IVersionValidateRequestData, sessionID: string): INullResponseData; gameStart(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; gameLogout(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/10ScopesAndTypes/types/callbacks/HealthCallbacks.d.ts b/TypeScript/10ScopesAndTypes/types/callbacks/HealthCallbacks.d.ts index b223bb3..a50dd42 100644 --- a/TypeScript/10ScopesAndTypes/types/callbacks/HealthCallbacks.d.ts +++ b/TypeScript/10ScopesAndTypes/types/callbacks/HealthCallbacks.d.ts @@ -1,13 +1,13 @@ import { HealthController } from "../controllers/HealthController"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; +import { IHealthTreatmentRequestData } from "../models/eft/health/IHealthTreatmentRequestData"; import { IOffraidEatRequestData } from "../models/eft/health/IOffraidEatRequestData"; import { IOffraidHealRequestData } from "../models/eft/health/IOffraidHealRequestData"; -import { IHealthTreatmentRequestData } from "../models/eft/health/IHealthTreatmentRequestData"; -import { ProfileHelper } from "../helpers/ProfileHelper"; +import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class HealthCallbacks { private httpResponse; private profileHelper; diff --git a/TypeScript/10ScopesAndTypes/types/callbacks/HideoutCallbacks.d.ts b/TypeScript/10ScopesAndTypes/types/callbacks/HideoutCallbacks.d.ts index b574232..3698176 100644 --- a/TypeScript/10ScopesAndTypes/types/callbacks/HideoutCallbacks.d.ts +++ b/TypeScript/10ScopesAndTypes/types/callbacks/HideoutCallbacks.d.ts @@ -1,22 +1,23 @@ import { HideoutController } from "../controllers/HideoutController"; +import { OnUpdate } from "../di/OnUpdate"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; -import { IHideoutUpgradeCompleteRequestData } from "../models/eft/hideout/IHideoutUpgradeCompleteRequestData"; -import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; -import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData"; -import { IHideoutTakeItemOutRequestData } from "../models/eft/hideout/IHideoutTakeItemOutRequestData"; -import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutToggleAreaRequestData"; -import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; +import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData"; +import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; +import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; +import { IHideoutTakeItemOutRequestData } from "../models/eft/hideout/IHideoutTakeItemOutRequestData"; import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; +import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutToggleAreaRequestData"; +import { IHideoutUpgradeCompleteRequestData } from "../models/eft/hideout/IHideoutUpgradeCompleteRequestData"; +import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ConfigServer } from "../servers/ConfigServer"; -import { OnUpdate } from "../di/OnUpdate"; export declare class HideoutCallbacks extends OnUpdate { private hideoutController; private configServer; private hideoutConfig; - constructor(hideoutController: HideoutController, configServer: ConfigServer); + constructor(hideoutController: HideoutController, // TODO: delay needed + configServer: ConfigServer); upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; upgradeComplete(pmcData: IPmcData, body: IHideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse; putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/TypeScript/10ScopesAndTypes/types/callbacks/HttpCallbacks.d.ts b/TypeScript/10ScopesAndTypes/types/callbacks/HttpCallbacks.d.ts index 7072297..9fe387d 100644 --- a/TypeScript/10ScopesAndTypes/types/callbacks/HttpCallbacks.d.ts +++ b/TypeScript/10ScopesAndTypes/types/callbacks/HttpCallbacks.d.ts @@ -1,5 +1,5 @@ -import { IHttpServer } from "../models/spt/server/IHttpServer"; import { OnLoad } from "../di/OnLoad"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class HttpCallbacks extends OnLoad { private httpServer; constructor(httpServer: IHttpServer); diff --git a/TypeScript/10ScopesAndTypes/types/callbacks/InraidCallbacks.d.ts b/TypeScript/10ScopesAndTypes/types/callbacks/InraidCallbacks.d.ts index 1948d01..2d53227 100644 --- a/TypeScript/10ScopesAndTypes/types/callbacks/InraidCallbacks.d.ts +++ b/TypeScript/10ScopesAndTypes/types/callbacks/InraidCallbacks.d.ts @@ -1,6 +1,6 @@ import { InraidController } from "../controllers/InraidController"; -import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ConfigServer } from "../servers/ConfigServer"; diff --git a/TypeScript/10ScopesAndTypes/types/callbacks/InsuranceCallbacks.d.ts b/TypeScript/10ScopesAndTypes/types/callbacks/InsuranceCallbacks.d.ts index 73b7bd9..79feb67 100644 --- a/TypeScript/10ScopesAndTypes/types/callbacks/InsuranceCallbacks.d.ts +++ b/TypeScript/10ScopesAndTypes/types/callbacks/InsuranceCallbacks.d.ts @@ -1,13 +1,13 @@ import { InsuranceController } from "../controllers/InsuranceController"; +import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData"; import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { ConfigServer } from "../servers/ConfigServer"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; -import { InsuranceService } from "../services/InsuranceService"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { ConfigServer } from "../servers/ConfigServer"; +import { InsuranceService } from "../services/InsuranceService"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class InsuranceCallbacks extends OnLoadOnUpdate { private insuranceController; private insuranceService; diff --git a/TypeScript/10ScopesAndTypes/types/callbacks/InventoryCallbacks.d.ts b/TypeScript/10ScopesAndTypes/types/callbacks/InventoryCallbacks.d.ts index 90d6936..9795aa0 100644 --- a/TypeScript/10ScopesAndTypes/types/callbacks/InventoryCallbacks.d.ts +++ b/TypeScript/10ScopesAndTypes/types/callbacks/InventoryCallbacks.d.ts @@ -1,21 +1,21 @@ import { InventoryController } from "../controllers/InventoryController"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IInventoryFoldRequestData } from "../models/eft/inventory/IInventoryFoldRequestData"; -import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; -import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; -import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData"; -import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData"; -import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwapRequestData"; -import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData"; -import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData"; import { IInventoryBindRequestData } from "../models/eft/inventory/IInventoryBindRequestData"; -import { IInventoryExamineRequestData } from "../models/eft/inventory/IInventoryExamineRequestData"; -import { IInventoryReadEncyclopediaRequestData } from "../models/eft/inventory/IInventoryReadEncyclopediaRequestData"; -import { IInventorySortRequestData } from "../models/eft/inventory/IInventorySortRequestData"; import { IInventoryCreateMarkerRequestData } from "../models/eft/inventory/IInventoryCreateMarkerRequestData"; import { IInventoryDeleteMarkerRequestData } from "../models/eft/inventory/IInventoryDeleteMarkerRequestData"; import { IInventoryEditMarkerRequestData } from "../models/eft/inventory/IInventoryEditMarkerRequestData"; +import { IInventoryExamineRequestData } from "../models/eft/inventory/IInventoryExamineRequestData"; +import { IInventoryFoldRequestData } from "../models/eft/inventory/IInventoryFoldRequestData"; +import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; +import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; +import { IInventoryReadEncyclopediaRequestData } from "../models/eft/inventory/IInventoryReadEncyclopediaRequestData"; +import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData"; +import { IInventorySortRequestData } from "../models/eft/inventory/IInventorySortRequestData"; +import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; +import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwapRequestData"; +import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData"; +import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData"; +import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class InventoryCallbacks { private inventoryController; diff --git a/TypeScript/10ScopesAndTypes/types/callbacks/LauncherCallbacks.d.ts b/TypeScript/10ScopesAndTypes/types/callbacks/LauncherCallbacks.d.ts index addf76b..4bd5e2c 100644 --- a/TypeScript/10ScopesAndTypes/types/callbacks/LauncherCallbacks.d.ts +++ b/TypeScript/10ScopesAndTypes/types/callbacks/LauncherCallbacks.d.ts @@ -1,17 +1,18 @@ -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { SaveServer } from "../servers/SaveServer"; import { LauncherController } from "../controllers/LauncherController"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IChangeRequestData } from "../models/eft/launcher/IChangeRequestData"; +import { ILoginRequestData } from "../models/eft/launcher/ILoginRequestData"; import { IRegisterData } from "../models/eft/launcher/IRegisterData"; import { IRemoveProfileData } from "../models/eft/launcher/IRemoveProfileData"; -import { ILoginRequestData } from "../models/eft/launcher/ILoginRequestData"; -import { IChangeRequestData } from "../models/eft/launcher/IChangeRequestData"; -import { IWatermark } from "../models/spt/utils/IWatermark"; +import { SaveServer } from "../servers/SaveServer"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { Watermark } from "../utils/Watermark"; declare class LauncherCallbacks { private httpResponse; private launcherController; private saveServer; private watermark; - constructor(httpResponse: HttpResponseUtil, launcherController: LauncherController, saveServer: SaveServer, watermark: IWatermark); + constructor(httpResponse: HttpResponseUtil, launcherController: LauncherController, saveServer: SaveServer, watermark: Watermark); connect(): string; login(url: string, info: ILoginRequestData, sessionID: string): string; register(url: string, info: IRegisterData, sessionID: string): "FAILED" | "OK"; @@ -20,7 +21,7 @@ declare class LauncherCallbacks { changePassword(url: string, info: IChangeRequestData, sessionID: string): "FAILED" | "OK"; wipe(url: string, info: IRegisterData, sessionID: string): "FAILED" | "OK"; getServerVersion(): string; - ping(url: string, info: any, sessionID: string): string; + ping(url: string, info: IEmptyRequestData, sessionID: string): string; removeProfile(url: string, info: IRemoveProfileData, sessionID: string): string; getCompatibleTarkovVersion(): string; } diff --git a/TypeScript/10ScopesAndTypes/types/callbacks/LocationCallbacks.d.ts b/TypeScript/10ScopesAndTypes/types/callbacks/LocationCallbacks.d.ts index 346893b..5ecab74 100644 --- a/TypeScript/10ScopesAndTypes/types/callbacks/LocationCallbacks.d.ts +++ b/TypeScript/10ScopesAndTypes/types/callbacks/LocationCallbacks.d.ts @@ -1,13 +1,14 @@ import { LocationController } from "../controllers/LocationController"; -import { IGetLocationRequestData } from "../models/eft/location/IGetLocationRequestData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSourceDestinationBase"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { ILocationBase } from "../models/eft/common/ILocationBase"; +import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSourceDestinationBase"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IGetLocationRequestData } from "../models/eft/location/IGetLocationRequestData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class LocationCallbacks { private httpResponse; private locationController; constructor(httpResponse: HttpResponseUtil, locationController: LocationController); - getLocationData(url: string, info: any, sessionID: string): IGetBodyResponseData; + getLocationData(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getLocation(url: string, info: IGetLocationRequestData, sessionID: string): IGetBodyResponseData; } diff --git a/TypeScript/10ScopesAndTypes/types/callbacks/MatchCallbacks.d.ts b/TypeScript/10ScopesAndTypes/types/callbacks/MatchCallbacks.d.ts index 9364a2f..63d38d9 100644 --- a/TypeScript/10ScopesAndTypes/types/callbacks/MatchCallbacks.d.ts +++ b/TypeScript/10ScopesAndTypes/types/callbacks/MatchCallbacks.d.ts @@ -1,10 +1,11 @@ import { MatchController } from "../controllers/MatchController"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; -import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; -import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; +import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData"; +import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { DatabaseServer } from "../servers/DatabaseServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class MatchCallbacks { @@ -22,7 +23,7 @@ export declare class MatchCallbacks { 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; + getProfile(url: string, info: IGetProfileRequestData, sessionID: string): IGetBodyResponseData; serverAvailable(url: string, info: any, sessionID: string): IGetBodyResponseData | IGetBodyResponseData; joinMatch(url: string, info: any, sessionID: string): IGetBodyResponseData; getMetrics(url: string, info: any, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/10ScopesAndTypes/types/callbacks/ModCallbacks.d.ts b/TypeScript/10ScopesAndTypes/types/callbacks/ModCallbacks.d.ts index b4c18c2..2011f0e 100644 --- a/TypeScript/10ScopesAndTypes/types/callbacks/ModCallbacks.d.ts +++ b/TypeScript/10ScopesAndTypes/types/callbacks/ModCallbacks.d.ts @@ -1,9 +1,9 @@ -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { OnLoad } from "../di/OnLoad"; import { DelayedModLoader } from "../loaders/DelayedModLoader"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from '../models/spt/utils/ILogger'; -import { IHttpServer } from '../models/spt/server/IHttpServer'; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; declare class ModCallbacks extends OnLoad { private logger; private httpResponse; diff --git a/TypeScript/10ScopesAndTypes/types/callbacks/NoteCallbacks.d.ts b/TypeScript/10ScopesAndTypes/types/callbacks/NoteCallbacks.d.ts index 36cbd44..fd7c5ca 100644 --- a/TypeScript/10ScopesAndTypes/types/callbacks/NoteCallbacks.d.ts +++ b/TypeScript/10ScopesAndTypes/types/callbacks/NoteCallbacks.d.ts @@ -1,7 +1,7 @@ import { NoteController } from "../controllers/NoteController"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { INoteActionData } from "../models/eft/notes/INoteActionData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { INoteActionData } from "../models/eft/notes/INoteActionData"; export declare class NoteCallbacks { private noteController; constructor(noteController: NoteController); diff --git a/TypeScript/10ScopesAndTypes/types/callbacks/NotifierCallbacks.d.ts b/TypeScript/10ScopesAndTypes/types/callbacks/NotifierCallbacks.d.ts index f47dcc9..416e6a3 100644 --- a/TypeScript/10ScopesAndTypes/types/callbacks/NotifierCallbacks.d.ts +++ b/TypeScript/10ScopesAndTypes/types/callbacks/NotifierCallbacks.d.ts @@ -1,10 +1,10 @@ -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { NotifierController } from "../controllers/NotifierController"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INotifierChannel } from "../models/eft/notifier/INotifier"; import { ISelectProfileRequestData } from "../models/eft/notifier/ISelectProfileRequestData"; -import { NotifierController } from "../controllers/NotifierController"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class NotifierCallbacks { private httpServerHelper; private httpResponse; diff --git a/TypeScript/10ScopesAndTypes/types/callbacks/PresetBuildCallbacks.d.ts b/TypeScript/10ScopesAndTypes/types/callbacks/PresetBuildCallbacks.d.ts index fd22c8f..639c33f 100644 --- a/TypeScript/10ScopesAndTypes/types/callbacks/PresetBuildCallbacks.d.ts +++ b/TypeScript/10ScopesAndTypes/types/callbacks/PresetBuildCallbacks.d.ts @@ -1,8 +1,8 @@ import { PresetBuildController } from "../controllers/PresetBuildController"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IPresetBuildActionRequestData } from "../models/eft/presetBuild/IPresetBuildActionRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IPresetBuildActionRequestData } from "../models/eft/presetBuild/IPresetBuildActionRequestData"; import { WeaponBuild } from "../models/eft/profile/IAkiProfile"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class PresetBuildCallbacks { diff --git a/TypeScript/10ScopesAndTypes/types/callbacks/ProfileCallbacks.d.ts b/TypeScript/10ScopesAndTypes/types/callbacks/ProfileCallbacks.d.ts index e50c130..efce47d 100644 --- a/TypeScript/10ScopesAndTypes/types/callbacks/ProfileCallbacks.d.ts +++ b/TypeScript/10ScopesAndTypes/types/callbacks/ProfileCallbacks.d.ts @@ -1,16 +1,16 @@ -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { TimeUtil } from "../utils/TimeUtil"; import { ProfileController } from "../controllers/ProfileController"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +import { IGetMiniProfileRequestData } from "../models/eft/launcher/IGetMiniProfileRequestData"; import { IProfileChangeNicknameRequestData } from "../models/eft/profile/IProfileChangeNicknameRequestData"; import { IProfileChangeVoiceRequestData } from "../models/eft/profile/IProfileChangeVoiceRequestData"; import { IProfileCreateRequestData } from "../models/eft/profile/IProfileCreateRequestData"; -import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { ISearchFriendRequestData } from "../models/eft/profile/ISearchFriendRequestData"; import { ISearchFriendResponse } from "../models/eft/profile/ISearchFriendResponse"; -import { IGetMiniProfileRequestData } from "../models/eft/launcher/IGetMiniProfileRequestData"; +import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export declare class ProfileCallbacks { private httpResponse; private timeUtil; diff --git a/TypeScript/10ScopesAndTypes/types/callbacks/QuestCallbacks.d.ts b/TypeScript/10ScopesAndTypes/types/callbacks/QuestCallbacks.d.ts index 1f3964b..f742096 100644 --- a/TypeScript/10ScopesAndTypes/types/callbacks/QuestCallbacks.d.ts +++ b/TypeScript/10ScopesAndTypes/types/callbacks/QuestCallbacks.d.ts @@ -1,15 +1,15 @@ import { QuestController } from "../controllers/QuestController"; import { RepeatableQuestController } from "../controllers/RepeatableQuestController"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { IListQuestsRequestData } from "../models/eft/quests/IListQuestsRequestData"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; -import { IHandoverQuestRequestData } from "../models/eft/quests/IHandoverQuestRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { IQuest } from "../models/eft/common/tables/IQuest"; import { IPmcDataRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; +import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; +import { IHandoverQuestRequestData } from "../models/eft/quests/IHandoverQuestRequestData"; +import { IListQuestsRequestData } from "../models/eft/quests/IListQuestsRequestData"; import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class QuestCallbacks { diff --git a/TypeScript/10ScopesAndTypes/types/callbacks/RagfairCallbacks.d.ts b/TypeScript/10ScopesAndTypes/types/callbacks/RagfairCallbacks.d.ts index 260fd13..152475f 100644 --- a/TypeScript/10ScopesAndTypes/types/callbacks/RagfairCallbacks.d.ts +++ b/TypeScript/10ScopesAndTypes/types/callbacks/RagfairCallbacks.d.ts @@ -1,20 +1,20 @@ -import { RagfairServer } from "../servers/RagfairServer"; 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"; -import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData"; -import { IAddOfferRequestData } from "../models/eft/ragfair/IAddOfferRequestData"; -import { IRemoveOfferRequestData } from "../models/eft/ragfair/IRemoveOfferRequestData"; -import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IAddOfferRequestData } from "../models/eft/ragfair/IAddOfferRequestData"; +import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData"; import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult"; +import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData"; +import { IRemoveOfferRequestData } from "../models/eft/ragfair/IRemoveOfferRequestData"; +import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; +import { RagfairServer } from "../servers/RagfairServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; -import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; -import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairCallbacks extends OnLoadOnUpdate { private httpResponse; private logger; diff --git a/TypeScript/10ScopesAndTypes/types/callbacks/RepairCallbacks.d.ts b/TypeScript/10ScopesAndTypes/types/callbacks/RepairCallbacks.d.ts index 4acd364..f63ec18 100644 --- a/TypeScript/10ScopesAndTypes/types/callbacks/RepairCallbacks.d.ts +++ b/TypeScript/10ScopesAndTypes/types/callbacks/RepairCallbacks.d.ts @@ -1,8 +1,8 @@ import { RepairController } from "../controllers/RepairController"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest"; import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepairActionDataRequest"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class RepairCallbacks { private repairController; constructor(repairController: RepairController); diff --git a/TypeScript/10ScopesAndTypes/types/callbacks/SaveCallbacks.d.ts b/TypeScript/10ScopesAndTypes/types/callbacks/SaveCallbacks.d.ts index 52d5faf..b7219a0 100644 --- a/TypeScript/10ScopesAndTypes/types/callbacks/SaveCallbacks.d.ts +++ b/TypeScript/10ScopesAndTypes/types/callbacks/SaveCallbacks.d.ts @@ -1,5 +1,5 @@ -import { SaveServer } from "../servers/SaveServer"; import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; +import { SaveServer } from "../servers/SaveServer"; export declare class SaveCallbacks extends OnLoadOnUpdate { private saveServer; constructor(saveServer: SaveServer); diff --git a/TypeScript/10ScopesAndTypes/types/callbacks/TradeCallbacks.d.ts b/TypeScript/10ScopesAndTypes/types/callbacks/TradeCallbacks.d.ts index 4cf8497..9928951 100644 --- a/TypeScript/10ScopesAndTypes/types/callbacks/TradeCallbacks.d.ts +++ b/TypeScript/10ScopesAndTypes/types/callbacks/TradeCallbacks.d.ts @@ -1,8 +1,8 @@ import { TradeController } from "../controllers/TradeController"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData"; +import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData"; export declare class TradeCallbacks { private tradeController; constructor(tradeController: TradeController); diff --git a/TypeScript/10ScopesAndTypes/types/callbacks/TraderCallbacks.d.ts b/TypeScript/10ScopesAndTypes/types/callbacks/TraderCallbacks.d.ts index 264ef94..2a8af7f 100644 --- a/TypeScript/10ScopesAndTypes/types/callbacks/TraderCallbacks.d.ts +++ b/TypeScript/10ScopesAndTypes/types/callbacks/TraderCallbacks.d.ts @@ -1,9 +1,9 @@ -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; 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 { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class TraderCallbacks extends OnLoadOnUpdate { private httpResponse; private traderController; diff --git a/TypeScript/10ScopesAndTypes/types/callbacks/WeatherCallbacks.d.ts b/TypeScript/10ScopesAndTypes/types/callbacks/WeatherCallbacks.d.ts index 2474417..e40ab3e 100644 --- a/TypeScript/10ScopesAndTypes/types/callbacks/WeatherCallbacks.d.ts +++ b/TypeScript/10ScopesAndTypes/types/callbacks/WeatherCallbacks.d.ts @@ -1,6 +1,6 @@ import { WeatherController } from "../controllers/WeatherController"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class WeatherCallbacks { private httpResponse; diff --git a/TypeScript/10ScopesAndTypes/types/callbacks/WishlistCallbacks.d.ts b/TypeScript/10ScopesAndTypes/types/callbacks/WishlistCallbacks.d.ts index 1816600..e0249fd 100644 --- a/TypeScript/10ScopesAndTypes/types/callbacks/WishlistCallbacks.d.ts +++ b/TypeScript/10ScopesAndTypes/types/callbacks/WishlistCallbacks.d.ts @@ -1,7 +1,7 @@ import { WishlistController } from "../controllers/WishlistController"; 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 WishlistCallbacks { private wishlistController; constructor(wishlistController: WishlistController); diff --git a/TypeScript/10ScopesAndTypes/types/controllers/GameController.d.ts b/TypeScript/10ScopesAndTypes/types/controllers/GameController.d.ts index 614d270..5c9a464 100644 --- a/TypeScript/10ScopesAndTypes/types/controllers/GameController.d.ts +++ b/TypeScript/10ScopesAndTypes/types/controllers/GameController.d.ts @@ -1,10 +1,10 @@ +import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; -import { ConfigServer } from "../servers/ConfigServer"; import { ILogger } from "../models/spt/utils/ILogger"; -import { IWatermark } from "../models/spt/utils/IWatermark"; -import { HttpServerHelper } from "../helpers/HttpServerHelper"; +import { ConfigServer } from "../servers/ConfigServer"; +import { Watermark } from "../utils/Watermark"; export declare class GameController { private logger; private watermark; @@ -12,7 +12,7 @@ export declare class GameController { private profileHelper; private configServer; private httpConfig; - constructor(logger: ILogger, watermark: IWatermark, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); + constructor(logger: ILogger, watermark: Watermark, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); gameStart(url: string, info: IEmptyRequestData, sessionID: string): void; getGameConfig(sessionID: string): IGameConfigResponse; getServer(): any[]; diff --git a/TypeScript/10ScopesAndTypes/types/controllers/InsuranceController.d.ts b/TypeScript/10ScopesAndTypes/types/controllers/InsuranceController.d.ts index 44c61fa..50437a6 100644 --- a/TypeScript/10ScopesAndTypes/types/controllers/InsuranceController.d.ts +++ b/TypeScript/10ScopesAndTypes/types/controllers/InsuranceController.d.ts @@ -28,7 +28,8 @@ export declare class InsuranceController { private insuranceService; private configServer; private insuranceConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, itemEventRouter: ItemEventRouter, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileHelper: ProfileHelper, dialogueHelper: DialogueHelper, paymentService: PaymentService, insuranceService: InsuranceService, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, itemEventRouter: ItemEventRouter, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileHelper: ProfileHelper, dialogueHelper: DialogueHelper, paymentService: PaymentService, // TODO: delay required + insuranceService: InsuranceService, configServer: ConfigServer); processReturn(): void; insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse; cost(info: IGetInsuranceCostRequestData, sessionID: string): any; diff --git a/TypeScript/10ScopesAndTypes/types/controllers/InventoryController.d.ts b/TypeScript/10ScopesAndTypes/types/controllers/InventoryController.d.ts index 4ff07b8..8235082 100644 --- a/TypeScript/10ScopesAndTypes/types/controllers/InventoryController.d.ts +++ b/TypeScript/10ScopesAndTypes/types/controllers/InventoryController.d.ts @@ -1,30 +1,31 @@ import { InventoryHelper } from "../helpers/InventoryHelper"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; +import { PaymentHelper } from "../helpers/PaymentHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { PaymentHelper } from "../helpers/PaymentHelper"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { DatabaseServer } from "../servers/DatabaseServer"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; -import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData"; -import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; -import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwapRequestData"; -import { IInventoryFoldRequestData } from "../models/eft/inventory/IInventoryFoldRequestData"; -import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData"; -import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData"; +import { IAddItemRequestData } from "../models/eft/inventory/IAddItemRequestData"; import { IInventoryBindRequestData } from "../models/eft/inventory/IInventoryBindRequestData"; -import { IInventoryExamineRequestData } from "../models/eft/inventory/IInventoryExamineRequestData"; -import { IInventoryReadEncyclopediaRequestData } from "../models/eft/inventory/IInventoryReadEncyclopediaRequestData"; -import { IInventorySortRequestData } from "../models/eft/inventory/IInventorySortRequestData"; import { IInventoryCreateMarkerRequestData } from "../models/eft/inventory/IInventoryCreateMarkerRequestData"; import { IInventoryDeleteMarkerRequestData } from "../models/eft/inventory/IInventoryDeleteMarkerRequestData"; import { IInventoryEditMarkerRequestData } from "../models/eft/inventory/IInventoryEditMarkerRequestData"; +import { IInventoryExamineRequestData } from "../models/eft/inventory/IInventoryExamineRequestData"; +import { IInventoryFoldRequestData } from "../models/eft/inventory/IInventoryFoldRequestData"; +import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; +import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; +import { IInventoryReadEncyclopediaRequestData } from "../models/eft/inventory/IInventoryReadEncyclopediaRequestData"; +import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData"; +import { IInventorySortRequestData } from "../models/eft/inventory/IInventorySortRequestData"; +import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; +import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwapRequestData"; +import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData"; +import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData"; +import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HashUtil } from "../utils/HashUtil"; +import { JsonUtil } from "../utils/JsonUtil"; export declare class InventoryController { private logger; private hashUtil; @@ -77,7 +78,7 @@ export declare class InventoryController { * Give Item * its used for "add" item like gifts etc. */ - addItem(pmcData: IPmcData, body: any, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; + addItem(pmcData: IPmcData, body: IAddItemRequestData, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; /** * Handles folding of Weapons */ diff --git a/TypeScript/10ScopesAndTypes/types/controllers/MatchController.d.ts b/TypeScript/10ScopesAndTypes/types/controllers/MatchController.d.ts index 229b884..84abbe3 100644 --- a/TypeScript/10ScopesAndTypes/types/controllers/MatchController.d.ts +++ b/TypeScript/10ScopesAndTypes/types/controllers/MatchController.d.ts @@ -1,8 +1,9 @@ -import { TraderHelper } from "../helpers/TraderHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; -import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; +import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData"; +import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; import { ConfigServer } from "../servers/ConfigServer"; import { SaveServer } from "../servers/SaveServer"; import { MatchLocationService } from "../services/MatchLocationService"; @@ -16,7 +17,7 @@ export declare class MatchController { private inraidConfig; constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, configServer: ConfigServer); getEnabled(): boolean; - getProfile(info: any): IPmcData[]; + getProfile(info: IGetProfileRequestData): IPmcData[]; private getMatch; createGroup(sessionID: string, info: any): any; deleteGroup(info: any): void; diff --git a/TypeScript/10ScopesAndTypes/types/controllers/RagfairController.d.ts b/TypeScript/10ScopesAndTypes/types/controllers/RagfairController.d.ts index 6e71edd..5b94a95 100644 --- a/TypeScript/10ScopesAndTypes/types/controllers/RagfairController.d.ts +++ b/TypeScript/10ScopesAndTypes/types/controllers/RagfairController.d.ts @@ -1,37 +1,37 @@ -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { RagfairServer } from "../servers/RagfairServer"; -import { SaveServer } from "../servers/SaveServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { PaymentService } from "../services/PaymentService"; -import { RagfairPriceService } from "../services/RagfairPriceService"; -import { RagfairOfferService } from "../services/RagfairOfferService"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { HandbookHelper } from "../helpers/HandbookHelper"; -import { PaymentHelper } from "../helpers/PaymentHelper"; -import { InventoryHelper } from "../helpers/InventoryHelper"; -import { RagfairHelper } from "../helpers/RagfairHelper"; -import { RagfairSellHelper } from "../helpers/RagfairSellHelper"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IAddOfferRequestData, Requirement } from "../models/eft/ragfair/IAddOfferRequestData"; -import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData"; -import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData"; -import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { Item } from "../models/eft/common/tables/IItem"; -import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult"; -import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; -import { ConfigServer } from "../servers/ConfigServer"; -import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; -import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; +import { HandbookHelper } from "../helpers/HandbookHelper"; +import { InventoryHelper } from "../helpers/InventoryHelper"; +import { ItemHelper } from "../helpers/ItemHelper"; +import { PaymentHelper } from "../helpers/PaymentHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { RagfairHelper } from "../helpers/RagfairHelper"; +import { RagfairOfferHelper } from "../helpers/RagfairOfferHelper"; +import { RagfairSellHelper } from "../helpers/RagfairSellHelper"; import { RagfairSortHelper } from "../helpers/RagfairSortHelper"; import { RagfairTaxHelper } from "../helpers/RagfairTaxHelper"; -import { RagfairOfferHelper } from "../helpers/RagfairOfferHelper"; -import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { IAddOfferRequestData, Requirement } from "../models/eft/ragfair/IAddOfferRequestData"; +import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData"; +import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult"; +import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData"; +import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { RagfairServer } from "../servers/RagfairServer"; +import { SaveServer } from "../servers/SaveServer"; +import { PaymentService } from "../services/PaymentService"; +import { RagfairOfferService } from "../services/RagfairOfferService"; +import { RagfairPriceService } from "../services/RagfairPriceService"; +import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export declare class RagfairController { private logger; private timeUtil; diff --git a/TypeScript/10ScopesAndTypes/types/controllers/RepeatableQuestController.d.ts b/TypeScript/10ScopesAndTypes/types/controllers/RepeatableQuestController.d.ts index d2de5df..bd5e5a1 100644 --- a/TypeScript/10ScopesAndTypes/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/10ScopesAndTypes/types/controllers/RepeatableQuestController.d.ts @@ -1,24 +1,24 @@ -import { TimeUtil } from "../utils/TimeUtil"; -import { ObjectId } from "../utils/ObjectId"; -import { RandomUtil, ProbabilityObjectArray, ProbabilityObject } from "../utils/RandomUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { MathUtil } from "../utils/MathUtil"; import { ItemHelper } from "../helpers/ItemHelper"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IPmcData, TraderInfo } from "../models/eft/common/IPmcData"; -import { IRepeatableQuestConfig, ELocationName } from "../models/spt/config/IQuestConfig"; -import { IExploration, IRepeatableQuest, IReward, IRewards, IExplorationCondition, ICompletionAvailableFor, IEliminationCondition, ICompletion, IElimination, IPmcDataRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; -import { Exit } from "../models/eft/common/ILocationBase"; -import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { PresetHelper } from "../helpers/PresetHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { PaymentService } from "../services/PaymentService"; -import { ConfigServer } from "../servers/ConfigServer"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { Exit } from "../models/eft/common/ILocationBase"; +import { IPmcData, TraderInfo } from "../models/eft/common/IPmcData"; +import { ICompletion, ICompletionAvailableFor, IElimination, IEliminationCondition, IExploration, IExplorationCondition, IPmcDataRepeatableQuest, IRepeatableQuest, IReward, IRewards } from "../models/eft/common/tables/IRepeatableQuests"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; +import { ELocationName, IRepeatableQuestConfig } from "../models/spt/config/IQuestConfig"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { PaymentService } from "../services/PaymentService"; +import { JsonUtil } from "../utils/JsonUtil"; +import { MathUtil } from "../utils/MathUtil"; +import { ObjectId } from "../utils/ObjectId"; +import { ProbabilityObject, ProbabilityObjectArray, RandomUtil } from "../utils/RandomUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export interface IQuestTypePool { types: string[]; pool: IQuestPool; diff --git a/TypeScript/10ScopesAndTypes/types/controllers/TraderController.d.ts b/TypeScript/10ScopesAndTypes/types/controllers/TraderController.d.ts index 5cd85c9..36eac75 100644 --- a/TypeScript/10ScopesAndTypes/types/controllers/TraderController.d.ts +++ b/TypeScript/10ScopesAndTypes/types/controllers/TraderController.d.ts @@ -1,13 +1,12 @@ -import { JsonUtil } from "../utils/JsonUtil"; -import { TimeUtil } from "../utils/TimeUtil"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { TraderAssortHelper } from "../helpers/TraderAssortHelper"; +import { TraderHelper } from "../helpers/TraderHelper"; +import { IBarterScheme, ITraderAssort, ITraderBase } from "../models/eft/common/tables/ITrader"; +import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { TraderAssortService } from "../services/TraderAssortService"; -import { IBarterScheme, ITraderAssort, ITraderBase } from "../models/eft/common/tables/ITrader"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { TraderAssortHelper } from "../helpers/TraderAssortHelper"; +import { JsonUtil } from "../utils/JsonUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export declare class TraderController { private logger; private databaseServer; @@ -17,9 +16,7 @@ export declare class TraderController { private timeUtil; private traderAssortService; private jsonUtil; - private configServer; - private traderConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, timeUtil: TimeUtil, traderAssortService: TraderAssortService, jsonUtil: JsonUtil, configServer: ConfigServer); + constructor(logger: ILogger, databaseServer: DatabaseServer, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, timeUtil: TimeUtil, traderAssortService: TraderAssortService, jsonUtil: JsonUtil); load(): void; getTrader(traderID: string, sessionID: string): ITraderBase; getAllTraders(sessionID: string): ITraderBase[]; diff --git a/TypeScript/10ScopesAndTypes/types/di/Container.d.ts b/TypeScript/10ScopesAndTypes/types/di/Container.d.ts index b67523f..17791b0 100644 --- a/TypeScript/10ScopesAndTypes/types/di/Container.d.ts +++ b/TypeScript/10ScopesAndTypes/types/di/Container.d.ts @@ -1,6 +1,7 @@ import { DependencyContainer } from "tsyringe"; export declare class Container { static registerTypes(depContainer: DependencyContainer): void; + static registerListTypes(depContainer: DependencyContainer): void; private static registerUtils; private static registerRouters; private static registerGenerators; diff --git a/TypeScript/10ScopesAndTypes/types/di/OnSaveLoad.d.ts b/TypeScript/10ScopesAndTypes/types/di/OnSaveLoad.d.ts new file mode 100644 index 0000000..1edf37e --- /dev/null +++ b/TypeScript/10ScopesAndTypes/types/di/OnSaveLoad.d.ts @@ -0,0 +1,4 @@ +export declare class OnSaveLoad { + onSaveLoad(): void; + getRoute(): string; +} diff --git a/TypeScript/10ScopesAndTypes/types/di/Router.d.ts b/TypeScript/10ScopesAndTypes/types/di/Router.d.ts index ac48587..2fb98e0 100644 --- a/TypeScript/10ScopesAndTypes/types/di/Router.d.ts +++ b/TypeScript/10ScopesAndTypes/types/di/Router.d.ts @@ -3,18 +3,22 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; export declare class Router { private handledRoutes; - constructor(); getTopLevelRoute(): string; protected getHandledRoutes(): HandledRoute[]; + private getInternalHandledRoutes; canHandle(url: string, partialMatch?: boolean): boolean; } export declare class StaticRouter extends Router { - constructor(); + private routes; + constructor(routes: RouteAction[]); handleStatic(url: string, info: any, sessionID: string, output: string): any; + getHandledRoutes(): HandledRoute[]; } export declare class DynamicRouter extends Router { - constructor(); + private routes; + constructor(routes: RouteAction[]); handleDynamic(url: string, info: any, sessionID: string, output: string): any; + getHandledRoutes(): HandledRoute[]; } export declare class ItemEventRouterDefinition extends Router { constructor(); @@ -29,3 +33,8 @@ export declare class HandledRoute { dynamic: boolean; constructor(route: string, dynamic: boolean); } +export declare class RouteAction { + url: string; + action: (url: string, info: any, sessionID: string, output: string) => any; + constructor(url: string, action: (url: string, info: any, sessionID: string, output: string) => any); +} diff --git a/TypeScript/10ScopesAndTypes/types/generators/BotInventoryGenerator.d.ts b/TypeScript/10ScopesAndTypes/types/generators/BotInventoryGenerator.d.ts index e9f09de..0cdbacb 100644 --- a/TypeScript/10ScopesAndTypes/types/generators/BotInventoryGenerator.d.ts +++ b/TypeScript/10ScopesAndTypes/types/generators/BotInventoryGenerator.d.ts @@ -17,7 +17,6 @@ export declare class BotInventoryGenerator { private botLootGenerator; private botGeneratorHelper; private weightedRandomHelper; - private botConfig; constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, botWeaponGenerator: BotWeaponGenerator, botLootGenerator: BotLootGenerator, botGeneratorHelper: BotGeneratorHelper, weightedRandomHelper: WeightedRandomHelper); generateInventory(templateInventory: Inventory, equipmentChances: Chances, generation: Generation, botRole: string, isPmc: boolean): PmcInventory; private generateEquipment; diff --git a/TypeScript/10ScopesAndTypes/types/generators/BotWeaponGenerator.d.ts b/TypeScript/10ScopesAndTypes/types/generators/BotWeaponGenerator.d.ts index 3e9d59c..e8f91cb 100644 --- a/TypeScript/10ScopesAndTypes/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/10ScopesAndTypes/types/generators/BotWeaponGenerator.d.ts @@ -1,11 +1,11 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { MinMax, ModsChances, Mods } from "../models/eft/common/tables/IBotType"; -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -import { HashUtil } from "../utils/HashUtil"; +import { ItemHelper } from "../helpers/ItemHelper"; +import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; +import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { MinMax, Mods, ModsChances } from "../models/eft/common/tables/IBotType"; import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; export declare class BotWeaponGenerator { private logger; diff --git a/TypeScript/10ScopesAndTypes/types/helpers/BotGeneratorHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/BotGeneratorHelper.d.ts index c3cf4d3..6abdc07 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/BotGeneratorHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/BotGeneratorHelper.d.ts @@ -1,17 +1,17 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ConfigServer } from "../servers/ConfigServer"; +import { DurabilityLimitsHelper } from "../helpers/DurabilityLimitsHelper"; import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { ModsChances, Mods } from "../models/eft/common/tables/IBotType"; +import { Mods, ModsChances } from "../models/eft/common/tables/IBotType"; import { Item, Upd } from "../models/eft/common/tables/IItem"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { DurabilityLimitsHelper } from "../helpers/DurabilityLimitsHelper"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; -import { InventoryHelper } from "./InventoryHelper"; import { ContainerHelper } from "./ContainerHelper"; +import { InventoryHelper } from "./InventoryHelper"; import { ItemHelper } from "./ItemHelper"; -import { ILogger } from "../models/spt/utils/ILogger"; declare class BotGeneratorHelper { private logger; private jsonUtil; diff --git a/TypeScript/10ScopesAndTypes/types/helpers/ExtendedProfileHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/ExtendedProfileHelper.d.ts index 22ead31..4dd7d3a 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/ExtendedProfileHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/ExtendedProfileHelper.d.ts @@ -1,16 +1,16 @@ +import { BotGenerator } from "../generators/BotGenerator"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { FenceService } from "../services/FenceService"; -import { IPmcData } from "../models/eft/common/IPmcData"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; +import { Watermark } from "../utils/Watermark"; import { ItemHelper } from "./ItemHelper"; -import { IWatermark } from "../models/spt/utils/IWatermark"; -import { BotGenerator } from "../generators/BotGenerator"; import { ProfileHelper } from "./ProfileHelper"; export declare class ExtendedProfileHelper extends ProfileHelper { private botGenerator; - constructor(jsonUtil: JsonUtil, watermark: IWatermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService, botGenerator: BotGenerator); + constructor(jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService, botGenerator: BotGenerator); generatePlayerScav(sessionID: string): IPmcData; private getScavSkills; private removeSecureContainer; diff --git a/TypeScript/10ScopesAndTypes/types/helpers/HideoutHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/HideoutHelper.d.ts index d60e370..5b4a5ad 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/HideoutHelper.d.ts @@ -1,21 +1,21 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; import { IPmcData, Production, Productive } from "../models/eft/common/IPmcData"; -import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; -import { StageBonus } from "../models/eft/hideout/IHideoutArea"; -import { TimeUtil } from "../utils/TimeUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { HashUtil } from "../utils/HashUtil"; -import { ProfileHelper } from "./ProfileHelper"; -import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { ConfigServer } from "../servers/ConfigServer"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { PlayerService } from "../services/PlayerService"; -import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; -import { InventoryHelper } from "./InventoryHelper"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { StageBonus } from "../models/eft/hideout/IHideoutArea"; +import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; +import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; +import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +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"; export declare class HideoutHelper { private logger; private hashUtil; diff --git a/TypeScript/10ScopesAndTypes/types/helpers/InventoryHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/InventoryHelper.d.ts index 4b3460c..00e95d3 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/InventoryHelper.d.ts @@ -1,21 +1,22 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; +import { IAddItemRequestData } from "../models/eft/inventory/IAddItemRequestData"; +import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; +import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; +import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { FenceService } from "../services/FenceService"; -import { ContainerHelper } from "./ContainerHelper"; -import { ItemHelper } from "./ItemHelper"; -import { PaymentHelper } from "./PaymentHelper"; -import { ProfileHelper } from "./ProfileHelper"; -import { DialogueHelper } from "./DialogueHelper"; import { HashUtil } from "../utils/HashUtil"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; -import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; -import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; -import { ILogger } from "../models/spt/utils/ILogger"; +import { ContainerHelper } from "./ContainerHelper"; +import { DialogueHelper } from "./DialogueHelper"; +import { ItemHelper } from "./ItemHelper"; +import { PaymentHelper } from "./PaymentHelper"; +import { ProfileHelper } from "./ProfileHelper"; import { TraderAssortHelper } from "./TraderAssortHelper"; export interface OwnerInventoryItems { from: Item[]; @@ -39,7 +40,7 @@ export declare class InventoryHelper { private configServer; private inventoryConfig; 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, configServer: ConfigServer); - addItem(pmcData: IPmcData, body: any, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; + addItem(pmcData: IPmcData, body: IAddItemRequestData, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; removeItem(pmcData: IPmcData, itemId: string, sessionID: string, output?: IItemEventRouterResponse): IItemEventRouterResponse; getItemSize(itemTpl: string, itemID: string, inventoryItem: Item[]): Record; private getSizeByInventoryItemHash; diff --git a/TypeScript/10ScopesAndTypes/types/helpers/ProfileHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/ProfileHelper.d.ts index 515e55e..508443c 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/ProfileHelper.d.ts @@ -1,22 +1,22 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { FenceService } from "../services/FenceService"; import { IPmcData, Stats } from "../models/eft/common/IPmcData"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { SaveServer } from "../servers/SaveServer"; +import { FenceService } from "../services/FenceService"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; +import { Watermark } from "../utils/Watermark"; import { ItemHelper } from "./ItemHelper"; -import { IWatermark } from "../models/spt/utils/IWatermark"; export declare class ProfileHelper { protected jsonUtil: JsonUtil; - protected watermark: IWatermark; + protected watermark: Watermark; protected timeUtil: TimeUtil; protected saveServer: SaveServer; protected databaseServer: DatabaseServer; protected itemHelper: ItemHelper; protected fenceService: FenceService; - constructor(jsonUtil: JsonUtil, watermark: IWatermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService); + constructor(jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService); resetProfileQuestCondition(sessionID: string, conditionId: string): void; getCompleteProfile(sessionID: string): IPmcData[]; isNicknameTaken(info: IValidateNicknameRequestData, sessionID: string): boolean; diff --git a/TypeScript/10ScopesAndTypes/types/helpers/QuestHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/QuestHelper.d.ts index 3474884..9e2dd5e 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/QuestHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/QuestHelper.d.ts @@ -1,21 +1,21 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { ItemHelper } from "./ItemHelper"; -import { ProfileHelper } from "./ProfileHelper"; -import { DialogueHelper } from "./DialogueHelper"; -import { PaymentHelper } from "./PaymentHelper"; -import { TraderHelper } from "./TraderHelper"; import { IPmcData, Quest } from "../models/eft/common/IPmcData"; 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 { ConfigServer } from "../servers/ConfigServer"; -import { RagfairServerHelper } from "./RagfairServerHelper"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HashUtil } from "../utils/HashUtil"; +import { JsonUtil } from "../utils/JsonUtil"; +import { TimeUtil } from "../utils/TimeUtil"; +import { DialogueHelper } from "./DialogueHelper"; +import { ItemHelper } from "./ItemHelper"; +import { PaymentHelper } from "./PaymentHelper"; +import { ProfileHelper } from "./ProfileHelper"; +import { RagfairServerHelper } from "./RagfairServerHelper"; +import { TraderHelper } from "./TraderHelper"; export declare class QuestHelper { private logger; private jsonUtil; diff --git a/TypeScript/10ScopesAndTypes/types/helpers/RagfairHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/RagfairHelper.d.ts index 2bce4a6..8e70bcd 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/RagfairHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/RagfairHelper.d.ts @@ -1,16 +1,16 @@ -import { JsonUtil } from "../utils/JsonUtil"; import { Item } from "../models/eft/common/tables/IItem"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { RagfairLinkedItemService } from "../services/RagfairLinkedItemService"; +import { JsonUtil } from "../utils/JsonUtil"; import { HandbookHelper } from "./HandbookHelper"; import { ItemHelper } from "./ItemHelper"; -import { RagfairLinkedItemService } from "../services/RagfairLinkedItemService"; -import { UtilityHelper } from "./UtilityHelper"; -import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from "../models/spt/utils/ILogger"; import { TraderAssortHelper } from "./TraderAssortHelper"; +import { UtilityHelper } from "./UtilityHelper"; export declare class RagfairHelper { private logger; private jsonUtil; diff --git a/TypeScript/10ScopesAndTypes/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/RagfairOfferHelper.d.ts index da3ceb8..3bf8add 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/RagfairOfferHelper.d.ts @@ -1,23 +1,23 @@ -import { HashUtil } from "../utils/HashUtil"; -import { TimeUtil } from "../utils/TimeUtil"; import { IPmcData } from "../models/eft/common/IPmcData"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { RagfairOfferService } from "../services/RagfairOfferService"; +import { HashUtil } from "../utils/HashUtil"; +import { TimeUtil } from "../utils/TimeUtil"; import { DialogueHelper } from "./DialogueHelper"; import { ItemHelper } from "./ItemHelper"; import { PaymentHelper } from "./PaymentHelper"; import { PresetHelper } from "./PresetHelper"; import { ProfileHelper } from "./ProfileHelper"; -import { RagfairServerHelper } from "./RagfairServerHelper"; -import { ConfigServer } from "../servers/ConfigServer"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { RagfairSortHelper } from "./RagfairSortHelper"; import { RagfairHelper } from "./RagfairHelper"; -import { ILogger } from "../models/spt/utils/ILogger"; +import { RagfairServerHelper } from "./RagfairServerHelper"; +import { RagfairSortHelper } from "./RagfairSortHelper"; export declare class RagfairOfferHelper { private logger; private timeUtil; diff --git a/TypeScript/10ScopesAndTypes/types/helpers/RagfairServerHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/RagfairServerHelper.d.ts index 9a26261..0f32a66 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/RagfairServerHelper.d.ts @@ -1,15 +1,15 @@ -import { SaveServer } from "../servers/SaveServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { ItemHelper } from "./ItemHelper"; -import { ProfileHelper } from "./ProfileHelper"; import { MemberCategory } from "../models/eft/common/MemberCategory"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { SaveServer } from "../servers/SaveServer"; +import { HashUtil } from "../utils/HashUtil"; +import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { DialogueHelper } from "./DialogueHelper"; -import { Item } from "../models/eft/common/tables/IItem"; -import { JsonUtil } from "../utils/JsonUtil"; -import { HashUtil } from "../utils/HashUtil"; +import { ItemHelper } from "./ItemHelper"; +import { ProfileHelper } from "./ProfileHelper"; export declare class RagfairServerHelper { private randomUtil; private hashUtil; diff --git a/TypeScript/10ScopesAndTypes/types/helpers/TradeHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/TradeHelper.d.ts index 0712ff4..a78cd20 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/TradeHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/TradeHelper.d.ts @@ -1,16 +1,16 @@ -import { RagfairServer } from "../servers/RagfairServer"; import { InventoryHelper } from "../helpers/InventoryHelper"; +import { ItemHelper } from "../helpers/ItemHelper"; import { TraderHelper } from "../helpers/TraderHelper"; -import { FenceService } from "../services/FenceService"; -import { PaymentService } from "../services/PaymentService"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { Upd } from "../models/eft/common/tables/IItem"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "../models/eft/trade/IProcessSellTradeRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { Upd } from "../models/eft/common/tables/IItem"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { RagfairServer } from "../servers/RagfairServer"; +import { FenceService } from "../services/FenceService"; +import { PaymentService } from "../services/PaymentService"; export declare class TradeHelper { private logger; private itemEventRouter; diff --git a/TypeScript/10ScopesAndTypes/types/loaders/DelayedModLoader.d.ts b/TypeScript/10ScopesAndTypes/types/loaders/DelayedModLoader.d.ts index db86c75..7d0009f 100644 --- a/TypeScript/10ScopesAndTypes/types/loaders/DelayedModLoader.d.ts +++ b/TypeScript/10ScopesAndTypes/types/loaders/DelayedModLoader.d.ts @@ -1,10 +1,9 @@ -import { DependencyContainer } from 'tsyringe'; -import { VFS } from "../utils/VFS"; -import { InitialModLoader } from "./InitialModLoader"; -import { BundleLoader } from "./BundleLoader"; 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 { InitialModLoader } from "./InitialModLoader"; export declare class DelayedModLoader implements IModLoader { private bundleLoader; private handbookController; @@ -16,7 +15,7 @@ export declare class DelayedModLoader implements IModLoader { getBundle(key: string, local: boolean): void; getImportedModsNames(): string[]; getModPath(mod: string): string; - load(container: DependencyContainer): void; + load(): void; private executeMods; private addBundles; } diff --git a/TypeScript/10ScopesAndTypes/types/loaders/InitialModLoader.d.ts b/TypeScript/10ScopesAndTypes/types/loaders/InitialModLoader.d.ts index 35503c8..d30a3fe 100644 --- a/TypeScript/10ScopesAndTypes/types/loaders/InitialModLoader.d.ts +++ b/TypeScript/10ScopesAndTypes/types/loaders/InitialModLoader.d.ts @@ -1,23 +1,22 @@ import { DependencyContainer } from "tsyringe"; -import { JsonUtil } from "../utils/JsonUtil"; -import { VFS } from "../utils/VFS"; +import { IModLoader } from "../models/spt/mod/IModLoader"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { ModCompilerService } from "../services/ModCompilerService"; -import { HashCacheService } from "../services/HashCacheService"; -import { IModLoader } from "../models/spt/mod/IModLoader"; +import { JsonUtil } from "../utils/JsonUtil"; +import { VFS } from "../utils/VFS"; export declare class InitialModLoader implements IModLoader { private logger; private vfs; private jsonUtil; private modCompilerService; - private hashCacheService; private configServer; + private static container; private readonly basepath; private imported; private onLoad; private akiConfig; - constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, hashCacheService: HashCacheService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, configServer: ConfigServer); load(container: DependencyContainer): Promise; getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; @@ -29,10 +28,10 @@ export declare class InitialModLoader implements IModLoader { private executeMods; private sortModsLoadOrder; private addMod; - private compileModIfNeeded; private areModDependenciesFulfilled; private isModCompatible; private validMod; private getLoadOrderRecursive; private getLoadOrder; + getContainer(): DependencyContainer; } diff --git a/TypeScript/10ScopesAndTypes/types/models/eft/common/ILocationBase.d.ts b/TypeScript/10ScopesAndTypes/types/models/eft/common/ILocationBase.d.ts index 0d092f6..ad48d32 100644 --- a/TypeScript/10ScopesAndTypes/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/10ScopesAndTypes/types/models/eft/common/ILocationBase.d.ts @@ -107,6 +107,15 @@ export interface BossLocationSpawn { BossPlayer: boolean; BossZone: string; Time: number; + TriggerId: string; + TriggerName: string; + Delay?: number; + Supports?: BossSupport[]; +} +export interface BossSupport { + BossEscortAmount: string; + BossEscortDifficult: string[]; + BossEscortType: string; } export interface BotLocationModifier { AccuracySpeed: number; diff --git a/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/IBotType.d.ts b/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/IBotType.d.ts index e0f39d9..01be0be 100644 --- a/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/IBotType.d.ts +++ b/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/IBotType.d.ts @@ -100,6 +100,8 @@ export interface Generation { export interface ItemMinMax { grenades: MinMax; healing: MinMax; + drugs: MinMax; + stims: MinMax; looseLoot: MinMax; magazines: MinMax; specialItems: MinMax; diff --git a/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/IQuest.d.ts b/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/IQuest.d.ts index 1582a2f..0aa7a4e 100644 --- a/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/IQuest.d.ts +++ b/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/IQuest.d.ts @@ -44,7 +44,7 @@ export interface AvailableForProps { value?: number; compareMethod?: string; visibilityConditions?: VisibilityCondition[]; - target?: string; + target?: string | string[]; status?: number[]; } export interface VisibilityCondition { diff --git a/TypeScript/10ScopesAndTypes/types/models/eft/inventory/IAddItemRequestData.d.ts b/TypeScript/10ScopesAndTypes/types/models/eft/inventory/IAddItemRequestData.d.ts new file mode 100644 index 0000000..53db97a --- /dev/null +++ b/TypeScript/10ScopesAndTypes/types/models/eft/inventory/IAddItemRequestData.d.ts @@ -0,0 +1,4 @@ +export interface IAddItemRequestData { + tid: string; + items: any[]; +} diff --git a/TypeScript/10ScopesAndTypes/types/models/eft/match/IGetProfileRequestData.d.ts b/TypeScript/10ScopesAndTypes/types/models/eft/match/IGetProfileRequestData.d.ts new file mode 100644 index 0000000..86b5bbd --- /dev/null +++ b/TypeScript/10ScopesAndTypes/types/models/eft/match/IGetProfileRequestData.d.ts @@ -0,0 +1,3 @@ +export interface IGetProfileRequestData { + profileId: string; +} diff --git a/TypeScript/10ScopesAndTypes/types/models/spt/utils/IWatermark.d.ts b/TypeScript/10ScopesAndTypes/types/models/spt/utils/IWatermark.d.ts deleted file mode 100644 index a15f5d7..0000000 --- a/TypeScript/10ScopesAndTypes/types/models/spt/utils/IWatermark.d.ts +++ /dev/null @@ -1,22 +0,0 @@ -export interface IWatermarkLocale { - getLocale(): string; - getDescription(): string[]; - getWarning(): string[]; -} -export interface IWatermark { - initialize(): void; - getVersionTag(): string; - /** - * Set window title - */ - setTitle(): void; - /** - * Reset console cursor to top - */ - resetCursor(): void; - /** - * Draw the watermark - */ - draw(): void; - getVersionLabel(): string; -} diff --git a/TypeScript/10ScopesAndTypes/types/routers/dynamic/BotDynamicRouter.d.ts b/TypeScript/10ScopesAndTypes/types/routers/dynamic/BotDynamicRouter.d.ts index 51e52f7..dd2f68a 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/dynamic/BotDynamicRouter.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/dynamic/BotDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { BotCallbacks } from "../../callbacks/BotCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class BotDynamicRouter extends DynamicRouter { private botCallbacks; constructor(botCallbacks: BotCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/10ScopesAndTypes/types/routers/dynamic/BundleDynamicRouter.d.ts b/TypeScript/10ScopesAndTypes/types/routers/dynamic/BundleDynamicRouter.d.ts index 6cec61d..be27008 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/dynamic/BundleDynamicRouter.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/dynamic/BundleDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { BundleCallbacks } from "../../callbacks/BundleCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class BundleDynamicRouter extends DynamicRouter { private bundleCallbacks; constructor(bundleCallbacks: BundleCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/10ScopesAndTypes/types/routers/dynamic/CustomizationDynamicRouter.d.ts b/TypeScript/10ScopesAndTypes/types/routers/dynamic/CustomizationDynamicRouter.d.ts index e8a27ff..03a5967 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/dynamic/CustomizationDynamicRouter.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/dynamic/CustomizationDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class CustomizationDynamicRouter extends DynamicRouter { private customizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/10ScopesAndTypes/types/routers/dynamic/DataDynamicRouter.d.ts b/TypeScript/10ScopesAndTypes/types/routers/dynamic/DataDynamicRouter.d.ts index 9b6f632..c30501a 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/dynamic/DataDynamicRouter.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/dynamic/DataDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { DataCallbacks } from "../../callbacks/DataCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class DataDynamicRouter extends DynamicRouter { private dataCallbacks; constructor(dataCallbacks: DataCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/10ScopesAndTypes/types/routers/dynamic/HttpDynamicRouter.d.ts b/TypeScript/10ScopesAndTypes/types/routers/dynamic/HttpDynamicRouter.d.ts index 17706d5..b2933e9 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/dynamic/HttpDynamicRouter.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/dynamic/HttpDynamicRouter.d.ts @@ -1,9 +1,6 @@ -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; import { ImageRouter } from "../ImageRouter"; export declare class HttpDynamicRouter extends DynamicRouter { private imageRouter; constructor(imageRouter: ImageRouter); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/10ScopesAndTypes/types/routers/dynamic/InraidDynamicRouter.d.ts b/TypeScript/10ScopesAndTypes/types/routers/dynamic/InraidDynamicRouter.d.ts index cb1e8c0..ea4a9ae 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/dynamic/InraidDynamicRouter.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/dynamic/InraidDynamicRouter.d.ts @@ -1,10 +1,7 @@ import { InraidCallbacks } from "../../callbacks/InraidCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class InraidDynamicRouter extends DynamicRouter { private inraidCallbacks; constructor(inraidCallbacks: InraidCallbacks); - private readonly _routes; getTopLevelRoute(): string; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/10ScopesAndTypes/types/routers/dynamic/LocationDynamicRouter.d.ts b/TypeScript/10ScopesAndTypes/types/routers/dynamic/LocationDynamicRouter.d.ts index 9d85230..30741db 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/dynamic/LocationDynamicRouter.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/dynamic/LocationDynamicRouter.d.ts @@ -1,10 +1,7 @@ import { LocationCallbacks } from "../../callbacks/LocationCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class LocationDynamicRouter extends DynamicRouter { private locationCallbacks; constructor(locationCallbacks: LocationCallbacks); - private readonly _routes; getTopLevelRoute(): string; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/10ScopesAndTypes/types/routers/dynamic/NotifierDynamicRouter.d.ts b/TypeScript/10ScopesAndTypes/types/routers/dynamic/NotifierDynamicRouter.d.ts index e087b40..4786817 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/dynamic/NotifierDynamicRouter.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/dynamic/NotifierDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { NotifierCallbacks } from "../../callbacks/NotifierCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class NotifierDynamicRouter extends DynamicRouter { private notifierCallbacks; constructor(notifierCallbacks: NotifierCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/10ScopesAndTypes/types/routers/dynamic/TraderDynamicRouter.d.ts b/TypeScript/10ScopesAndTypes/types/routers/dynamic/TraderDynamicRouter.d.ts index d957e0e..a100b4c 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/dynamic/TraderDynamicRouter.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/dynamic/TraderDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { TraderCallbacks } from "../../callbacks/TraderCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class TraderDynamicRouter extends DynamicRouter { private traderCallbacks; constructor(traderCallbacks: TraderCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/10ScopesAndTypes/types/routers/serializers/NotifySerializer.d.ts b/TypeScript/10ScopesAndTypes/types/routers/serializers/NotifySerializer.d.ts index 7be87ef..8be8ac2 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/serializers/NotifySerializer.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/serializers/NotifySerializer.d.ts @@ -1,7 +1,7 @@ -import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { NotifierController } from "../../controllers/NotifierController"; import { Serializer } from "../../di/Serializer"; import { HttpServerHelper } from "../../helpers/HttpServerHelper"; +import { IHttpServer } from "../../models/spt/server/IHttpServer"; export declare class NotifySerializer extends Serializer { private notifierController; private httpServerHelper; diff --git a/TypeScript/10ScopesAndTypes/types/routers/static/BotStaticRouter.d.ts b/TypeScript/10ScopesAndTypes/types/routers/static/BotStaticRouter.d.ts index 7b23da6..d8b0bf4 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/static/BotStaticRouter.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/static/BotStaticRouter.d.ts @@ -1,8 +1,6 @@ import { BotCallbacks } from "../../callbacks/BotCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class BotStaticRouter extends StaticRouter { private botCallbacks; constructor(botCallbacks: BotCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/10ScopesAndTypes/types/routers/static/BundleStaticRouter.d.ts b/TypeScript/10ScopesAndTypes/types/routers/static/BundleStaticRouter.d.ts index 9283003..3905b82 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/static/BundleStaticRouter.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/static/BundleStaticRouter.d.ts @@ -1,8 +1,6 @@ import { BundleCallbacks } from "../../callbacks/BundleCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class BundleStaticRouter extends StaticRouter { private bundleCallbacks; constructor(bundleCallbacks: BundleCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/10ScopesAndTypes/types/routers/static/CustomizationStaticRouter.d.ts b/TypeScript/10ScopesAndTypes/types/routers/static/CustomizationStaticRouter.d.ts index 0d29578..46c71b8 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/static/CustomizationStaticRouter.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/static/CustomizationStaticRouter.d.ts @@ -1,8 +1,6 @@ import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class CustomizationStaticRouter extends StaticRouter { private customizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/10ScopesAndTypes/types/routers/static/DataStaticRouter.d.ts b/TypeScript/10ScopesAndTypes/types/routers/static/DataStaticRouter.d.ts index b8d2fea..a493d3a 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/static/DataStaticRouter.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/static/DataStaticRouter.d.ts @@ -1,8 +1,6 @@ import { DataCallbacks } from "../../callbacks/DataCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class DataStaticRouter extends StaticRouter { private dataCallbacks; constructor(dataCallbacks: DataCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/10ScopesAndTypes/types/routers/static/DialogStaticRouter.d.ts b/TypeScript/10ScopesAndTypes/types/routers/static/DialogStaticRouter.d.ts index 5e7285e..a59fb14 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/static/DialogStaticRouter.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/static/DialogStaticRouter.d.ts @@ -1,8 +1,6 @@ import { DialogueCallbacks } from "../../callbacks/DialogueCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class DialogStaticRouter extends StaticRouter { private dialogueCallbacks; constructor(dialogueCallbacks: DialogueCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/10ScopesAndTypes/types/routers/static/GameStaticRouter.d.ts b/TypeScript/10ScopesAndTypes/types/routers/static/GameStaticRouter.d.ts index e8eca40..988b673 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/static/GameStaticRouter.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/static/GameStaticRouter.d.ts @@ -1,8 +1,6 @@ import { GameCallbacks } from "../../callbacks/GameCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class GameStaticRouter extends StaticRouter { private gameCallbacks; constructor(gameCallbacks: GameCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/10ScopesAndTypes/types/routers/static/HealthStaticRouter.d.ts b/TypeScript/10ScopesAndTypes/types/routers/static/HealthStaticRouter.d.ts index aa0b8b3..e644861 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/static/HealthStaticRouter.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/static/HealthStaticRouter.d.ts @@ -1,8 +1,6 @@ import { HealthCallbacks } from "../../callbacks/HealthCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class HealthStaticRouter extends StaticRouter { private healthCallbacks; constructor(healthCallbacks: HealthCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/10ScopesAndTypes/types/routers/static/InraidStaticRouter.d.ts b/TypeScript/10ScopesAndTypes/types/routers/static/InraidStaticRouter.d.ts index 417d9d7..66ed860 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/static/InraidStaticRouter.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/static/InraidStaticRouter.d.ts @@ -1,8 +1,6 @@ import { InraidCallbacks } from "../../callbacks/InraidCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class InraidStaticRouter extends StaticRouter { private inraidCallbacks; constructor(inraidCallbacks: InraidCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/10ScopesAndTypes/types/routers/static/InsuranceStaticRouter.d.ts b/TypeScript/10ScopesAndTypes/types/routers/static/InsuranceStaticRouter.d.ts index 6fbffe5..8da26b3 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/static/InsuranceStaticRouter.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/static/InsuranceStaticRouter.d.ts @@ -1,8 +1,6 @@ import { InsuranceCallbacks } from "../../callbacks/InsuranceCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class InsuranceStaticRouter extends StaticRouter { private insuranceCallbacks; constructor(insuranceCallbacks: InsuranceCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/10ScopesAndTypes/types/routers/static/ItemEventStaticRouter.d.ts b/TypeScript/10ScopesAndTypes/types/routers/static/ItemEventStaticRouter.d.ts index 1a869e1..08ba6bb 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/static/ItemEventStaticRouter.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/static/ItemEventStaticRouter.d.ts @@ -1,8 +1,6 @@ import { ItemEventCallbacks } from "../../callbacks/ItemEventCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class ItemEventStaticRouter extends StaticRouter { private itemEventCallbacks; constructor(itemEventCallbacks: ItemEventCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/10ScopesAndTypes/types/routers/static/LauncherStaticRouter.d.ts b/TypeScript/10ScopesAndTypes/types/routers/static/LauncherStaticRouter.d.ts index 0d5e231..9d07f78 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/static/LauncherStaticRouter.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/static/LauncherStaticRouter.d.ts @@ -1,8 +1,6 @@ import { LauncherCallbacks } from "../../callbacks/LauncherCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class LauncherStaticRouter extends StaticRouter { private launcherCallbacks; constructor(launcherCallbacks: LauncherCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): string; } diff --git a/TypeScript/10ScopesAndTypes/types/routers/static/LocationStaticRouter.d.ts b/TypeScript/10ScopesAndTypes/types/routers/static/LocationStaticRouter.d.ts index 0b9b063..9c5c52e 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/static/LocationStaticRouter.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/static/LocationStaticRouter.d.ts @@ -1,8 +1,6 @@ import { LocationCallbacks } from "../../callbacks/LocationCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class LocationStaticRouter extends StaticRouter { private locationCallbacks; constructor(locationCallbacks: LocationCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/10ScopesAndTypes/types/routers/static/MatchStaticRouter.d.ts b/TypeScript/10ScopesAndTypes/types/routers/static/MatchStaticRouter.d.ts index 55c9640..d746381 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/static/MatchStaticRouter.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/static/MatchStaticRouter.d.ts @@ -1,8 +1,6 @@ import { MatchCallbacks } from "../../callbacks/MatchCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class MatchStaticRouter extends StaticRouter { private matchCallbacks; constructor(matchCallbacks: MatchCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/10ScopesAndTypes/types/routers/static/NotifierStaticRouter.d.ts b/TypeScript/10ScopesAndTypes/types/routers/static/NotifierStaticRouter.d.ts index 0d992db..1c8566d 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/static/NotifierStaticRouter.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/static/NotifierStaticRouter.d.ts @@ -1,8 +1,6 @@ import { NotifierCallbacks } from "../../callbacks/NotifierCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class NotifierStaticRouter extends StaticRouter { private notifierCallbacks; constructor(notifierCallbacks: NotifierCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/10ScopesAndTypes/types/routers/static/PresetStaticRouter.d.ts b/TypeScript/10ScopesAndTypes/types/routers/static/PresetStaticRouter.d.ts index a1bda56..2272f82 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/static/PresetStaticRouter.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/static/PresetStaticRouter.d.ts @@ -1,8 +1,6 @@ import { PresetBuildCallbacks } from "../../callbacks/PresetBuildCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class PresetStaticRouter extends StaticRouter { private presetCallbacks; constructor(presetCallbacks: PresetBuildCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/10ScopesAndTypes/types/routers/static/ProfileStaticRouter.d.ts b/TypeScript/10ScopesAndTypes/types/routers/static/ProfileStaticRouter.d.ts index d03b782..fd787f1 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/static/ProfileStaticRouter.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/static/ProfileStaticRouter.d.ts @@ -1,8 +1,6 @@ import { ProfileCallbacks } from "../../callbacks/ProfileCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class ProfileStaticRouter extends StaticRouter { private profileCallbacks; constructor(profileCallbacks: ProfileCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/10ScopesAndTypes/types/routers/static/QuestStaticRouter.d.ts b/TypeScript/10ScopesAndTypes/types/routers/static/QuestStaticRouter.d.ts index d375409..fda3c23 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/static/QuestStaticRouter.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/static/QuestStaticRouter.d.ts @@ -1,8 +1,6 @@ import { QuestCallbacks } from "../../callbacks/QuestCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class QuestStaticRouter extends StaticRouter { private questCallbacks; constructor(questCallbacks: QuestCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/10ScopesAndTypes/types/routers/static/RagfairStaticRouter.d.ts b/TypeScript/10ScopesAndTypes/types/routers/static/RagfairStaticRouter.d.ts index d5ed312..618374f 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/static/RagfairStaticRouter.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/static/RagfairStaticRouter.d.ts @@ -1,8 +1,6 @@ import { RagfairCallbacks } from "../../callbacks/RagfairCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class RagfairStaticRouter extends StaticRouter { private ragfairCallbacks; constructor(ragfairCallbacks: RagfairCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/10ScopesAndTypes/types/routers/static/TraderStaticRouter.d.ts b/TypeScript/10ScopesAndTypes/types/routers/static/TraderStaticRouter.d.ts index e3406fb..18f0629 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/static/TraderStaticRouter.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/static/TraderStaticRouter.d.ts @@ -1,8 +1,6 @@ import { TraderCallbacks } from "../../callbacks/TraderCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class TraderStaticRouter extends StaticRouter { private traderCallbacks; constructor(traderCallbacks: TraderCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/10ScopesAndTypes/types/routers/static/WeatherStaticRouter.d.ts b/TypeScript/10ScopesAndTypes/types/routers/static/WeatherStaticRouter.d.ts index aec3575..61b904d 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/static/WeatherStaticRouter.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/static/WeatherStaticRouter.d.ts @@ -1,8 +1,6 @@ import { WeatherCallbacks } from "../../callbacks/WeatherCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class WeatherStaticRouter extends StaticRouter { private weatherCallbacks; constructor(weatherCallbacks: WeatherCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/10ScopesAndTypes/types/servers/HttpServer.d.ts b/TypeScript/10ScopesAndTypes/types/servers/HttpServer.d.ts index 0ba20c6..d0db7e4 100644 --- a/TypeScript/10ScopesAndTypes/types/servers/HttpServer.d.ts +++ b/TypeScript/10ScopesAndTypes/types/servers/HttpServer.d.ts @@ -1,19 +1,21 @@ /// -import { HttpRouter } from "../routers/HttpRouter"; -import { JsonUtil } from "../utils/JsonUtil"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { DatabaseServer } from "./DatabaseServer"; -import { Serializer } from "../di/Serializer"; import http, { ServerResponse } from "http"; -import { INotification } from "../models/eft/notifier/INotifier"; -import { NotifierHelper } from "../helpers/NotifierHelper"; -import { ConfigServer } from "./ConfigServer"; -import { ILogger } from "../models/spt/utils/ILogger"; +import { Serializer } from "../di/Serializer"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; +import { NotifierHelper } from "../helpers/NotifierHelper"; +import { INotification } from "../models/eft/notifier/INotifier"; import { IHttpServer } from "../models/spt/server/IHttpServer"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { HttpRouter } from "../routers/HttpRouter"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { JsonUtil } from "../utils/JsonUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +import { ConfigServer } from "./ConfigServer"; +import { DatabaseServer } from "./DatabaseServer"; export declare class HttpServer implements IHttpServer { private httpRouter; private logger; + private randomUtil; private jsonUtil; private httpResponse; private databaseServer; @@ -21,7 +23,8 @@ export declare class HttpServer implements IHttpServer { private httpServerHelper; private serializers; private configServer; - constructor(httpRouter: HttpRouter, logger: ILogger, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); + constructor(httpRouter: HttpRouter, // TODO: delay required + logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); private buffers; private onReceive; private onRespond; @@ -39,5 +42,6 @@ export declare class HttpServer implements IHttpServer { sendResponse(sessionID: string, req: any, resp: any, body: Buffer): void; handleRequest(req: http.IncomingMessage, resp: http.ServerResponse): void; load(): void; + private getRandomisedMessage; wsOnConnection(ws: any, req: any): void; } diff --git a/TypeScript/10ScopesAndTypes/types/services/InsuranceService.d.ts b/TypeScript/10ScopesAndTypes/types/services/InsuranceService.d.ts index 35f0dbc..160faba 100644 --- a/TypeScript/10ScopesAndTypes/types/services/InsuranceService.d.ts +++ b/TypeScript/10ScopesAndTypes/types/services/InsuranceService.d.ts @@ -1,10 +1,10 @@ +import { DialogueHelper } from "../helpers/DialogueHelper"; +import { SecureContainerHelper } from "../helpers/SecureContainerHelper"; +import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ILogger } from "../models/spt/utils/ILogger"; -import { DialogueHelper } from "../helpers/DialogueHelper"; -import { SecureContainerHelper } from "../helpers/SecureContainerHelper"; -import { TraderHelper } from "../helpers/TraderHelper"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; diff --git a/TypeScript/10ScopesAndTypes/types/services/ModCompilerService.d.ts b/TypeScript/10ScopesAndTypes/types/services/ModCompilerService.d.ts index 7e750c3..d316e48 100644 --- a/TypeScript/10ScopesAndTypes/types/services/ModCompilerService.d.ts +++ b/TypeScript/10ScopesAndTypes/types/services/ModCompilerService.d.ts @@ -1,10 +1,12 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { VFS } from "../utils/VFS"; +import { HashCacheService } from "./HashCacheService"; export declare class ModCompilerService { private logger; + private hashCacheService; private vfs; - constructor(logger: ILogger, vfs: VFS); - compileMod(path: string, modTypeScriptFiles: string[]): Promise; + constructor(logger: ILogger, hashCacheService: HashCacheService, vfs: VFS); + compileMod(modName: string, path: string, modTypeScriptFiles: string[]): Promise; private compile; private areFilesReady; private delay; diff --git a/TypeScript/10ScopesAndTypes/types/services/PaymentService.d.ts b/TypeScript/10ScopesAndTypes/types/services/PaymentService.d.ts index 20cee50..0a6c4d6 100644 --- a/TypeScript/10ScopesAndTypes/types/services/PaymentService.d.ts +++ b/TypeScript/10ScopesAndTypes/types/services/PaymentService.d.ts @@ -1,15 +1,15 @@ +import { HandbookHelper } from "../helpers/HandbookHelper"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { ItemHelper } from "../helpers/ItemHelper"; -import { DatabaseServer } from "../servers/DatabaseServer"; +import { PaymentHelper } from "../helpers/PaymentHelper"; +import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "../models/eft/trade/IProcessSellTradeRequestData"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { PaymentHelper } from "../helpers/PaymentHelper"; -import { HandbookHelper } from "../helpers/HandbookHelper"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class PaymentService { private logger; private httpResponse; diff --git a/TypeScript/10ScopesAndTypes/types/services/PlayerService.d.ts b/TypeScript/10ScopesAndTypes/types/services/PlayerService.d.ts index 4a74b4a..99e5986 100644 --- a/TypeScript/10ScopesAndTypes/types/services/PlayerService.d.ts +++ b/TypeScript/10ScopesAndTypes/types/services/PlayerService.d.ts @@ -1,7 +1,7 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; 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"; export declare class PlayerService { private logger; private databaseServer; diff --git a/TypeScript/10ScopesAndTypes/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts b/TypeScript/10ScopesAndTypes/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts new file mode 100644 index 0000000..abfe237 --- /dev/null +++ b/TypeScript/10ScopesAndTypes/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts @@ -0,0 +1,6 @@ +import { DynamicRouter, RouteAction } from "../../../di/Router"; +export declare class DynamicRouterMod extends DynamicRouter { + private topLevelRoute; + constructor(routes: RouteAction[], topLevelRoute: string); + getTopLevelRoute(): string; +} diff --git a/TypeScript/10ScopesAndTypes/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/10ScopesAndTypes/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts new file mode 100644 index 0000000..6742fc6 --- /dev/null +++ b/TypeScript/10ScopesAndTypes/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -0,0 +1,7 @@ +import { DependencyContainer } from "tsyringe"; +import { RouteAction } from "../../../di/Router"; +export declare class DynamicRouterModService { + private container; + constructor(container: DependencyContainer); + registerDynamicRouter(name: string, routes: RouteAction[], topLevelRoute: string): void; +} diff --git a/TypeScript/10ScopesAndTypes/types/services/mod/onLoad/OnLoadMod.d.ts b/TypeScript/10ScopesAndTypes/types/services/mod/onLoad/OnLoadMod.d.ts new file mode 100644 index 0000000..53fb062 --- /dev/null +++ b/TypeScript/10ScopesAndTypes/types/services/mod/onLoad/OnLoadMod.d.ts @@ -0,0 +1,8 @@ +import { OnLoad } from "../../../di/OnLoad"; +export declare class OnLoadMod extends OnLoad { + private onLoadOverride; + private getRouteOverride; + constructor(onLoadOverride: () => void, getRouteOverride: () => string); + onLoad(): void; + getRoute(): string; +} diff --git a/TypeScript/10ScopesAndTypes/types/services/mod/onLoad/OnLoadModService.d.ts b/TypeScript/10ScopesAndTypes/types/services/mod/onLoad/OnLoadModService.d.ts new file mode 100644 index 0000000..89bad14 --- /dev/null +++ b/TypeScript/10ScopesAndTypes/types/services/mod/onLoad/OnLoadModService.d.ts @@ -0,0 +1,6 @@ +import { DependencyContainer } from "tsyringe"; +export declare class OnLoadModService { + private container; + constructor(container: DependencyContainer); + registerOnLoad(name: string, onLoad: () => void, getRoute: () => string): void; +} diff --git a/TypeScript/10ScopesAndTypes/types/services/mod/onUpdate/OnUpdateMod.d.ts b/TypeScript/10ScopesAndTypes/types/services/mod/onUpdate/OnUpdateMod.d.ts new file mode 100644 index 0000000..ee89043 --- /dev/null +++ b/TypeScript/10ScopesAndTypes/types/services/mod/onUpdate/OnUpdateMod.d.ts @@ -0,0 +1,8 @@ +import { OnUpdate } from "../../../di/OnUpdate"; +export declare class OnUpdateMod extends OnUpdate { + private onUpdateOverride; + private getRouteOverride; + constructor(onUpdateOverride: (timeSinceLastRun: number) => boolean, getRouteOverride: () => string); + onUpdate(timeSinceLastRun: number): boolean; + getRoute(): string; +} diff --git a/TypeScript/10ScopesAndTypes/types/services/mod/onUpdate/OnUpdateModService.d.ts b/TypeScript/10ScopesAndTypes/types/services/mod/onUpdate/OnUpdateModService.d.ts new file mode 100644 index 0000000..32419f4 --- /dev/null +++ b/TypeScript/10ScopesAndTypes/types/services/mod/onUpdate/OnUpdateModService.d.ts @@ -0,0 +1,6 @@ +import { DependencyContainer } from "tsyringe"; +export declare class OnUpdateModService { + private container; + constructor(container: DependencyContainer); + registerOnUpdate(name: string, onUpdate: (timeSinceLastRun: number) => boolean, getRoute: () => string): void; +} diff --git a/TypeScript/10ScopesAndTypes/types/services/mod/staticRouter/StaticRouterMod.d.ts b/TypeScript/10ScopesAndTypes/types/services/mod/staticRouter/StaticRouterMod.d.ts new file mode 100644 index 0000000..1e62747 --- /dev/null +++ b/TypeScript/10ScopesAndTypes/types/services/mod/staticRouter/StaticRouterMod.d.ts @@ -0,0 +1,6 @@ +import { RouteAction, StaticRouter } from "../../../di/Router"; +export declare class StaticRouterMod extends StaticRouter { + private topLevelRoute; + constructor(routes: RouteAction[], topLevelRoute: string); + getTopLevelRoute(): string; +} diff --git a/TypeScript/10ScopesAndTypes/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/10ScopesAndTypes/types/services/mod/staticRouter/StaticRouterModService.d.ts new file mode 100644 index 0000000..d4c42aa --- /dev/null +++ b/TypeScript/10ScopesAndTypes/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -0,0 +1,7 @@ +import { DependencyContainer } from "tsyringe"; +import { RouteAction } from "../../../di/Router"; +export declare class StaticRouterModService { + private container; + constructor(container: DependencyContainer); + registerStaticRouter(name: string, routes: RouteAction[], topLevelRoute: string): void; +} diff --git a/TypeScript/10ScopesAndTypes/types/utils/AyncQueue.d.ts b/TypeScript/10ScopesAndTypes/types/utils/AyncQueue.d.ts index 8f1559b..a99aa37 100644 --- a/TypeScript/10ScopesAndTypes/types/utils/AyncQueue.d.ts +++ b/TypeScript/10ScopesAndTypes/types/utils/AyncQueue.d.ts @@ -1,7 +1,7 @@ import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; import { ICommand } from "../models/spt/utils/ICommand"; export declare class AsyncQueue implements IAsyncQueue { - commandsQueue: ICommand[]; + private commandsQueue; constructor(); waitFor(command: ICommand): Promise; } diff --git a/TypeScript/10ScopesAndTypes/types/utils/Watermark.d.ts b/TypeScript/10ScopesAndTypes/types/utils/Watermark.d.ts index 598d5a6..e7b9883 100644 --- a/TypeScript/10ScopesAndTypes/types/utils/Watermark.d.ts +++ b/TypeScript/10ScopesAndTypes/types/utils/Watermark.d.ts @@ -1,13 +1,12 @@ -import { IWatermark, IWatermarkLocale } from "../models/spt/utils/IWatermark"; import { ConfigServer } from "../servers/ConfigServer"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class WatermarkLocale implements IWatermarkLocale { +export declare class WatermarkLocale { private locales; getLocale(): string; getDescription(): string[]; getWarning(): string[]; } -export declare class Watermark implements IWatermark { +export declare class Watermark { private logger; private configServer; private watermarkLocale?; diff --git a/TypeScript/1LogToConsole/types/di/OnSaveLoad.d.ts b/TypeScript/1LogToConsole/types/di/OnSaveLoad.d.ts new file mode 100644 index 0000000..1edf37e --- /dev/null +++ b/TypeScript/1LogToConsole/types/di/OnSaveLoad.d.ts @@ -0,0 +1,4 @@ +export declare class OnSaveLoad { + onSaveLoad(): void; + getRoute(): string; +} diff --git a/TypeScript/1LogToConsole/types/loaders/DelayedModLoader.d.ts b/TypeScript/1LogToConsole/types/loaders/DelayedModLoader.d.ts index 7e7d8d0..7d0009f 100644 --- a/TypeScript/1LogToConsole/types/loaders/DelayedModLoader.d.ts +++ b/TypeScript/1LogToConsole/types/loaders/DelayedModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { HandbookController } from "../controllers/HandbookController"; import { IModLoader } from "../models/spt/mod/IModLoader"; import { ModCompilerService } from "../services/ModCompilerService"; @@ -16,7 +15,7 @@ export declare class DelayedModLoader implements IModLoader { getBundle(key: string, local: boolean): void; getImportedModsNames(): string[]; getModPath(mod: string): string; - load(container: DependencyContainer): void; + load(): void; private executeMods; private addBundles; } diff --git a/TypeScript/1LogToConsole/types/loaders/InitialModLoader.d.ts b/TypeScript/1LogToConsole/types/loaders/InitialModLoader.d.ts index a53cce2..d30a3fe 100644 --- a/TypeScript/1LogToConsole/types/loaders/InitialModLoader.d.ts +++ b/TypeScript/1LogToConsole/types/loaders/InitialModLoader.d.ts @@ -11,6 +11,7 @@ export declare class InitialModLoader implements IModLoader { private jsonUtil; private modCompilerService; private configServer; + private static container; private readonly basepath; private imported; private onLoad; @@ -32,4 +33,5 @@ export declare class InitialModLoader implements IModLoader { private validMod; private getLoadOrderRecursive; private getLoadOrder; + getContainer(): DependencyContainer; } diff --git a/TypeScript/1LogToConsole/types/models/eft/common/ILocationBase.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/ILocationBase.d.ts index 0d092f6..ad48d32 100644 --- a/TypeScript/1LogToConsole/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/1LogToConsole/types/models/eft/common/ILocationBase.d.ts @@ -107,6 +107,15 @@ export interface BossLocationSpawn { BossPlayer: boolean; BossZone: string; Time: number; + TriggerId: string; + TriggerName: string; + Delay?: number; + Supports?: BossSupport[]; +} +export interface BossSupport { + BossEscortAmount: string; + BossEscortDifficult: string[]; + BossEscortType: string; } export interface BotLocationModifier { AccuracySpeed: number; diff --git a/TypeScript/1LogToConsole/types/models/eft/common/tables/IBotType.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/tables/IBotType.d.ts index d30cc37..01be0be 100644 --- a/TypeScript/1LogToConsole/types/models/eft/common/tables/IBotType.d.ts +++ b/TypeScript/1LogToConsole/types/models/eft/common/tables/IBotType.d.ts @@ -100,6 +100,7 @@ export interface Generation { export interface ItemMinMax { grenades: MinMax; healing: MinMax; + drugs: MinMax; stims: MinMax; looseLoot: MinMax; magazines: MinMax; diff --git a/TypeScript/1LogToConsole/types/models/eft/common/tables/IQuest.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/tables/IQuest.d.ts index 1582a2f..0aa7a4e 100644 --- a/TypeScript/1LogToConsole/types/models/eft/common/tables/IQuest.d.ts +++ b/TypeScript/1LogToConsole/types/models/eft/common/tables/IQuest.d.ts @@ -44,7 +44,7 @@ export interface AvailableForProps { value?: number; compareMethod?: string; visibilityConditions?: VisibilityCondition[]; - target?: string; + target?: string | string[]; status?: number[]; } export interface VisibilityCondition { diff --git a/TypeScript/2EditDatabase/.eslintignore b/TypeScript/2EditDatabase/.eslintignore new file mode 100644 index 0000000..9922d9a --- /dev/null +++ b/TypeScript/2EditDatabase/.eslintignore @@ -0,0 +1,9 @@ +# Exclude these folders from linting +node_modules +dist/ +types/ + +# Exclude these filetypes from linting +*.json +*.txt +*.exe \ No newline at end of file diff --git a/TypeScript/2EditDatabase/.eslintrc.json b/TypeScript/2EditDatabase/.eslintrc.json new file mode 100644 index 0000000..c505160 --- /dev/null +++ b/TypeScript/2EditDatabase/.eslintrc.json @@ -0,0 +1,75 @@ +{ + "root": true, + "parser": "@typescript-eslint/parser", + "plugins": [ + "@typescript-eslint" + ], + "extends": [ + "eslint:recommended", + "plugin:@typescript-eslint/eslint-recommended", + "plugin:@typescript-eslint/recommended" + ], + "rules": { + "@typescript-eslint/no-explicit-any": 0, + "@typescript-eslint/no-unused-vars": 1, + "@typescript-eslint/no-empty-interface": 0, + "@typescript-eslint/no-namespace": 0, + "@typescript-eslint/comma-dangle": 1, + "@typescript-eslint/func-call-spacing": 2, + "@typescript-eslint/quotes": 1, + "@typescript-eslint/brace-style": [ + "warn", + "allman" + ], + "@typescript-eslint/naming-convention": [ + "warn", + { + "selector": "default", + "format": ["camelCase"], + "leadingUnderscore": "allow" + }, + { + "selector": "typeLike", + "format": ["PascalCase"] + }, + { + "selector": "objectLiteralProperty", + "format": ["PascalCase", "camelCase"], + "leadingUnderscore": "allow" + }, + { + "selector": "typeProperty", + "format": ["PascalCase", "camelCase"], + "leadingUnderscore": "allow" + }, + { + "selector": "enumMember", + "format": ["UPPER_CASE"] + } + ], + "@typescript-eslint/indent": [ + "warn", + 4 + ], + "@typescript-eslint/no-unused-expressions": [ + "warn", + { + "allowShortCircuit": false, + "allowTernary": false + } + ], + "@typescript-eslint/keyword-spacing": [ + "warn", + { + "before": true, + "after": true + } + ], + "@typescript-eslint/explicit-module-boundary-types": [ + "warn", + { + "allowArgumentsExplicitlyTypedAsAny": true + } + ] + } +} \ No newline at end of file diff --git a/TypeScript/2EditDatabase/README.md b/TypeScript/2EditDatabase/README.md new file mode 100644 index 0000000..efc31a4 --- /dev/null +++ b/TypeScript/2EditDatabase/README.md @@ -0,0 +1,64 @@ + +This project was created to automate most parts of building and setting up an environment. + +## **NodeJS 14.15.3:** + +The first step would be to install nodejs on your pc, the version you NEED is **14.15.3** + +That version is the one that has been used to test the mod templates and build scripts. + +It can be downloaded from here: https://nodejs.org/download/release/v14.15.3/ + +A system reboot may be needed after install. + +## **IDE:** + +The second step is having an IDE ready. For the currect purpose we've setup a VSCodium workspace file. + +You CAN use Visual Studio Code if you so desire, just keep in mind that our dev tests on the mod files was done using VSCodium. + +You can get VSCodium here: https://vscodium.com/#install + +## **Workspace:** + +Once you have NodeJS and VSCodium ready, open the mod.code-workspace file with VSCodium (File->Open Worspace from File...). + +Once the project loads into VSCodium you will be recommended to install the ESLint plugin. This is HIGHLY recommended. + +## **Environment Setup:** + +There is a task that will automatically setup your environment to use typescript. + +To run it, you just need to go to: + +> Terminal->Run Task...->Show All Tasks...->npm: install + +After running this task, your environment will be ready to start coding. + +DO NOT remove the node_modules folder, this is an auto generated directory that has the required dependencies to be able to use typescript and more. + +## **IMPORTANT:** + +Before starting to work on your mod, we suggest you read about Dependency Injection and Inversion of Control as this is the adopted architecture SPT-AKI has adopted. + +It will be difficult to understand some of the problems you may be having if you dont understand the basics of it. + +A guide explaining all the essentials will be available on the hub on release for you to read about. + +## **Coding:** + +All your work should be centered around the mod.ts file as an entry point. +You can ONLY change the following properties from the package.json file: `"name"`, `"version"`, `"license"`: `"MIT"`, `"author"`, `"akiVersion"`. + +If you have never used typescript before, you can read about it here: https://www.typescriptlang.org/docs/ + +## **Distributing your mod:** + +The project has been set up with an automatic task that will copy and zip ALL required files for your mod to work on SPT-AKI. +To run this task you just need to go to: + +> Terminal->Run Task...->Show All Tasks...->npm: build:zip + +The output will be a mod.zip file that will appear on the root of the project. + +Always verify that all files were included into the zip file. \ No newline at end of file diff --git a/TypeScript/2EditDatabase/mod.code-workspace b/TypeScript/2EditDatabase/mod.code-workspace new file mode 100644 index 0000000..6732c67 --- /dev/null +++ b/TypeScript/2EditDatabase/mod.code-workspace @@ -0,0 +1,12 @@ +{ + "folders": [ + { + "path": "." + } + ], + "extensions": { + "recommendations": [ + "dbaeumer.vscode-eslint" + ] + } +} \ No newline at end of file diff --git a/TypeScript/2EditDatabase/package.json b/TypeScript/2EditDatabase/package.json index b003a50..55cd2e3 100644 --- a/TypeScript/2EditDatabase/package.json +++ b/TypeScript/2EditDatabase/package.json @@ -1,17 +1,25 @@ { - "name": "EditDatabase", - "version": "1.0.0", - "main": "src/mod.js", - "license": "MIT", - "author": "Chomp", - "akiVersion": "3.0.0", - "scripts": { - "install": "npx handpick --target=devDependencies", - "build": "tsc" - }, - "devDependencies": { - "@types/node": "^17.0.31", - "tsyringe": "^4.6.0", - "typescript": "^4.6.4" - } + "name": "EditDatabase", + "version": "1.0.0", + "main": "src/mod.js", + "license": "MIT", + "author": "Chomp", + "akiVersion": "3.0.0", + "scripts": { + "setup:environment": "npm i", + "build:unzipped": "copyfiles -e \"./node_modules/**/*.*\" -e \"./dist/**/*.*\" -e \"./package-lock.json\" -e \"./tsconfig.json\" -e \"./README.txt\" -e \"./mod.code-workspace\" ./**/*.* ./dist", + "zip:files": "cd dist/ && bestzip ../mod.zip *", + "build:zip": "npm run clean:environment && npm run build:unzipped && npm run zip:files", + "clean:environment": "node -e \"require('fs').rm('mod.zip', ()=>{})\" && node -e \"require('fs').rmdir('./dist/',{recursive:true},()=>{})\"" + }, + "devDependencies": { + "@types/node": "^14.15.3", + "@typescript-eslint/eslint-plugin": "^4.33.0", + "@typescript-eslint/parser": "^4.33.0", + "copyfiles": "2.4.1", + "eslint": "7.26.0", + "tsyringe": "4.6.0", + "typescript": "4.6.4", + "bestzip": "2.2.1" + } } diff --git a/TypeScript/2EditDatabase/types/di/OnSaveLoad.d.ts b/TypeScript/2EditDatabase/types/di/OnSaveLoad.d.ts new file mode 100644 index 0000000..1edf37e --- /dev/null +++ b/TypeScript/2EditDatabase/types/di/OnSaveLoad.d.ts @@ -0,0 +1,4 @@ +export declare class OnSaveLoad { + onSaveLoad(): void; + getRoute(): string; +} diff --git a/TypeScript/2EditDatabase/types/loaders/DelayedModLoader.d.ts b/TypeScript/2EditDatabase/types/loaders/DelayedModLoader.d.ts index 7e7d8d0..7d0009f 100644 --- a/TypeScript/2EditDatabase/types/loaders/DelayedModLoader.d.ts +++ b/TypeScript/2EditDatabase/types/loaders/DelayedModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { HandbookController } from "../controllers/HandbookController"; import { IModLoader } from "../models/spt/mod/IModLoader"; import { ModCompilerService } from "../services/ModCompilerService"; @@ -16,7 +15,7 @@ export declare class DelayedModLoader implements IModLoader { getBundle(key: string, local: boolean): void; getImportedModsNames(): string[]; getModPath(mod: string): string; - load(container: DependencyContainer): void; + load(): void; private executeMods; private addBundles; } diff --git a/TypeScript/2EditDatabase/types/loaders/InitialModLoader.d.ts b/TypeScript/2EditDatabase/types/loaders/InitialModLoader.d.ts index a53cce2..d30a3fe 100644 --- a/TypeScript/2EditDatabase/types/loaders/InitialModLoader.d.ts +++ b/TypeScript/2EditDatabase/types/loaders/InitialModLoader.d.ts @@ -11,6 +11,7 @@ export declare class InitialModLoader implements IModLoader { private jsonUtil; private modCompilerService; private configServer; + private static container; private readonly basepath; private imported; private onLoad; @@ -32,4 +33,5 @@ export declare class InitialModLoader implements IModLoader { private validMod; private getLoadOrderRecursive; private getLoadOrder; + getContainer(): DependencyContainer; } diff --git a/TypeScript/2EditDatabase/types/models/eft/common/ILocationBase.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/ILocationBase.d.ts index 0d092f6..ad48d32 100644 --- a/TypeScript/2EditDatabase/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/2EditDatabase/types/models/eft/common/ILocationBase.d.ts @@ -107,6 +107,15 @@ export interface BossLocationSpawn { BossPlayer: boolean; BossZone: string; Time: number; + TriggerId: string; + TriggerName: string; + Delay?: number; + Supports?: BossSupport[]; +} +export interface BossSupport { + BossEscortAmount: string; + BossEscortDifficult: string[]; + BossEscortType: string; } export interface BotLocationModifier { AccuracySpeed: number; diff --git a/TypeScript/2EditDatabase/types/models/eft/common/tables/IBotType.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/tables/IBotType.d.ts index d30cc37..01be0be 100644 --- a/TypeScript/2EditDatabase/types/models/eft/common/tables/IBotType.d.ts +++ b/TypeScript/2EditDatabase/types/models/eft/common/tables/IBotType.d.ts @@ -100,6 +100,7 @@ export interface Generation { export interface ItemMinMax { grenades: MinMax; healing: MinMax; + drugs: MinMax; stims: MinMax; looseLoot: MinMax; magazines: MinMax; diff --git a/TypeScript/2EditDatabase/types/models/eft/common/tables/IQuest.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/tables/IQuest.d.ts index 1582a2f..0aa7a4e 100644 --- a/TypeScript/2EditDatabase/types/models/eft/common/tables/IQuest.d.ts +++ b/TypeScript/2EditDatabase/types/models/eft/common/tables/IQuest.d.ts @@ -44,7 +44,7 @@ export interface AvailableForProps { value?: number; compareMethod?: string; visibilityConditions?: VisibilityCondition[]; - target?: string; + target?: string | string[]; status?: number[]; } export interface VisibilityCondition { diff --git a/TypeScript/3.0GetSptConfigFile/.eslintignore b/TypeScript/3.0GetSptConfigFile/.eslintignore new file mode 100644 index 0000000..9922d9a --- /dev/null +++ b/TypeScript/3.0GetSptConfigFile/.eslintignore @@ -0,0 +1,9 @@ +# Exclude these folders from linting +node_modules +dist/ +types/ + +# Exclude these filetypes from linting +*.json +*.txt +*.exe \ No newline at end of file diff --git a/TypeScript/3.0GetSptConfigFile/.eslintrc.json b/TypeScript/3.0GetSptConfigFile/.eslintrc.json new file mode 100644 index 0000000..c505160 --- /dev/null +++ b/TypeScript/3.0GetSptConfigFile/.eslintrc.json @@ -0,0 +1,75 @@ +{ + "root": true, + "parser": "@typescript-eslint/parser", + "plugins": [ + "@typescript-eslint" + ], + "extends": [ + "eslint:recommended", + "plugin:@typescript-eslint/eslint-recommended", + "plugin:@typescript-eslint/recommended" + ], + "rules": { + "@typescript-eslint/no-explicit-any": 0, + "@typescript-eslint/no-unused-vars": 1, + "@typescript-eslint/no-empty-interface": 0, + "@typescript-eslint/no-namespace": 0, + "@typescript-eslint/comma-dangle": 1, + "@typescript-eslint/func-call-spacing": 2, + "@typescript-eslint/quotes": 1, + "@typescript-eslint/brace-style": [ + "warn", + "allman" + ], + "@typescript-eslint/naming-convention": [ + "warn", + { + "selector": "default", + "format": ["camelCase"], + "leadingUnderscore": "allow" + }, + { + "selector": "typeLike", + "format": ["PascalCase"] + }, + { + "selector": "objectLiteralProperty", + "format": ["PascalCase", "camelCase"], + "leadingUnderscore": "allow" + }, + { + "selector": "typeProperty", + "format": ["PascalCase", "camelCase"], + "leadingUnderscore": "allow" + }, + { + "selector": "enumMember", + "format": ["UPPER_CASE"] + } + ], + "@typescript-eslint/indent": [ + "warn", + 4 + ], + "@typescript-eslint/no-unused-expressions": [ + "warn", + { + "allowShortCircuit": false, + "allowTernary": false + } + ], + "@typescript-eslint/keyword-spacing": [ + "warn", + { + "before": true, + "after": true + } + ], + "@typescript-eslint/explicit-module-boundary-types": [ + "warn", + { + "allowArgumentsExplicitlyTypedAsAny": true + } + ] + } +} \ No newline at end of file diff --git a/TypeScript/3.0GetSptConfigFile/README.md b/TypeScript/3.0GetSptConfigFile/README.md new file mode 100644 index 0000000..efc31a4 --- /dev/null +++ b/TypeScript/3.0GetSptConfigFile/README.md @@ -0,0 +1,64 @@ + +This project was created to automate most parts of building and setting up an environment. + +## **NodeJS 14.15.3:** + +The first step would be to install nodejs on your pc, the version you NEED is **14.15.3** + +That version is the one that has been used to test the mod templates and build scripts. + +It can be downloaded from here: https://nodejs.org/download/release/v14.15.3/ + +A system reboot may be needed after install. + +## **IDE:** + +The second step is having an IDE ready. For the currect purpose we've setup a VSCodium workspace file. + +You CAN use Visual Studio Code if you so desire, just keep in mind that our dev tests on the mod files was done using VSCodium. + +You can get VSCodium here: https://vscodium.com/#install + +## **Workspace:** + +Once you have NodeJS and VSCodium ready, open the mod.code-workspace file with VSCodium (File->Open Worspace from File...). + +Once the project loads into VSCodium you will be recommended to install the ESLint plugin. This is HIGHLY recommended. + +## **Environment Setup:** + +There is a task that will automatically setup your environment to use typescript. + +To run it, you just need to go to: + +> Terminal->Run Task...->Show All Tasks...->npm: install + +After running this task, your environment will be ready to start coding. + +DO NOT remove the node_modules folder, this is an auto generated directory that has the required dependencies to be able to use typescript and more. + +## **IMPORTANT:** + +Before starting to work on your mod, we suggest you read about Dependency Injection and Inversion of Control as this is the adopted architecture SPT-AKI has adopted. + +It will be difficult to understand some of the problems you may be having if you dont understand the basics of it. + +A guide explaining all the essentials will be available on the hub on release for you to read about. + +## **Coding:** + +All your work should be centered around the mod.ts file as an entry point. +You can ONLY change the following properties from the package.json file: `"name"`, `"version"`, `"license"`: `"MIT"`, `"author"`, `"akiVersion"`. + +If you have never used typescript before, you can read about it here: https://www.typescriptlang.org/docs/ + +## **Distributing your mod:** + +The project has been set up with an automatic task that will copy and zip ALL required files for your mod to work on SPT-AKI. +To run this task you just need to go to: + +> Terminal->Run Task...->Show All Tasks...->npm: build:zip + +The output will be a mod.zip file that will appear on the root of the project. + +Always verify that all files were included into the zip file. \ No newline at end of file diff --git a/TypeScript/3.0GetSptConfigFile/mod.code-workspace b/TypeScript/3.0GetSptConfigFile/mod.code-workspace new file mode 100644 index 0000000..6732c67 --- /dev/null +++ b/TypeScript/3.0GetSptConfigFile/mod.code-workspace @@ -0,0 +1,12 @@ +{ + "folders": [ + { + "path": "." + } + ], + "extensions": { + "recommendations": [ + "dbaeumer.vscode-eslint" + ] + } +} \ No newline at end of file diff --git a/TypeScript/3.0GetSptConfigFile/package.json b/TypeScript/3.0GetSptConfigFile/package.json index 3dee4a9..8ad8376 100644 --- a/TypeScript/3.0GetSptConfigFile/package.json +++ b/TypeScript/3.0GetSptConfigFile/package.json @@ -1,17 +1,25 @@ { - "name": "GetSptConfigFile", - "version": "1.0.0", - "main": "src/mod.js", - "license": "MIT", - "author": "Chomp", - "akiVersion": "3.0.0", - "scripts": { - "install": "npx handpick --target=devDependencies", - "build": "tsc" - }, - "devDependencies": { - "@types/node": "^17.0.31", - "tsyringe": "^4.6.0", - "typescript": "^4.6.4" - } + "name": "GetSptConfigFile", + "version": "1.0.0", + "main": "src/mod.js", + "license": "MIT", + "author": "Chomp", + "akiVersion": "3.0.0", + "scripts": { + "setup:environment": "npm i", + "build:unzipped": "copyfiles -e \"./node_modules/**/*.*\" -e \"./dist/**/*.*\" -e \"./package-lock.json\" -e \"./tsconfig.json\" -e \"./README.txt\" -e \"./mod.code-workspace\" ./**/*.* ./dist", + "zip:files": "cd dist/ && bestzip ../mod.zip *", + "build:zip": "npm run clean:environment && npm run build:unzipped && npm run zip:files", + "clean:environment": "node -e \"require('fs').rm('mod.zip', ()=>{})\" && node -e \"require('fs').rmdir('./dist/',{recursive:true},()=>{})\"" + }, + "devDependencies": { + "@types/node": "^14.15.3", + "@typescript-eslint/eslint-plugin": "^4.33.0", + "@typescript-eslint/parser": "^4.33.0", + "copyfiles": "2.4.1", + "eslint": "7.26.0", + "tsyringe": "4.6.0", + "typescript": "4.6.4", + "bestzip": "2.2.1" + } } diff --git a/TypeScript/3.0GetSptConfigFile/types/Config.d.ts b/TypeScript/3.0GetSptConfigFile/types/Config.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/Config.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/BotCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/BotCallbacks.d.ts index 358d5e3..9602975 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/BotCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/BotCallbacks.d.ts @@ -1,8 +1,8 @@ import { BotController } from "../controllers/BotController"; import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IBotBase } from "../models/eft/common/tables/IBotBase"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class BotCallbacks { private botController; diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/BundleCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/BundleCallbacks.d.ts index 08c33c0..b007ab8 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/BundleCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/BundleCallbacks.d.ts @@ -1,8 +1,8 @@ import { BundleLoader } from "../loaders/BundleLoader"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class BundleCallbacks { private logger; private httpResponse; diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/CustomizationCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/CustomizationCallbacks.d.ts index 0a4265b..918b8b6 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/CustomizationCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/CustomizationCallbacks.d.ts @@ -1,22 +1,23 @@ -import { SaveServer } from "../servers/SaveServer"; import { CustomizationController } from "../controllers/CustomizationController"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { ISuit } from "../models/eft/common/tables/ITrader"; import { IBuyClothingRequestData } from "../models/eft/customization/IBuyClothingRequestData"; import { IWearClothingRequestData } from "../models/eft/customization/IWearClothingRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { ISuit } from "../models/eft/common/tables/ITrader"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class CustomizationCallbacks { private customizationController; private saveServer; private httpResponse; constructor(customizationController: CustomizationController, saveServer: SaveServer, httpResponse: HttpResponseUtil); - getSuits(url: string, info: any, sessionID: string): IGetBodyResponseData<{ + getSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<{ _id: string; suites: string[]; }>; - getTraderSuits(url: string, info: any, sessionID: string): IGetBodyResponseData; + getTraderSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; wearClothing(pmcData: IPmcData, body: IWearClothingRequestData, sessionID: string): IItemEventRouterResponse; buyClothing(pmcData: IPmcData, body: IBuyClothingRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/DataCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/DataCallbacks.d.ts index ac9cab7..018420e 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/DataCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/DataCallbacks.d.ts @@ -1,4 +1,3 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGlobals } from "../models/eft/common/IGlobals"; import { ICustomizationItem } from "../models/eft/common/tables/ICustomizationItem"; @@ -10,6 +9,7 @@ import { IHideoutSettingsBase } from "../models/eft/hideout/IHideoutSettingsBase import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { ILanguageBase } from "../models/spt/server/ILocaleBase"; import { ISettingsBase } from "../models/spt/server/ISettingsBase"; +import { DatabaseServer } from "../servers/DatabaseServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class DataCallbacks { private httpResponse; diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/DialogueCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/DialogueCallbacks.d.ts index e81255c..3b6fbd1 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/DialogueCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/DialogueCallbacks.d.ts @@ -1,25 +1,25 @@ -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { HashUtil } from "../utils/HashUtil"; -import { TimeUtil } from "../utils/TimeUtil"; import { DialogueController } from "../controllers/DialogueController"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { DialogueInfo } from "../models/eft/profile/IAkiProfile"; -import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; -import { IGetMailDialogViewRequestData } from "../models/eft/dialog/IGetMailDialogViewRequestData"; -import { IGetMailDialogInfoRequestData } from "../models/eft/dialog/IGetMailDialogInfoRequestData"; -import { IRemoveDialogRequestData } from "../models/eft/dialog/IRemoveDialogRequestData"; -import { IGetMailDialogListRequestData } from "../models/eft/dialog/IGetMailDialogListRequestData"; +import { OnUpdate } from "../di/OnUpdate"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IFriendRequestData } from "../models/eft/dialog/IFriendRequestData"; -import { IPinDialogRequestData } from "../models/eft/dialog/IPinDialogRequestData"; -import { ISetDialogReadRequestData } from "../models/eft/dialog/ISetDialogReadRequestData"; import { IGetAllAttachmentsRequestData } from "../models/eft/dialog/IGetAllAttachmentsRequestData"; +import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachmentsResponse"; import { IGetChatServerListRequestData } from "../models/eft/dialog/IGetChatServerListRequestData"; import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse"; -import { ISendMessageRequest } from "../models/eft/dialog/ISendMessageRequest"; +import { IGetMailDialogInfoRequestData } from "../models/eft/dialog/IGetMailDialogInfoRequestData"; +import { IGetMailDialogListRequestData } from "../models/eft/dialog/IGetMailDialogListRequestData"; +import { IGetMailDialogViewRequestData } from "../models/eft/dialog/IGetMailDialogViewRequestData"; import { IGetMailDialogViewResponseData } from "../models/eft/dialog/IGetMailDialogViewResponseData"; -import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachmentsResponse"; -import { OnUpdate } from "../di/OnUpdate"; +import { IPinDialogRequestData } from "../models/eft/dialog/IPinDialogRequestData"; +import { IRemoveDialogRequestData } from "../models/eft/dialog/IRemoveDialogRequestData"; +import { ISendMessageRequest } from "../models/eft/dialog/ISendMessageRequest"; +import { ISetDialogReadRequestData } from "../models/eft/dialog/ISetDialogReadRequestData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +import { DialogueInfo } from "../models/eft/profile/IAkiProfile"; +import { HashUtil } from "../utils/HashUtil"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export declare class DialogueCallbacks extends OnUpdate { private hashUtil; private timeUtil; diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/GameCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/GameCallbacks.d.ts index 9481129..44a30ea 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/GameCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/GameCallbacks.d.ts @@ -1,17 +1,17 @@ import { GameController } from "../controllers/GameController"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; import { IGameEmptyCrcRequestData } from "../models/eft/game/IGameEmptyCrcRequestData"; import { IVersionValidateRequestData } from "../models/eft/game/IVersionValidateRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; -import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { IWatermark } from "../models/spt/utils/IWatermark"; +import { Watermark } from "../utils/Watermark"; declare class GameCallbacks { private httpResponse; private watermark; private gameController; - constructor(httpResponse: HttpResponseUtil, watermark: IWatermark, gameController: GameController); + constructor(httpResponse: HttpResponseUtil, watermark: Watermark, gameController: GameController); versionValidate(url: string, info: IVersionValidateRequestData, sessionID: string): INullResponseData; gameStart(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; gameLogout(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/HealthCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/HealthCallbacks.d.ts index b223bb3..a50dd42 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/HealthCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/HealthCallbacks.d.ts @@ -1,13 +1,13 @@ import { HealthController } from "../controllers/HealthController"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; +import { IHealthTreatmentRequestData } from "../models/eft/health/IHealthTreatmentRequestData"; import { IOffraidEatRequestData } from "../models/eft/health/IOffraidEatRequestData"; import { IOffraidHealRequestData } from "../models/eft/health/IOffraidHealRequestData"; -import { IHealthTreatmentRequestData } from "../models/eft/health/IHealthTreatmentRequestData"; -import { ProfileHelper } from "../helpers/ProfileHelper"; +import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class HealthCallbacks { private httpResponse; private profileHelper; diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/HideoutCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/HideoutCallbacks.d.ts index b574232..3698176 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/HideoutCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/HideoutCallbacks.d.ts @@ -1,22 +1,23 @@ import { HideoutController } from "../controllers/HideoutController"; +import { OnUpdate } from "../di/OnUpdate"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; -import { IHideoutUpgradeCompleteRequestData } from "../models/eft/hideout/IHideoutUpgradeCompleteRequestData"; -import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; -import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData"; -import { IHideoutTakeItemOutRequestData } from "../models/eft/hideout/IHideoutTakeItemOutRequestData"; -import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutToggleAreaRequestData"; -import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; +import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData"; +import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; +import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; +import { IHideoutTakeItemOutRequestData } from "../models/eft/hideout/IHideoutTakeItemOutRequestData"; import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; +import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutToggleAreaRequestData"; +import { IHideoutUpgradeCompleteRequestData } from "../models/eft/hideout/IHideoutUpgradeCompleteRequestData"; +import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ConfigServer } from "../servers/ConfigServer"; -import { OnUpdate } from "../di/OnUpdate"; export declare class HideoutCallbacks extends OnUpdate { private hideoutController; private configServer; private hideoutConfig; - constructor(hideoutController: HideoutController, configServer: ConfigServer); + constructor(hideoutController: HideoutController, // TODO: delay needed + configServer: ConfigServer); upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; upgradeComplete(pmcData: IPmcData, body: IHideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse; putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/HttpCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/HttpCallbacks.d.ts index 7072297..9fe387d 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/HttpCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/HttpCallbacks.d.ts @@ -1,5 +1,5 @@ -import { IHttpServer } from "../models/spt/server/IHttpServer"; import { OnLoad } from "../di/OnLoad"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class HttpCallbacks extends OnLoad { private httpServer; constructor(httpServer: IHttpServer); diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/InraidCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/InraidCallbacks.d.ts index 1948d01..2d53227 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/InraidCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/InraidCallbacks.d.ts @@ -1,6 +1,6 @@ import { InraidController } from "../controllers/InraidController"; -import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ConfigServer } from "../servers/ConfigServer"; diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/InsuranceCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/InsuranceCallbacks.d.ts index 73b7bd9..79feb67 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/InsuranceCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/InsuranceCallbacks.d.ts @@ -1,13 +1,13 @@ import { InsuranceController } from "../controllers/InsuranceController"; +import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData"; import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { ConfigServer } from "../servers/ConfigServer"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; -import { InsuranceService } from "../services/InsuranceService"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { ConfigServer } from "../servers/ConfigServer"; +import { InsuranceService } from "../services/InsuranceService"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class InsuranceCallbacks extends OnLoadOnUpdate { private insuranceController; private insuranceService; diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/InventoryCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/InventoryCallbacks.d.ts index 90d6936..9795aa0 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/InventoryCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/InventoryCallbacks.d.ts @@ -1,21 +1,21 @@ import { InventoryController } from "../controllers/InventoryController"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IInventoryFoldRequestData } from "../models/eft/inventory/IInventoryFoldRequestData"; -import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; -import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; -import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData"; -import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData"; -import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwapRequestData"; -import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData"; -import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData"; import { IInventoryBindRequestData } from "../models/eft/inventory/IInventoryBindRequestData"; -import { IInventoryExamineRequestData } from "../models/eft/inventory/IInventoryExamineRequestData"; -import { IInventoryReadEncyclopediaRequestData } from "../models/eft/inventory/IInventoryReadEncyclopediaRequestData"; -import { IInventorySortRequestData } from "../models/eft/inventory/IInventorySortRequestData"; import { IInventoryCreateMarkerRequestData } from "../models/eft/inventory/IInventoryCreateMarkerRequestData"; import { IInventoryDeleteMarkerRequestData } from "../models/eft/inventory/IInventoryDeleteMarkerRequestData"; import { IInventoryEditMarkerRequestData } from "../models/eft/inventory/IInventoryEditMarkerRequestData"; +import { IInventoryExamineRequestData } from "../models/eft/inventory/IInventoryExamineRequestData"; +import { IInventoryFoldRequestData } from "../models/eft/inventory/IInventoryFoldRequestData"; +import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; +import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; +import { IInventoryReadEncyclopediaRequestData } from "../models/eft/inventory/IInventoryReadEncyclopediaRequestData"; +import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData"; +import { IInventorySortRequestData } from "../models/eft/inventory/IInventorySortRequestData"; +import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; +import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwapRequestData"; +import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData"; +import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData"; +import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class InventoryCallbacks { private inventoryController; diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/LauncherCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/LauncherCallbacks.d.ts index addf76b..4bd5e2c 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/LauncherCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/LauncherCallbacks.d.ts @@ -1,17 +1,18 @@ -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { SaveServer } from "../servers/SaveServer"; import { LauncherController } from "../controllers/LauncherController"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IChangeRequestData } from "../models/eft/launcher/IChangeRequestData"; +import { ILoginRequestData } from "../models/eft/launcher/ILoginRequestData"; import { IRegisterData } from "../models/eft/launcher/IRegisterData"; import { IRemoveProfileData } from "../models/eft/launcher/IRemoveProfileData"; -import { ILoginRequestData } from "../models/eft/launcher/ILoginRequestData"; -import { IChangeRequestData } from "../models/eft/launcher/IChangeRequestData"; -import { IWatermark } from "../models/spt/utils/IWatermark"; +import { SaveServer } from "../servers/SaveServer"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { Watermark } from "../utils/Watermark"; declare class LauncherCallbacks { private httpResponse; private launcherController; private saveServer; private watermark; - constructor(httpResponse: HttpResponseUtil, launcherController: LauncherController, saveServer: SaveServer, watermark: IWatermark); + constructor(httpResponse: HttpResponseUtil, launcherController: LauncherController, saveServer: SaveServer, watermark: Watermark); connect(): string; login(url: string, info: ILoginRequestData, sessionID: string): string; register(url: string, info: IRegisterData, sessionID: string): "FAILED" | "OK"; @@ -20,7 +21,7 @@ declare class LauncherCallbacks { changePassword(url: string, info: IChangeRequestData, sessionID: string): "FAILED" | "OK"; wipe(url: string, info: IRegisterData, sessionID: string): "FAILED" | "OK"; getServerVersion(): string; - ping(url: string, info: any, sessionID: string): string; + ping(url: string, info: IEmptyRequestData, sessionID: string): string; removeProfile(url: string, info: IRemoveProfileData, sessionID: string): string; getCompatibleTarkovVersion(): string; } diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/LocationCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/LocationCallbacks.d.ts index 346893b..5ecab74 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/LocationCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/LocationCallbacks.d.ts @@ -1,13 +1,14 @@ import { LocationController } from "../controllers/LocationController"; -import { IGetLocationRequestData } from "../models/eft/location/IGetLocationRequestData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSourceDestinationBase"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { ILocationBase } from "../models/eft/common/ILocationBase"; +import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSourceDestinationBase"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IGetLocationRequestData } from "../models/eft/location/IGetLocationRequestData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class LocationCallbacks { private httpResponse; private locationController; constructor(httpResponse: HttpResponseUtil, locationController: LocationController); - getLocationData(url: string, info: any, sessionID: string): IGetBodyResponseData; + getLocationData(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getLocation(url: string, info: IGetLocationRequestData, sessionID: string): IGetBodyResponseData; } diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/MatchCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/MatchCallbacks.d.ts index 9364a2f..63d38d9 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/MatchCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/MatchCallbacks.d.ts @@ -1,10 +1,11 @@ import { MatchController } from "../controllers/MatchController"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; -import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; -import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; +import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData"; +import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { DatabaseServer } from "../servers/DatabaseServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class MatchCallbacks { @@ -22,7 +23,7 @@ export declare class MatchCallbacks { 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; + getProfile(url: string, info: IGetProfileRequestData, sessionID: string): IGetBodyResponseData; serverAvailable(url: string, info: any, sessionID: string): IGetBodyResponseData | IGetBodyResponseData; joinMatch(url: string, info: any, sessionID: string): IGetBodyResponseData; getMetrics(url: string, info: any, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/ModCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/ModCallbacks.d.ts index b4c18c2..2011f0e 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/ModCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/ModCallbacks.d.ts @@ -1,9 +1,9 @@ -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { OnLoad } from "../di/OnLoad"; import { DelayedModLoader } from "../loaders/DelayedModLoader"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from '../models/spt/utils/ILogger'; -import { IHttpServer } from '../models/spt/server/IHttpServer'; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; declare class ModCallbacks extends OnLoad { private logger; private httpResponse; diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/NoteCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/NoteCallbacks.d.ts index 36cbd44..fd7c5ca 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/NoteCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/NoteCallbacks.d.ts @@ -1,7 +1,7 @@ import { NoteController } from "../controllers/NoteController"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { INoteActionData } from "../models/eft/notes/INoteActionData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { INoteActionData } from "../models/eft/notes/INoteActionData"; export declare class NoteCallbacks { private noteController; constructor(noteController: NoteController); diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/NotifierCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/NotifierCallbacks.d.ts index f47dcc9..416e6a3 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/NotifierCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/NotifierCallbacks.d.ts @@ -1,10 +1,10 @@ -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { NotifierController } from "../controllers/NotifierController"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INotifierChannel } from "../models/eft/notifier/INotifier"; import { ISelectProfileRequestData } from "../models/eft/notifier/ISelectProfileRequestData"; -import { NotifierController } from "../controllers/NotifierController"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class NotifierCallbacks { private httpServerHelper; private httpResponse; diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/PresetBuildCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/PresetBuildCallbacks.d.ts index fd22c8f..639c33f 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/PresetBuildCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/PresetBuildCallbacks.d.ts @@ -1,8 +1,8 @@ import { PresetBuildController } from "../controllers/PresetBuildController"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IPresetBuildActionRequestData } from "../models/eft/presetBuild/IPresetBuildActionRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IPresetBuildActionRequestData } from "../models/eft/presetBuild/IPresetBuildActionRequestData"; import { WeaponBuild } from "../models/eft/profile/IAkiProfile"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class PresetBuildCallbacks { diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/ProfileCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/ProfileCallbacks.d.ts index e50c130..efce47d 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/ProfileCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/ProfileCallbacks.d.ts @@ -1,16 +1,16 @@ -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { TimeUtil } from "../utils/TimeUtil"; import { ProfileController } from "../controllers/ProfileController"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +import { IGetMiniProfileRequestData } from "../models/eft/launcher/IGetMiniProfileRequestData"; import { IProfileChangeNicknameRequestData } from "../models/eft/profile/IProfileChangeNicknameRequestData"; import { IProfileChangeVoiceRequestData } from "../models/eft/profile/IProfileChangeVoiceRequestData"; import { IProfileCreateRequestData } from "../models/eft/profile/IProfileCreateRequestData"; -import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { ISearchFriendRequestData } from "../models/eft/profile/ISearchFriendRequestData"; import { ISearchFriendResponse } from "../models/eft/profile/ISearchFriendResponse"; -import { IGetMiniProfileRequestData } from "../models/eft/launcher/IGetMiniProfileRequestData"; +import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export declare class ProfileCallbacks { private httpResponse; private timeUtil; diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/QuestCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/QuestCallbacks.d.ts index 1f3964b..f742096 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/QuestCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/QuestCallbacks.d.ts @@ -1,15 +1,15 @@ import { QuestController } from "../controllers/QuestController"; import { RepeatableQuestController } from "../controllers/RepeatableQuestController"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { IListQuestsRequestData } from "../models/eft/quests/IListQuestsRequestData"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; -import { IHandoverQuestRequestData } from "../models/eft/quests/IHandoverQuestRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { IQuest } from "../models/eft/common/tables/IQuest"; import { IPmcDataRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; +import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; +import { IHandoverQuestRequestData } from "../models/eft/quests/IHandoverQuestRequestData"; +import { IListQuestsRequestData } from "../models/eft/quests/IListQuestsRequestData"; import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class QuestCallbacks { diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/RagfairCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/RagfairCallbacks.d.ts index 260fd13..152475f 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/RagfairCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/RagfairCallbacks.d.ts @@ -1,20 +1,20 @@ -import { RagfairServer } from "../servers/RagfairServer"; 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"; -import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData"; -import { IAddOfferRequestData } from "../models/eft/ragfair/IAddOfferRequestData"; -import { IRemoveOfferRequestData } from "../models/eft/ragfair/IRemoveOfferRequestData"; -import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IAddOfferRequestData } from "../models/eft/ragfair/IAddOfferRequestData"; +import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData"; import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult"; +import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData"; +import { IRemoveOfferRequestData } from "../models/eft/ragfair/IRemoveOfferRequestData"; +import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; +import { RagfairServer } from "../servers/RagfairServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; -import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; -import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairCallbacks extends OnLoadOnUpdate { private httpResponse; private logger; diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/RepairCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/RepairCallbacks.d.ts index 4acd364..f63ec18 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/RepairCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/RepairCallbacks.d.ts @@ -1,8 +1,8 @@ import { RepairController } from "../controllers/RepairController"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest"; import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepairActionDataRequest"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class RepairCallbacks { private repairController; constructor(repairController: RepairController); diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/SaveCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/SaveCallbacks.d.ts index 52d5faf..b7219a0 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/SaveCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/SaveCallbacks.d.ts @@ -1,5 +1,5 @@ -import { SaveServer } from "../servers/SaveServer"; import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; +import { SaveServer } from "../servers/SaveServer"; export declare class SaveCallbacks extends OnLoadOnUpdate { private saveServer; constructor(saveServer: SaveServer); diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/TradeCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/TradeCallbacks.d.ts index 4cf8497..9928951 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/TradeCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/TradeCallbacks.d.ts @@ -1,8 +1,8 @@ import { TradeController } from "../controllers/TradeController"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData"; +import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData"; export declare class TradeCallbacks { private tradeController; constructor(tradeController: TradeController); diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/TraderCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/TraderCallbacks.d.ts index 264ef94..2a8af7f 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/TraderCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/TraderCallbacks.d.ts @@ -1,9 +1,9 @@ -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; 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 { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class TraderCallbacks extends OnLoadOnUpdate { private httpResponse; private traderController; diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/WeatherCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/WeatherCallbacks.d.ts index 2474417..e40ab3e 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/WeatherCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/WeatherCallbacks.d.ts @@ -1,6 +1,6 @@ import { WeatherController } from "../controllers/WeatherController"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class WeatherCallbacks { private httpResponse; diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/WishlistCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/WishlistCallbacks.d.ts index 1816600..e0249fd 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/WishlistCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/WishlistCallbacks.d.ts @@ -1,7 +1,7 @@ import { WishlistController } from "../controllers/WishlistController"; 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 WishlistCallbacks { private wishlistController; constructor(wishlistController: WishlistController); diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/GameController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/GameController.d.ts index 614d270..5c9a464 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/GameController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/GameController.d.ts @@ -1,10 +1,10 @@ +import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; -import { ConfigServer } from "../servers/ConfigServer"; import { ILogger } from "../models/spt/utils/ILogger"; -import { IWatermark } from "../models/spt/utils/IWatermark"; -import { HttpServerHelper } from "../helpers/HttpServerHelper"; +import { ConfigServer } from "../servers/ConfigServer"; +import { Watermark } from "../utils/Watermark"; export declare class GameController { private logger; private watermark; @@ -12,7 +12,7 @@ export declare class GameController { private profileHelper; private configServer; private httpConfig; - constructor(logger: ILogger, watermark: IWatermark, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); + constructor(logger: ILogger, watermark: Watermark, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); gameStart(url: string, info: IEmptyRequestData, sessionID: string): void; getGameConfig(sessionID: string): IGameConfigResponse; getServer(): any[]; diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/InsuranceController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/InsuranceController.d.ts index 44c61fa..50437a6 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/InsuranceController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/InsuranceController.d.ts @@ -28,7 +28,8 @@ export declare class InsuranceController { private insuranceService; private configServer; private insuranceConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, itemEventRouter: ItemEventRouter, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileHelper: ProfileHelper, dialogueHelper: DialogueHelper, paymentService: PaymentService, insuranceService: InsuranceService, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, itemEventRouter: ItemEventRouter, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileHelper: ProfileHelper, dialogueHelper: DialogueHelper, paymentService: PaymentService, // TODO: delay required + insuranceService: InsuranceService, configServer: ConfigServer); processReturn(): void; insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse; cost(info: IGetInsuranceCostRequestData, sessionID: string): any; diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/InventoryController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/InventoryController.d.ts index 4ff07b8..8235082 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/InventoryController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/InventoryController.d.ts @@ -1,30 +1,31 @@ import { InventoryHelper } from "../helpers/InventoryHelper"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; +import { PaymentHelper } from "../helpers/PaymentHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { PaymentHelper } from "../helpers/PaymentHelper"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { DatabaseServer } from "../servers/DatabaseServer"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; -import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData"; -import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; -import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwapRequestData"; -import { IInventoryFoldRequestData } from "../models/eft/inventory/IInventoryFoldRequestData"; -import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData"; -import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData"; +import { IAddItemRequestData } from "../models/eft/inventory/IAddItemRequestData"; import { IInventoryBindRequestData } from "../models/eft/inventory/IInventoryBindRequestData"; -import { IInventoryExamineRequestData } from "../models/eft/inventory/IInventoryExamineRequestData"; -import { IInventoryReadEncyclopediaRequestData } from "../models/eft/inventory/IInventoryReadEncyclopediaRequestData"; -import { IInventorySortRequestData } from "../models/eft/inventory/IInventorySortRequestData"; import { IInventoryCreateMarkerRequestData } from "../models/eft/inventory/IInventoryCreateMarkerRequestData"; import { IInventoryDeleteMarkerRequestData } from "../models/eft/inventory/IInventoryDeleteMarkerRequestData"; import { IInventoryEditMarkerRequestData } from "../models/eft/inventory/IInventoryEditMarkerRequestData"; +import { IInventoryExamineRequestData } from "../models/eft/inventory/IInventoryExamineRequestData"; +import { IInventoryFoldRequestData } from "../models/eft/inventory/IInventoryFoldRequestData"; +import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; +import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; +import { IInventoryReadEncyclopediaRequestData } from "../models/eft/inventory/IInventoryReadEncyclopediaRequestData"; +import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData"; +import { IInventorySortRequestData } from "../models/eft/inventory/IInventorySortRequestData"; +import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; +import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwapRequestData"; +import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData"; +import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData"; +import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HashUtil } from "../utils/HashUtil"; +import { JsonUtil } from "../utils/JsonUtil"; export declare class InventoryController { private logger; private hashUtil; @@ -77,7 +78,7 @@ export declare class InventoryController { * Give Item * its used for "add" item like gifts etc. */ - addItem(pmcData: IPmcData, body: any, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; + addItem(pmcData: IPmcData, body: IAddItemRequestData, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; /** * Handles folding of Weapons */ diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/MatchController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/MatchController.d.ts index 229b884..84abbe3 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/MatchController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/MatchController.d.ts @@ -1,8 +1,9 @@ -import { TraderHelper } from "../helpers/TraderHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; -import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; +import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData"; +import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; import { ConfigServer } from "../servers/ConfigServer"; import { SaveServer } from "../servers/SaveServer"; import { MatchLocationService } from "../services/MatchLocationService"; @@ -16,7 +17,7 @@ export declare class MatchController { private inraidConfig; constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, configServer: ConfigServer); getEnabled(): boolean; - getProfile(info: any): IPmcData[]; + getProfile(info: IGetProfileRequestData): IPmcData[]; private getMatch; createGroup(sessionID: string, info: any): any; deleteGroup(info: any): void; diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/RagfairController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/RagfairController.d.ts index 6e71edd..5b94a95 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/RagfairController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/RagfairController.d.ts @@ -1,37 +1,37 @@ -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { RagfairServer } from "../servers/RagfairServer"; -import { SaveServer } from "../servers/SaveServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { PaymentService } from "../services/PaymentService"; -import { RagfairPriceService } from "../services/RagfairPriceService"; -import { RagfairOfferService } from "../services/RagfairOfferService"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { HandbookHelper } from "../helpers/HandbookHelper"; -import { PaymentHelper } from "../helpers/PaymentHelper"; -import { InventoryHelper } from "../helpers/InventoryHelper"; -import { RagfairHelper } from "../helpers/RagfairHelper"; -import { RagfairSellHelper } from "../helpers/RagfairSellHelper"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IAddOfferRequestData, Requirement } from "../models/eft/ragfair/IAddOfferRequestData"; -import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData"; -import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData"; -import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { Item } from "../models/eft/common/tables/IItem"; -import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult"; -import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; -import { ConfigServer } from "../servers/ConfigServer"; -import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; -import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; +import { HandbookHelper } from "../helpers/HandbookHelper"; +import { InventoryHelper } from "../helpers/InventoryHelper"; +import { ItemHelper } from "../helpers/ItemHelper"; +import { PaymentHelper } from "../helpers/PaymentHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { RagfairHelper } from "../helpers/RagfairHelper"; +import { RagfairOfferHelper } from "../helpers/RagfairOfferHelper"; +import { RagfairSellHelper } from "../helpers/RagfairSellHelper"; import { RagfairSortHelper } from "../helpers/RagfairSortHelper"; import { RagfairTaxHelper } from "../helpers/RagfairTaxHelper"; -import { RagfairOfferHelper } from "../helpers/RagfairOfferHelper"; -import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { IAddOfferRequestData, Requirement } from "../models/eft/ragfair/IAddOfferRequestData"; +import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData"; +import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult"; +import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData"; +import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { RagfairServer } from "../servers/RagfairServer"; +import { SaveServer } from "../servers/SaveServer"; +import { PaymentService } from "../services/PaymentService"; +import { RagfairOfferService } from "../services/RagfairOfferService"; +import { RagfairPriceService } from "../services/RagfairPriceService"; +import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export declare class RagfairController { private logger; private timeUtil; diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/RepeatableQuestController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/RepeatableQuestController.d.ts index d2de5df..bd5e5a1 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/RepeatableQuestController.d.ts @@ -1,24 +1,24 @@ -import { TimeUtil } from "../utils/TimeUtil"; -import { ObjectId } from "../utils/ObjectId"; -import { RandomUtil, ProbabilityObjectArray, ProbabilityObject } from "../utils/RandomUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { MathUtil } from "../utils/MathUtil"; import { ItemHelper } from "../helpers/ItemHelper"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IPmcData, TraderInfo } from "../models/eft/common/IPmcData"; -import { IRepeatableQuestConfig, ELocationName } from "../models/spt/config/IQuestConfig"; -import { IExploration, IRepeatableQuest, IReward, IRewards, IExplorationCondition, ICompletionAvailableFor, IEliminationCondition, ICompletion, IElimination, IPmcDataRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; -import { Exit } from "../models/eft/common/ILocationBase"; -import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { PresetHelper } from "../helpers/PresetHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { PaymentService } from "../services/PaymentService"; -import { ConfigServer } from "../servers/ConfigServer"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { Exit } from "../models/eft/common/ILocationBase"; +import { IPmcData, TraderInfo } from "../models/eft/common/IPmcData"; +import { ICompletion, ICompletionAvailableFor, IElimination, IEliminationCondition, IExploration, IExplorationCondition, IPmcDataRepeatableQuest, IRepeatableQuest, IReward, IRewards } from "../models/eft/common/tables/IRepeatableQuests"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; +import { ELocationName, IRepeatableQuestConfig } from "../models/spt/config/IQuestConfig"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { PaymentService } from "../services/PaymentService"; +import { JsonUtil } from "../utils/JsonUtil"; +import { MathUtil } from "../utils/MathUtil"; +import { ObjectId } from "../utils/ObjectId"; +import { ProbabilityObject, ProbabilityObjectArray, RandomUtil } from "../utils/RandomUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export interface IQuestTypePool { types: string[]; pool: IQuestPool; diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/TraderController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/TraderController.d.ts index 5cd85c9..36eac75 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/TraderController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/TraderController.d.ts @@ -1,13 +1,12 @@ -import { JsonUtil } from "../utils/JsonUtil"; -import { TimeUtil } from "../utils/TimeUtil"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { TraderAssortHelper } from "../helpers/TraderAssortHelper"; +import { TraderHelper } from "../helpers/TraderHelper"; +import { IBarterScheme, ITraderAssort, ITraderBase } from "../models/eft/common/tables/ITrader"; +import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { TraderAssortService } from "../services/TraderAssortService"; -import { IBarterScheme, ITraderAssort, ITraderBase } from "../models/eft/common/tables/ITrader"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { TraderAssortHelper } from "../helpers/TraderAssortHelper"; +import { JsonUtil } from "../utils/JsonUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export declare class TraderController { private logger; private databaseServer; @@ -17,9 +16,7 @@ export declare class TraderController { private timeUtil; private traderAssortService; private jsonUtil; - private configServer; - private traderConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, timeUtil: TimeUtil, traderAssortService: TraderAssortService, jsonUtil: JsonUtil, configServer: ConfigServer); + constructor(logger: ILogger, databaseServer: DatabaseServer, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, timeUtil: TimeUtil, traderAssortService: TraderAssortService, jsonUtil: JsonUtil); load(): void; getTrader(traderID: string, sessionID: string): ITraderBase; getAllTraders(sessionID: string): ITraderBase[]; diff --git a/TypeScript/3.0GetSptConfigFile/types/di/Container.d.ts b/TypeScript/3.0GetSptConfigFile/types/di/Container.d.ts index b67523f..17791b0 100644 --- a/TypeScript/3.0GetSptConfigFile/types/di/Container.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/di/Container.d.ts @@ -1,6 +1,7 @@ import { DependencyContainer } from "tsyringe"; export declare class Container { static registerTypes(depContainer: DependencyContainer): void; + static registerListTypes(depContainer: DependencyContainer): void; private static registerUtils; private static registerRouters; private static registerGenerators; diff --git a/TypeScript/3.0GetSptConfigFile/types/di/OnSaveLoad.d.ts b/TypeScript/3.0GetSptConfigFile/types/di/OnSaveLoad.d.ts new file mode 100644 index 0000000..1edf37e --- /dev/null +++ b/TypeScript/3.0GetSptConfigFile/types/di/OnSaveLoad.d.ts @@ -0,0 +1,4 @@ +export declare class OnSaveLoad { + onSaveLoad(): void; + getRoute(): string; +} diff --git a/TypeScript/3.0GetSptConfigFile/types/di/Router.d.ts b/TypeScript/3.0GetSptConfigFile/types/di/Router.d.ts index ac48587..2fb98e0 100644 --- a/TypeScript/3.0GetSptConfigFile/types/di/Router.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/di/Router.d.ts @@ -3,18 +3,22 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; export declare class Router { private handledRoutes; - constructor(); getTopLevelRoute(): string; protected getHandledRoutes(): HandledRoute[]; + private getInternalHandledRoutes; canHandle(url: string, partialMatch?: boolean): boolean; } export declare class StaticRouter extends Router { - constructor(); + private routes; + constructor(routes: RouteAction[]); handleStatic(url: string, info: any, sessionID: string, output: string): any; + getHandledRoutes(): HandledRoute[]; } export declare class DynamicRouter extends Router { - constructor(); + private routes; + constructor(routes: RouteAction[]); handleDynamic(url: string, info: any, sessionID: string, output: string): any; + getHandledRoutes(): HandledRoute[]; } export declare class ItemEventRouterDefinition extends Router { constructor(); @@ -29,3 +33,8 @@ export declare class HandledRoute { dynamic: boolean; constructor(route: string, dynamic: boolean); } +export declare class RouteAction { + url: string; + action: (url: string, info: any, sessionID: string, output: string) => any; + constructor(url: string, action: (url: string, info: any, sessionID: string, output: string) => any); +} diff --git a/TypeScript/3.0GetSptConfigFile/types/generators/BotInventoryGenerator.d.ts b/TypeScript/3.0GetSptConfigFile/types/generators/BotInventoryGenerator.d.ts index e9f09de..0cdbacb 100644 --- a/TypeScript/3.0GetSptConfigFile/types/generators/BotInventoryGenerator.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/generators/BotInventoryGenerator.d.ts @@ -17,7 +17,6 @@ export declare class BotInventoryGenerator { private botLootGenerator; private botGeneratorHelper; private weightedRandomHelper; - private botConfig; constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, botWeaponGenerator: BotWeaponGenerator, botLootGenerator: BotLootGenerator, botGeneratorHelper: BotGeneratorHelper, weightedRandomHelper: WeightedRandomHelper); generateInventory(templateInventory: Inventory, equipmentChances: Chances, generation: Generation, botRole: string, isPmc: boolean): PmcInventory; private generateEquipment; diff --git a/TypeScript/3.0GetSptConfigFile/types/generators/BotWeaponGenerator.d.ts b/TypeScript/3.0GetSptConfigFile/types/generators/BotWeaponGenerator.d.ts index 3e9d59c..e8f91cb 100644 --- a/TypeScript/3.0GetSptConfigFile/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/generators/BotWeaponGenerator.d.ts @@ -1,11 +1,11 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { MinMax, ModsChances, Mods } from "../models/eft/common/tables/IBotType"; -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -import { HashUtil } from "../utils/HashUtil"; +import { ItemHelper } from "../helpers/ItemHelper"; +import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; +import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { MinMax, Mods, ModsChances } from "../models/eft/common/tables/IBotType"; import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; export declare class BotWeaponGenerator { private logger; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/BotGeneratorHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/BotGeneratorHelper.d.ts index c3cf4d3..6abdc07 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/BotGeneratorHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/BotGeneratorHelper.d.ts @@ -1,17 +1,17 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ConfigServer } from "../servers/ConfigServer"; +import { DurabilityLimitsHelper } from "../helpers/DurabilityLimitsHelper"; import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { ModsChances, Mods } from "../models/eft/common/tables/IBotType"; +import { Mods, ModsChances } from "../models/eft/common/tables/IBotType"; import { Item, Upd } from "../models/eft/common/tables/IItem"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { DurabilityLimitsHelper } from "../helpers/DurabilityLimitsHelper"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; -import { InventoryHelper } from "./InventoryHelper"; import { ContainerHelper } from "./ContainerHelper"; +import { InventoryHelper } from "./InventoryHelper"; import { ItemHelper } from "./ItemHelper"; -import { ILogger } from "../models/spt/utils/ILogger"; declare class BotGeneratorHelper { private logger; private jsonUtil; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/ExtendedProfileHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/ExtendedProfileHelper.d.ts index 22ead31..4dd7d3a 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/ExtendedProfileHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/ExtendedProfileHelper.d.ts @@ -1,16 +1,16 @@ +import { BotGenerator } from "../generators/BotGenerator"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { FenceService } from "../services/FenceService"; -import { IPmcData } from "../models/eft/common/IPmcData"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; +import { Watermark } from "../utils/Watermark"; import { ItemHelper } from "./ItemHelper"; -import { IWatermark } from "../models/spt/utils/IWatermark"; -import { BotGenerator } from "../generators/BotGenerator"; import { ProfileHelper } from "./ProfileHelper"; export declare class ExtendedProfileHelper extends ProfileHelper { private botGenerator; - constructor(jsonUtil: JsonUtil, watermark: IWatermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService, botGenerator: BotGenerator); + constructor(jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService, botGenerator: BotGenerator); generatePlayerScav(sessionID: string): IPmcData; private getScavSkills; private removeSecureContainer; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/HideoutHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/HideoutHelper.d.ts index d60e370..5b4a5ad 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/HideoutHelper.d.ts @@ -1,21 +1,21 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; import { IPmcData, Production, Productive } from "../models/eft/common/IPmcData"; -import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; -import { StageBonus } from "../models/eft/hideout/IHideoutArea"; -import { TimeUtil } from "../utils/TimeUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { HashUtil } from "../utils/HashUtil"; -import { ProfileHelper } from "./ProfileHelper"; -import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { ConfigServer } from "../servers/ConfigServer"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { PlayerService } from "../services/PlayerService"; -import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; -import { InventoryHelper } from "./InventoryHelper"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { StageBonus } from "../models/eft/hideout/IHideoutArea"; +import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; +import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; +import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +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"; export declare class HideoutHelper { private logger; private hashUtil; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/InventoryHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/InventoryHelper.d.ts index 4b3460c..00e95d3 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/InventoryHelper.d.ts @@ -1,21 +1,22 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; +import { IAddItemRequestData } from "../models/eft/inventory/IAddItemRequestData"; +import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; +import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; +import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { FenceService } from "../services/FenceService"; -import { ContainerHelper } from "./ContainerHelper"; -import { ItemHelper } from "./ItemHelper"; -import { PaymentHelper } from "./PaymentHelper"; -import { ProfileHelper } from "./ProfileHelper"; -import { DialogueHelper } from "./DialogueHelper"; import { HashUtil } from "../utils/HashUtil"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; -import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; -import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; -import { ILogger } from "../models/spt/utils/ILogger"; +import { ContainerHelper } from "./ContainerHelper"; +import { DialogueHelper } from "./DialogueHelper"; +import { ItemHelper } from "./ItemHelper"; +import { PaymentHelper } from "./PaymentHelper"; +import { ProfileHelper } from "./ProfileHelper"; import { TraderAssortHelper } from "./TraderAssortHelper"; export interface OwnerInventoryItems { from: Item[]; @@ -39,7 +40,7 @@ export declare class InventoryHelper { private configServer; private inventoryConfig; 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, configServer: ConfigServer); - addItem(pmcData: IPmcData, body: any, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; + addItem(pmcData: IPmcData, body: IAddItemRequestData, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; removeItem(pmcData: IPmcData, itemId: string, sessionID: string, output?: IItemEventRouterResponse): IItemEventRouterResponse; getItemSize(itemTpl: string, itemID: string, inventoryItem: Item[]): Record; private getSizeByInventoryItemHash; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/ProfileHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/ProfileHelper.d.ts index 515e55e..508443c 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/ProfileHelper.d.ts @@ -1,22 +1,22 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { FenceService } from "../services/FenceService"; import { IPmcData, Stats } from "../models/eft/common/IPmcData"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { SaveServer } from "../servers/SaveServer"; +import { FenceService } from "../services/FenceService"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; +import { Watermark } from "../utils/Watermark"; import { ItemHelper } from "./ItemHelper"; -import { IWatermark } from "../models/spt/utils/IWatermark"; export declare class ProfileHelper { protected jsonUtil: JsonUtil; - protected watermark: IWatermark; + protected watermark: Watermark; protected timeUtil: TimeUtil; protected saveServer: SaveServer; protected databaseServer: DatabaseServer; protected itemHelper: ItemHelper; protected fenceService: FenceService; - constructor(jsonUtil: JsonUtil, watermark: IWatermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService); + constructor(jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService); resetProfileQuestCondition(sessionID: string, conditionId: string): void; getCompleteProfile(sessionID: string): IPmcData[]; isNicknameTaken(info: IValidateNicknameRequestData, sessionID: string): boolean; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/QuestHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/QuestHelper.d.ts index 3474884..9e2dd5e 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/QuestHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/QuestHelper.d.ts @@ -1,21 +1,21 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { ItemHelper } from "./ItemHelper"; -import { ProfileHelper } from "./ProfileHelper"; -import { DialogueHelper } from "./DialogueHelper"; -import { PaymentHelper } from "./PaymentHelper"; -import { TraderHelper } from "./TraderHelper"; import { IPmcData, Quest } from "../models/eft/common/IPmcData"; 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 { ConfigServer } from "../servers/ConfigServer"; -import { RagfairServerHelper } from "./RagfairServerHelper"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HashUtil } from "../utils/HashUtil"; +import { JsonUtil } from "../utils/JsonUtil"; +import { TimeUtil } from "../utils/TimeUtil"; +import { DialogueHelper } from "./DialogueHelper"; +import { ItemHelper } from "./ItemHelper"; +import { PaymentHelper } from "./PaymentHelper"; +import { ProfileHelper } from "./ProfileHelper"; +import { RagfairServerHelper } from "./RagfairServerHelper"; +import { TraderHelper } from "./TraderHelper"; export declare class QuestHelper { private logger; private jsonUtil; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairHelper.d.ts index 2bce4a6..8e70bcd 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairHelper.d.ts @@ -1,16 +1,16 @@ -import { JsonUtil } from "../utils/JsonUtil"; import { Item } from "../models/eft/common/tables/IItem"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { RagfairLinkedItemService } from "../services/RagfairLinkedItemService"; +import { JsonUtil } from "../utils/JsonUtil"; import { HandbookHelper } from "./HandbookHelper"; import { ItemHelper } from "./ItemHelper"; -import { RagfairLinkedItemService } from "../services/RagfairLinkedItemService"; -import { UtilityHelper } from "./UtilityHelper"; -import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from "../models/spt/utils/ILogger"; import { TraderAssortHelper } from "./TraderAssortHelper"; +import { UtilityHelper } from "./UtilityHelper"; export declare class RagfairHelper { private logger; private jsonUtil; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairOfferHelper.d.ts index da3ceb8..3bf8add 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairOfferHelper.d.ts @@ -1,23 +1,23 @@ -import { HashUtil } from "../utils/HashUtil"; -import { TimeUtil } from "../utils/TimeUtil"; import { IPmcData } from "../models/eft/common/IPmcData"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { RagfairOfferService } from "../services/RagfairOfferService"; +import { HashUtil } from "../utils/HashUtil"; +import { TimeUtil } from "../utils/TimeUtil"; import { DialogueHelper } from "./DialogueHelper"; import { ItemHelper } from "./ItemHelper"; import { PaymentHelper } from "./PaymentHelper"; import { PresetHelper } from "./PresetHelper"; import { ProfileHelper } from "./ProfileHelper"; -import { RagfairServerHelper } from "./RagfairServerHelper"; -import { ConfigServer } from "../servers/ConfigServer"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { RagfairSortHelper } from "./RagfairSortHelper"; import { RagfairHelper } from "./RagfairHelper"; -import { ILogger } from "../models/spt/utils/ILogger"; +import { RagfairServerHelper } from "./RagfairServerHelper"; +import { RagfairSortHelper } from "./RagfairSortHelper"; export declare class RagfairOfferHelper { private logger; private timeUtil; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairServerHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairServerHelper.d.ts index 9a26261..0f32a66 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairServerHelper.d.ts @@ -1,15 +1,15 @@ -import { SaveServer } from "../servers/SaveServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { ItemHelper } from "./ItemHelper"; -import { ProfileHelper } from "./ProfileHelper"; import { MemberCategory } from "../models/eft/common/MemberCategory"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { SaveServer } from "../servers/SaveServer"; +import { HashUtil } from "../utils/HashUtil"; +import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { DialogueHelper } from "./DialogueHelper"; -import { Item } from "../models/eft/common/tables/IItem"; -import { JsonUtil } from "../utils/JsonUtil"; -import { HashUtil } from "../utils/HashUtil"; +import { ItemHelper } from "./ItemHelper"; +import { ProfileHelper } from "./ProfileHelper"; export declare class RagfairServerHelper { private randomUtil; private hashUtil; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/TradeHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/TradeHelper.d.ts index 0712ff4..a78cd20 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/TradeHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/TradeHelper.d.ts @@ -1,16 +1,16 @@ -import { RagfairServer } from "../servers/RagfairServer"; import { InventoryHelper } from "../helpers/InventoryHelper"; +import { ItemHelper } from "../helpers/ItemHelper"; import { TraderHelper } from "../helpers/TraderHelper"; -import { FenceService } from "../services/FenceService"; -import { PaymentService } from "../services/PaymentService"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { Upd } from "../models/eft/common/tables/IItem"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "../models/eft/trade/IProcessSellTradeRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { Upd } from "../models/eft/common/tables/IItem"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { RagfairServer } from "../servers/RagfairServer"; +import { FenceService } from "../services/FenceService"; +import { PaymentService } from "../services/PaymentService"; export declare class TradeHelper { private logger; private itemEventRouter; diff --git a/TypeScript/3.0GetSptConfigFile/types/loaders/DelayedModLoader.d.ts b/TypeScript/3.0GetSptConfigFile/types/loaders/DelayedModLoader.d.ts index db86c75..7d0009f 100644 --- a/TypeScript/3.0GetSptConfigFile/types/loaders/DelayedModLoader.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/loaders/DelayedModLoader.d.ts @@ -1,10 +1,9 @@ -import { DependencyContainer } from 'tsyringe'; -import { VFS } from "../utils/VFS"; -import { InitialModLoader } from "./InitialModLoader"; -import { BundleLoader } from "./BundleLoader"; 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 { InitialModLoader } from "./InitialModLoader"; export declare class DelayedModLoader implements IModLoader { private bundleLoader; private handbookController; @@ -16,7 +15,7 @@ export declare class DelayedModLoader implements IModLoader { getBundle(key: string, local: boolean): void; getImportedModsNames(): string[]; getModPath(mod: string): string; - load(container: DependencyContainer): void; + load(): void; private executeMods; private addBundles; } diff --git a/TypeScript/3.0GetSptConfigFile/types/loaders/InitialModLoader.d.ts b/TypeScript/3.0GetSptConfigFile/types/loaders/InitialModLoader.d.ts index 35503c8..d30a3fe 100644 --- a/TypeScript/3.0GetSptConfigFile/types/loaders/InitialModLoader.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/loaders/InitialModLoader.d.ts @@ -1,23 +1,22 @@ import { DependencyContainer } from "tsyringe"; -import { JsonUtil } from "../utils/JsonUtil"; -import { VFS } from "../utils/VFS"; +import { IModLoader } from "../models/spt/mod/IModLoader"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { ModCompilerService } from "../services/ModCompilerService"; -import { HashCacheService } from "../services/HashCacheService"; -import { IModLoader } from "../models/spt/mod/IModLoader"; +import { JsonUtil } from "../utils/JsonUtil"; +import { VFS } from "../utils/VFS"; export declare class InitialModLoader implements IModLoader { private logger; private vfs; private jsonUtil; private modCompilerService; - private hashCacheService; private configServer; + private static container; private readonly basepath; private imported; private onLoad; private akiConfig; - constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, hashCacheService: HashCacheService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, configServer: ConfigServer); load(container: DependencyContainer): Promise; getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; @@ -29,10 +28,10 @@ export declare class InitialModLoader implements IModLoader { private executeMods; private sortModsLoadOrder; private addMod; - private compileModIfNeeded; private areModDependenciesFulfilled; private isModCompatible; private validMod; private getLoadOrderRecursive; private getLoadOrder; + getContainer(): DependencyContainer; } diff --git a/TypeScript/3.0GetSptConfigFile/types/models/eft/common/ILocationBase.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/common/ILocationBase.d.ts index 0d092f6..ad48d32 100644 --- a/TypeScript/3.0GetSptConfigFile/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/models/eft/common/ILocationBase.d.ts @@ -107,6 +107,15 @@ export interface BossLocationSpawn { BossPlayer: boolean; BossZone: string; Time: number; + TriggerId: string; + TriggerName: string; + Delay?: number; + Supports?: BossSupport[]; +} +export interface BossSupport { + BossEscortAmount: string; + BossEscortDifficult: string[]; + BossEscortType: string; } export interface BotLocationModifier { AccuracySpeed: number; diff --git a/TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/IBotType.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/IBotType.d.ts index e0f39d9..01be0be 100644 --- a/TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/IBotType.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/IBotType.d.ts @@ -100,6 +100,8 @@ export interface Generation { export interface ItemMinMax { grenades: MinMax; healing: MinMax; + drugs: MinMax; + stims: MinMax; looseLoot: MinMax; magazines: MinMax; specialItems: MinMax; diff --git a/TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/IQuest.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/IQuest.d.ts index 1582a2f..0aa7a4e 100644 --- a/TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/IQuest.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/IQuest.d.ts @@ -44,7 +44,7 @@ export interface AvailableForProps { value?: number; compareMethod?: string; visibilityConditions?: VisibilityCondition[]; - target?: string; + target?: string | string[]; status?: number[]; } export interface VisibilityCondition { diff --git a/TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IAddItemRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IAddItemRequestData.d.ts new file mode 100644 index 0000000..53db97a --- /dev/null +++ b/TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IAddItemRequestData.d.ts @@ -0,0 +1,4 @@ +export interface IAddItemRequestData { + tid: string; + items: any[]; +} diff --git a/TypeScript/3.0GetSptConfigFile/types/models/eft/match/IGetProfileRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/match/IGetProfileRequestData.d.ts new file mode 100644 index 0000000..86b5bbd --- /dev/null +++ b/TypeScript/3.0GetSptConfigFile/types/models/eft/match/IGetProfileRequestData.d.ts @@ -0,0 +1,3 @@ +export interface IGetProfileRequestData { + profileId: string; +} diff --git a/TypeScript/3.0GetSptConfigFile/types/models/spt/utils/IWatermark.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/utils/IWatermark.d.ts deleted file mode 100644 index a15f5d7..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/models/spt/utils/IWatermark.d.ts +++ /dev/null @@ -1,22 +0,0 @@ -export interface IWatermarkLocale { - getLocale(): string; - getDescription(): string[]; - getWarning(): string[]; -} -export interface IWatermark { - initialize(): void; - getVersionTag(): string; - /** - * Set window title - */ - setTitle(): void; - /** - * Reset console cursor to top - */ - resetCursor(): void; - /** - * Draw the watermark - */ - draw(): void; - getVersionLabel(): string; -} diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/BotDynamicRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/BotDynamicRouter.d.ts index 51e52f7..dd2f68a 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/BotDynamicRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/BotDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { BotCallbacks } from "../../callbacks/BotCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class BotDynamicRouter extends DynamicRouter { private botCallbacks; constructor(botCallbacks: BotCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/BundleDynamicRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/BundleDynamicRouter.d.ts index 6cec61d..be27008 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/BundleDynamicRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/BundleDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { BundleCallbacks } from "../../callbacks/BundleCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class BundleDynamicRouter extends DynamicRouter { private bundleCallbacks; constructor(bundleCallbacks: BundleCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/CustomizationDynamicRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/CustomizationDynamicRouter.d.ts index e8a27ff..03a5967 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/CustomizationDynamicRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/CustomizationDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class CustomizationDynamicRouter extends DynamicRouter { private customizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/DataDynamicRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/DataDynamicRouter.d.ts index 9b6f632..c30501a 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/DataDynamicRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/DataDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { DataCallbacks } from "../../callbacks/DataCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class DataDynamicRouter extends DynamicRouter { private dataCallbacks; constructor(dataCallbacks: DataCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/HttpDynamicRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/HttpDynamicRouter.d.ts index 17706d5..b2933e9 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/HttpDynamicRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/HttpDynamicRouter.d.ts @@ -1,9 +1,6 @@ -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; import { ImageRouter } from "../ImageRouter"; export declare class HttpDynamicRouter extends DynamicRouter { private imageRouter; constructor(imageRouter: ImageRouter); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/InraidDynamicRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/InraidDynamicRouter.d.ts index cb1e8c0..ea4a9ae 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/InraidDynamicRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/InraidDynamicRouter.d.ts @@ -1,10 +1,7 @@ import { InraidCallbacks } from "../../callbacks/InraidCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class InraidDynamicRouter extends DynamicRouter { private inraidCallbacks; constructor(inraidCallbacks: InraidCallbacks); - private readonly _routes; getTopLevelRoute(): string; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/LocationDynamicRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/LocationDynamicRouter.d.ts index 9d85230..30741db 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/LocationDynamicRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/LocationDynamicRouter.d.ts @@ -1,10 +1,7 @@ import { LocationCallbacks } from "../../callbacks/LocationCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class LocationDynamicRouter extends DynamicRouter { private locationCallbacks; constructor(locationCallbacks: LocationCallbacks); - private readonly _routes; getTopLevelRoute(): string; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/NotifierDynamicRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/NotifierDynamicRouter.d.ts index e087b40..4786817 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/NotifierDynamicRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/NotifierDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { NotifierCallbacks } from "../../callbacks/NotifierCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class NotifierDynamicRouter extends DynamicRouter { private notifierCallbacks; constructor(notifierCallbacks: NotifierCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/TraderDynamicRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/TraderDynamicRouter.d.ts index d957e0e..a100b4c 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/TraderDynamicRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/dynamic/TraderDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { TraderCallbacks } from "../../callbacks/TraderCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class TraderDynamicRouter extends DynamicRouter { private traderCallbacks; constructor(traderCallbacks: TraderCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/serializers/NotifySerializer.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/serializers/NotifySerializer.d.ts index 7be87ef..8be8ac2 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/serializers/NotifySerializer.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/serializers/NotifySerializer.d.ts @@ -1,7 +1,7 @@ -import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { NotifierController } from "../../controllers/NotifierController"; import { Serializer } from "../../di/Serializer"; import { HttpServerHelper } from "../../helpers/HttpServerHelper"; +import { IHttpServer } from "../../models/spt/server/IHttpServer"; export declare class NotifySerializer extends Serializer { private notifierController; private httpServerHelper; diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/static/BotStaticRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/static/BotStaticRouter.d.ts index 7b23da6..d8b0bf4 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/static/BotStaticRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/static/BotStaticRouter.d.ts @@ -1,8 +1,6 @@ import { BotCallbacks } from "../../callbacks/BotCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class BotStaticRouter extends StaticRouter { private botCallbacks; constructor(botCallbacks: BotCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/static/BundleStaticRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/static/BundleStaticRouter.d.ts index 9283003..3905b82 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/static/BundleStaticRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/static/BundleStaticRouter.d.ts @@ -1,8 +1,6 @@ import { BundleCallbacks } from "../../callbacks/BundleCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class BundleStaticRouter extends StaticRouter { private bundleCallbacks; constructor(bundleCallbacks: BundleCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/static/CustomizationStaticRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/static/CustomizationStaticRouter.d.ts index 0d29578..46c71b8 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/static/CustomizationStaticRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/static/CustomizationStaticRouter.d.ts @@ -1,8 +1,6 @@ import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class CustomizationStaticRouter extends StaticRouter { private customizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/static/DataStaticRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/static/DataStaticRouter.d.ts index b8d2fea..a493d3a 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/static/DataStaticRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/static/DataStaticRouter.d.ts @@ -1,8 +1,6 @@ import { DataCallbacks } from "../../callbacks/DataCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class DataStaticRouter extends StaticRouter { private dataCallbacks; constructor(dataCallbacks: DataCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/static/DialogStaticRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/static/DialogStaticRouter.d.ts index 5e7285e..a59fb14 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/static/DialogStaticRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/static/DialogStaticRouter.d.ts @@ -1,8 +1,6 @@ import { DialogueCallbacks } from "../../callbacks/DialogueCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class DialogStaticRouter extends StaticRouter { private dialogueCallbacks; constructor(dialogueCallbacks: DialogueCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/static/GameStaticRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/static/GameStaticRouter.d.ts index e8eca40..988b673 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/static/GameStaticRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/static/GameStaticRouter.d.ts @@ -1,8 +1,6 @@ import { GameCallbacks } from "../../callbacks/GameCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class GameStaticRouter extends StaticRouter { private gameCallbacks; constructor(gameCallbacks: GameCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/static/HealthStaticRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/static/HealthStaticRouter.d.ts index aa0b8b3..e644861 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/static/HealthStaticRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/static/HealthStaticRouter.d.ts @@ -1,8 +1,6 @@ import { HealthCallbacks } from "../../callbacks/HealthCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class HealthStaticRouter extends StaticRouter { private healthCallbacks; constructor(healthCallbacks: HealthCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/static/InraidStaticRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/static/InraidStaticRouter.d.ts index 417d9d7..66ed860 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/static/InraidStaticRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/static/InraidStaticRouter.d.ts @@ -1,8 +1,6 @@ import { InraidCallbacks } from "../../callbacks/InraidCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class InraidStaticRouter extends StaticRouter { private inraidCallbacks; constructor(inraidCallbacks: InraidCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/static/InsuranceStaticRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/static/InsuranceStaticRouter.d.ts index 6fbffe5..8da26b3 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/static/InsuranceStaticRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/static/InsuranceStaticRouter.d.ts @@ -1,8 +1,6 @@ import { InsuranceCallbacks } from "../../callbacks/InsuranceCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class InsuranceStaticRouter extends StaticRouter { private insuranceCallbacks; constructor(insuranceCallbacks: InsuranceCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/static/ItemEventStaticRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/static/ItemEventStaticRouter.d.ts index 1a869e1..08ba6bb 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/static/ItemEventStaticRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/static/ItemEventStaticRouter.d.ts @@ -1,8 +1,6 @@ import { ItemEventCallbacks } from "../../callbacks/ItemEventCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class ItemEventStaticRouter extends StaticRouter { private itemEventCallbacks; constructor(itemEventCallbacks: ItemEventCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/static/LauncherStaticRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/static/LauncherStaticRouter.d.ts index 0d5e231..9d07f78 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/static/LauncherStaticRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/static/LauncherStaticRouter.d.ts @@ -1,8 +1,6 @@ import { LauncherCallbacks } from "../../callbacks/LauncherCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class LauncherStaticRouter extends StaticRouter { private launcherCallbacks; constructor(launcherCallbacks: LauncherCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): string; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/static/LocationStaticRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/static/LocationStaticRouter.d.ts index 0b9b063..9c5c52e 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/static/LocationStaticRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/static/LocationStaticRouter.d.ts @@ -1,8 +1,6 @@ import { LocationCallbacks } from "../../callbacks/LocationCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class LocationStaticRouter extends StaticRouter { private locationCallbacks; constructor(locationCallbacks: LocationCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/static/MatchStaticRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/static/MatchStaticRouter.d.ts index 55c9640..d746381 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/static/MatchStaticRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/static/MatchStaticRouter.d.ts @@ -1,8 +1,6 @@ import { MatchCallbacks } from "../../callbacks/MatchCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class MatchStaticRouter extends StaticRouter { private matchCallbacks; constructor(matchCallbacks: MatchCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/static/NotifierStaticRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/static/NotifierStaticRouter.d.ts index 0d992db..1c8566d 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/static/NotifierStaticRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/static/NotifierStaticRouter.d.ts @@ -1,8 +1,6 @@ import { NotifierCallbacks } from "../../callbacks/NotifierCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class NotifierStaticRouter extends StaticRouter { private notifierCallbacks; constructor(notifierCallbacks: NotifierCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/static/PresetStaticRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/static/PresetStaticRouter.d.ts index a1bda56..2272f82 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/static/PresetStaticRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/static/PresetStaticRouter.d.ts @@ -1,8 +1,6 @@ import { PresetBuildCallbacks } from "../../callbacks/PresetBuildCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class PresetStaticRouter extends StaticRouter { private presetCallbacks; constructor(presetCallbacks: PresetBuildCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/static/ProfileStaticRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/static/ProfileStaticRouter.d.ts index d03b782..fd787f1 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/static/ProfileStaticRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/static/ProfileStaticRouter.d.ts @@ -1,8 +1,6 @@ import { ProfileCallbacks } from "../../callbacks/ProfileCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class ProfileStaticRouter extends StaticRouter { private profileCallbacks; constructor(profileCallbacks: ProfileCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/static/QuestStaticRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/static/QuestStaticRouter.d.ts index d375409..fda3c23 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/static/QuestStaticRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/static/QuestStaticRouter.d.ts @@ -1,8 +1,6 @@ import { QuestCallbacks } from "../../callbacks/QuestCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class QuestStaticRouter extends StaticRouter { private questCallbacks; constructor(questCallbacks: QuestCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/static/RagfairStaticRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/static/RagfairStaticRouter.d.ts index d5ed312..618374f 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/static/RagfairStaticRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/static/RagfairStaticRouter.d.ts @@ -1,8 +1,6 @@ import { RagfairCallbacks } from "../../callbacks/RagfairCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class RagfairStaticRouter extends StaticRouter { private ragfairCallbacks; constructor(ragfairCallbacks: RagfairCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/static/TraderStaticRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/static/TraderStaticRouter.d.ts index e3406fb..18f0629 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/static/TraderStaticRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/static/TraderStaticRouter.d.ts @@ -1,8 +1,6 @@ import { TraderCallbacks } from "../../callbacks/TraderCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class TraderStaticRouter extends StaticRouter { private traderCallbacks; constructor(traderCallbacks: TraderCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/static/WeatherStaticRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/static/WeatherStaticRouter.d.ts index aec3575..61b904d 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/static/WeatherStaticRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/static/WeatherStaticRouter.d.ts @@ -1,8 +1,6 @@ import { WeatherCallbacks } from "../../callbacks/WeatherCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class WeatherStaticRouter extends StaticRouter { private weatherCallbacks; constructor(weatherCallbacks: WeatherCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/3.0GetSptConfigFile/types/servers/HttpServer.d.ts b/TypeScript/3.0GetSptConfigFile/types/servers/HttpServer.d.ts index 0ba20c6..d0db7e4 100644 --- a/TypeScript/3.0GetSptConfigFile/types/servers/HttpServer.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/servers/HttpServer.d.ts @@ -1,19 +1,21 @@ /// -import { HttpRouter } from "../routers/HttpRouter"; -import { JsonUtil } from "../utils/JsonUtil"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { DatabaseServer } from "./DatabaseServer"; -import { Serializer } from "../di/Serializer"; import http, { ServerResponse } from "http"; -import { INotification } from "../models/eft/notifier/INotifier"; -import { NotifierHelper } from "../helpers/NotifierHelper"; -import { ConfigServer } from "./ConfigServer"; -import { ILogger } from "../models/spt/utils/ILogger"; +import { Serializer } from "../di/Serializer"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; +import { NotifierHelper } from "../helpers/NotifierHelper"; +import { INotification } from "../models/eft/notifier/INotifier"; import { IHttpServer } from "../models/spt/server/IHttpServer"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { HttpRouter } from "../routers/HttpRouter"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { JsonUtil } from "../utils/JsonUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +import { ConfigServer } from "./ConfigServer"; +import { DatabaseServer } from "./DatabaseServer"; export declare class HttpServer implements IHttpServer { private httpRouter; private logger; + private randomUtil; private jsonUtil; private httpResponse; private databaseServer; @@ -21,7 +23,8 @@ export declare class HttpServer implements IHttpServer { private httpServerHelper; private serializers; private configServer; - constructor(httpRouter: HttpRouter, logger: ILogger, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); + constructor(httpRouter: HttpRouter, // TODO: delay required + logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); private buffers; private onReceive; private onRespond; @@ -39,5 +42,6 @@ export declare class HttpServer implements IHttpServer { sendResponse(sessionID: string, req: any, resp: any, body: Buffer): void; handleRequest(req: http.IncomingMessage, resp: http.ServerResponse): void; load(): void; + private getRandomisedMessage; wsOnConnection(ws: any, req: any): void; } diff --git a/TypeScript/3.0GetSptConfigFile/types/services/InsuranceService.d.ts b/TypeScript/3.0GetSptConfigFile/types/services/InsuranceService.d.ts index 35f0dbc..160faba 100644 --- a/TypeScript/3.0GetSptConfigFile/types/services/InsuranceService.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/services/InsuranceService.d.ts @@ -1,10 +1,10 @@ +import { DialogueHelper } from "../helpers/DialogueHelper"; +import { SecureContainerHelper } from "../helpers/SecureContainerHelper"; +import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ILogger } from "../models/spt/utils/ILogger"; -import { DialogueHelper } from "../helpers/DialogueHelper"; -import { SecureContainerHelper } from "../helpers/SecureContainerHelper"; -import { TraderHelper } from "../helpers/TraderHelper"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; diff --git a/TypeScript/3.0GetSptConfigFile/types/services/ModCompilerService.d.ts b/TypeScript/3.0GetSptConfigFile/types/services/ModCompilerService.d.ts index 7e750c3..d316e48 100644 --- a/TypeScript/3.0GetSptConfigFile/types/services/ModCompilerService.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/services/ModCompilerService.d.ts @@ -1,10 +1,12 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { VFS } from "../utils/VFS"; +import { HashCacheService } from "./HashCacheService"; export declare class ModCompilerService { private logger; + private hashCacheService; private vfs; - constructor(logger: ILogger, vfs: VFS); - compileMod(path: string, modTypeScriptFiles: string[]): Promise; + constructor(logger: ILogger, hashCacheService: HashCacheService, vfs: VFS); + compileMod(modName: string, path: string, modTypeScriptFiles: string[]): Promise; private compile; private areFilesReady; private delay; diff --git a/TypeScript/3.0GetSptConfigFile/types/services/PaymentService.d.ts b/TypeScript/3.0GetSptConfigFile/types/services/PaymentService.d.ts index 20cee50..0a6c4d6 100644 --- a/TypeScript/3.0GetSptConfigFile/types/services/PaymentService.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/services/PaymentService.d.ts @@ -1,15 +1,15 @@ +import { HandbookHelper } from "../helpers/HandbookHelper"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { ItemHelper } from "../helpers/ItemHelper"; -import { DatabaseServer } from "../servers/DatabaseServer"; +import { PaymentHelper } from "../helpers/PaymentHelper"; +import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "../models/eft/trade/IProcessSellTradeRequestData"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { PaymentHelper } from "../helpers/PaymentHelper"; -import { HandbookHelper } from "../helpers/HandbookHelper"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class PaymentService { private logger; private httpResponse; diff --git a/TypeScript/3.0GetSptConfigFile/types/services/PlayerService.d.ts b/TypeScript/3.0GetSptConfigFile/types/services/PlayerService.d.ts index 4a74b4a..99e5986 100644 --- a/TypeScript/3.0GetSptConfigFile/types/services/PlayerService.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/services/PlayerService.d.ts @@ -1,7 +1,7 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; 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"; export declare class PlayerService { private logger; private databaseServer; diff --git a/TypeScript/3.0GetSptConfigFile/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts b/TypeScript/3.0GetSptConfigFile/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts new file mode 100644 index 0000000..abfe237 --- /dev/null +++ b/TypeScript/3.0GetSptConfigFile/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts @@ -0,0 +1,6 @@ +import { DynamicRouter, RouteAction } from "../../../di/Router"; +export declare class DynamicRouterMod extends DynamicRouter { + private topLevelRoute; + constructor(routes: RouteAction[], topLevelRoute: string); + getTopLevelRoute(): string; +} diff --git a/TypeScript/3.0GetSptConfigFile/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/3.0GetSptConfigFile/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts new file mode 100644 index 0000000..6742fc6 --- /dev/null +++ b/TypeScript/3.0GetSptConfigFile/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -0,0 +1,7 @@ +import { DependencyContainer } from "tsyringe"; +import { RouteAction } from "../../../di/Router"; +export declare class DynamicRouterModService { + private container; + constructor(container: DependencyContainer); + registerDynamicRouter(name: string, routes: RouteAction[], topLevelRoute: string): void; +} diff --git a/TypeScript/3.0GetSptConfigFile/types/services/mod/onLoad/OnLoadMod.d.ts b/TypeScript/3.0GetSptConfigFile/types/services/mod/onLoad/OnLoadMod.d.ts new file mode 100644 index 0000000..53fb062 --- /dev/null +++ b/TypeScript/3.0GetSptConfigFile/types/services/mod/onLoad/OnLoadMod.d.ts @@ -0,0 +1,8 @@ +import { OnLoad } from "../../../di/OnLoad"; +export declare class OnLoadMod extends OnLoad { + private onLoadOverride; + private getRouteOverride; + constructor(onLoadOverride: () => void, getRouteOverride: () => string); + onLoad(): void; + getRoute(): string; +} diff --git a/TypeScript/3.0GetSptConfigFile/types/services/mod/onLoad/OnLoadModService.d.ts b/TypeScript/3.0GetSptConfigFile/types/services/mod/onLoad/OnLoadModService.d.ts new file mode 100644 index 0000000..89bad14 --- /dev/null +++ b/TypeScript/3.0GetSptConfigFile/types/services/mod/onLoad/OnLoadModService.d.ts @@ -0,0 +1,6 @@ +import { DependencyContainer } from "tsyringe"; +export declare class OnLoadModService { + private container; + constructor(container: DependencyContainer); + registerOnLoad(name: string, onLoad: () => void, getRoute: () => string): void; +} diff --git a/TypeScript/3.0GetSptConfigFile/types/services/mod/onUpdate/OnUpdateMod.d.ts b/TypeScript/3.0GetSptConfigFile/types/services/mod/onUpdate/OnUpdateMod.d.ts new file mode 100644 index 0000000..ee89043 --- /dev/null +++ b/TypeScript/3.0GetSptConfigFile/types/services/mod/onUpdate/OnUpdateMod.d.ts @@ -0,0 +1,8 @@ +import { OnUpdate } from "../../../di/OnUpdate"; +export declare class OnUpdateMod extends OnUpdate { + private onUpdateOverride; + private getRouteOverride; + constructor(onUpdateOverride: (timeSinceLastRun: number) => boolean, getRouteOverride: () => string); + onUpdate(timeSinceLastRun: number): boolean; + getRoute(): string; +} diff --git a/TypeScript/3.0GetSptConfigFile/types/services/mod/onUpdate/OnUpdateModService.d.ts b/TypeScript/3.0GetSptConfigFile/types/services/mod/onUpdate/OnUpdateModService.d.ts new file mode 100644 index 0000000..32419f4 --- /dev/null +++ b/TypeScript/3.0GetSptConfigFile/types/services/mod/onUpdate/OnUpdateModService.d.ts @@ -0,0 +1,6 @@ +import { DependencyContainer } from "tsyringe"; +export declare class OnUpdateModService { + private container; + constructor(container: DependencyContainer); + registerOnUpdate(name: string, onUpdate: (timeSinceLastRun: number) => boolean, getRoute: () => string): void; +} diff --git a/TypeScript/3.0GetSptConfigFile/types/services/mod/staticRouter/StaticRouterMod.d.ts b/TypeScript/3.0GetSptConfigFile/types/services/mod/staticRouter/StaticRouterMod.d.ts new file mode 100644 index 0000000..1e62747 --- /dev/null +++ b/TypeScript/3.0GetSptConfigFile/types/services/mod/staticRouter/StaticRouterMod.d.ts @@ -0,0 +1,6 @@ +import { RouteAction, StaticRouter } from "../../../di/Router"; +export declare class StaticRouterMod extends StaticRouter { + private topLevelRoute; + constructor(routes: RouteAction[], topLevelRoute: string); + getTopLevelRoute(): string; +} diff --git a/TypeScript/3.0GetSptConfigFile/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/3.0GetSptConfigFile/types/services/mod/staticRouter/StaticRouterModService.d.ts new file mode 100644 index 0000000..d4c42aa --- /dev/null +++ b/TypeScript/3.0GetSptConfigFile/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -0,0 +1,7 @@ +import { DependencyContainer } from "tsyringe"; +import { RouteAction } from "../../../di/Router"; +export declare class StaticRouterModService { + private container; + constructor(container: DependencyContainer); + registerStaticRouter(name: string, routes: RouteAction[], topLevelRoute: string): void; +} diff --git a/TypeScript/3.0GetSptConfigFile/types/utils/AyncQueue.d.ts b/TypeScript/3.0GetSptConfigFile/types/utils/AyncQueue.d.ts index 8f1559b..a99aa37 100644 --- a/TypeScript/3.0GetSptConfigFile/types/utils/AyncQueue.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/utils/AyncQueue.d.ts @@ -1,7 +1,7 @@ import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; import { ICommand } from "../models/spt/utils/ICommand"; export declare class AsyncQueue implements IAsyncQueue { - commandsQueue: ICommand[]; + private commandsQueue; constructor(); waitFor(command: ICommand): Promise; } diff --git a/TypeScript/3.0GetSptConfigFile/types/utils/Watermark.d.ts b/TypeScript/3.0GetSptConfigFile/types/utils/Watermark.d.ts index 598d5a6..e7b9883 100644 --- a/TypeScript/3.0GetSptConfigFile/types/utils/Watermark.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/utils/Watermark.d.ts @@ -1,13 +1,12 @@ -import { IWatermark, IWatermarkLocale } from "../models/spt/utils/IWatermark"; import { ConfigServer } from "../servers/ConfigServer"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class WatermarkLocale implements IWatermarkLocale { +export declare class WatermarkLocale { private locales; getLocale(): string; getDescription(): string[]; getWarning(): string[]; } -export declare class Watermark implements IWatermark { +export declare class Watermark { private logger; private configServer; private watermarkLocale?; diff --git a/TypeScript/4UseACustomConfigFile/.eslintignore b/TypeScript/4UseACustomConfigFile/.eslintignore new file mode 100644 index 0000000..9922d9a --- /dev/null +++ b/TypeScript/4UseACustomConfigFile/.eslintignore @@ -0,0 +1,9 @@ +# Exclude these folders from linting +node_modules +dist/ +types/ + +# Exclude these filetypes from linting +*.json +*.txt +*.exe \ No newline at end of file diff --git a/TypeScript/4UseACustomConfigFile/.eslintrc.json b/TypeScript/4UseACustomConfigFile/.eslintrc.json new file mode 100644 index 0000000..c505160 --- /dev/null +++ b/TypeScript/4UseACustomConfigFile/.eslintrc.json @@ -0,0 +1,75 @@ +{ + "root": true, + "parser": "@typescript-eslint/parser", + "plugins": [ + "@typescript-eslint" + ], + "extends": [ + "eslint:recommended", + "plugin:@typescript-eslint/eslint-recommended", + "plugin:@typescript-eslint/recommended" + ], + "rules": { + "@typescript-eslint/no-explicit-any": 0, + "@typescript-eslint/no-unused-vars": 1, + "@typescript-eslint/no-empty-interface": 0, + "@typescript-eslint/no-namespace": 0, + "@typescript-eslint/comma-dangle": 1, + "@typescript-eslint/func-call-spacing": 2, + "@typescript-eslint/quotes": 1, + "@typescript-eslint/brace-style": [ + "warn", + "allman" + ], + "@typescript-eslint/naming-convention": [ + "warn", + { + "selector": "default", + "format": ["camelCase"], + "leadingUnderscore": "allow" + }, + { + "selector": "typeLike", + "format": ["PascalCase"] + }, + { + "selector": "objectLiteralProperty", + "format": ["PascalCase", "camelCase"], + "leadingUnderscore": "allow" + }, + { + "selector": "typeProperty", + "format": ["PascalCase", "camelCase"], + "leadingUnderscore": "allow" + }, + { + "selector": "enumMember", + "format": ["UPPER_CASE"] + } + ], + "@typescript-eslint/indent": [ + "warn", + 4 + ], + "@typescript-eslint/no-unused-expressions": [ + "warn", + { + "allowShortCircuit": false, + "allowTernary": false + } + ], + "@typescript-eslint/keyword-spacing": [ + "warn", + { + "before": true, + "after": true + } + ], + "@typescript-eslint/explicit-module-boundary-types": [ + "warn", + { + "allowArgumentsExplicitlyTypedAsAny": true + } + ] + } +} \ No newline at end of file diff --git a/TypeScript/4UseACustomConfigFile/README.md b/TypeScript/4UseACustomConfigFile/README.md new file mode 100644 index 0000000..efc31a4 --- /dev/null +++ b/TypeScript/4UseACustomConfigFile/README.md @@ -0,0 +1,64 @@ + +This project was created to automate most parts of building and setting up an environment. + +## **NodeJS 14.15.3:** + +The first step would be to install nodejs on your pc, the version you NEED is **14.15.3** + +That version is the one that has been used to test the mod templates and build scripts. + +It can be downloaded from here: https://nodejs.org/download/release/v14.15.3/ + +A system reboot may be needed after install. + +## **IDE:** + +The second step is having an IDE ready. For the currect purpose we've setup a VSCodium workspace file. + +You CAN use Visual Studio Code if you so desire, just keep in mind that our dev tests on the mod files was done using VSCodium. + +You can get VSCodium here: https://vscodium.com/#install + +## **Workspace:** + +Once you have NodeJS and VSCodium ready, open the mod.code-workspace file with VSCodium (File->Open Worspace from File...). + +Once the project loads into VSCodium you will be recommended to install the ESLint plugin. This is HIGHLY recommended. + +## **Environment Setup:** + +There is a task that will automatically setup your environment to use typescript. + +To run it, you just need to go to: + +> Terminal->Run Task...->Show All Tasks...->npm: install + +After running this task, your environment will be ready to start coding. + +DO NOT remove the node_modules folder, this is an auto generated directory that has the required dependencies to be able to use typescript and more. + +## **IMPORTANT:** + +Before starting to work on your mod, we suggest you read about Dependency Injection and Inversion of Control as this is the adopted architecture SPT-AKI has adopted. + +It will be difficult to understand some of the problems you may be having if you dont understand the basics of it. + +A guide explaining all the essentials will be available on the hub on release for you to read about. + +## **Coding:** + +All your work should be centered around the mod.ts file as an entry point. +You can ONLY change the following properties from the package.json file: `"name"`, `"version"`, `"license"`: `"MIT"`, `"author"`, `"akiVersion"`. + +If you have never used typescript before, you can read about it here: https://www.typescriptlang.org/docs/ + +## **Distributing your mod:** + +The project has been set up with an automatic task that will copy and zip ALL required files for your mod to work on SPT-AKI. +To run this task you just need to go to: + +> Terminal->Run Task...->Show All Tasks...->npm: build:zip + +The output will be a mod.zip file that will appear on the root of the project. + +Always verify that all files were included into the zip file. \ No newline at end of file diff --git a/TypeScript/4UseACustomConfigFile/mod.code-workspace b/TypeScript/4UseACustomConfigFile/mod.code-workspace new file mode 100644 index 0000000..6732c67 --- /dev/null +++ b/TypeScript/4UseACustomConfigFile/mod.code-workspace @@ -0,0 +1,12 @@ +{ + "folders": [ + { + "path": "." + } + ], + "extensions": { + "recommendations": [ + "dbaeumer.vscode-eslint" + ] + } +} \ No newline at end of file diff --git a/TypeScript/4UseACustomConfigFile/package.json b/TypeScript/4UseACustomConfigFile/package.json index 6003fa6..5a70a9a 100644 --- a/TypeScript/4UseACustomConfigFile/package.json +++ b/TypeScript/4UseACustomConfigFile/package.json @@ -1,17 +1,25 @@ { - "name": "UseACustomConfigFile", - "version": "1.0.0", - "main": "src/mod.js", - "license": "MIT", - "author": "Chomp", - "akiVersion": "3.0.0", - "scripts": { - "install": "npx handpick --target=devDependencies", - "build": "tsc" - }, - "devDependencies": { - "@types/node": "^17.0.31", - "tsyringe": "^4.6.0", - "typescript": "^4.6.4" - } + "name": "UseACustomConfigFile", + "version": "1.0.0", + "main": "src/mod.js", + "license": "MIT", + "author": "Chomp", + "akiVersion": "3.0.0", + "scripts": { + "setup:environment": "npm i", + "build:unzipped": "copyfiles -e \"./node_modules/**/*.*\" -e \"./dist/**/*.*\" -e \"./package-lock.json\" -e \"./tsconfig.json\" -e \"./README.txt\" -e \"./mod.code-workspace\" ./**/*.* ./dist", + "zip:files": "cd dist/ && bestzip ../mod.zip *", + "build:zip": "npm run clean:environment && npm run build:unzipped && npm run zip:files", + "clean:environment": "node -e \"require('fs').rm('mod.zip', ()=>{})\" && node -e \"require('fs').rmdir('./dist/',{recursive:true},()=>{})\"" + }, + "devDependencies": { + "@types/node": "^14.15.3", + "@typescript-eslint/eslint-plugin": "^4.33.0", + "@typescript-eslint/parser": "^4.33.0", + "copyfiles": "2.4.1", + "eslint": "7.26.0", + "tsyringe": "4.6.0", + "typescript": "4.6.4", + "bestzip": "2.2.1" + } } diff --git a/TypeScript/4UseACustomConfigFile/types/Config.d.ts b/TypeScript/4UseACustomConfigFile/types/Config.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/4UseACustomConfigFile/types/Config.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/BotCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/BotCallbacks.d.ts index 358d5e3..9602975 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/BotCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/BotCallbacks.d.ts @@ -1,8 +1,8 @@ import { BotController } from "../controllers/BotController"; import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IBotBase } from "../models/eft/common/tables/IBotBase"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class BotCallbacks { private botController; diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/BundleCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/BundleCallbacks.d.ts index 08c33c0..b007ab8 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/BundleCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/BundleCallbacks.d.ts @@ -1,8 +1,8 @@ import { BundleLoader } from "../loaders/BundleLoader"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class BundleCallbacks { private logger; private httpResponse; diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/CustomizationCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/CustomizationCallbacks.d.ts index 0a4265b..918b8b6 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/CustomizationCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/CustomizationCallbacks.d.ts @@ -1,22 +1,23 @@ -import { SaveServer } from "../servers/SaveServer"; import { CustomizationController } from "../controllers/CustomizationController"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { ISuit } from "../models/eft/common/tables/ITrader"; import { IBuyClothingRequestData } from "../models/eft/customization/IBuyClothingRequestData"; import { IWearClothingRequestData } from "../models/eft/customization/IWearClothingRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { ISuit } from "../models/eft/common/tables/ITrader"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class CustomizationCallbacks { private customizationController; private saveServer; private httpResponse; constructor(customizationController: CustomizationController, saveServer: SaveServer, httpResponse: HttpResponseUtil); - getSuits(url: string, info: any, sessionID: string): IGetBodyResponseData<{ + getSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<{ _id: string; suites: string[]; }>; - getTraderSuits(url: string, info: any, sessionID: string): IGetBodyResponseData; + getTraderSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; wearClothing(pmcData: IPmcData, body: IWearClothingRequestData, sessionID: string): IItemEventRouterResponse; buyClothing(pmcData: IPmcData, body: IBuyClothingRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/DataCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/DataCallbacks.d.ts index ac9cab7..018420e 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/DataCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/DataCallbacks.d.ts @@ -1,4 +1,3 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGlobals } from "../models/eft/common/IGlobals"; import { ICustomizationItem } from "../models/eft/common/tables/ICustomizationItem"; @@ -10,6 +9,7 @@ import { IHideoutSettingsBase } from "../models/eft/hideout/IHideoutSettingsBase import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { ILanguageBase } from "../models/spt/server/ILocaleBase"; import { ISettingsBase } from "../models/spt/server/ISettingsBase"; +import { DatabaseServer } from "../servers/DatabaseServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class DataCallbacks { private httpResponse; diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/DialogueCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/DialogueCallbacks.d.ts index e81255c..3b6fbd1 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/DialogueCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/DialogueCallbacks.d.ts @@ -1,25 +1,25 @@ -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { HashUtil } from "../utils/HashUtil"; -import { TimeUtil } from "../utils/TimeUtil"; import { DialogueController } from "../controllers/DialogueController"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { DialogueInfo } from "../models/eft/profile/IAkiProfile"; -import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; -import { IGetMailDialogViewRequestData } from "../models/eft/dialog/IGetMailDialogViewRequestData"; -import { IGetMailDialogInfoRequestData } from "../models/eft/dialog/IGetMailDialogInfoRequestData"; -import { IRemoveDialogRequestData } from "../models/eft/dialog/IRemoveDialogRequestData"; -import { IGetMailDialogListRequestData } from "../models/eft/dialog/IGetMailDialogListRequestData"; +import { OnUpdate } from "../di/OnUpdate"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IFriendRequestData } from "../models/eft/dialog/IFriendRequestData"; -import { IPinDialogRequestData } from "../models/eft/dialog/IPinDialogRequestData"; -import { ISetDialogReadRequestData } from "../models/eft/dialog/ISetDialogReadRequestData"; import { IGetAllAttachmentsRequestData } from "../models/eft/dialog/IGetAllAttachmentsRequestData"; +import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachmentsResponse"; import { IGetChatServerListRequestData } from "../models/eft/dialog/IGetChatServerListRequestData"; import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse"; -import { ISendMessageRequest } from "../models/eft/dialog/ISendMessageRequest"; +import { IGetMailDialogInfoRequestData } from "../models/eft/dialog/IGetMailDialogInfoRequestData"; +import { IGetMailDialogListRequestData } from "../models/eft/dialog/IGetMailDialogListRequestData"; +import { IGetMailDialogViewRequestData } from "../models/eft/dialog/IGetMailDialogViewRequestData"; import { IGetMailDialogViewResponseData } from "../models/eft/dialog/IGetMailDialogViewResponseData"; -import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachmentsResponse"; -import { OnUpdate } from "../di/OnUpdate"; +import { IPinDialogRequestData } from "../models/eft/dialog/IPinDialogRequestData"; +import { IRemoveDialogRequestData } from "../models/eft/dialog/IRemoveDialogRequestData"; +import { ISendMessageRequest } from "../models/eft/dialog/ISendMessageRequest"; +import { ISetDialogReadRequestData } from "../models/eft/dialog/ISetDialogReadRequestData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +import { DialogueInfo } from "../models/eft/profile/IAkiProfile"; +import { HashUtil } from "../utils/HashUtil"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export declare class DialogueCallbacks extends OnUpdate { private hashUtil; private timeUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/GameCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/GameCallbacks.d.ts index 9481129..44a30ea 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/GameCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/GameCallbacks.d.ts @@ -1,17 +1,17 @@ import { GameController } from "../controllers/GameController"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; import { IGameEmptyCrcRequestData } from "../models/eft/game/IGameEmptyCrcRequestData"; import { IVersionValidateRequestData } from "../models/eft/game/IVersionValidateRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; -import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { IWatermark } from "../models/spt/utils/IWatermark"; +import { Watermark } from "../utils/Watermark"; declare class GameCallbacks { private httpResponse; private watermark; private gameController; - constructor(httpResponse: HttpResponseUtil, watermark: IWatermark, gameController: GameController); + constructor(httpResponse: HttpResponseUtil, watermark: Watermark, gameController: GameController); versionValidate(url: string, info: IVersionValidateRequestData, sessionID: string): INullResponseData; gameStart(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; gameLogout(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/HealthCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/HealthCallbacks.d.ts index b223bb3..a50dd42 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/HealthCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/HealthCallbacks.d.ts @@ -1,13 +1,13 @@ import { HealthController } from "../controllers/HealthController"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; +import { IHealthTreatmentRequestData } from "../models/eft/health/IHealthTreatmentRequestData"; import { IOffraidEatRequestData } from "../models/eft/health/IOffraidEatRequestData"; import { IOffraidHealRequestData } from "../models/eft/health/IOffraidHealRequestData"; -import { IHealthTreatmentRequestData } from "../models/eft/health/IHealthTreatmentRequestData"; -import { ProfileHelper } from "../helpers/ProfileHelper"; +import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class HealthCallbacks { private httpResponse; private profileHelper; diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/HideoutCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/HideoutCallbacks.d.ts index b574232..3698176 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/HideoutCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/HideoutCallbacks.d.ts @@ -1,22 +1,23 @@ import { HideoutController } from "../controllers/HideoutController"; +import { OnUpdate } from "../di/OnUpdate"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; -import { IHideoutUpgradeCompleteRequestData } from "../models/eft/hideout/IHideoutUpgradeCompleteRequestData"; -import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; -import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData"; -import { IHideoutTakeItemOutRequestData } from "../models/eft/hideout/IHideoutTakeItemOutRequestData"; -import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutToggleAreaRequestData"; -import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; +import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData"; +import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; +import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; +import { IHideoutTakeItemOutRequestData } from "../models/eft/hideout/IHideoutTakeItemOutRequestData"; import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; +import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutToggleAreaRequestData"; +import { IHideoutUpgradeCompleteRequestData } from "../models/eft/hideout/IHideoutUpgradeCompleteRequestData"; +import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ConfigServer } from "../servers/ConfigServer"; -import { OnUpdate } from "../di/OnUpdate"; export declare class HideoutCallbacks extends OnUpdate { private hideoutController; private configServer; private hideoutConfig; - constructor(hideoutController: HideoutController, configServer: ConfigServer); + constructor(hideoutController: HideoutController, // TODO: delay needed + configServer: ConfigServer); upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; upgradeComplete(pmcData: IPmcData, body: IHideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse; putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/HttpCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/HttpCallbacks.d.ts index 7072297..9fe387d 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/HttpCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/HttpCallbacks.d.ts @@ -1,5 +1,5 @@ -import { IHttpServer } from "../models/spt/server/IHttpServer"; import { OnLoad } from "../di/OnLoad"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class HttpCallbacks extends OnLoad { private httpServer; constructor(httpServer: IHttpServer); diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/InraidCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/InraidCallbacks.d.ts index 1948d01..2d53227 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/InraidCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/InraidCallbacks.d.ts @@ -1,6 +1,6 @@ import { InraidController } from "../controllers/InraidController"; -import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ConfigServer } from "../servers/ConfigServer"; diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/InsuranceCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/InsuranceCallbacks.d.ts index 73b7bd9..79feb67 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/InsuranceCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/InsuranceCallbacks.d.ts @@ -1,13 +1,13 @@ import { InsuranceController } from "../controllers/InsuranceController"; +import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData"; import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { ConfigServer } from "../servers/ConfigServer"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; -import { InsuranceService } from "../services/InsuranceService"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { ConfigServer } from "../servers/ConfigServer"; +import { InsuranceService } from "../services/InsuranceService"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class InsuranceCallbacks extends OnLoadOnUpdate { private insuranceController; private insuranceService; diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/InventoryCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/InventoryCallbacks.d.ts index 90d6936..9795aa0 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/InventoryCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/InventoryCallbacks.d.ts @@ -1,21 +1,21 @@ import { InventoryController } from "../controllers/InventoryController"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IInventoryFoldRequestData } from "../models/eft/inventory/IInventoryFoldRequestData"; -import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; -import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; -import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData"; -import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData"; -import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwapRequestData"; -import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData"; -import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData"; import { IInventoryBindRequestData } from "../models/eft/inventory/IInventoryBindRequestData"; -import { IInventoryExamineRequestData } from "../models/eft/inventory/IInventoryExamineRequestData"; -import { IInventoryReadEncyclopediaRequestData } from "../models/eft/inventory/IInventoryReadEncyclopediaRequestData"; -import { IInventorySortRequestData } from "../models/eft/inventory/IInventorySortRequestData"; import { IInventoryCreateMarkerRequestData } from "../models/eft/inventory/IInventoryCreateMarkerRequestData"; import { IInventoryDeleteMarkerRequestData } from "../models/eft/inventory/IInventoryDeleteMarkerRequestData"; import { IInventoryEditMarkerRequestData } from "../models/eft/inventory/IInventoryEditMarkerRequestData"; +import { IInventoryExamineRequestData } from "../models/eft/inventory/IInventoryExamineRequestData"; +import { IInventoryFoldRequestData } from "../models/eft/inventory/IInventoryFoldRequestData"; +import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; +import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; +import { IInventoryReadEncyclopediaRequestData } from "../models/eft/inventory/IInventoryReadEncyclopediaRequestData"; +import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData"; +import { IInventorySortRequestData } from "../models/eft/inventory/IInventorySortRequestData"; +import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; +import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwapRequestData"; +import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData"; +import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData"; +import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class InventoryCallbacks { private inventoryController; diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/LauncherCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/LauncherCallbacks.d.ts index addf76b..4bd5e2c 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/LauncherCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/LauncherCallbacks.d.ts @@ -1,17 +1,18 @@ -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { SaveServer } from "../servers/SaveServer"; import { LauncherController } from "../controllers/LauncherController"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IChangeRequestData } from "../models/eft/launcher/IChangeRequestData"; +import { ILoginRequestData } from "../models/eft/launcher/ILoginRequestData"; import { IRegisterData } from "../models/eft/launcher/IRegisterData"; import { IRemoveProfileData } from "../models/eft/launcher/IRemoveProfileData"; -import { ILoginRequestData } from "../models/eft/launcher/ILoginRequestData"; -import { IChangeRequestData } from "../models/eft/launcher/IChangeRequestData"; -import { IWatermark } from "../models/spt/utils/IWatermark"; +import { SaveServer } from "../servers/SaveServer"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { Watermark } from "../utils/Watermark"; declare class LauncherCallbacks { private httpResponse; private launcherController; private saveServer; private watermark; - constructor(httpResponse: HttpResponseUtil, launcherController: LauncherController, saveServer: SaveServer, watermark: IWatermark); + constructor(httpResponse: HttpResponseUtil, launcherController: LauncherController, saveServer: SaveServer, watermark: Watermark); connect(): string; login(url: string, info: ILoginRequestData, sessionID: string): string; register(url: string, info: IRegisterData, sessionID: string): "FAILED" | "OK"; @@ -20,7 +21,7 @@ declare class LauncherCallbacks { changePassword(url: string, info: IChangeRequestData, sessionID: string): "FAILED" | "OK"; wipe(url: string, info: IRegisterData, sessionID: string): "FAILED" | "OK"; getServerVersion(): string; - ping(url: string, info: any, sessionID: string): string; + ping(url: string, info: IEmptyRequestData, sessionID: string): string; removeProfile(url: string, info: IRemoveProfileData, sessionID: string): string; getCompatibleTarkovVersion(): string; } diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/LocationCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/LocationCallbacks.d.ts index 346893b..5ecab74 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/LocationCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/LocationCallbacks.d.ts @@ -1,13 +1,14 @@ import { LocationController } from "../controllers/LocationController"; -import { IGetLocationRequestData } from "../models/eft/location/IGetLocationRequestData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSourceDestinationBase"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { ILocationBase } from "../models/eft/common/ILocationBase"; +import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSourceDestinationBase"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IGetLocationRequestData } from "../models/eft/location/IGetLocationRequestData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class LocationCallbacks { private httpResponse; private locationController; constructor(httpResponse: HttpResponseUtil, locationController: LocationController); - getLocationData(url: string, info: any, sessionID: string): IGetBodyResponseData; + getLocationData(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getLocation(url: string, info: IGetLocationRequestData, sessionID: string): IGetBodyResponseData; } diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/MatchCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/MatchCallbacks.d.ts index 9364a2f..63d38d9 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/MatchCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/MatchCallbacks.d.ts @@ -1,10 +1,11 @@ import { MatchController } from "../controllers/MatchController"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; -import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; -import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; +import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData"; +import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { DatabaseServer } from "../servers/DatabaseServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class MatchCallbacks { @@ -22,7 +23,7 @@ export declare class MatchCallbacks { 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; + getProfile(url: string, info: IGetProfileRequestData, sessionID: string): IGetBodyResponseData; serverAvailable(url: string, info: any, sessionID: string): IGetBodyResponseData | IGetBodyResponseData; joinMatch(url: string, info: any, sessionID: string): IGetBodyResponseData; getMetrics(url: string, info: any, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/ModCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/ModCallbacks.d.ts index b4c18c2..2011f0e 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/ModCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/ModCallbacks.d.ts @@ -1,9 +1,9 @@ -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { OnLoad } from "../di/OnLoad"; import { DelayedModLoader } from "../loaders/DelayedModLoader"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from '../models/spt/utils/ILogger'; -import { IHttpServer } from '../models/spt/server/IHttpServer'; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; declare class ModCallbacks extends OnLoad { private logger; private httpResponse; diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/NoteCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/NoteCallbacks.d.ts index 36cbd44..fd7c5ca 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/NoteCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/NoteCallbacks.d.ts @@ -1,7 +1,7 @@ import { NoteController } from "../controllers/NoteController"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { INoteActionData } from "../models/eft/notes/INoteActionData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { INoteActionData } from "../models/eft/notes/INoteActionData"; export declare class NoteCallbacks { private noteController; constructor(noteController: NoteController); diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/NotifierCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/NotifierCallbacks.d.ts index f47dcc9..416e6a3 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/NotifierCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/NotifierCallbacks.d.ts @@ -1,10 +1,10 @@ -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { NotifierController } from "../controllers/NotifierController"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INotifierChannel } from "../models/eft/notifier/INotifier"; import { ISelectProfileRequestData } from "../models/eft/notifier/ISelectProfileRequestData"; -import { NotifierController } from "../controllers/NotifierController"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class NotifierCallbacks { private httpServerHelper; private httpResponse; diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/PresetBuildCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/PresetBuildCallbacks.d.ts index fd22c8f..639c33f 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/PresetBuildCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/PresetBuildCallbacks.d.ts @@ -1,8 +1,8 @@ import { PresetBuildController } from "../controllers/PresetBuildController"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IPresetBuildActionRequestData } from "../models/eft/presetBuild/IPresetBuildActionRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IPresetBuildActionRequestData } from "../models/eft/presetBuild/IPresetBuildActionRequestData"; import { WeaponBuild } from "../models/eft/profile/IAkiProfile"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class PresetBuildCallbacks { diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/ProfileCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/ProfileCallbacks.d.ts index e50c130..efce47d 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/ProfileCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/ProfileCallbacks.d.ts @@ -1,16 +1,16 @@ -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { TimeUtil } from "../utils/TimeUtil"; import { ProfileController } from "../controllers/ProfileController"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +import { IGetMiniProfileRequestData } from "../models/eft/launcher/IGetMiniProfileRequestData"; import { IProfileChangeNicknameRequestData } from "../models/eft/profile/IProfileChangeNicknameRequestData"; import { IProfileChangeVoiceRequestData } from "../models/eft/profile/IProfileChangeVoiceRequestData"; import { IProfileCreateRequestData } from "../models/eft/profile/IProfileCreateRequestData"; -import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { ISearchFriendRequestData } from "../models/eft/profile/ISearchFriendRequestData"; import { ISearchFriendResponse } from "../models/eft/profile/ISearchFriendResponse"; -import { IGetMiniProfileRequestData } from "../models/eft/launcher/IGetMiniProfileRequestData"; +import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export declare class ProfileCallbacks { private httpResponse; private timeUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/QuestCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/QuestCallbacks.d.ts index 1f3964b..f742096 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/QuestCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/QuestCallbacks.d.ts @@ -1,15 +1,15 @@ import { QuestController } from "../controllers/QuestController"; import { RepeatableQuestController } from "../controllers/RepeatableQuestController"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { IListQuestsRequestData } from "../models/eft/quests/IListQuestsRequestData"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; -import { IHandoverQuestRequestData } from "../models/eft/quests/IHandoverQuestRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { IQuest } from "../models/eft/common/tables/IQuest"; import { IPmcDataRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; +import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; +import { IHandoverQuestRequestData } from "../models/eft/quests/IHandoverQuestRequestData"; +import { IListQuestsRequestData } from "../models/eft/quests/IListQuestsRequestData"; import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class QuestCallbacks { diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/RagfairCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/RagfairCallbacks.d.ts index 260fd13..152475f 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/RagfairCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/RagfairCallbacks.d.ts @@ -1,20 +1,20 @@ -import { RagfairServer } from "../servers/RagfairServer"; 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"; -import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData"; -import { IAddOfferRequestData } from "../models/eft/ragfair/IAddOfferRequestData"; -import { IRemoveOfferRequestData } from "../models/eft/ragfair/IRemoveOfferRequestData"; -import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IAddOfferRequestData } from "../models/eft/ragfair/IAddOfferRequestData"; +import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData"; import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult"; +import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData"; +import { IRemoveOfferRequestData } from "../models/eft/ragfair/IRemoveOfferRequestData"; +import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; +import { RagfairServer } from "../servers/RagfairServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; -import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; -import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairCallbacks extends OnLoadOnUpdate { private httpResponse; private logger; diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/RepairCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/RepairCallbacks.d.ts index 4acd364..f63ec18 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/RepairCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/RepairCallbacks.d.ts @@ -1,8 +1,8 @@ import { RepairController } from "../controllers/RepairController"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest"; import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepairActionDataRequest"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class RepairCallbacks { private repairController; constructor(repairController: RepairController); diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/SaveCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/SaveCallbacks.d.ts index 52d5faf..b7219a0 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/SaveCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/SaveCallbacks.d.ts @@ -1,5 +1,5 @@ -import { SaveServer } from "../servers/SaveServer"; import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; +import { SaveServer } from "../servers/SaveServer"; export declare class SaveCallbacks extends OnLoadOnUpdate { private saveServer; constructor(saveServer: SaveServer); diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/TradeCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/TradeCallbacks.d.ts index 4cf8497..9928951 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/TradeCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/TradeCallbacks.d.ts @@ -1,8 +1,8 @@ import { TradeController } from "../controllers/TradeController"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData"; +import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData"; export declare class TradeCallbacks { private tradeController; constructor(tradeController: TradeController); diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/TraderCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/TraderCallbacks.d.ts index 264ef94..2a8af7f 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/TraderCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/TraderCallbacks.d.ts @@ -1,9 +1,9 @@ -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; 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 { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class TraderCallbacks extends OnLoadOnUpdate { private httpResponse; private traderController; diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/WeatherCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/WeatherCallbacks.d.ts index 2474417..e40ab3e 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/WeatherCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/WeatherCallbacks.d.ts @@ -1,6 +1,6 @@ import { WeatherController } from "../controllers/WeatherController"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class WeatherCallbacks { private httpResponse; diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/WishlistCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/WishlistCallbacks.d.ts index 1816600..e0249fd 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/WishlistCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/WishlistCallbacks.d.ts @@ -1,7 +1,7 @@ import { WishlistController } from "../controllers/WishlistController"; 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 WishlistCallbacks { private wishlistController; constructor(wishlistController: WishlistController); diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/GameController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/GameController.d.ts index 614d270..5c9a464 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/GameController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/GameController.d.ts @@ -1,10 +1,10 @@ +import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; -import { ConfigServer } from "../servers/ConfigServer"; import { ILogger } from "../models/spt/utils/ILogger"; -import { IWatermark } from "../models/spt/utils/IWatermark"; -import { HttpServerHelper } from "../helpers/HttpServerHelper"; +import { ConfigServer } from "../servers/ConfigServer"; +import { Watermark } from "../utils/Watermark"; export declare class GameController { private logger; private watermark; @@ -12,7 +12,7 @@ export declare class GameController { private profileHelper; private configServer; private httpConfig; - constructor(logger: ILogger, watermark: IWatermark, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); + constructor(logger: ILogger, watermark: Watermark, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); gameStart(url: string, info: IEmptyRequestData, sessionID: string): void; getGameConfig(sessionID: string): IGameConfigResponse; getServer(): any[]; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/InsuranceController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/InsuranceController.d.ts index 44c61fa..50437a6 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/InsuranceController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/InsuranceController.d.ts @@ -28,7 +28,8 @@ export declare class InsuranceController { private insuranceService; private configServer; private insuranceConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, itemEventRouter: ItemEventRouter, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileHelper: ProfileHelper, dialogueHelper: DialogueHelper, paymentService: PaymentService, insuranceService: InsuranceService, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, itemEventRouter: ItemEventRouter, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileHelper: ProfileHelper, dialogueHelper: DialogueHelper, paymentService: PaymentService, // TODO: delay required + insuranceService: InsuranceService, configServer: ConfigServer); processReturn(): void; insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse; cost(info: IGetInsuranceCostRequestData, sessionID: string): any; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/InventoryController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/InventoryController.d.ts index 4ff07b8..8235082 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/InventoryController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/InventoryController.d.ts @@ -1,30 +1,31 @@ import { InventoryHelper } from "../helpers/InventoryHelper"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; +import { PaymentHelper } from "../helpers/PaymentHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { PaymentHelper } from "../helpers/PaymentHelper"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { DatabaseServer } from "../servers/DatabaseServer"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; -import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData"; -import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; -import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwapRequestData"; -import { IInventoryFoldRequestData } from "../models/eft/inventory/IInventoryFoldRequestData"; -import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData"; -import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData"; +import { IAddItemRequestData } from "../models/eft/inventory/IAddItemRequestData"; import { IInventoryBindRequestData } from "../models/eft/inventory/IInventoryBindRequestData"; -import { IInventoryExamineRequestData } from "../models/eft/inventory/IInventoryExamineRequestData"; -import { IInventoryReadEncyclopediaRequestData } from "../models/eft/inventory/IInventoryReadEncyclopediaRequestData"; -import { IInventorySortRequestData } from "../models/eft/inventory/IInventorySortRequestData"; import { IInventoryCreateMarkerRequestData } from "../models/eft/inventory/IInventoryCreateMarkerRequestData"; import { IInventoryDeleteMarkerRequestData } from "../models/eft/inventory/IInventoryDeleteMarkerRequestData"; import { IInventoryEditMarkerRequestData } from "../models/eft/inventory/IInventoryEditMarkerRequestData"; +import { IInventoryExamineRequestData } from "../models/eft/inventory/IInventoryExamineRequestData"; +import { IInventoryFoldRequestData } from "../models/eft/inventory/IInventoryFoldRequestData"; +import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; +import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; +import { IInventoryReadEncyclopediaRequestData } from "../models/eft/inventory/IInventoryReadEncyclopediaRequestData"; +import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData"; +import { IInventorySortRequestData } from "../models/eft/inventory/IInventorySortRequestData"; +import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; +import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwapRequestData"; +import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData"; +import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData"; +import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HashUtil } from "../utils/HashUtil"; +import { JsonUtil } from "../utils/JsonUtil"; export declare class InventoryController { private logger; private hashUtil; @@ -77,7 +78,7 @@ export declare class InventoryController { * Give Item * its used for "add" item like gifts etc. */ - addItem(pmcData: IPmcData, body: any, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; + addItem(pmcData: IPmcData, body: IAddItemRequestData, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; /** * Handles folding of Weapons */ diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/MatchController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/MatchController.d.ts index 229b884..84abbe3 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/MatchController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/MatchController.d.ts @@ -1,8 +1,9 @@ -import { TraderHelper } from "../helpers/TraderHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; -import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; +import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData"; +import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; import { ConfigServer } from "../servers/ConfigServer"; import { SaveServer } from "../servers/SaveServer"; import { MatchLocationService } from "../services/MatchLocationService"; @@ -16,7 +17,7 @@ export declare class MatchController { private inraidConfig; constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, configServer: ConfigServer); getEnabled(): boolean; - getProfile(info: any): IPmcData[]; + getProfile(info: IGetProfileRequestData): IPmcData[]; private getMatch; createGroup(sessionID: string, info: any): any; deleteGroup(info: any): void; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/RagfairController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/RagfairController.d.ts index 6e71edd..5b94a95 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/RagfairController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/RagfairController.d.ts @@ -1,37 +1,37 @@ -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { RagfairServer } from "../servers/RagfairServer"; -import { SaveServer } from "../servers/SaveServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { PaymentService } from "../services/PaymentService"; -import { RagfairPriceService } from "../services/RagfairPriceService"; -import { RagfairOfferService } from "../services/RagfairOfferService"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { HandbookHelper } from "../helpers/HandbookHelper"; -import { PaymentHelper } from "../helpers/PaymentHelper"; -import { InventoryHelper } from "../helpers/InventoryHelper"; -import { RagfairHelper } from "../helpers/RagfairHelper"; -import { RagfairSellHelper } from "../helpers/RagfairSellHelper"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IAddOfferRequestData, Requirement } from "../models/eft/ragfair/IAddOfferRequestData"; -import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData"; -import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData"; -import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { Item } from "../models/eft/common/tables/IItem"; -import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult"; -import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; -import { ConfigServer } from "../servers/ConfigServer"; -import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; -import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; +import { HandbookHelper } from "../helpers/HandbookHelper"; +import { InventoryHelper } from "../helpers/InventoryHelper"; +import { ItemHelper } from "../helpers/ItemHelper"; +import { PaymentHelper } from "../helpers/PaymentHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { RagfairHelper } from "../helpers/RagfairHelper"; +import { RagfairOfferHelper } from "../helpers/RagfairOfferHelper"; +import { RagfairSellHelper } from "../helpers/RagfairSellHelper"; import { RagfairSortHelper } from "../helpers/RagfairSortHelper"; import { RagfairTaxHelper } from "../helpers/RagfairTaxHelper"; -import { RagfairOfferHelper } from "../helpers/RagfairOfferHelper"; -import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { IAddOfferRequestData, Requirement } from "../models/eft/ragfair/IAddOfferRequestData"; +import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData"; +import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult"; +import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData"; +import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { RagfairServer } from "../servers/RagfairServer"; +import { SaveServer } from "../servers/SaveServer"; +import { PaymentService } from "../services/PaymentService"; +import { RagfairOfferService } from "../services/RagfairOfferService"; +import { RagfairPriceService } from "../services/RagfairPriceService"; +import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export declare class RagfairController { private logger; private timeUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/RepeatableQuestController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/RepeatableQuestController.d.ts index d2de5df..bd5e5a1 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/RepeatableQuestController.d.ts @@ -1,24 +1,24 @@ -import { TimeUtil } from "../utils/TimeUtil"; -import { ObjectId } from "../utils/ObjectId"; -import { RandomUtil, ProbabilityObjectArray, ProbabilityObject } from "../utils/RandomUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { MathUtil } from "../utils/MathUtil"; import { ItemHelper } from "../helpers/ItemHelper"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IPmcData, TraderInfo } from "../models/eft/common/IPmcData"; -import { IRepeatableQuestConfig, ELocationName } from "../models/spt/config/IQuestConfig"; -import { IExploration, IRepeatableQuest, IReward, IRewards, IExplorationCondition, ICompletionAvailableFor, IEliminationCondition, ICompletion, IElimination, IPmcDataRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; -import { Exit } from "../models/eft/common/ILocationBase"; -import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { PresetHelper } from "../helpers/PresetHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { PaymentService } from "../services/PaymentService"; -import { ConfigServer } from "../servers/ConfigServer"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { Exit } from "../models/eft/common/ILocationBase"; +import { IPmcData, TraderInfo } from "../models/eft/common/IPmcData"; +import { ICompletion, ICompletionAvailableFor, IElimination, IEliminationCondition, IExploration, IExplorationCondition, IPmcDataRepeatableQuest, IRepeatableQuest, IReward, IRewards } from "../models/eft/common/tables/IRepeatableQuests"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; +import { ELocationName, IRepeatableQuestConfig } from "../models/spt/config/IQuestConfig"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { PaymentService } from "../services/PaymentService"; +import { JsonUtil } from "../utils/JsonUtil"; +import { MathUtil } from "../utils/MathUtil"; +import { ObjectId } from "../utils/ObjectId"; +import { ProbabilityObject, ProbabilityObjectArray, RandomUtil } from "../utils/RandomUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export interface IQuestTypePool { types: string[]; pool: IQuestPool; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/TraderController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/TraderController.d.ts index 5cd85c9..36eac75 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/TraderController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/TraderController.d.ts @@ -1,13 +1,12 @@ -import { JsonUtil } from "../utils/JsonUtil"; -import { TimeUtil } from "../utils/TimeUtil"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { TraderAssortHelper } from "../helpers/TraderAssortHelper"; +import { TraderHelper } from "../helpers/TraderHelper"; +import { IBarterScheme, ITraderAssort, ITraderBase } from "../models/eft/common/tables/ITrader"; +import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { TraderAssortService } from "../services/TraderAssortService"; -import { IBarterScheme, ITraderAssort, ITraderBase } from "../models/eft/common/tables/ITrader"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { TraderAssortHelper } from "../helpers/TraderAssortHelper"; +import { JsonUtil } from "../utils/JsonUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export declare class TraderController { private logger; private databaseServer; @@ -17,9 +16,7 @@ export declare class TraderController { private timeUtil; private traderAssortService; private jsonUtil; - private configServer; - private traderConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, timeUtil: TimeUtil, traderAssortService: TraderAssortService, jsonUtil: JsonUtil, configServer: ConfigServer); + constructor(logger: ILogger, databaseServer: DatabaseServer, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, timeUtil: TimeUtil, traderAssortService: TraderAssortService, jsonUtil: JsonUtil); load(): void; getTrader(traderID: string, sessionID: string): ITraderBase; getAllTraders(sessionID: string): ITraderBase[]; diff --git a/TypeScript/4UseACustomConfigFile/types/di/Container.d.ts b/TypeScript/4UseACustomConfigFile/types/di/Container.d.ts index b67523f..17791b0 100644 --- a/TypeScript/4UseACustomConfigFile/types/di/Container.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/di/Container.d.ts @@ -1,6 +1,7 @@ import { DependencyContainer } from "tsyringe"; export declare class Container { static registerTypes(depContainer: DependencyContainer): void; + static registerListTypes(depContainer: DependencyContainer): void; private static registerUtils; private static registerRouters; private static registerGenerators; diff --git a/TypeScript/4UseACustomConfigFile/types/di/OnSaveLoad.d.ts b/TypeScript/4UseACustomConfigFile/types/di/OnSaveLoad.d.ts new file mode 100644 index 0000000..1edf37e --- /dev/null +++ b/TypeScript/4UseACustomConfigFile/types/di/OnSaveLoad.d.ts @@ -0,0 +1,4 @@ +export declare class OnSaveLoad { + onSaveLoad(): void; + getRoute(): string; +} diff --git a/TypeScript/4UseACustomConfigFile/types/di/Router.d.ts b/TypeScript/4UseACustomConfigFile/types/di/Router.d.ts index ac48587..2fb98e0 100644 --- a/TypeScript/4UseACustomConfigFile/types/di/Router.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/di/Router.d.ts @@ -3,18 +3,22 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; export declare class Router { private handledRoutes; - constructor(); getTopLevelRoute(): string; protected getHandledRoutes(): HandledRoute[]; + private getInternalHandledRoutes; canHandle(url: string, partialMatch?: boolean): boolean; } export declare class StaticRouter extends Router { - constructor(); + private routes; + constructor(routes: RouteAction[]); handleStatic(url: string, info: any, sessionID: string, output: string): any; + getHandledRoutes(): HandledRoute[]; } export declare class DynamicRouter extends Router { - constructor(); + private routes; + constructor(routes: RouteAction[]); handleDynamic(url: string, info: any, sessionID: string, output: string): any; + getHandledRoutes(): HandledRoute[]; } export declare class ItemEventRouterDefinition extends Router { constructor(); @@ -29,3 +33,8 @@ export declare class HandledRoute { dynamic: boolean; constructor(route: string, dynamic: boolean); } +export declare class RouteAction { + url: string; + action: (url: string, info: any, sessionID: string, output: string) => any; + constructor(url: string, action: (url: string, info: any, sessionID: string, output: string) => any); +} diff --git a/TypeScript/4UseACustomConfigFile/types/generators/BotInventoryGenerator.d.ts b/TypeScript/4UseACustomConfigFile/types/generators/BotInventoryGenerator.d.ts index e9f09de..0cdbacb 100644 --- a/TypeScript/4UseACustomConfigFile/types/generators/BotInventoryGenerator.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/generators/BotInventoryGenerator.d.ts @@ -17,7 +17,6 @@ export declare class BotInventoryGenerator { private botLootGenerator; private botGeneratorHelper; private weightedRandomHelper; - private botConfig; constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, botWeaponGenerator: BotWeaponGenerator, botLootGenerator: BotLootGenerator, botGeneratorHelper: BotGeneratorHelper, weightedRandomHelper: WeightedRandomHelper); generateInventory(templateInventory: Inventory, equipmentChances: Chances, generation: Generation, botRole: string, isPmc: boolean): PmcInventory; private generateEquipment; diff --git a/TypeScript/4UseACustomConfigFile/types/generators/BotWeaponGenerator.d.ts b/TypeScript/4UseACustomConfigFile/types/generators/BotWeaponGenerator.d.ts index 3e9d59c..e8f91cb 100644 --- a/TypeScript/4UseACustomConfigFile/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/generators/BotWeaponGenerator.d.ts @@ -1,11 +1,11 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { MinMax, ModsChances, Mods } from "../models/eft/common/tables/IBotType"; -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -import { HashUtil } from "../utils/HashUtil"; +import { ItemHelper } from "../helpers/ItemHelper"; +import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; +import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { MinMax, Mods, ModsChances } from "../models/eft/common/tables/IBotType"; import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; export declare class BotWeaponGenerator { private logger; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/BotGeneratorHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/BotGeneratorHelper.d.ts index c3cf4d3..6abdc07 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/BotGeneratorHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/BotGeneratorHelper.d.ts @@ -1,17 +1,17 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ConfigServer } from "../servers/ConfigServer"; +import { DurabilityLimitsHelper } from "../helpers/DurabilityLimitsHelper"; import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { ModsChances, Mods } from "../models/eft/common/tables/IBotType"; +import { Mods, ModsChances } from "../models/eft/common/tables/IBotType"; import { Item, Upd } from "../models/eft/common/tables/IItem"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { DurabilityLimitsHelper } from "../helpers/DurabilityLimitsHelper"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; -import { InventoryHelper } from "./InventoryHelper"; import { ContainerHelper } from "./ContainerHelper"; +import { InventoryHelper } from "./InventoryHelper"; import { ItemHelper } from "./ItemHelper"; -import { ILogger } from "../models/spt/utils/ILogger"; declare class BotGeneratorHelper { private logger; private jsonUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/ExtendedProfileHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/ExtendedProfileHelper.d.ts index 22ead31..4dd7d3a 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/ExtendedProfileHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/ExtendedProfileHelper.d.ts @@ -1,16 +1,16 @@ +import { BotGenerator } from "../generators/BotGenerator"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { FenceService } from "../services/FenceService"; -import { IPmcData } from "../models/eft/common/IPmcData"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; +import { Watermark } from "../utils/Watermark"; import { ItemHelper } from "./ItemHelper"; -import { IWatermark } from "../models/spt/utils/IWatermark"; -import { BotGenerator } from "../generators/BotGenerator"; import { ProfileHelper } from "./ProfileHelper"; export declare class ExtendedProfileHelper extends ProfileHelper { private botGenerator; - constructor(jsonUtil: JsonUtil, watermark: IWatermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService, botGenerator: BotGenerator); + constructor(jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService, botGenerator: BotGenerator); generatePlayerScav(sessionID: string): IPmcData; private getScavSkills; private removeSecureContainer; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/HideoutHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/HideoutHelper.d.ts index d60e370..5b4a5ad 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/HideoutHelper.d.ts @@ -1,21 +1,21 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; import { IPmcData, Production, Productive } from "../models/eft/common/IPmcData"; -import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; -import { StageBonus } from "../models/eft/hideout/IHideoutArea"; -import { TimeUtil } from "../utils/TimeUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { HashUtil } from "../utils/HashUtil"; -import { ProfileHelper } from "./ProfileHelper"; -import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { ConfigServer } from "../servers/ConfigServer"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { PlayerService } from "../services/PlayerService"; -import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; -import { InventoryHelper } from "./InventoryHelper"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { StageBonus } from "../models/eft/hideout/IHideoutArea"; +import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; +import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; +import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +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"; export declare class HideoutHelper { private logger; private hashUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/InventoryHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/InventoryHelper.d.ts index 4b3460c..00e95d3 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/InventoryHelper.d.ts @@ -1,21 +1,22 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; +import { IAddItemRequestData } from "../models/eft/inventory/IAddItemRequestData"; +import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; +import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; +import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { FenceService } from "../services/FenceService"; -import { ContainerHelper } from "./ContainerHelper"; -import { ItemHelper } from "./ItemHelper"; -import { PaymentHelper } from "./PaymentHelper"; -import { ProfileHelper } from "./ProfileHelper"; -import { DialogueHelper } from "./DialogueHelper"; import { HashUtil } from "../utils/HashUtil"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; -import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; -import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; -import { ILogger } from "../models/spt/utils/ILogger"; +import { ContainerHelper } from "./ContainerHelper"; +import { DialogueHelper } from "./DialogueHelper"; +import { ItemHelper } from "./ItemHelper"; +import { PaymentHelper } from "./PaymentHelper"; +import { ProfileHelper } from "./ProfileHelper"; import { TraderAssortHelper } from "./TraderAssortHelper"; export interface OwnerInventoryItems { from: Item[]; @@ -39,7 +40,7 @@ export declare class InventoryHelper { private configServer; private inventoryConfig; 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, configServer: ConfigServer); - addItem(pmcData: IPmcData, body: any, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; + addItem(pmcData: IPmcData, body: IAddItemRequestData, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; removeItem(pmcData: IPmcData, itemId: string, sessionID: string, output?: IItemEventRouterResponse): IItemEventRouterResponse; getItemSize(itemTpl: string, itemID: string, inventoryItem: Item[]): Record; private getSizeByInventoryItemHash; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/ProfileHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/ProfileHelper.d.ts index 515e55e..508443c 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/ProfileHelper.d.ts @@ -1,22 +1,22 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { FenceService } from "../services/FenceService"; import { IPmcData, Stats } from "../models/eft/common/IPmcData"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { SaveServer } from "../servers/SaveServer"; +import { FenceService } from "../services/FenceService"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; +import { Watermark } from "../utils/Watermark"; import { ItemHelper } from "./ItemHelper"; -import { IWatermark } from "../models/spt/utils/IWatermark"; export declare class ProfileHelper { protected jsonUtil: JsonUtil; - protected watermark: IWatermark; + protected watermark: Watermark; protected timeUtil: TimeUtil; protected saveServer: SaveServer; protected databaseServer: DatabaseServer; protected itemHelper: ItemHelper; protected fenceService: FenceService; - constructor(jsonUtil: JsonUtil, watermark: IWatermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService); + constructor(jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService); resetProfileQuestCondition(sessionID: string, conditionId: string): void; getCompleteProfile(sessionID: string): IPmcData[]; isNicknameTaken(info: IValidateNicknameRequestData, sessionID: string): boolean; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/QuestHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/QuestHelper.d.ts index 3474884..9e2dd5e 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/QuestHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/QuestHelper.d.ts @@ -1,21 +1,21 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { ItemHelper } from "./ItemHelper"; -import { ProfileHelper } from "./ProfileHelper"; -import { DialogueHelper } from "./DialogueHelper"; -import { PaymentHelper } from "./PaymentHelper"; -import { TraderHelper } from "./TraderHelper"; import { IPmcData, Quest } from "../models/eft/common/IPmcData"; 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 { ConfigServer } from "../servers/ConfigServer"; -import { RagfairServerHelper } from "./RagfairServerHelper"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HashUtil } from "../utils/HashUtil"; +import { JsonUtil } from "../utils/JsonUtil"; +import { TimeUtil } from "../utils/TimeUtil"; +import { DialogueHelper } from "./DialogueHelper"; +import { ItemHelper } from "./ItemHelper"; +import { PaymentHelper } from "./PaymentHelper"; +import { ProfileHelper } from "./ProfileHelper"; +import { RagfairServerHelper } from "./RagfairServerHelper"; +import { TraderHelper } from "./TraderHelper"; export declare class QuestHelper { private logger; private jsonUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/RagfairHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/RagfairHelper.d.ts index 2bce4a6..8e70bcd 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/RagfairHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/RagfairHelper.d.ts @@ -1,16 +1,16 @@ -import { JsonUtil } from "../utils/JsonUtil"; import { Item } from "../models/eft/common/tables/IItem"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { RagfairLinkedItemService } from "../services/RagfairLinkedItemService"; +import { JsonUtil } from "../utils/JsonUtil"; import { HandbookHelper } from "./HandbookHelper"; import { ItemHelper } from "./ItemHelper"; -import { RagfairLinkedItemService } from "../services/RagfairLinkedItemService"; -import { UtilityHelper } from "./UtilityHelper"; -import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from "../models/spt/utils/ILogger"; import { TraderAssortHelper } from "./TraderAssortHelper"; +import { UtilityHelper } from "./UtilityHelper"; export declare class RagfairHelper { private logger; private jsonUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/RagfairOfferHelper.d.ts index da3ceb8..3bf8add 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/RagfairOfferHelper.d.ts @@ -1,23 +1,23 @@ -import { HashUtil } from "../utils/HashUtil"; -import { TimeUtil } from "../utils/TimeUtil"; import { IPmcData } from "../models/eft/common/IPmcData"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { RagfairOfferService } from "../services/RagfairOfferService"; +import { HashUtil } from "../utils/HashUtil"; +import { TimeUtil } from "../utils/TimeUtil"; import { DialogueHelper } from "./DialogueHelper"; import { ItemHelper } from "./ItemHelper"; import { PaymentHelper } from "./PaymentHelper"; import { PresetHelper } from "./PresetHelper"; import { ProfileHelper } from "./ProfileHelper"; -import { RagfairServerHelper } from "./RagfairServerHelper"; -import { ConfigServer } from "../servers/ConfigServer"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { RagfairSortHelper } from "./RagfairSortHelper"; import { RagfairHelper } from "./RagfairHelper"; -import { ILogger } from "../models/spt/utils/ILogger"; +import { RagfairServerHelper } from "./RagfairServerHelper"; +import { RagfairSortHelper } from "./RagfairSortHelper"; export declare class RagfairOfferHelper { private logger; private timeUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/RagfairServerHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/RagfairServerHelper.d.ts index 9a26261..0f32a66 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/RagfairServerHelper.d.ts @@ -1,15 +1,15 @@ -import { SaveServer } from "../servers/SaveServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { ItemHelper } from "./ItemHelper"; -import { ProfileHelper } from "./ProfileHelper"; import { MemberCategory } from "../models/eft/common/MemberCategory"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { SaveServer } from "../servers/SaveServer"; +import { HashUtil } from "../utils/HashUtil"; +import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { DialogueHelper } from "./DialogueHelper"; -import { Item } from "../models/eft/common/tables/IItem"; -import { JsonUtil } from "../utils/JsonUtil"; -import { HashUtil } from "../utils/HashUtil"; +import { ItemHelper } from "./ItemHelper"; +import { ProfileHelper } from "./ProfileHelper"; export declare class RagfairServerHelper { private randomUtil; private hashUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/TradeHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/TradeHelper.d.ts index 0712ff4..a78cd20 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/TradeHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/TradeHelper.d.ts @@ -1,16 +1,16 @@ -import { RagfairServer } from "../servers/RagfairServer"; import { InventoryHelper } from "../helpers/InventoryHelper"; +import { ItemHelper } from "../helpers/ItemHelper"; import { TraderHelper } from "../helpers/TraderHelper"; -import { FenceService } from "../services/FenceService"; -import { PaymentService } from "../services/PaymentService"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { Upd } from "../models/eft/common/tables/IItem"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "../models/eft/trade/IProcessSellTradeRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { Upd } from "../models/eft/common/tables/IItem"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { RagfairServer } from "../servers/RagfairServer"; +import { FenceService } from "../services/FenceService"; +import { PaymentService } from "../services/PaymentService"; export declare class TradeHelper { private logger; private itemEventRouter; diff --git a/TypeScript/4UseACustomConfigFile/types/loaders/DelayedModLoader.d.ts b/TypeScript/4UseACustomConfigFile/types/loaders/DelayedModLoader.d.ts index db86c75..7d0009f 100644 --- a/TypeScript/4UseACustomConfigFile/types/loaders/DelayedModLoader.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/loaders/DelayedModLoader.d.ts @@ -1,10 +1,9 @@ -import { DependencyContainer } from 'tsyringe'; -import { VFS } from "../utils/VFS"; -import { InitialModLoader } from "./InitialModLoader"; -import { BundleLoader } from "./BundleLoader"; 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 { InitialModLoader } from "./InitialModLoader"; export declare class DelayedModLoader implements IModLoader { private bundleLoader; private handbookController; @@ -16,7 +15,7 @@ export declare class DelayedModLoader implements IModLoader { getBundle(key: string, local: boolean): void; getImportedModsNames(): string[]; getModPath(mod: string): string; - load(container: DependencyContainer): void; + load(): void; private executeMods; private addBundles; } diff --git a/TypeScript/4UseACustomConfigFile/types/loaders/InitialModLoader.d.ts b/TypeScript/4UseACustomConfigFile/types/loaders/InitialModLoader.d.ts index 35503c8..d30a3fe 100644 --- a/TypeScript/4UseACustomConfigFile/types/loaders/InitialModLoader.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/loaders/InitialModLoader.d.ts @@ -1,23 +1,22 @@ import { DependencyContainer } from "tsyringe"; -import { JsonUtil } from "../utils/JsonUtil"; -import { VFS } from "../utils/VFS"; +import { IModLoader } from "../models/spt/mod/IModLoader"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { ModCompilerService } from "../services/ModCompilerService"; -import { HashCacheService } from "../services/HashCacheService"; -import { IModLoader } from "../models/spt/mod/IModLoader"; +import { JsonUtil } from "../utils/JsonUtil"; +import { VFS } from "../utils/VFS"; export declare class InitialModLoader implements IModLoader { private logger; private vfs; private jsonUtil; private modCompilerService; - private hashCacheService; private configServer; + private static container; private readonly basepath; private imported; private onLoad; private akiConfig; - constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, hashCacheService: HashCacheService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, configServer: ConfigServer); load(container: DependencyContainer): Promise; getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; @@ -29,10 +28,10 @@ export declare class InitialModLoader implements IModLoader { private executeMods; private sortModsLoadOrder; private addMod; - private compileModIfNeeded; private areModDependenciesFulfilled; private isModCompatible; private validMod; private getLoadOrderRecursive; private getLoadOrder; + getContainer(): DependencyContainer; } diff --git a/TypeScript/4UseACustomConfigFile/types/models/eft/common/ILocationBase.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/ILocationBase.d.ts index 0d092f6..ad48d32 100644 --- a/TypeScript/4UseACustomConfigFile/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/models/eft/common/ILocationBase.d.ts @@ -107,6 +107,15 @@ export interface BossLocationSpawn { BossPlayer: boolean; BossZone: string; Time: number; + TriggerId: string; + TriggerName: string; + Delay?: number; + Supports?: BossSupport[]; +} +export interface BossSupport { + BossEscortAmount: string; + BossEscortDifficult: string[]; + BossEscortType: string; } export interface BotLocationModifier { AccuracySpeed: number; diff --git a/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IBotType.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IBotType.d.ts index e0f39d9..01be0be 100644 --- a/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IBotType.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IBotType.d.ts @@ -100,6 +100,8 @@ export interface Generation { export interface ItemMinMax { grenades: MinMax; healing: MinMax; + drugs: MinMax; + stims: MinMax; looseLoot: MinMax; magazines: MinMax; specialItems: MinMax; diff --git a/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IQuest.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IQuest.d.ts index 1582a2f..0aa7a4e 100644 --- a/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IQuest.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IQuest.d.ts @@ -44,7 +44,7 @@ export interface AvailableForProps { value?: number; compareMethod?: string; visibilityConditions?: VisibilityCondition[]; - target?: string; + target?: string | string[]; status?: number[]; } export interface VisibilityCondition { diff --git a/TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IAddItemRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IAddItemRequestData.d.ts new file mode 100644 index 0000000..53db97a --- /dev/null +++ b/TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IAddItemRequestData.d.ts @@ -0,0 +1,4 @@ +export interface IAddItemRequestData { + tid: string; + items: any[]; +} diff --git a/TypeScript/4UseACustomConfigFile/types/models/eft/match/IGetProfileRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/match/IGetProfileRequestData.d.ts new file mode 100644 index 0000000..86b5bbd --- /dev/null +++ b/TypeScript/4UseACustomConfigFile/types/models/eft/match/IGetProfileRequestData.d.ts @@ -0,0 +1,3 @@ +export interface IGetProfileRequestData { + profileId: string; +} diff --git a/TypeScript/4UseACustomConfigFile/types/models/spt/utils/IWatermark.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/utils/IWatermark.d.ts deleted file mode 100644 index a15f5d7..0000000 --- a/TypeScript/4UseACustomConfigFile/types/models/spt/utils/IWatermark.d.ts +++ /dev/null @@ -1,22 +0,0 @@ -export interface IWatermarkLocale { - getLocale(): string; - getDescription(): string[]; - getWarning(): string[]; -} -export interface IWatermark { - initialize(): void; - getVersionTag(): string; - /** - * Set window title - */ - setTitle(): void; - /** - * Reset console cursor to top - */ - resetCursor(): void; - /** - * Draw the watermark - */ - draw(): void; - getVersionLabel(): string; -} diff --git a/TypeScript/4UseACustomConfigFile/types/routers/dynamic/BotDynamicRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/dynamic/BotDynamicRouter.d.ts index 51e52f7..dd2f68a 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/dynamic/BotDynamicRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/dynamic/BotDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { BotCallbacks } from "../../callbacks/BotCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class BotDynamicRouter extends DynamicRouter { private botCallbacks; constructor(botCallbacks: BotCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/dynamic/BundleDynamicRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/dynamic/BundleDynamicRouter.d.ts index 6cec61d..be27008 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/dynamic/BundleDynamicRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/dynamic/BundleDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { BundleCallbacks } from "../../callbacks/BundleCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class BundleDynamicRouter extends DynamicRouter { private bundleCallbacks; constructor(bundleCallbacks: BundleCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/dynamic/CustomizationDynamicRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/dynamic/CustomizationDynamicRouter.d.ts index e8a27ff..03a5967 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/dynamic/CustomizationDynamicRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/dynamic/CustomizationDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class CustomizationDynamicRouter extends DynamicRouter { private customizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/dynamic/DataDynamicRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/dynamic/DataDynamicRouter.d.ts index 9b6f632..c30501a 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/dynamic/DataDynamicRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/dynamic/DataDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { DataCallbacks } from "../../callbacks/DataCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class DataDynamicRouter extends DynamicRouter { private dataCallbacks; constructor(dataCallbacks: DataCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/dynamic/HttpDynamicRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/dynamic/HttpDynamicRouter.d.ts index 17706d5..b2933e9 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/dynamic/HttpDynamicRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/dynamic/HttpDynamicRouter.d.ts @@ -1,9 +1,6 @@ -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; import { ImageRouter } from "../ImageRouter"; export declare class HttpDynamicRouter extends DynamicRouter { private imageRouter; constructor(imageRouter: ImageRouter); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/dynamic/InraidDynamicRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/dynamic/InraidDynamicRouter.d.ts index cb1e8c0..ea4a9ae 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/dynamic/InraidDynamicRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/dynamic/InraidDynamicRouter.d.ts @@ -1,10 +1,7 @@ import { InraidCallbacks } from "../../callbacks/InraidCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class InraidDynamicRouter extends DynamicRouter { private inraidCallbacks; constructor(inraidCallbacks: InraidCallbacks); - private readonly _routes; getTopLevelRoute(): string; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/dynamic/LocationDynamicRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/dynamic/LocationDynamicRouter.d.ts index 9d85230..30741db 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/dynamic/LocationDynamicRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/dynamic/LocationDynamicRouter.d.ts @@ -1,10 +1,7 @@ import { LocationCallbacks } from "../../callbacks/LocationCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class LocationDynamicRouter extends DynamicRouter { private locationCallbacks; constructor(locationCallbacks: LocationCallbacks); - private readonly _routes; getTopLevelRoute(): string; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/dynamic/NotifierDynamicRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/dynamic/NotifierDynamicRouter.d.ts index e087b40..4786817 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/dynamic/NotifierDynamicRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/dynamic/NotifierDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { NotifierCallbacks } from "../../callbacks/NotifierCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class NotifierDynamicRouter extends DynamicRouter { private notifierCallbacks; constructor(notifierCallbacks: NotifierCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/dynamic/TraderDynamicRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/dynamic/TraderDynamicRouter.d.ts index d957e0e..a100b4c 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/dynamic/TraderDynamicRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/dynamic/TraderDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { TraderCallbacks } from "../../callbacks/TraderCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class TraderDynamicRouter extends DynamicRouter { private traderCallbacks; constructor(traderCallbacks: TraderCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/serializers/NotifySerializer.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/serializers/NotifySerializer.d.ts index 7be87ef..8be8ac2 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/serializers/NotifySerializer.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/serializers/NotifySerializer.d.ts @@ -1,7 +1,7 @@ -import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { NotifierController } from "../../controllers/NotifierController"; import { Serializer } from "../../di/Serializer"; import { HttpServerHelper } from "../../helpers/HttpServerHelper"; +import { IHttpServer } from "../../models/spt/server/IHttpServer"; export declare class NotifySerializer extends Serializer { private notifierController; private httpServerHelper; diff --git a/TypeScript/4UseACustomConfigFile/types/routers/static/BotStaticRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/static/BotStaticRouter.d.ts index 7b23da6..d8b0bf4 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/static/BotStaticRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/static/BotStaticRouter.d.ts @@ -1,8 +1,6 @@ import { BotCallbacks } from "../../callbacks/BotCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class BotStaticRouter extends StaticRouter { private botCallbacks; constructor(botCallbacks: BotCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/static/BundleStaticRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/static/BundleStaticRouter.d.ts index 9283003..3905b82 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/static/BundleStaticRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/static/BundleStaticRouter.d.ts @@ -1,8 +1,6 @@ import { BundleCallbacks } from "../../callbacks/BundleCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class BundleStaticRouter extends StaticRouter { private bundleCallbacks; constructor(bundleCallbacks: BundleCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/static/CustomizationStaticRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/static/CustomizationStaticRouter.d.ts index 0d29578..46c71b8 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/static/CustomizationStaticRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/static/CustomizationStaticRouter.d.ts @@ -1,8 +1,6 @@ import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class CustomizationStaticRouter extends StaticRouter { private customizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/static/DataStaticRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/static/DataStaticRouter.d.ts index b8d2fea..a493d3a 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/static/DataStaticRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/static/DataStaticRouter.d.ts @@ -1,8 +1,6 @@ import { DataCallbacks } from "../../callbacks/DataCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class DataStaticRouter extends StaticRouter { private dataCallbacks; constructor(dataCallbacks: DataCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/static/DialogStaticRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/static/DialogStaticRouter.d.ts index 5e7285e..a59fb14 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/static/DialogStaticRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/static/DialogStaticRouter.d.ts @@ -1,8 +1,6 @@ import { DialogueCallbacks } from "../../callbacks/DialogueCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class DialogStaticRouter extends StaticRouter { private dialogueCallbacks; constructor(dialogueCallbacks: DialogueCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/static/GameStaticRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/static/GameStaticRouter.d.ts index e8eca40..988b673 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/static/GameStaticRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/static/GameStaticRouter.d.ts @@ -1,8 +1,6 @@ import { GameCallbacks } from "../../callbacks/GameCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class GameStaticRouter extends StaticRouter { private gameCallbacks; constructor(gameCallbacks: GameCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/static/HealthStaticRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/static/HealthStaticRouter.d.ts index aa0b8b3..e644861 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/static/HealthStaticRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/static/HealthStaticRouter.d.ts @@ -1,8 +1,6 @@ import { HealthCallbacks } from "../../callbacks/HealthCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class HealthStaticRouter extends StaticRouter { private healthCallbacks; constructor(healthCallbacks: HealthCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/static/InraidStaticRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/static/InraidStaticRouter.d.ts index 417d9d7..66ed860 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/static/InraidStaticRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/static/InraidStaticRouter.d.ts @@ -1,8 +1,6 @@ import { InraidCallbacks } from "../../callbacks/InraidCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class InraidStaticRouter extends StaticRouter { private inraidCallbacks; constructor(inraidCallbacks: InraidCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/static/InsuranceStaticRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/static/InsuranceStaticRouter.d.ts index 6fbffe5..8da26b3 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/static/InsuranceStaticRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/static/InsuranceStaticRouter.d.ts @@ -1,8 +1,6 @@ import { InsuranceCallbacks } from "../../callbacks/InsuranceCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class InsuranceStaticRouter extends StaticRouter { private insuranceCallbacks; constructor(insuranceCallbacks: InsuranceCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/static/ItemEventStaticRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/static/ItemEventStaticRouter.d.ts index 1a869e1..08ba6bb 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/static/ItemEventStaticRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/static/ItemEventStaticRouter.d.ts @@ -1,8 +1,6 @@ import { ItemEventCallbacks } from "../../callbacks/ItemEventCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class ItemEventStaticRouter extends StaticRouter { private itemEventCallbacks; constructor(itemEventCallbacks: ItemEventCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/static/LauncherStaticRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/static/LauncherStaticRouter.d.ts index 0d5e231..9d07f78 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/static/LauncherStaticRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/static/LauncherStaticRouter.d.ts @@ -1,8 +1,6 @@ import { LauncherCallbacks } from "../../callbacks/LauncherCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class LauncherStaticRouter extends StaticRouter { private launcherCallbacks; constructor(launcherCallbacks: LauncherCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): string; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/static/LocationStaticRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/static/LocationStaticRouter.d.ts index 0b9b063..9c5c52e 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/static/LocationStaticRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/static/LocationStaticRouter.d.ts @@ -1,8 +1,6 @@ import { LocationCallbacks } from "../../callbacks/LocationCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class LocationStaticRouter extends StaticRouter { private locationCallbacks; constructor(locationCallbacks: LocationCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/static/MatchStaticRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/static/MatchStaticRouter.d.ts index 55c9640..d746381 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/static/MatchStaticRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/static/MatchStaticRouter.d.ts @@ -1,8 +1,6 @@ import { MatchCallbacks } from "../../callbacks/MatchCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class MatchStaticRouter extends StaticRouter { private matchCallbacks; constructor(matchCallbacks: MatchCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/static/NotifierStaticRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/static/NotifierStaticRouter.d.ts index 0d992db..1c8566d 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/static/NotifierStaticRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/static/NotifierStaticRouter.d.ts @@ -1,8 +1,6 @@ import { NotifierCallbacks } from "../../callbacks/NotifierCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class NotifierStaticRouter extends StaticRouter { private notifierCallbacks; constructor(notifierCallbacks: NotifierCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/static/PresetStaticRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/static/PresetStaticRouter.d.ts index a1bda56..2272f82 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/static/PresetStaticRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/static/PresetStaticRouter.d.ts @@ -1,8 +1,6 @@ import { PresetBuildCallbacks } from "../../callbacks/PresetBuildCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class PresetStaticRouter extends StaticRouter { private presetCallbacks; constructor(presetCallbacks: PresetBuildCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/static/ProfileStaticRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/static/ProfileStaticRouter.d.ts index d03b782..fd787f1 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/static/ProfileStaticRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/static/ProfileStaticRouter.d.ts @@ -1,8 +1,6 @@ import { ProfileCallbacks } from "../../callbacks/ProfileCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class ProfileStaticRouter extends StaticRouter { private profileCallbacks; constructor(profileCallbacks: ProfileCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/static/QuestStaticRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/static/QuestStaticRouter.d.ts index d375409..fda3c23 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/static/QuestStaticRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/static/QuestStaticRouter.d.ts @@ -1,8 +1,6 @@ import { QuestCallbacks } from "../../callbacks/QuestCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class QuestStaticRouter extends StaticRouter { private questCallbacks; constructor(questCallbacks: QuestCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/static/RagfairStaticRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/static/RagfairStaticRouter.d.ts index d5ed312..618374f 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/static/RagfairStaticRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/static/RagfairStaticRouter.d.ts @@ -1,8 +1,6 @@ import { RagfairCallbacks } from "../../callbacks/RagfairCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class RagfairStaticRouter extends StaticRouter { private ragfairCallbacks; constructor(ragfairCallbacks: RagfairCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/static/TraderStaticRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/static/TraderStaticRouter.d.ts index e3406fb..18f0629 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/static/TraderStaticRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/static/TraderStaticRouter.d.ts @@ -1,8 +1,6 @@ import { TraderCallbacks } from "../../callbacks/TraderCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class TraderStaticRouter extends StaticRouter { private traderCallbacks; constructor(traderCallbacks: TraderCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/static/WeatherStaticRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/static/WeatherStaticRouter.d.ts index aec3575..61b904d 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/static/WeatherStaticRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/static/WeatherStaticRouter.d.ts @@ -1,8 +1,6 @@ import { WeatherCallbacks } from "../../callbacks/WeatherCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class WeatherStaticRouter extends StaticRouter { private weatherCallbacks; constructor(weatherCallbacks: WeatherCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/4UseACustomConfigFile/types/servers/HttpServer.d.ts b/TypeScript/4UseACustomConfigFile/types/servers/HttpServer.d.ts index 0ba20c6..d0db7e4 100644 --- a/TypeScript/4UseACustomConfigFile/types/servers/HttpServer.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/servers/HttpServer.d.ts @@ -1,19 +1,21 @@ /// -import { HttpRouter } from "../routers/HttpRouter"; -import { JsonUtil } from "../utils/JsonUtil"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { DatabaseServer } from "./DatabaseServer"; -import { Serializer } from "../di/Serializer"; import http, { ServerResponse } from "http"; -import { INotification } from "../models/eft/notifier/INotifier"; -import { NotifierHelper } from "../helpers/NotifierHelper"; -import { ConfigServer } from "./ConfigServer"; -import { ILogger } from "../models/spt/utils/ILogger"; +import { Serializer } from "../di/Serializer"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; +import { NotifierHelper } from "../helpers/NotifierHelper"; +import { INotification } from "../models/eft/notifier/INotifier"; import { IHttpServer } from "../models/spt/server/IHttpServer"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { HttpRouter } from "../routers/HttpRouter"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { JsonUtil } from "../utils/JsonUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +import { ConfigServer } from "./ConfigServer"; +import { DatabaseServer } from "./DatabaseServer"; export declare class HttpServer implements IHttpServer { private httpRouter; private logger; + private randomUtil; private jsonUtil; private httpResponse; private databaseServer; @@ -21,7 +23,8 @@ export declare class HttpServer implements IHttpServer { private httpServerHelper; private serializers; private configServer; - constructor(httpRouter: HttpRouter, logger: ILogger, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); + constructor(httpRouter: HttpRouter, // TODO: delay required + logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); private buffers; private onReceive; private onRespond; @@ -39,5 +42,6 @@ export declare class HttpServer implements IHttpServer { sendResponse(sessionID: string, req: any, resp: any, body: Buffer): void; handleRequest(req: http.IncomingMessage, resp: http.ServerResponse): void; load(): void; + private getRandomisedMessage; wsOnConnection(ws: any, req: any): void; } diff --git a/TypeScript/4UseACustomConfigFile/types/services/InsuranceService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/InsuranceService.d.ts index 35f0dbc..160faba 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/InsuranceService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/InsuranceService.d.ts @@ -1,10 +1,10 @@ +import { DialogueHelper } from "../helpers/DialogueHelper"; +import { SecureContainerHelper } from "../helpers/SecureContainerHelper"; +import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ILogger } from "../models/spt/utils/ILogger"; -import { DialogueHelper } from "../helpers/DialogueHelper"; -import { SecureContainerHelper } from "../helpers/SecureContainerHelper"; -import { TraderHelper } from "../helpers/TraderHelper"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; diff --git a/TypeScript/4UseACustomConfigFile/types/services/ModCompilerService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/ModCompilerService.d.ts index 7e750c3..d316e48 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/ModCompilerService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/ModCompilerService.d.ts @@ -1,10 +1,12 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { VFS } from "../utils/VFS"; +import { HashCacheService } from "./HashCacheService"; export declare class ModCompilerService { private logger; + private hashCacheService; private vfs; - constructor(logger: ILogger, vfs: VFS); - compileMod(path: string, modTypeScriptFiles: string[]): Promise; + constructor(logger: ILogger, hashCacheService: HashCacheService, vfs: VFS); + compileMod(modName: string, path: string, modTypeScriptFiles: string[]): Promise; private compile; private areFilesReady; private delay; diff --git a/TypeScript/4UseACustomConfigFile/types/services/PaymentService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/PaymentService.d.ts index 20cee50..0a6c4d6 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/PaymentService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/PaymentService.d.ts @@ -1,15 +1,15 @@ +import { HandbookHelper } from "../helpers/HandbookHelper"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { ItemHelper } from "../helpers/ItemHelper"; -import { DatabaseServer } from "../servers/DatabaseServer"; +import { PaymentHelper } from "../helpers/PaymentHelper"; +import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "../models/eft/trade/IProcessSellTradeRequestData"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { PaymentHelper } from "../helpers/PaymentHelper"; -import { HandbookHelper } from "../helpers/HandbookHelper"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class PaymentService { private logger; private httpResponse; diff --git a/TypeScript/4UseACustomConfigFile/types/services/PlayerService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/PlayerService.d.ts index 4a74b4a..99e5986 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/PlayerService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/PlayerService.d.ts @@ -1,7 +1,7 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; 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"; export declare class PlayerService { private logger; private databaseServer; diff --git a/TypeScript/4UseACustomConfigFile/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts b/TypeScript/4UseACustomConfigFile/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts new file mode 100644 index 0000000..abfe237 --- /dev/null +++ b/TypeScript/4UseACustomConfigFile/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts @@ -0,0 +1,6 @@ +import { DynamicRouter, RouteAction } from "../../../di/Router"; +export declare class DynamicRouterMod extends DynamicRouter { + private topLevelRoute; + constructor(routes: RouteAction[], topLevelRoute: string); + getTopLevelRoute(): string; +} diff --git a/TypeScript/4UseACustomConfigFile/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts new file mode 100644 index 0000000..6742fc6 --- /dev/null +++ b/TypeScript/4UseACustomConfigFile/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -0,0 +1,7 @@ +import { DependencyContainer } from "tsyringe"; +import { RouteAction } from "../../../di/Router"; +export declare class DynamicRouterModService { + private container; + constructor(container: DependencyContainer); + registerDynamicRouter(name: string, routes: RouteAction[], topLevelRoute: string): void; +} diff --git a/TypeScript/4UseACustomConfigFile/types/services/mod/onLoad/OnLoadMod.d.ts b/TypeScript/4UseACustomConfigFile/types/services/mod/onLoad/OnLoadMod.d.ts new file mode 100644 index 0000000..53fb062 --- /dev/null +++ b/TypeScript/4UseACustomConfigFile/types/services/mod/onLoad/OnLoadMod.d.ts @@ -0,0 +1,8 @@ +import { OnLoad } from "../../../di/OnLoad"; +export declare class OnLoadMod extends OnLoad { + private onLoadOverride; + private getRouteOverride; + constructor(onLoadOverride: () => void, getRouteOverride: () => string); + onLoad(): void; + getRoute(): string; +} diff --git a/TypeScript/4UseACustomConfigFile/types/services/mod/onLoad/OnLoadModService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/mod/onLoad/OnLoadModService.d.ts new file mode 100644 index 0000000..89bad14 --- /dev/null +++ b/TypeScript/4UseACustomConfigFile/types/services/mod/onLoad/OnLoadModService.d.ts @@ -0,0 +1,6 @@ +import { DependencyContainer } from "tsyringe"; +export declare class OnLoadModService { + private container; + constructor(container: DependencyContainer); + registerOnLoad(name: string, onLoad: () => void, getRoute: () => string): void; +} diff --git a/TypeScript/4UseACustomConfigFile/types/services/mod/onUpdate/OnUpdateMod.d.ts b/TypeScript/4UseACustomConfigFile/types/services/mod/onUpdate/OnUpdateMod.d.ts new file mode 100644 index 0000000..ee89043 --- /dev/null +++ b/TypeScript/4UseACustomConfigFile/types/services/mod/onUpdate/OnUpdateMod.d.ts @@ -0,0 +1,8 @@ +import { OnUpdate } from "../../../di/OnUpdate"; +export declare class OnUpdateMod extends OnUpdate { + private onUpdateOverride; + private getRouteOverride; + constructor(onUpdateOverride: (timeSinceLastRun: number) => boolean, getRouteOverride: () => string); + onUpdate(timeSinceLastRun: number): boolean; + getRoute(): string; +} diff --git a/TypeScript/4UseACustomConfigFile/types/services/mod/onUpdate/OnUpdateModService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/mod/onUpdate/OnUpdateModService.d.ts new file mode 100644 index 0000000..32419f4 --- /dev/null +++ b/TypeScript/4UseACustomConfigFile/types/services/mod/onUpdate/OnUpdateModService.d.ts @@ -0,0 +1,6 @@ +import { DependencyContainer } from "tsyringe"; +export declare class OnUpdateModService { + private container; + constructor(container: DependencyContainer); + registerOnUpdate(name: string, onUpdate: (timeSinceLastRun: number) => boolean, getRoute: () => string): void; +} diff --git a/TypeScript/4UseACustomConfigFile/types/services/mod/staticRouter/StaticRouterMod.d.ts b/TypeScript/4UseACustomConfigFile/types/services/mod/staticRouter/StaticRouterMod.d.ts new file mode 100644 index 0000000..1e62747 --- /dev/null +++ b/TypeScript/4UseACustomConfigFile/types/services/mod/staticRouter/StaticRouterMod.d.ts @@ -0,0 +1,6 @@ +import { RouteAction, StaticRouter } from "../../../di/Router"; +export declare class StaticRouterMod extends StaticRouter { + private topLevelRoute; + constructor(routes: RouteAction[], topLevelRoute: string); + getTopLevelRoute(): string; +} diff --git a/TypeScript/4UseACustomConfigFile/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/mod/staticRouter/StaticRouterModService.d.ts new file mode 100644 index 0000000..d4c42aa --- /dev/null +++ b/TypeScript/4UseACustomConfigFile/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -0,0 +1,7 @@ +import { DependencyContainer } from "tsyringe"; +import { RouteAction } from "../../../di/Router"; +export declare class StaticRouterModService { + private container; + constructor(container: DependencyContainer); + registerStaticRouter(name: string, routes: RouteAction[], topLevelRoute: string): void; +} diff --git a/TypeScript/4UseACustomConfigFile/types/utils/AyncQueue.d.ts b/TypeScript/4UseACustomConfigFile/types/utils/AyncQueue.d.ts index 8f1559b..a99aa37 100644 --- a/TypeScript/4UseACustomConfigFile/types/utils/AyncQueue.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/utils/AyncQueue.d.ts @@ -1,7 +1,7 @@ import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; import { ICommand } from "../models/spt/utils/ICommand"; export declare class AsyncQueue implements IAsyncQueue { - commandsQueue: ICommand[]; + private commandsQueue; constructor(); waitFor(command: ICommand): Promise; } diff --git a/TypeScript/4UseACustomConfigFile/types/utils/Watermark.d.ts b/TypeScript/4UseACustomConfigFile/types/utils/Watermark.d.ts index 598d5a6..e7b9883 100644 --- a/TypeScript/4UseACustomConfigFile/types/utils/Watermark.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/utils/Watermark.d.ts @@ -1,13 +1,12 @@ -import { IWatermark, IWatermarkLocale } from "../models/spt/utils/IWatermark"; import { ConfigServer } from "../servers/ConfigServer"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class WatermarkLocale implements IWatermarkLocale { +export declare class WatermarkLocale { private locales; getLocale(): string; getDescription(): string[]; getWarning(): string[]; } -export declare class Watermark implements IWatermark { +export declare class Watermark { private logger; private configServer; private watermarkLocale?; diff --git a/TypeScript/5ReplaceMethod/package.json b/TypeScript/5ReplaceMethod/package.json index 18b8056..efac879 100644 --- a/TypeScript/5ReplaceMethod/package.json +++ b/TypeScript/5ReplaceMethod/package.json @@ -1,5 +1,5 @@ { - "name": "ReplaceFunction", + "name": "ReplaceMethod", "version": "1.0.0", "main": "src/mod.js", "license": "MIT", diff --git a/TypeScript/5ReplaceMethod/types/Config.d.ts b/TypeScript/5ReplaceMethod/types/Config.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/5ReplaceMethod/types/Config.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/5ReplaceMethod/types/Program.d.ts b/TypeScript/5ReplaceMethod/types/Program.d.ts index d88ab0a..d4b71b9 100644 --- a/TypeScript/5ReplaceMethod/types/Program.d.ts +++ b/TypeScript/5ReplaceMethod/types/Program.d.ts @@ -1,5 +1,4 @@ -export declare class Program -{ +export declare class Program { constructor(); start(): void; } diff --git a/TypeScript/5ReplaceMethod/types/callbacks/BotCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/BotCallbacks.d.ts index 296b825..9602975 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/BotCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/BotCallbacks.d.ts @@ -1,11 +1,10 @@ import { BotController } from "../controllers/BotController"; import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IBotBase } from "../models/eft/common/tables/IBotBase"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -export declare class BotCallbacks -{ +export declare class BotCallbacks { private botController; private httpResponse; constructor(botController: BotController, httpResponse: HttpResponseUtil); diff --git a/TypeScript/5ReplaceMethod/types/callbacks/BundleCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/BundleCallbacks.d.ts index 654c26b..b007ab8 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/BundleCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/BundleCallbacks.d.ts @@ -1,10 +1,9 @@ import { BundleLoader } from "../loaders/BundleLoader"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { IHttpServer } from "../models/spt/server/IHttpServer"; -export declare class BundleCallbacks -{ +export declare class BundleCallbacks { private logger; private httpResponse; private httpServer; diff --git a/TypeScript/5ReplaceMethod/types/callbacks/CustomizationCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/CustomizationCallbacks.d.ts index d778073..918b8b6 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/CustomizationCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/CustomizationCallbacks.d.ts @@ -1,23 +1,23 @@ -import { SaveServer } from "../servers/SaveServer"; import { CustomizationController } from "../controllers/CustomizationController"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { ISuit } from "../models/eft/common/tables/ITrader"; import { IBuyClothingRequestData } from "../models/eft/customization/IBuyClothingRequestData"; import { IWearClothingRequestData } from "../models/eft/customization/IWearClothingRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { ISuit } from "../models/eft/common/tables/ITrader"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -export declare class CustomizationCallbacks -{ +export declare class CustomizationCallbacks { private customizationController; private saveServer; private httpResponse; constructor(customizationController: CustomizationController, saveServer: SaveServer, httpResponse: HttpResponseUtil); - getSuits(url: string, info: any, sessionID: string): IGetBodyResponseData<{ + getSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<{ _id: string; suites: string[]; }>; - getTraderSuits(url: string, info: any, sessionID: string): IGetBodyResponseData; + getTraderSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; wearClothing(pmcData: IPmcData, body: IWearClothingRequestData, sessionID: string): IItemEventRouterResponse; buyClothing(pmcData: IPmcData, body: IBuyClothingRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/5ReplaceMethod/types/callbacks/DataCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/DataCallbacks.d.ts index d58f33e..018420e 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/DataCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/DataCallbacks.d.ts @@ -1,4 +1,3 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGlobals } from "../models/eft/common/IGlobals"; import { ICustomizationItem } from "../models/eft/common/tables/ICustomizationItem"; @@ -10,9 +9,9 @@ import { IHideoutSettingsBase } from "../models/eft/hideout/IHideoutSettingsBase import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { ILanguageBase } from "../models/spt/server/ILocaleBase"; import { ISettingsBase } from "../models/spt/server/ISettingsBase"; +import { DatabaseServer } from "../servers/DatabaseServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -export declare class DataCallbacks -{ +export declare class DataCallbacks { private httpResponse; private databaseServer; constructor(httpResponse: HttpResponseUtil, databaseServer: DatabaseServer); diff --git a/TypeScript/5ReplaceMethod/types/callbacks/DialogueCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/DialogueCallbacks.d.ts index e4ffde6..3b6fbd1 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/DialogueCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/DialogueCallbacks.d.ts @@ -1,27 +1,26 @@ -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { HashUtil } from "../utils/HashUtil"; -import { TimeUtil } from "../utils/TimeUtil"; import { DialogueController } from "../controllers/DialogueController"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { DialogueInfo } from "../models/eft/profile/IAkiProfile"; -import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; -import { IGetMailDialogViewRequestData } from "../models/eft/dialog/IGetMailDialogViewRequestData"; -import { IGetMailDialogInfoRequestData } from "../models/eft/dialog/IGetMailDialogInfoRequestData"; -import { IRemoveDialogRequestData } from "../models/eft/dialog/IRemoveDialogRequestData"; -import { IGetMailDialogListRequestData } from "../models/eft/dialog/IGetMailDialogListRequestData"; +import { OnUpdate } from "../di/OnUpdate"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IFriendRequestData } from "../models/eft/dialog/IFriendRequestData"; -import { IPinDialogRequestData } from "../models/eft/dialog/IPinDialogRequestData"; -import { ISetDialogReadRequestData } from "../models/eft/dialog/ISetDialogReadRequestData"; import { IGetAllAttachmentsRequestData } from "../models/eft/dialog/IGetAllAttachmentsRequestData"; +import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachmentsResponse"; import { IGetChatServerListRequestData } from "../models/eft/dialog/IGetChatServerListRequestData"; import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse"; -import { ISendMessageRequest } from "../models/eft/dialog/ISendMessageRequest"; +import { IGetMailDialogInfoRequestData } from "../models/eft/dialog/IGetMailDialogInfoRequestData"; +import { IGetMailDialogListRequestData } from "../models/eft/dialog/IGetMailDialogListRequestData"; +import { IGetMailDialogViewRequestData } from "../models/eft/dialog/IGetMailDialogViewRequestData"; import { IGetMailDialogViewResponseData } from "../models/eft/dialog/IGetMailDialogViewResponseData"; -import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachmentsResponse"; -import { OnUpdate } from "../di/OnUpdate"; -export declare class DialogueCallbacks extends OnUpdate -{ +import { IPinDialogRequestData } from "../models/eft/dialog/IPinDialogRequestData"; +import { IRemoveDialogRequestData } from "../models/eft/dialog/IRemoveDialogRequestData"; +import { ISendMessageRequest } from "../models/eft/dialog/ISendMessageRequest"; +import { ISetDialogReadRequestData } from "../models/eft/dialog/ISetDialogReadRequestData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +import { DialogueInfo } from "../models/eft/profile/IAkiProfile"; +import { HashUtil } from "../utils/HashUtil"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { TimeUtil } from "../utils/TimeUtil"; +export declare class DialogueCallbacks extends OnUpdate { private hashUtil; private timeUtil; private httpResponse; diff --git a/TypeScript/5ReplaceMethod/types/callbacks/GameCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/GameCallbacks.d.ts index 753936d..44a30ea 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/GameCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/GameCallbacks.d.ts @@ -1,18 +1,17 @@ import { GameController } from "../controllers/GameController"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; import { IGameEmptyCrcRequestData } from "../models/eft/game/IGameEmptyCrcRequestData"; import { IVersionValidateRequestData } from "../models/eft/game/IVersionValidateRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; -import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { IWatermark } from "../models/spt/utils/IWatermark"; -declare class GameCallbacks -{ +import { Watermark } from "../utils/Watermark"; +declare class GameCallbacks { private httpResponse; private watermark; private gameController; - constructor(httpResponse: HttpResponseUtil, watermark: IWatermark, gameController: GameController); + constructor(httpResponse: HttpResponseUtil, watermark: Watermark, gameController: GameController); versionValidate(url: string, info: IVersionValidateRequestData, sessionID: string): INullResponseData; gameStart(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; gameLogout(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/5ReplaceMethod/types/callbacks/HandbookCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/HandbookCallbacks.d.ts index a26fb32..0db5fec 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/HandbookCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/HandbookCallbacks.d.ts @@ -1,7 +1,6 @@ import { HandbookController } from "../controllers/HandbookController"; import { OnLoad } from "../di/OnLoad"; -export declare class HandbookCallbacks extends OnLoad -{ +export declare class HandbookCallbacks extends OnLoad { private handbookController; constructor(handbookController: HandbookController); onLoad(): void; diff --git a/TypeScript/5ReplaceMethod/types/callbacks/HealthCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/HealthCallbacks.d.ts index 327fd95..a50dd42 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/HealthCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/HealthCallbacks.d.ts @@ -1,15 +1,14 @@ import { HealthController } from "../controllers/HealthController"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; +import { IHealthTreatmentRequestData } from "../models/eft/health/IHealthTreatmentRequestData"; import { IOffraidEatRequestData } from "../models/eft/health/IOffraidEatRequestData"; import { IOffraidHealRequestData } from "../models/eft/health/IOffraidHealRequestData"; -import { IHealthTreatmentRequestData } from "../models/eft/health/IHealthTreatmentRequestData"; -import { ProfileHelper } from "../helpers/ProfileHelper"; +import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -export declare class HealthCallbacks -{ +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +export declare class HealthCallbacks { private httpResponse; private profileHelper; private healthController; diff --git a/TypeScript/5ReplaceMethod/types/callbacks/HideoutCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/HideoutCallbacks.d.ts index e6cd42d..3698176 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/HideoutCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/HideoutCallbacks.d.ts @@ -1,23 +1,23 @@ import { HideoutController } from "../controllers/HideoutController"; +import { OnUpdate } from "../di/OnUpdate"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; -import { IHideoutUpgradeCompleteRequestData } from "../models/eft/hideout/IHideoutUpgradeCompleteRequestData"; -import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; -import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData"; -import { IHideoutTakeItemOutRequestData } from "../models/eft/hideout/IHideoutTakeItemOutRequestData"; -import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutToggleAreaRequestData"; -import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; +import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData"; +import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; +import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; +import { IHideoutTakeItemOutRequestData } from "../models/eft/hideout/IHideoutTakeItemOutRequestData"; import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; +import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutToggleAreaRequestData"; +import { IHideoutUpgradeCompleteRequestData } from "../models/eft/hideout/IHideoutUpgradeCompleteRequestData"; +import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ConfigServer } from "../servers/ConfigServer"; -import { OnUpdate } from "../di/OnUpdate"; -export declare class HideoutCallbacks extends OnUpdate -{ +export declare class HideoutCallbacks extends OnUpdate { private hideoutController; private configServer; private hideoutConfig; - constructor(hideoutController: HideoutController, configServer: ConfigServer); + constructor(hideoutController: HideoutController, // TODO: delay needed + configServer: ConfigServer); upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; upgradeComplete(pmcData: IPmcData, body: IHideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse; putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/TypeScript/5ReplaceMethod/types/callbacks/HttpCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/HttpCallbacks.d.ts index cdcc808..9fe387d 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/HttpCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/HttpCallbacks.d.ts @@ -1,7 +1,6 @@ -import { IHttpServer } from "../models/spt/server/IHttpServer"; import { OnLoad } from "../di/OnLoad"; -export declare class HttpCallbacks extends OnLoad -{ +import { IHttpServer } from "../models/spt/server/IHttpServer"; +export declare class HttpCallbacks extends OnLoad { private httpServer; constructor(httpServer: IHttpServer); onLoad(): void; diff --git a/TypeScript/5ReplaceMethod/types/callbacks/InraidCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/InraidCallbacks.d.ts index 229418e..2d53227 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/InraidCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/InraidCallbacks.d.ts @@ -1,12 +1,11 @@ import { InraidController } from "../controllers/InraidController"; -import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ConfigServer } from "../servers/ConfigServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -export declare class InraidCallbacks -{ +export declare class InraidCallbacks { private inraidController; private httpResponse; private configServer; diff --git a/TypeScript/5ReplaceMethod/types/callbacks/InsuranceCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/InsuranceCallbacks.d.ts index bf60875..79feb67 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/InsuranceCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/InsuranceCallbacks.d.ts @@ -1,15 +1,14 @@ import { InsuranceController } from "../controllers/InsuranceController"; +import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData"; import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { ConfigServer } from "../servers/ConfigServer"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; -import { InsuranceService } from "../services/InsuranceService"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -export declare class InsuranceCallbacks extends OnLoadOnUpdate -{ +import { ConfigServer } from "../servers/ConfigServer"; +import { InsuranceService } from "../services/InsuranceService"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +export declare class InsuranceCallbacks extends OnLoadOnUpdate { private insuranceController; private insuranceService; private httpResponse; diff --git a/TypeScript/5ReplaceMethod/types/callbacks/InventoryCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/InventoryCallbacks.d.ts index 69114a2..9795aa0 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/InventoryCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/InventoryCallbacks.d.ts @@ -1,24 +1,23 @@ import { InventoryController } from "../controllers/InventoryController"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IInventoryFoldRequestData } from "../models/eft/inventory/IInventoryFoldRequestData"; -import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; -import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; -import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData"; -import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData"; -import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwapRequestData"; -import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData"; -import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData"; import { IInventoryBindRequestData } from "../models/eft/inventory/IInventoryBindRequestData"; -import { IInventoryExamineRequestData } from "../models/eft/inventory/IInventoryExamineRequestData"; -import { IInventoryReadEncyclopediaRequestData } from "../models/eft/inventory/IInventoryReadEncyclopediaRequestData"; -import { IInventorySortRequestData } from "../models/eft/inventory/IInventorySortRequestData"; import { IInventoryCreateMarkerRequestData } from "../models/eft/inventory/IInventoryCreateMarkerRequestData"; import { IInventoryDeleteMarkerRequestData } from "../models/eft/inventory/IInventoryDeleteMarkerRequestData"; import { IInventoryEditMarkerRequestData } from "../models/eft/inventory/IInventoryEditMarkerRequestData"; +import { IInventoryExamineRequestData } from "../models/eft/inventory/IInventoryExamineRequestData"; +import { IInventoryFoldRequestData } from "../models/eft/inventory/IInventoryFoldRequestData"; +import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; +import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; +import { IInventoryReadEncyclopediaRequestData } from "../models/eft/inventory/IInventoryReadEncyclopediaRequestData"; +import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData"; +import { IInventorySortRequestData } from "../models/eft/inventory/IInventorySortRequestData"; +import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; +import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwapRequestData"; +import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData"; +import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData"; +import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -export declare class InventoryCallbacks -{ +export declare class InventoryCallbacks { private inventoryController; constructor(inventoryController: InventoryController); moveItem(pmcData: IPmcData, body: IInventoryMoveRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/TypeScript/5ReplaceMethod/types/callbacks/ItemEventCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/ItemEventCallbacks.d.ts index f15af7f..74e79c4 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/ItemEventCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/ItemEventCallbacks.d.ts @@ -3,8 +3,7 @@ import { IItemEventRouterRequest } from "../models/eft/itemEvent/IItemEventRoute import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -export declare class ItemEventCallbacks -{ +export declare class ItemEventCallbacks { private httpResponse; private itemEventRouter; constructor(httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter); diff --git a/TypeScript/5ReplaceMethod/types/callbacks/LauncherCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/LauncherCallbacks.d.ts index 281f2b1..4bd5e2c 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/LauncherCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/LauncherCallbacks.d.ts @@ -1,18 +1,18 @@ -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { SaveServer } from "../servers/SaveServer"; import { LauncherController } from "../controllers/LauncherController"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IChangeRequestData } from "../models/eft/launcher/IChangeRequestData"; +import { ILoginRequestData } from "../models/eft/launcher/ILoginRequestData"; import { IRegisterData } from "../models/eft/launcher/IRegisterData"; import { IRemoveProfileData } from "../models/eft/launcher/IRemoveProfileData"; -import { ILoginRequestData } from "../models/eft/launcher/ILoginRequestData"; -import { IChangeRequestData } from "../models/eft/launcher/IChangeRequestData"; -import { IWatermark } from "../models/spt/utils/IWatermark"; -declare class LauncherCallbacks -{ +import { SaveServer } from "../servers/SaveServer"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { Watermark } from "../utils/Watermark"; +declare class LauncherCallbacks { private httpResponse; private launcherController; private saveServer; private watermark; - constructor(httpResponse: HttpResponseUtil, launcherController: LauncherController, saveServer: SaveServer, watermark: IWatermark); + constructor(httpResponse: HttpResponseUtil, launcherController: LauncherController, saveServer: SaveServer, watermark: Watermark); connect(): string; login(url: string, info: ILoginRequestData, sessionID: string): string; register(url: string, info: IRegisterData, sessionID: string): "FAILED" | "OK"; @@ -21,7 +21,7 @@ declare class LauncherCallbacks changePassword(url: string, info: IChangeRequestData, sessionID: string): "FAILED" | "OK"; wipe(url: string, info: IRegisterData, sessionID: string): "FAILED" | "OK"; getServerVersion(): string; - ping(url: string, info: any, sessionID: string): string; + ping(url: string, info: IEmptyRequestData, sessionID: string): string; removeProfile(url: string, info: IRemoveProfileData, sessionID: string): string; getCompatibleTarkovVersion(): string; } diff --git a/TypeScript/5ReplaceMethod/types/callbacks/LocationCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/LocationCallbacks.d.ts index 3745269..5ecab74 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/LocationCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/LocationCallbacks.d.ts @@ -1,14 +1,14 @@ import { LocationController } from "../controllers/LocationController"; -import { IGetLocationRequestData } from "../models/eft/location/IGetLocationRequestData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSourceDestinationBase"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { ILocationBase } from "../models/eft/common/ILocationBase"; +import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSourceDestinationBase"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IGetLocationRequestData } from "../models/eft/location/IGetLocationRequestData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -export declare class LocationCallbacks -{ +export declare class LocationCallbacks { private httpResponse; private locationController; constructor(httpResponse: HttpResponseUtil, locationController: LocationController); - getLocationData(url: string, info: any, sessionID: string): IGetBodyResponseData; + getLocationData(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getLocation(url: string, info: IGetLocationRequestData, sessionID: string): IGetBodyResponseData; } diff --git a/TypeScript/5ReplaceMethod/types/callbacks/MatchCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/MatchCallbacks.d.ts index 812f215..63d38d9 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/MatchCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/MatchCallbacks.d.ts @@ -1,14 +1,14 @@ import { MatchController } from "../controllers/MatchController"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; -import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; -import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; +import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData"; +import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { DatabaseServer } from "../servers/DatabaseServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; -export declare class MatchCallbacks -{ +export declare class MatchCallbacks { private httpResponse; private jsonUtil; private matchController; @@ -23,7 +23,7 @@ export declare class MatchCallbacks 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; + getProfile(url: string, info: IGetProfileRequestData, sessionID: string): IGetBodyResponseData; serverAvailable(url: string, info: any, sessionID: string): IGetBodyResponseData | IGetBodyResponseData; joinMatch(url: string, info: any, sessionID: string): IGetBodyResponseData; getMetrics(url: string, info: any, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/5ReplaceMethod/types/callbacks/ModCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/ModCallbacks.d.ts index 4f150f0..2011f0e 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/ModCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/ModCallbacks.d.ts @@ -1,11 +1,10 @@ -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { OnLoad } from "../di/OnLoad"; import { DelayedModLoader } from "../loaders/DelayedModLoader"; -import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from "../models/spt/utils/ILogger"; import { IHttpServer } from "../models/spt/server/IHttpServer"; -declare class ModCallbacks extends OnLoad -{ +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +declare class ModCallbacks extends OnLoad { private logger; private httpResponse; private httpServer; diff --git a/TypeScript/5ReplaceMethod/types/callbacks/NoteCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/NoteCallbacks.d.ts index 4df8604..fd7c5ca 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/NoteCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/NoteCallbacks.d.ts @@ -1,9 +1,8 @@ import { NoteController } from "../controllers/NoteController"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { INoteActionData } from "../models/eft/notes/INoteActionData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -export declare class NoteCallbacks -{ +import { INoteActionData } from "../models/eft/notes/INoteActionData"; +export declare class NoteCallbacks { private noteController; constructor(noteController: NoteController); addNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; diff --git a/TypeScript/5ReplaceMethod/types/callbacks/NotifierCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/NotifierCallbacks.d.ts index a718f61..416e6a3 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/NotifierCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/NotifierCallbacks.d.ts @@ -1,12 +1,11 @@ -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { NotifierController } from "../controllers/NotifierController"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INotifierChannel } from "../models/eft/notifier/INotifier"; import { ISelectProfileRequestData } from "../models/eft/notifier/ISelectProfileRequestData"; -import { NotifierController } from "../controllers/NotifierController"; -export declare class NotifierCallbacks -{ +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +export declare class NotifierCallbacks { private httpServerHelper; private httpResponse; private notifierController; diff --git a/TypeScript/5ReplaceMethod/types/callbacks/PresetBuildCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/PresetBuildCallbacks.d.ts index 2e463b2..639c33f 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/PresetBuildCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/PresetBuildCallbacks.d.ts @@ -1,12 +1,11 @@ import { PresetBuildController } from "../controllers/PresetBuildController"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IPresetBuildActionRequestData } from "../models/eft/presetBuild/IPresetBuildActionRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IPresetBuildActionRequestData } from "../models/eft/presetBuild/IPresetBuildActionRequestData"; import { WeaponBuild } from "../models/eft/profile/IAkiProfile"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -export declare class PresetBuildCallbacks -{ +export declare class PresetBuildCallbacks { private httpResponse; private presetBuildController; constructor(httpResponse: HttpResponseUtil, presetBuildController: PresetBuildController); diff --git a/TypeScript/5ReplaceMethod/types/callbacks/PresetCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/PresetCallbacks.d.ts index 33c8bda..f62afd6 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/PresetCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/PresetCallbacks.d.ts @@ -1,7 +1,6 @@ import { PresetController } from "../controllers/PresetController"; import { OnLoad } from "../di/OnLoad"; -export declare class PresetCallbacks extends OnLoad -{ +export declare class PresetCallbacks extends OnLoad { private presetController; constructor(presetController: PresetController); onLoad(): void; diff --git a/TypeScript/5ReplaceMethod/types/callbacks/ProfileCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/ProfileCallbacks.d.ts index 115b8a2..efce47d 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/ProfileCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/ProfileCallbacks.d.ts @@ -1,18 +1,17 @@ -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { TimeUtil } from "../utils/TimeUtil"; import { ProfileController } from "../controllers/ProfileController"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +import { IGetMiniProfileRequestData } from "../models/eft/launcher/IGetMiniProfileRequestData"; import { IProfileChangeNicknameRequestData } from "../models/eft/profile/IProfileChangeNicknameRequestData"; import { IProfileChangeVoiceRequestData } from "../models/eft/profile/IProfileChangeVoiceRequestData"; import { IProfileCreateRequestData } from "../models/eft/profile/IProfileCreateRequestData"; -import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { ISearchFriendRequestData } from "../models/eft/profile/ISearchFriendRequestData"; import { ISearchFriendResponse } from "../models/eft/profile/ISearchFriendResponse"; -import { IGetMiniProfileRequestData } from "../models/eft/launcher/IGetMiniProfileRequestData"; -export declare class ProfileCallbacks -{ +import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { TimeUtil } from "../utils/TimeUtil"; +export declare class ProfileCallbacks { private httpResponse; private timeUtil; private profileController; diff --git a/TypeScript/5ReplaceMethod/types/callbacks/QuestCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/QuestCallbacks.d.ts index 4234b37..f742096 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/QuestCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/QuestCallbacks.d.ts @@ -1,19 +1,18 @@ import { QuestController } from "../controllers/QuestController"; import { RepeatableQuestController } from "../controllers/RepeatableQuestController"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { IListQuestsRequestData } from "../models/eft/quests/IListQuestsRequestData"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; -import { IHandoverQuestRequestData } from "../models/eft/quests/IHandoverQuestRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { IQuest } from "../models/eft/common/tables/IQuest"; import { IPmcDataRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; +import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; +import { IHandoverQuestRequestData } from "../models/eft/quests/IHandoverQuestRequestData"; +import { IListQuestsRequestData } from "../models/eft/quests/IListQuestsRequestData"; import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -export declare class QuestCallbacks -{ +export declare class QuestCallbacks { private httpResponse; private questController; private repeatableQuestController; diff --git a/TypeScript/5ReplaceMethod/types/callbacks/RagfairCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/RagfairCallbacks.d.ts index 3161db5..152475f 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/RagfairCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/RagfairCallbacks.d.ts @@ -1,22 +1,21 @@ -import { RagfairServer } from "../servers/RagfairServer"; 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"; -import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData"; -import { IAddOfferRequestData } from "../models/eft/ragfair/IAddOfferRequestData"; -import { IRemoveOfferRequestData } from "../models/eft/ragfair/IRemoveOfferRequestData"; -import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IAddOfferRequestData } from "../models/eft/ragfair/IAddOfferRequestData"; +import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData"; import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult"; +import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData"; +import { IRemoveOfferRequestData } from "../models/eft/ragfair/IRemoveOfferRequestData"; +import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; +import { RagfairServer } from "../servers/RagfairServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; -import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; -import { ILogger } from "../models/spt/utils/ILogger"; -export declare class RagfairCallbacks extends OnLoadOnUpdate -{ +export declare class RagfairCallbacks extends OnLoadOnUpdate { private httpResponse; private logger; private jsonUtil; diff --git a/TypeScript/5ReplaceMethod/types/callbacks/RepairCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/RepairCallbacks.d.ts index 40c92dc..f63ec18 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/RepairCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/RepairCallbacks.d.ts @@ -1,10 +1,9 @@ import { RepairController } from "../controllers/RepairController"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest"; import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepairActionDataRequest"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -export declare class RepairCallbacks -{ +export declare class RepairCallbacks { private repairController; constructor(repairController: RepairController); traderRepair(pmcData: IPmcData, body: ITraderRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; diff --git a/TypeScript/5ReplaceMethod/types/callbacks/SaveCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/SaveCallbacks.d.ts index 886a3a5..b7219a0 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/SaveCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/SaveCallbacks.d.ts @@ -1,7 +1,6 @@ -import { SaveServer } from "../servers/SaveServer"; import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; -export declare class SaveCallbacks extends OnLoadOnUpdate -{ +import { SaveServer } from "../servers/SaveServer"; +export declare class SaveCallbacks extends OnLoadOnUpdate { private saveServer; constructor(saveServer: SaveServer); onLoad(): void; diff --git a/TypeScript/5ReplaceMethod/types/callbacks/TradeCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/TradeCallbacks.d.ts index 94d614f..9928951 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/TradeCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/TradeCallbacks.d.ts @@ -1,10 +1,9 @@ import { TradeController } from "../controllers/TradeController"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData"; -export declare class TradeCallbacks -{ +import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData"; +export declare class TradeCallbacks { private tradeController; constructor(tradeController: TradeController); processTrade(pmcData: IPmcData, body: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/TypeScript/5ReplaceMethod/types/callbacks/TraderCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/TraderCallbacks.d.ts index e9e789d..2a8af7f 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/TraderCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/TraderCallbacks.d.ts @@ -1,11 +1,10 @@ -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; 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 { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; -export declare class TraderCallbacks extends OnLoadOnUpdate -{ +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +export declare class TraderCallbacks extends OnLoadOnUpdate { private httpResponse; private traderController; constructor(httpResponse: HttpResponseUtil, traderController: TraderController); diff --git a/TypeScript/5ReplaceMethod/types/callbacks/WeatherCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/WeatherCallbacks.d.ts index c81887a..e40ab3e 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/WeatherCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/WeatherCallbacks.d.ts @@ -1,9 +1,8 @@ import { WeatherController } from "../controllers/WeatherController"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -export declare class WeatherCallbacks -{ +export declare class WeatherCallbacks { private httpResponse; private weatherController; constructor(httpResponse: HttpResponseUtil, weatherController: WeatherController); diff --git a/TypeScript/5ReplaceMethod/types/callbacks/WishlistCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/WishlistCallbacks.d.ts index a901582..e0249fd 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/WishlistCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/WishlistCallbacks.d.ts @@ -1,9 +1,8 @@ import { WishlistController } from "../controllers/WishlistController"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IWishlistActionData } from "../models/eft/wishlist/IWishlistActionData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -export declare class WishlistCallbacks -{ +import { IWishlistActionData } from "../models/eft/wishlist/IWishlistActionData"; +export declare class WishlistCallbacks { private wishlistController; constructor(wishlistController: WishlistController); addToWishlist(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse; diff --git a/TypeScript/5ReplaceMethod/types/controllers/BotController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/BotController.d.ts index f1d4144..d7dc36d 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/BotController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/BotController.d.ts @@ -6,8 +6,7 @@ import { IBotCore } from "../models/eft/common/tables/IBotCore"; import { ConfigServer } from "../servers/ConfigServer"; import { BotHelper } from "../helpers/BotHelper"; import { BotGenerator } from "../generators/BotGenerator"; -export declare class BotController -{ +export declare class BotController { private databaseServer; private botGenerator; private botHelper; diff --git a/TypeScript/5ReplaceMethod/types/controllers/CustomizationController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/CustomizationController.d.ts index f7c853f..6fd3b12 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/CustomizationController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/CustomizationController.d.ts @@ -8,8 +8,7 @@ import { ISuit } from "../models/eft/common/tables/ITrader"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class CustomizationController -{ +export declare class CustomizationController { private logger; private itemEventRouter; private databaseServer; diff --git a/TypeScript/5ReplaceMethod/types/controllers/DialogueController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/DialogueController.d.ts index 25b11d1..8095666 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/DialogueController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/DialogueController.d.ts @@ -6,8 +6,7 @@ import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListD import { IGetMailDialogViewResponseData } from "../models/eft/dialog/IGetMailDialogViewResponseData"; import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachmentsResponse"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -export declare class DialogueController -{ +export declare class DialogueController { private httpResponse; private saveServer; private dialogueHelper; diff --git a/TypeScript/5ReplaceMethod/types/controllers/GameController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/GameController.d.ts index 7ffa738..5c9a464 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/GameController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/GameController.d.ts @@ -1,19 +1,18 @@ +import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; -import { ConfigServer } from "../servers/ConfigServer"; import { ILogger } from "../models/spt/utils/ILogger"; -import { IWatermark } from "../models/spt/utils/IWatermark"; -import { HttpServerHelper } from "../helpers/HttpServerHelper"; -export declare class GameController -{ +import { ConfigServer } from "../servers/ConfigServer"; +import { Watermark } from "../utils/Watermark"; +export declare class GameController { private logger; private watermark; private httpServerHelper; private profileHelper; private configServer; private httpConfig; - constructor(logger: ILogger, watermark: IWatermark, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); + constructor(logger: ILogger, watermark: Watermark, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); gameStart(url: string, info: IEmptyRequestData, sessionID: string): void; getGameConfig(sessionID: string): IGameConfigResponse; getServer(): any[]; diff --git a/TypeScript/5ReplaceMethod/types/controllers/HandbookController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/HandbookController.d.ts index 5cb4188..5a55e89 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/HandbookController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/HandbookController.d.ts @@ -1,7 +1,6 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { HandbookHelper } from "../helpers/HandbookHelper"; -export declare class HandbookController -{ +export declare class HandbookController { private databaseServer; private handbookHelper; constructor(databaseServer: DatabaseServer, handbookHelper: HandbookHelper); diff --git a/TypeScript/5ReplaceMethod/types/controllers/HealthController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/HealthController.d.ts index 6da4165..ca049f6 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/HealthController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/HealthController.d.ts @@ -10,8 +10,7 @@ import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestD import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class HealthController -{ +export declare class HealthController { private logger; private itemEventRouter; private itemHelper; diff --git a/TypeScript/5ReplaceMethod/types/controllers/HideoutController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/HideoutController.d.ts index f520d2f..22b7040 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/HideoutController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/HideoutController.d.ts @@ -24,8 +24,7 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { ItemEventRouter } from "../routers/ItemEventRouter"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class HideoutController -{ +export declare class HideoutController { private logger; private hashUtil; private timeUtil; diff --git a/TypeScript/5ReplaceMethod/types/controllers/InraidController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/InraidController.d.ts index df9d8fe..1033e5f 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/InraidController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/InraidController.d.ts @@ -11,8 +11,7 @@ import { QuestHelper } from "../helpers/QuestHelper"; import { InRaidHelper } from "../helpers/InRaidHelper"; import { InsuranceService } from "../services/InsuranceService"; import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; -export declare class InraidController -{ +export declare class InraidController { private saveServer; private jsonUtil; private databaseServer; diff --git a/TypeScript/5ReplaceMethod/types/controllers/InsuranceController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/InsuranceController.d.ts index 70859e7..50437a6 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/InsuranceController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/InsuranceController.d.ts @@ -14,8 +14,7 @@ import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { InsuranceService } from "../services/InsuranceService"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class InsuranceController -{ +export declare class InsuranceController { private logger; private randomUtil; private itemEventRouter; @@ -29,7 +28,8 @@ export declare class InsuranceController private insuranceService; private configServer; private insuranceConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, itemEventRouter: ItemEventRouter, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileHelper: ProfileHelper, dialogueHelper: DialogueHelper, paymentService: PaymentService, insuranceService: InsuranceService, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, itemEventRouter: ItemEventRouter, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileHelper: ProfileHelper, dialogueHelper: DialogueHelper, paymentService: PaymentService, // TODO: delay required + insuranceService: InsuranceService, configServer: ConfigServer); processReturn(): void; insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse; cost(info: IGetInsuranceCostRequestData, sessionID: string): any; diff --git a/TypeScript/5ReplaceMethod/types/controllers/InventoryController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/InventoryController.d.ts index 95eedf6..8235082 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/InventoryController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/InventoryController.d.ts @@ -1,32 +1,32 @@ import { InventoryHelper } from "../helpers/InventoryHelper"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; +import { PaymentHelper } from "../helpers/PaymentHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { PaymentHelper } from "../helpers/PaymentHelper"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { DatabaseServer } from "../servers/DatabaseServer"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; -import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData"; -import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; -import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwapRequestData"; -import { IInventoryFoldRequestData } from "../models/eft/inventory/IInventoryFoldRequestData"; -import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData"; -import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData"; +import { IAddItemRequestData } from "../models/eft/inventory/IAddItemRequestData"; import { IInventoryBindRequestData } from "../models/eft/inventory/IInventoryBindRequestData"; -import { IInventoryExamineRequestData } from "../models/eft/inventory/IInventoryExamineRequestData"; -import { IInventoryReadEncyclopediaRequestData } from "../models/eft/inventory/IInventoryReadEncyclopediaRequestData"; -import { IInventorySortRequestData } from "../models/eft/inventory/IInventorySortRequestData"; import { IInventoryCreateMarkerRequestData } from "../models/eft/inventory/IInventoryCreateMarkerRequestData"; import { IInventoryDeleteMarkerRequestData } from "../models/eft/inventory/IInventoryDeleteMarkerRequestData"; import { IInventoryEditMarkerRequestData } from "../models/eft/inventory/IInventoryEditMarkerRequestData"; +import { IInventoryExamineRequestData } from "../models/eft/inventory/IInventoryExamineRequestData"; +import { IInventoryFoldRequestData } from "../models/eft/inventory/IInventoryFoldRequestData"; +import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; +import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; +import { IInventoryReadEncyclopediaRequestData } from "../models/eft/inventory/IInventoryReadEncyclopediaRequestData"; +import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData"; +import { IInventorySortRequestData } from "../models/eft/inventory/IInventorySortRequestData"; +import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; +import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwapRequestData"; +import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData"; +import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData"; +import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class InventoryController -{ +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HashUtil } from "../utils/HashUtil"; +import { JsonUtil } from "../utils/JsonUtil"; +export declare class InventoryController { private logger; private hashUtil; private jsonUtil; @@ -78,7 +78,7 @@ export declare class InventoryController * Give Item * its used for "add" item like gifts etc. */ - addItem(pmcData: IPmcData, body: any, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; + addItem(pmcData: IPmcData, body: IAddItemRequestData, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; /** * Handles folding of Weapons */ diff --git a/TypeScript/5ReplaceMethod/types/controllers/LauncherController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/LauncherController.d.ts index 6a2ce5b..d3d8e6a 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/LauncherController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/LauncherController.d.ts @@ -7,8 +7,7 @@ import { ILoginRequestData } from "../models/eft/launcher/ILoginRequestData"; import { IChangeRequestData } from "../models/eft/launcher/IChangeRequestData"; import { Info } from "../models/eft/profile/IAkiProfile"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; -export declare class LauncherController -{ +export declare class LauncherController { private hashUtil; private saveServer; private httpServerHelper; diff --git a/TypeScript/5ReplaceMethod/types/controllers/LocationController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/LocationController.d.ts index a3bc141..dde270c 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/LocationController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/LocationController.d.ts @@ -5,8 +5,7 @@ import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSo import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class LocationController -{ +export declare class LocationController { private jsonUtil; private logger; private locationGenerator; diff --git a/TypeScript/5ReplaceMethod/types/controllers/MatchController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/MatchController.d.ts index 2d8b735..84abbe3 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/MatchController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/MatchController.d.ts @@ -1,13 +1,13 @@ -import { TraderHelper } from "../helpers/TraderHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; -import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; +import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData"; +import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; import { ConfigServer } from "../servers/ConfigServer"; import { SaveServer } from "../servers/SaveServer"; import { MatchLocationService } from "../services/MatchLocationService"; -export declare class MatchController -{ +export declare class MatchController { private saveServer; private profileHelper; private matchLocationService; @@ -17,7 +17,7 @@ export declare class MatchController private inraidConfig; constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, configServer: ConfigServer); getEnabled(): boolean; - getProfile(info: any): IPmcData[]; + getProfile(info: IGetProfileRequestData): IPmcData[]; private getMatch; createGroup(sessionID: string, info: any): any; deleteGroup(info: any): void; diff --git a/TypeScript/5ReplaceMethod/types/controllers/NoteController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/NoteController.d.ts index c343d17..ecd8001 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/NoteController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/NoteController.d.ts @@ -2,8 +2,7 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { INoteActionData } from "../models/eft/notes/INoteActionData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -declare class NoteController -{ +declare class NoteController { private itemEventRouter; constructor(itemEventRouter: ItemEventRouter); addNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; diff --git a/TypeScript/5ReplaceMethod/types/controllers/NotifierController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/NotifierController.d.ts index 1194125..36fef66 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/NotifierController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/NotifierController.d.ts @@ -2,8 +2,7 @@ import { NotifierHelper } from "../helpers/NotifierHelper"; import { NotificationService } from "../services/NotificationService"; import { INotifierChannel } from "../models/eft/notifier/INotifier"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; -export declare class NotifierController -{ +export declare class NotifierController { private notifierHelper; private httpServerHelper; private notificationService; diff --git a/TypeScript/5ReplaceMethod/types/controllers/PresetBuildController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/PresetBuildController.d.ts index e3a315a..a15b181 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/PresetBuildController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/PresetBuildController.d.ts @@ -6,8 +6,7 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { WeaponBuild } from "../models/eft/profile/IAkiProfile"; import { HashUtil } from "../utils/HashUtil"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -export declare class PresetBuildController -{ +export declare class PresetBuildController { private hashUtil; private itemEventRouter; private itemHelper; diff --git a/TypeScript/5ReplaceMethod/types/controllers/PresetController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/PresetController.d.ts index 99db736..6ec8c55 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/PresetController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/PresetController.d.ts @@ -1,7 +1,6 @@ import { PresetHelper } from "../helpers/PresetHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; -export declare class PresetController -{ +export declare class PresetController { private presetHelper; private databaseServer; constructor(presetHelper: PresetHelper, databaseServer: DatabaseServer); diff --git a/TypeScript/5ReplaceMethod/types/controllers/ProfileController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/ProfileController.d.ts index e409e8f..46b66d8 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/ProfileController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/ProfileController.d.ts @@ -13,8 +13,7 @@ import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { IMiniProfile } from "../models/eft/launcher/IMiniProfile"; import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; -export declare class ProfileController -{ +export declare class ProfileController { private hashUtil; private timeUtil; private saveServer; diff --git a/TypeScript/5ReplaceMethod/types/controllers/QuestController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/QuestController.d.ts index 636e37a..a964c32 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/QuestController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/QuestController.d.ts @@ -15,8 +15,7 @@ import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRe import { IHandoverQuestRequestData } from "../models/eft/quests/IHandoverQuestRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class QuestController -{ +export declare class QuestController { private logger; private timeUtil; private itemEventRouter; diff --git a/TypeScript/5ReplaceMethod/types/controllers/RagfairController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/RagfairController.d.ts index 20bca9a..5b94a95 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/RagfairController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/RagfairController.d.ts @@ -1,39 +1,38 @@ -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { RagfairServer } from "../servers/RagfairServer"; -import { SaveServer } from "../servers/SaveServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { PaymentService } from "../services/PaymentService"; -import { RagfairPriceService } from "../services/RagfairPriceService"; -import { RagfairOfferService } from "../services/RagfairOfferService"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { HandbookHelper } from "../helpers/HandbookHelper"; -import { PaymentHelper } from "../helpers/PaymentHelper"; -import { InventoryHelper } from "../helpers/InventoryHelper"; -import { RagfairHelper } from "../helpers/RagfairHelper"; -import { RagfairSellHelper } from "../helpers/RagfairSellHelper"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IAddOfferRequestData, Requirement } from "../models/eft/ragfair/IAddOfferRequestData"; -import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData"; -import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData"; -import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { Item } from "../models/eft/common/tables/IItem"; -import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult"; -import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; -import { ConfigServer } from "../servers/ConfigServer"; -import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; -import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; +import { HandbookHelper } from "../helpers/HandbookHelper"; +import { InventoryHelper } from "../helpers/InventoryHelper"; +import { ItemHelper } from "../helpers/ItemHelper"; +import { PaymentHelper } from "../helpers/PaymentHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { RagfairHelper } from "../helpers/RagfairHelper"; +import { RagfairOfferHelper } from "../helpers/RagfairOfferHelper"; +import { RagfairSellHelper } from "../helpers/RagfairSellHelper"; import { RagfairSortHelper } from "../helpers/RagfairSortHelper"; import { RagfairTaxHelper } from "../helpers/RagfairTaxHelper"; -import { RagfairOfferHelper } from "../helpers/RagfairOfferHelper"; -import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { IAddOfferRequestData, Requirement } from "../models/eft/ragfair/IAddOfferRequestData"; +import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData"; +import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult"; +import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData"; +import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class RagfairController -{ +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { RagfairServer } from "../servers/RagfairServer"; +import { SaveServer } from "../servers/SaveServer"; +import { PaymentService } from "../services/PaymentService"; +import { RagfairOfferService } from "../services/RagfairOfferService"; +import { RagfairPriceService } from "../services/RagfairPriceService"; +import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { TimeUtil } from "../utils/TimeUtil"; +export declare class RagfairController { private logger; private timeUtil; private httpResponse; diff --git a/TypeScript/5ReplaceMethod/types/controllers/RepairController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/RepairController.d.ts index 5de1bcb..3a9f3a2 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/RepairController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/RepairController.d.ts @@ -10,8 +10,7 @@ import { ConfigServer } from "../servers/ConfigServer"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { RepairHelper } from "../helpers/RepairHelper"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class RepairController -{ +export declare class RepairController { private logger; private itemEventRouter; private databaseServer; diff --git a/TypeScript/5ReplaceMethod/types/controllers/RepeatableQuestController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/RepeatableQuestController.d.ts index 5a24672..bd5e5a1 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/RepeatableQuestController.d.ts @@ -1,44 +1,39 @@ -import { TimeUtil } from "../utils/TimeUtil"; -import { ObjectId } from "../utils/ObjectId"; -import { RandomUtil, ProbabilityObjectArray, ProbabilityObject } from "../utils/RandomUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { MathUtil } from "../utils/MathUtil"; import { ItemHelper } from "../helpers/ItemHelper"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IPmcData, TraderInfo } from "../models/eft/common/IPmcData"; -import { IRepeatableQuestConfig, ELocationName } from "../models/spt/config/IQuestConfig"; -import { IExploration, IRepeatableQuest, IReward, IRewards, IExplorationCondition, ICompletionAvailableFor, IEliminationCondition, ICompletion, IElimination, IPmcDataRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; -import { Exit } from "../models/eft/common/ILocationBase"; -import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { PresetHelper } from "../helpers/PresetHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { PaymentService } from "../services/PaymentService"; -import { ConfigServer } from "../servers/ConfigServer"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { Exit } from "../models/eft/common/ILocationBase"; +import { IPmcData, TraderInfo } from "../models/eft/common/IPmcData"; +import { ICompletion, ICompletionAvailableFor, IElimination, IEliminationCondition, IExploration, IExplorationCondition, IPmcDataRepeatableQuest, IRepeatableQuest, IReward, IRewards } from "../models/eft/common/tables/IRepeatableQuests"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; +import { ELocationName, IRepeatableQuestConfig } from "../models/spt/config/IQuestConfig"; import { ILogger } from "../models/spt/utils/ILogger"; -export interface IQuestTypePool -{ +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { PaymentService } from "../services/PaymentService"; +import { JsonUtil } from "../utils/JsonUtil"; +import { MathUtil } from "../utils/MathUtil"; +import { ObjectId } from "../utils/ObjectId"; +import { ProbabilityObject, ProbabilityObjectArray, RandomUtil } from "../utils/RandomUtil"; +import { TimeUtil } from "../utils/TimeUtil"; +export interface IQuestTypePool { types: string[]; pool: IQuestPool; } -export interface IQuestPool -{ +export interface IQuestPool { Exploration: IExplorationPool; Elimination: IEliminationPool; } -export interface IExplorationPool -{ +export interface IExplorationPool { locations: Partial>; } -export interface IEliminationPool -{ +export interface IEliminationPool { targets: IEliminationTargetPool; } -export interface IEliminationTargetPool -{ +export interface IEliminationTargetPool { Savage?: ITargetLocation; AnyPmc?: ITargetLocation; bossBully?: ITargetLocation; @@ -48,12 +43,10 @@ export interface IEliminationTargetPool bossTagilla?: ITargetLocation; bossKojaniy?: ITargetLocation; } -export interface ITargetLocation -{ +export interface ITargetLocation { locations: string[]; } -export declare class RepeatableQuestController -{ +export declare class RepeatableQuestController { private timeUtil; private logger; private randomUtil; diff --git a/TypeScript/5ReplaceMethod/types/controllers/TradeController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/TradeController.d.ts index 82b4545..f0a177b 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/TradeController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/TradeController.d.ts @@ -8,8 +8,7 @@ import { Upd } from "../models/eft/common/tables/IItem"; import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ILogger } from "../models/spt/utils/ILogger"; -declare class TradeController -{ +declare class TradeController { private logger; private itemEventRouter; private tradeHelper; diff --git a/TypeScript/5ReplaceMethod/types/controllers/TraderController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/TraderController.d.ts index f48d4ad..36eac75 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/TraderController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/TraderController.d.ts @@ -1,15 +1,13 @@ -import { JsonUtil } from "../utils/JsonUtil"; -import { TimeUtil } from "../utils/TimeUtil"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { TraderAssortHelper } from "../helpers/TraderAssortHelper"; +import { TraderHelper } from "../helpers/TraderHelper"; +import { IBarterScheme, ITraderAssort, ITraderBase } from "../models/eft/common/tables/ITrader"; +import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { TraderAssortService } from "../services/TraderAssortService"; -import { IBarterScheme, ITraderAssort, ITraderBase } from "../models/eft/common/tables/ITrader"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { TraderAssortHelper } from "../helpers/TraderAssortHelper"; -export declare class TraderController -{ +import { JsonUtil } from "../utils/JsonUtil"; +import { TimeUtil } from "../utils/TimeUtil"; +export declare class TraderController { private logger; private databaseServer; private traderAssortHelper; @@ -18,9 +16,7 @@ export declare class TraderController private timeUtil; private traderAssortService; private jsonUtil; - private configServer; - private traderConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, timeUtil: TimeUtil, traderAssortService: TraderAssortService, jsonUtil: JsonUtil, configServer: ConfigServer); + constructor(logger: ILogger, databaseServer: DatabaseServer, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, timeUtil: TimeUtil, traderAssortService: TraderAssortService, jsonUtil: JsonUtil); load(): void; getTrader(traderID: string, sessionID: string): ITraderBase; getAllTraders(sessionID: string): ITraderBase[]; diff --git a/TypeScript/5ReplaceMethod/types/controllers/WeatherController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/WeatherController.d.ts index 3a84fe8..4f8bcf1 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/WeatherController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/WeatherController.d.ts @@ -1,8 +1,7 @@ import { ConfigServer } from "../servers/ConfigServer"; import { WeatherGenerator } from "../generators/WeatherGenerator"; import { IWeatherData } from "../models/eft/weather/IWeatherData"; -export declare class WeatherController -{ +export declare class WeatherController { private weatherGenerator; private configServer; private weatherConfig; diff --git a/TypeScript/5ReplaceMethod/types/controllers/WishlistController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/WishlistController.d.ts index bd3a44c..5ef8df3 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/WishlistController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/WishlistController.d.ts @@ -2,8 +2,7 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IWishlistActionData } from "../models/eft/wishlist/IWishlistActionData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -export declare class WishlistController -{ +export declare class WishlistController { private itemEvenRouter; constructor(itemEvenRouter: ItemEventRouter); addToWishList(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse; diff --git a/TypeScript/5ReplaceMethod/types/di/Container.d.ts b/TypeScript/5ReplaceMethod/types/di/Container.d.ts index 7092203..17791b0 100644 --- a/TypeScript/5ReplaceMethod/types/di/Container.d.ts +++ b/TypeScript/5ReplaceMethod/types/di/Container.d.ts @@ -1,7 +1,7 @@ import { DependencyContainer } from "tsyringe"; -export declare class Container -{ +export declare class Container { static registerTypes(depContainer: DependencyContainer): void; + static registerListTypes(depContainer: DependencyContainer): void; private static registerUtils; private static registerRouters; private static registerGenerators; diff --git a/TypeScript/5ReplaceMethod/types/di/OnLoad.d.ts b/TypeScript/5ReplaceMethod/types/di/OnLoad.d.ts index c7fbc30..064d07d 100644 --- a/TypeScript/5ReplaceMethod/types/di/OnLoad.d.ts +++ b/TypeScript/5ReplaceMethod/types/di/OnLoad.d.ts @@ -1,5 +1,4 @@ -export declare class OnLoad -{ +export declare class OnLoad { onLoad(): void; getRoute(): string; } diff --git a/TypeScript/5ReplaceMethod/types/di/OnLoadOnUpdate.d.ts b/TypeScript/5ReplaceMethod/types/di/OnLoadOnUpdate.d.ts index 76ae962..8bd3dc3 100644 --- a/TypeScript/5ReplaceMethod/types/di/OnLoadOnUpdate.d.ts +++ b/TypeScript/5ReplaceMethod/types/di/OnLoadOnUpdate.d.ts @@ -1,7 +1,6 @@ import { OnLoad } from "./OnLoad"; import { OnUpdate } from "./OnUpdate"; -export declare class OnLoadOnUpdate implements OnLoad, OnUpdate -{ +export declare class OnLoadOnUpdate implements OnLoad, OnUpdate { onUpdate(timeSinceLastRun: number): boolean; onLoad(): void; getRoute(): string; diff --git a/TypeScript/5ReplaceMethod/types/di/OnSaveLoad.d.ts b/TypeScript/5ReplaceMethod/types/di/OnSaveLoad.d.ts new file mode 100644 index 0000000..1edf37e --- /dev/null +++ b/TypeScript/5ReplaceMethod/types/di/OnSaveLoad.d.ts @@ -0,0 +1,4 @@ +export declare class OnSaveLoad { + onSaveLoad(): void; + getRoute(): string; +} diff --git a/TypeScript/5ReplaceMethod/types/di/OnUpdate.d.ts b/TypeScript/5ReplaceMethod/types/di/OnUpdate.d.ts index 1c61ea3..7fbbe09 100644 --- a/TypeScript/5ReplaceMethod/types/di/OnUpdate.d.ts +++ b/TypeScript/5ReplaceMethod/types/di/OnUpdate.d.ts @@ -1,5 +1,4 @@ -export declare class OnUpdate -{ +export declare class OnUpdate { onUpdate(timeSinceLastRun: number): boolean; getRoute(): string; } diff --git a/TypeScript/5ReplaceMethod/types/di/Router.d.ts b/TypeScript/5ReplaceMethod/types/di/Router.d.ts index 796dd8a..2fb98e0 100644 --- a/TypeScript/5ReplaceMethod/types/di/Router.d.ts +++ b/TypeScript/5ReplaceMethod/types/di/Router.d.ts @@ -1,37 +1,40 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; -export declare class Router -{ +export declare class Router { private handledRoutes; - constructor(); getTopLevelRoute(): string; protected getHandledRoutes(): HandledRoute[]; + private getInternalHandledRoutes; canHandle(url: string, partialMatch?: boolean): boolean; } -export declare class StaticRouter extends Router -{ - constructor(); +export declare class StaticRouter extends Router { + private routes; + constructor(routes: RouteAction[]); handleStatic(url: string, info: any, sessionID: string, output: string): any; + getHandledRoutes(): HandledRoute[]; } -export declare class DynamicRouter extends Router -{ - constructor(); +export declare class DynamicRouter extends Router { + private routes; + constructor(routes: RouteAction[]); handleDynamic(url: string, info: any, sessionID: string, output: string): any; + getHandledRoutes(): HandledRoute[]; } -export declare class ItemEventRouterDefinition extends Router -{ +export declare class ItemEventRouterDefinition extends Router { constructor(); handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } -export declare class SaveLoadRouter extends Router -{ +export declare class SaveLoadRouter extends Router { constructor(); handleLoad(profile: IAkiProfile): IAkiProfile; } -export declare class HandledRoute -{ +export declare class HandledRoute { route: string; dynamic: boolean; constructor(route: string, dynamic: boolean); } +export declare class RouteAction { + url: string; + action: (url: string, info: any, sessionID: string, output: string) => any; + constructor(url: string, action: (url: string, info: any, sessionID: string, output: string) => any); +} diff --git a/TypeScript/5ReplaceMethod/types/di/Serializer.d.ts b/TypeScript/5ReplaceMethod/types/di/Serializer.d.ts index 66f99b7..70aa7c5 100644 --- a/TypeScript/5ReplaceMethod/types/di/Serializer.d.ts +++ b/TypeScript/5ReplaceMethod/types/di/Serializer.d.ts @@ -1,6 +1,5 @@ import { IHttpServer } from "../models/spt/server/IHttpServer"; -export declare class Serializer -{ +export declare class Serializer { serialize(sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; canHandle(something: string): boolean; } diff --git a/TypeScript/5ReplaceMethod/types/generators/BotGenerator.d.ts b/TypeScript/5ReplaceMethod/types/generators/BotGenerator.d.ts index a58cec0..af7d7d4 100644 --- a/TypeScript/5ReplaceMethod/types/generators/BotGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/generators/BotGenerator.d.ts @@ -9,8 +9,7 @@ import { ConfigServer } from "../servers/ConfigServer"; import { GameEventHelper } from "../helpers/GameEventHelper"; import { BotInventoryGenerator } from "./BotInventoryGenerator"; import { BotHelper } from "../helpers/BotHelper"; -export declare class BotGenerator -{ +export declare class BotGenerator { private logger; private hashUtil; private randomUtil; diff --git a/TypeScript/5ReplaceMethod/types/generators/BotInventoryGenerator.d.ts b/TypeScript/5ReplaceMethod/types/generators/BotInventoryGenerator.d.ts index 89a3457..0cdbacb 100644 --- a/TypeScript/5ReplaceMethod/types/generators/BotInventoryGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/generators/BotInventoryGenerator.d.ts @@ -8,8 +8,7 @@ import { BotLootGenerator } from "./BotLootGenerator"; import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -export declare class BotInventoryGenerator -{ +export declare class BotInventoryGenerator { private logger; private hashUtil; private randomUtil; @@ -18,7 +17,6 @@ export declare class BotInventoryGenerator private botLootGenerator; private botGeneratorHelper; private weightedRandomHelper; - private botConfig; constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, botWeaponGenerator: BotWeaponGenerator, botLootGenerator: BotLootGenerator, botGeneratorHelper: BotGeneratorHelper, weightedRandomHelper: WeightedRandomHelper); generateInventory(templateInventory: Inventory, equipmentChances: Chances, generation: Generation, botRole: string, isPmc: boolean): PmcInventory; private generateEquipment; diff --git a/TypeScript/5ReplaceMethod/types/generators/BotLootGenerator.d.ts b/TypeScript/5ReplaceMethod/types/generators/BotLootGenerator.d.ts index c285bd5..3bf1b36 100644 --- a/TypeScript/5ReplaceMethod/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/generators/BotLootGenerator.d.ts @@ -8,8 +8,7 @@ import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -export declare class BotLootGenerator -{ +export declare class BotLootGenerator { private jsonUtil; private hashUtil; private randomUtil; diff --git a/TypeScript/5ReplaceMethod/types/generators/BotWeaponGenerator.d.ts b/TypeScript/5ReplaceMethod/types/generators/BotWeaponGenerator.d.ts index 8b12d58..e8f91cb 100644 --- a/TypeScript/5ReplaceMethod/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/generators/BotWeaponGenerator.d.ts @@ -1,14 +1,13 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { MinMax, ModsChances, Mods } from "../models/eft/common/tables/IBotType"; -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -import { HashUtil } from "../utils/HashUtil"; +import { ItemHelper } from "../helpers/ItemHelper"; +import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; +import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { MinMax, Mods, ModsChances } from "../models/eft/common/tables/IBotType"; import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; -export declare class BotWeaponGenerator -{ +export declare class BotWeaponGenerator { private logger; private hashUtil; private databaseServer; diff --git a/TypeScript/5ReplaceMethod/types/generators/LocationGenerator.d.ts b/TypeScript/5ReplaceMethod/types/generators/LocationGenerator.d.ts index 60d4fb1..b7ba7c5 100644 --- a/TypeScript/5ReplaceMethod/types/generators/LocationGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/generators/LocationGenerator.d.ts @@ -12,14 +12,12 @@ import { MathUtil } from "../utils/MathUtil"; import { ObjectId } from "../utils/ObjectId"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { ILogger } from "../models/spt/utils/ILogger"; -export interface IContainerItem -{ +export interface IContainerItem { items: Item[]; width: number; height: number; } -export declare class LocationGenerator -{ +export declare class LocationGenerator { private logger; private jsonUtil; private objectId; diff --git a/TypeScript/5ReplaceMethod/types/generators/PMCLootGenerator.d.ts b/TypeScript/5ReplaceMethod/types/generators/PMCLootGenerator.d.ts index bd76cb6..601431b 100644 --- a/TypeScript/5ReplaceMethod/types/generators/PMCLootGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/generators/PMCLootGenerator.d.ts @@ -1,8 +1,7 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; -export declare class PMCLootGenerator -{ +export declare class PMCLootGenerator { private itemHelper; private databaseServer; private configServer; diff --git a/TypeScript/5ReplaceMethod/types/generators/RagfairAssortGenerator.d.ts b/TypeScript/5ReplaceMethod/types/generators/RagfairAssortGenerator.d.ts index 3b92121..8b52a90 100644 --- a/TypeScript/5ReplaceMethod/types/generators/RagfairAssortGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/generators/RagfairAssortGenerator.d.ts @@ -3,8 +3,7 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "../helpers/ItemHelper"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; -export declare class RagfairAssortGenerator -{ +export declare class RagfairAssortGenerator { private jsonUtil; private hashUtil; private itemHelper; diff --git a/TypeScript/5ReplaceMethod/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/5ReplaceMethod/types/generators/RagfairOfferGenerator.d.ts index c38209a..cb2566c 100644 --- a/TypeScript/5ReplaceMethod/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/generators/RagfairOfferGenerator.d.ts @@ -16,8 +16,7 @@ import { RagfairOfferService } from "../services/RagfairOfferService"; import { RagfairPriceService } from "../services/RagfairPriceService"; import { FenceService } from "../services/FenceService"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class RagfairOfferGenerator -{ +export declare class RagfairOfferGenerator { private logger; private jsonUtil; private hashUtil; diff --git a/TypeScript/5ReplaceMethod/types/generators/WeatherGenerator.d.ts b/TypeScript/5ReplaceMethod/types/generators/WeatherGenerator.d.ts index 97c3f2e..b9faa3a 100644 --- a/TypeScript/5ReplaceMethod/types/generators/WeatherGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/generators/WeatherGenerator.d.ts @@ -3,8 +3,7 @@ import { ConfigServer } from "../servers/ConfigServer"; import { IWeatherData } from "../models/eft/weather/IWeatherData"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; -export declare class WeatherGenerator -{ +export declare class WeatherGenerator { private weightedRandomHelper; private randomUtil; private timeUtil; diff --git a/TypeScript/5ReplaceMethod/types/helpers/AssortHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/AssortHelper.d.ts index 0a91be2..33cb5c6 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/AssortHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/AssortHelper.d.ts @@ -4,8 +4,7 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "./ItemHelper"; import { QuestHelper } from "./QuestHelper"; -export declare class AssortHelper -{ +export declare class AssortHelper { private logger; private itemHelper; private databaseServer; diff --git a/TypeScript/5ReplaceMethod/types/helpers/BotGeneratorHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/BotGeneratorHelper.d.ts index baa565f..6abdc07 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/BotGeneratorHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/BotGeneratorHelper.d.ts @@ -1,19 +1,18 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ConfigServer } from "../servers/ConfigServer"; +import { DurabilityLimitsHelper } from "../helpers/DurabilityLimitsHelper"; import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { ModsChances, Mods } from "../models/eft/common/tables/IBotType"; +import { Mods, ModsChances } from "../models/eft/common/tables/IBotType"; import { Item, Upd } from "../models/eft/common/tables/IItem"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { DurabilityLimitsHelper } from "../helpers/DurabilityLimitsHelper"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; -import { InventoryHelper } from "./InventoryHelper"; import { ContainerHelper } from "./ContainerHelper"; +import { InventoryHelper } from "./InventoryHelper"; import { ItemHelper } from "./ItemHelper"; -import { ILogger } from "../models/spt/utils/ILogger"; -declare class BotGeneratorHelper -{ +declare class BotGeneratorHelper { private logger; private jsonUtil; private hashUtil; @@ -49,8 +48,7 @@ declare class BotGeneratorHelper addItemWithChildrenToEquipmentSlot(equipmentSlots: string[], parentId: string, parentTpl: string, itemWithChildren: Item[], inventory: PmcInventory): boolean; private itemAllowedInContainer; } -export declare class ExhaustableArray -{ +export declare class ExhaustableArray { private itemPool; private randomUtil; private jsonUtil; @@ -60,10 +58,8 @@ export declare class ExhaustableArray getFirstValue(): T; hasValues(): boolean; } -declare namespace BotGeneratorHelper -{ - enum EquipmentSlots - { +declare namespace BotGeneratorHelper { + enum EquipmentSlots { HEADWEAR = "Headwear", EARPIECE = "Earpiece", FACE_COVER = "FaceCover", diff --git a/TypeScript/5ReplaceMethod/types/helpers/BotHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/BotHelper.d.ts index 8f52dc9..032218b 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/BotHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/BotHelper.d.ts @@ -4,8 +4,7 @@ import { ConfigServer } from "../servers/ConfigServer"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class BotHelper -{ +export declare class BotHelper { private logger; private jsonUtil; private databaseServer; diff --git a/TypeScript/5ReplaceMethod/types/helpers/ContainerHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/ContainerHelper.d.ts index b5c75c8..34cd1e4 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/ContainerHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/ContainerHelper.d.ts @@ -1,13 +1,11 @@ -export declare class FindSlotResult -{ +export declare class FindSlotResult { success: boolean; x: any; y: any; rotation: boolean; constructor(success?: boolean, x?: any, y?: any, rotation?: boolean); } -export declare class ContainerHelper -{ +export declare class ContainerHelper { private locateSlot; findSlotForItem(container2D: number[][], itemWidth: number, itemHeight: number): FindSlotResult; fillContainerMapWithItem(container2D: number[][], x: number, y: number, itemW: number, itemH: number, rotate: boolean): any; diff --git a/TypeScript/5ReplaceMethod/types/helpers/DialogueHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/DialogueHelper.d.ts index ba70b50..d8082e4 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/DialogueHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/DialogueHelper.d.ts @@ -5,8 +5,7 @@ import { Dialogue, MessageContent, MessagePreview, MessageType } from "../models import { HashUtil } from "../utils/HashUtil"; import { NotifierHelper } from "./NotifierHelper"; import { NotificationSendHelper } from "./NotificationSendHelper"; -export declare class DialogueHelper -{ +export declare class DialogueHelper { private hashUtil; private saveServer; private databaseServer; diff --git a/TypeScript/5ReplaceMethod/types/helpers/DurabilityLimitsHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/DurabilityLimitsHelper.d.ts index 69d4584..ee8c887 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/DurabilityLimitsHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/DurabilityLimitsHelper.d.ts @@ -2,8 +2,7 @@ import { ConfigServer } from "../servers/ConfigServer"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { RandomUtil } from "../utils/RandomUtil"; import { BotHelper } from "./BotHelper"; -export declare class DurabilityLimitsHelper -{ +export declare class DurabilityLimitsHelper { private randomUtil; private botHelper; private configServer; diff --git a/TypeScript/5ReplaceMethod/types/helpers/ExtendedProfileHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/ExtendedProfileHelper.d.ts index 83b236b..4dd7d3a 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/ExtendedProfileHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/ExtendedProfileHelper.d.ts @@ -1,17 +1,16 @@ +import { BotGenerator } from "../generators/BotGenerator"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { FenceService } from "../services/FenceService"; -import { IPmcData } from "../models/eft/common/IPmcData"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; +import { Watermark } from "../utils/Watermark"; import { ItemHelper } from "./ItemHelper"; -import { IWatermark } from "../models/spt/utils/IWatermark"; -import { BotGenerator } from "../generators/BotGenerator"; import { ProfileHelper } from "./ProfileHelper"; -export declare class ExtendedProfileHelper extends ProfileHelper -{ +export declare class ExtendedProfileHelper extends ProfileHelper { private botGenerator; - constructor(jsonUtil: JsonUtil, watermark: IWatermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService, botGenerator: BotGenerator); + constructor(jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService, botGenerator: BotGenerator); generatePlayerScav(sessionID: string): IPmcData; private getScavSkills; private removeSecureContainer; diff --git a/TypeScript/5ReplaceMethod/types/helpers/GameEventHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/GameEventHelper.d.ts index 7fafeb0..8131d31 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/GameEventHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/GameEventHelper.d.ts @@ -1,6 +1,5 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -export declare class GameEventHelper -{ +export declare class GameEventHelper { private databaseServer; constructor(databaseServer: DatabaseServer); get EVENT(): Record; diff --git a/TypeScript/5ReplaceMethod/types/helpers/HandbookHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/HandbookHelper.d.ts index 5151784..aed6984 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/HandbookHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/HandbookHelper.d.ts @@ -1,17 +1,14 @@ -declare class LookupItem -{ +declare class LookupItem { byId: Record; byParent: Record; constructor(); } -export declare class LookupCollection -{ +export declare class LookupCollection { items: LookupItem; categories: LookupItem; constructor(); } -export declare class HandbookHelper -{ +export declare class HandbookHelper { private lookup; hydrateLookup(lookup: LookupCollection): void; getTemplatePrice(x: string): number; diff --git a/TypeScript/5ReplaceMethod/types/helpers/HealthHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/HealthHelper.d.ts index a9ec39f..fb5bed7 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/HealthHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/HealthHelper.d.ts @@ -6,8 +6,7 @@ import { ConfigServer } from "../servers/ConfigServer"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class HealthHelper -{ +export declare class HealthHelper { private jsonUtil; private logger; private timeUtil; diff --git a/TypeScript/5ReplaceMethod/types/helpers/HideoutHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/HideoutHelper.d.ts index 8806286..5b4a5ad 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/HideoutHelper.d.ts @@ -1,23 +1,22 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; import { IPmcData, Production, Productive } from "../models/eft/common/IPmcData"; -import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; -import { StageBonus } from "../models/eft/hideout/IHideoutArea"; -import { TimeUtil } from "../utils/TimeUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { HashUtil } from "../utils/HashUtil"; -import { ProfileHelper } from "./ProfileHelper"; -import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { ConfigServer } from "../servers/ConfigServer"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { PlayerService } from "../services/PlayerService"; -import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; -import { InventoryHelper } from "./InventoryHelper"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { StageBonus } from "../models/eft/hideout/IHideoutArea"; +import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; +import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; +import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class HideoutHelper -{ +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +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"; +export declare class HideoutHelper { private logger; private hashUtil; private timeUtil; diff --git a/TypeScript/5ReplaceMethod/types/helpers/HttpServerHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/HttpServerHelper.d.ts index bbbf72f..2e40814 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/HttpServerHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/HttpServerHelper.d.ts @@ -1,6 +1,5 @@ import { ConfigServer } from "../servers/ConfigServer"; -export declare class HttpServerHelper -{ +export declare class HttpServerHelper { private configServer; private httpConfig; private mime; diff --git a/TypeScript/5ReplaceMethod/types/helpers/InRaidHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/InRaidHelper.d.ts index 0a99fec..e79d384 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/InRaidHelper.d.ts @@ -7,8 +7,7 @@ import { SaveServer } from "../servers/SaveServer"; import { JsonUtil } from "../utils/JsonUtil"; import { InventoryHelper } from "./InventoryHelper"; import { PaymentHelper } from "./PaymentHelper"; -export declare class InRaidHelper -{ +export declare class InRaidHelper { private logger; private saveServer; private jsonUtil; diff --git a/TypeScript/5ReplaceMethod/types/helpers/InventoryHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/InventoryHelper.d.ts index 33c39ee..00e95d3 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/InventoryHelper.d.ts @@ -1,31 +1,30 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; +import { IAddItemRequestData } from "../models/eft/inventory/IAddItemRequestData"; +import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; +import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; +import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { FenceService } from "../services/FenceService"; -import { ContainerHelper } from "./ContainerHelper"; -import { ItemHelper } from "./ItemHelper"; -import { PaymentHelper } from "./PaymentHelper"; -import { ProfileHelper } from "./ProfileHelper"; -import { DialogueHelper } from "./DialogueHelper"; import { HashUtil } from "../utils/HashUtil"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; -import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; -import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; -import { ILogger } from "../models/spt/utils/ILogger"; +import { ContainerHelper } from "./ContainerHelper"; +import { DialogueHelper } from "./DialogueHelper"; +import { ItemHelper } from "./ItemHelper"; +import { PaymentHelper } from "./PaymentHelper"; +import { ProfileHelper } from "./ProfileHelper"; import { TraderAssortHelper } from "./TraderAssortHelper"; -export interface OwnerInventoryItems -{ +export interface OwnerInventoryItems { from: Item[]; to: Item[]; sameInventory: boolean; isMail: boolean; } -export declare class InventoryHelper -{ +export declare class InventoryHelper { private logger; private jsonUtil; private hashUtil; @@ -41,7 +40,7 @@ export declare class InventoryHelper private configServer; private inventoryConfig; 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, configServer: ConfigServer); - addItem(pmcData: IPmcData, body: any, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; + addItem(pmcData: IPmcData, body: IAddItemRequestData, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; removeItem(pmcData: IPmcData, itemId: string, sessionID: string, output?: IItemEventRouterResponse): IItemEventRouterResponse; getItemSize(itemTpl: string, itemID: string, inventoryItem: Item[]): Record; private getSizeByInventoryItemHash; diff --git a/TypeScript/5ReplaceMethod/types/helpers/ItemHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/ItemHelper.d.ts index 82ed481..8c1175a 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/ItemHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/ItemHelper.d.ts @@ -5,8 +5,7 @@ import { Item } from "../models/eft/common/tables/IItem"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { ILogger } from "../models/spt/utils/ILogger"; -declare class ItemHelper -{ +declare class ItemHelper { private logger; private hashUtil; private jsonUtil; @@ -139,10 +138,8 @@ declare class ItemHelper isQuestItem(tpl: string): boolean; getItemSize(items: Item[], rootItemId: string): ItemHelper.ItemSize; } -declare namespace ItemHelper -{ - enum BaseClasses - { +declare namespace ItemHelper { + enum BaseClasses { WEAPON = "5422acb9af1c889c16000029", ARMOR = "5448e54d4bdc2dcc718b4568", VEST = "5448e5284bdc2dcb718b4567", @@ -226,13 +223,11 @@ declare namespace ItemHelper ITEM = "54009119af1c881c07000029", CYLINDER_MAGAZINE = "610720f290b75a49ff2e5e25" } - interface ItemSize - { + interface ItemSize { width: number; height: number; } - enum Money - { + enum Money { ROUBLES = "5449016a4bdc2d6f028b456f", EUROS = "569668774bdc2da2298b4568", DOLLARS = "5696686a4bdc2da3298b456a" diff --git a/TypeScript/5ReplaceMethod/types/helpers/NotificationSendHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/NotificationSendHelper.d.ts index c6d53f8..b9298da 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/NotificationSendHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/NotificationSendHelper.d.ts @@ -1,8 +1,7 @@ import { INotification } from "../models/eft/notifier/INotifier"; import { IHttpServer } from "../models/spt/server/IHttpServer"; import { NotificationService } from "../services/NotificationService"; -export declare class NotificationSendHelper -{ +export declare class NotificationSendHelper { private httpServer; private notificationService; constructor(httpServer: IHttpServer, notificationService: NotificationService); diff --git a/TypeScript/5ReplaceMethod/types/helpers/NotifierHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/NotifierHelper.d.ts index eccb67c..0d524e9 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/NotifierHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/NotifierHelper.d.ts @@ -1,8 +1,7 @@ import { INotification } from "../models/eft/notifier/INotifier"; import { Message, MessageContentRagfair } from "../models/eft/profile/IAkiProfile"; import { HttpServerHelper } from "./HttpServerHelper"; -export declare class NotifierHelper -{ +export declare class NotifierHelper { private httpServerHelper; /** * The default notification sent when waiting times out. diff --git a/TypeScript/5ReplaceMethod/types/helpers/PaymentHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/PaymentHelper.d.ts index 1bd6d2b..2d068a4 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/PaymentHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/PaymentHelper.d.ts @@ -1,5 +1,4 @@ -export declare class PaymentHelper -{ +export declare class PaymentHelper { /** * Check whether tpl is Money * @param {string} tpl diff --git a/TypeScript/5ReplaceMethod/types/helpers/PresetHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/PresetHelper.d.ts index 4fdc9ab..0a24128 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/PresetHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/PresetHelper.d.ts @@ -1,7 +1,6 @@ import { Preset } from "../models/eft/common/IGlobals"; import { DatabaseServer } from "../servers/DatabaseServer"; -export declare class PresetHelper -{ +export declare class PresetHelper { private databaseServer; private lookup; constructor(databaseServer: DatabaseServer); diff --git a/TypeScript/5ReplaceMethod/types/helpers/ProfileHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/ProfileHelper.d.ts index 3ad8967..508443c 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/ProfileHelper.d.ts @@ -1,23 +1,22 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { FenceService } from "../services/FenceService"; import { IPmcData, Stats } from "../models/eft/common/IPmcData"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { SaveServer } from "../servers/SaveServer"; +import { FenceService } from "../services/FenceService"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; +import { Watermark } from "../utils/Watermark"; import { ItemHelper } from "./ItemHelper"; -import { IWatermark } from "../models/spt/utils/IWatermark"; -export declare class ProfileHelper -{ +export declare class ProfileHelper { protected jsonUtil: JsonUtil; - protected watermark: IWatermark; + protected watermark: Watermark; protected timeUtil: TimeUtil; protected saveServer: SaveServer; protected databaseServer: DatabaseServer; protected itemHelper: ItemHelper; protected fenceService: FenceService; - constructor(jsonUtil: JsonUtil, watermark: IWatermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService); + constructor(jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService); resetProfileQuestCondition(sessionID: string, conditionId: string): void; getCompleteProfile(sessionID: string): IPmcData[]; isNicknameTaken(info: IValidateNicknameRequestData, sessionID: string): boolean; diff --git a/TypeScript/5ReplaceMethod/types/helpers/QuestConditionHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/QuestConditionHelper.d.ts index 66d3ab8..2a0ee94 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/QuestConditionHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/QuestConditionHelper.d.ts @@ -1,6 +1,5 @@ import { AvailableForConditions } from "../models/eft/common/tables/IQuest"; -export declare class QuestConditionHelper -{ +export declare class QuestConditionHelper { getQuestConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; getLevelConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; getLoyaltyConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; diff --git a/TypeScript/5ReplaceMethod/types/helpers/QuestHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/QuestHelper.d.ts index 6841f54..9e2dd5e 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/QuestHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/QuestHelper.d.ts @@ -1,23 +1,22 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { ItemHelper } from "./ItemHelper"; -import { ProfileHelper } from "./ProfileHelper"; -import { DialogueHelper } from "./DialogueHelper"; -import { PaymentHelper } from "./PaymentHelper"; -import { TraderHelper } from "./TraderHelper"; import { IPmcData, Quest } from "../models/eft/common/IPmcData"; 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 { ConfigServer } from "../servers/ConfigServer"; -import { RagfairServerHelper } from "./RagfairServerHelper"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class QuestHelper -{ +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HashUtil } from "../utils/HashUtil"; +import { JsonUtil } from "../utils/JsonUtil"; +import { TimeUtil } from "../utils/TimeUtil"; +import { DialogueHelper } from "./DialogueHelper"; +import { ItemHelper } from "./ItemHelper"; +import { PaymentHelper } from "./PaymentHelper"; +import { ProfileHelper } from "./ProfileHelper"; +import { RagfairServerHelper } from "./RagfairServerHelper"; +import { TraderHelper } from "./TraderHelper"; +export declare class QuestHelper { private logger; private jsonUtil; private timeUtil; diff --git a/TypeScript/5ReplaceMethod/types/helpers/RagfairHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/RagfairHelper.d.ts index 6fae0a6..8e70bcd 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/RagfairHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/RagfairHelper.d.ts @@ -1,18 +1,17 @@ -import { JsonUtil } from "../utils/JsonUtil"; import { Item } from "../models/eft/common/tables/IItem"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { RagfairLinkedItemService } from "../services/RagfairLinkedItemService"; +import { JsonUtil } from "../utils/JsonUtil"; import { HandbookHelper } from "./HandbookHelper"; import { ItemHelper } from "./ItemHelper"; -import { RagfairLinkedItemService } from "../services/RagfairLinkedItemService"; -import { UtilityHelper } from "./UtilityHelper"; -import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from "../models/spt/utils/ILogger"; import { TraderAssortHelper } from "./TraderAssortHelper"; -export declare class RagfairHelper -{ +import { UtilityHelper } from "./UtilityHelper"; +export declare class RagfairHelper { private logger; private jsonUtil; private traderAssortHelper; diff --git a/TypeScript/5ReplaceMethod/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/RagfairOfferHelper.d.ts index 2b7227d..3bf8add 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/RagfairOfferHelper.d.ts @@ -1,25 +1,24 @@ -import { HashUtil } from "../utils/HashUtil"; -import { TimeUtil } from "../utils/TimeUtil"; import { IPmcData } from "../models/eft/common/IPmcData"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { RagfairOfferService } from "../services/RagfairOfferService"; +import { HashUtil } from "../utils/HashUtil"; +import { TimeUtil } from "../utils/TimeUtil"; import { DialogueHelper } from "./DialogueHelper"; import { ItemHelper } from "./ItemHelper"; import { PaymentHelper } from "./PaymentHelper"; import { PresetHelper } from "./PresetHelper"; import { ProfileHelper } from "./ProfileHelper"; -import { RagfairServerHelper } from "./RagfairServerHelper"; -import { ConfigServer } from "../servers/ConfigServer"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { RagfairSortHelper } from "./RagfairSortHelper"; import { RagfairHelper } from "./RagfairHelper"; -import { ILogger } from "../models/spt/utils/ILogger"; -export declare class RagfairOfferHelper -{ +import { RagfairServerHelper } from "./RagfairServerHelper"; +import { RagfairSortHelper } from "./RagfairSortHelper"; +export declare class RagfairOfferHelper { private logger; private timeUtil; private hashUtil; diff --git a/TypeScript/5ReplaceMethod/types/helpers/RagfairSellHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/RagfairSellHelper.d.ts index 1f5990c..929d112 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/RagfairSellHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/RagfairSellHelper.d.ts @@ -3,8 +3,7 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; -export declare class RagfairSellHelper -{ +export declare class RagfairSellHelper { private logger; private randomUtil; private timeUtil; diff --git a/TypeScript/5ReplaceMethod/types/helpers/RagfairServerHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/RagfairServerHelper.d.ts index 488e516..0f32a66 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/RagfairServerHelper.d.ts @@ -1,17 +1,16 @@ -import { SaveServer } from "../servers/SaveServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { ItemHelper } from "./ItemHelper"; -import { ProfileHelper } from "./ProfileHelper"; import { MemberCategory } from "../models/eft/common/MemberCategory"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { SaveServer } from "../servers/SaveServer"; +import { HashUtil } from "../utils/HashUtil"; +import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { DialogueHelper } from "./DialogueHelper"; -import { Item } from "../models/eft/common/tables/IItem"; -import { JsonUtil } from "../utils/JsonUtil"; -import { HashUtil } from "../utils/HashUtil"; -export declare class RagfairServerHelper -{ +import { ItemHelper } from "./ItemHelper"; +import { ProfileHelper } from "./ProfileHelper"; +export declare class RagfairServerHelper { private randomUtil; private hashUtil; private saveServer; diff --git a/TypeScript/5ReplaceMethod/types/helpers/RagfairSortHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/RagfairSortHelper.d.ts index 0cfcb46..e9d8069 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/RagfairSortHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/RagfairSortHelper.d.ts @@ -1,7 +1,6 @@ import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { DatabaseServer } from "../servers/DatabaseServer"; -export declare class RagfairSortHelper -{ +export declare class RagfairSortHelper { private databaseServer; constructor(databaseServer: DatabaseServer); sortOffers(offers: IRagfairOffer[], type: number, direction?: number): IRagfairOffer[]; diff --git a/TypeScript/5ReplaceMethod/types/helpers/RagfairTaxHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/RagfairTaxHelper.d.ts index 0a01deb..e87334f 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/RagfairTaxHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/RagfairTaxHelper.d.ts @@ -4,8 +4,7 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { RagfairPriceService } from "../services/RagfairPriceService"; import { ItemHelper } from "./ItemHelper"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class RagfairTaxHelper -{ +export declare class RagfairTaxHelper { private logger; private databaseServer; private ragfairPriceService; diff --git a/TypeScript/5ReplaceMethod/types/helpers/RepairHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/RepairHelper.d.ts index 7bdffc3..d11d0d2 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/RepairHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/RepairHelper.d.ts @@ -5,8 +5,7 @@ import { ConfigServer } from "../servers/ConfigServer"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class RepairHelper -{ +export declare class RepairHelper { private logger; private jsonUtil; private randomUtil; diff --git a/TypeScript/5ReplaceMethod/types/helpers/SecureContainerHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/SecureContainerHelper.d.ts index 085bb63..8f246b6 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/SecureContainerHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/SecureContainerHelper.d.ts @@ -1,14 +1,12 @@ import { Item } from "../models/eft/common/tables/IItem"; import { ItemHelper } from "./ItemHelper"; -export interface OwnerInventoryItems -{ +export interface OwnerInventoryItems { from: Item[]; to: Item[]; sameInventory: boolean; isMail: boolean; } -export declare class SecureContainerHelper -{ +export declare class SecureContainerHelper { private itemHelper; constructor(itemHelper: ItemHelper); getSecureContainerItems(items: Item[]): string[]; diff --git a/TypeScript/5ReplaceMethod/types/helpers/TradeHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/TradeHelper.d.ts index dc4eb56..a78cd20 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/TradeHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/TradeHelper.d.ts @@ -1,18 +1,17 @@ -import { RagfairServer } from "../servers/RagfairServer"; import { InventoryHelper } from "../helpers/InventoryHelper"; +import { ItemHelper } from "../helpers/ItemHelper"; import { TraderHelper } from "../helpers/TraderHelper"; -import { FenceService } from "../services/FenceService"; -import { PaymentService } from "../services/PaymentService"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { Upd } from "../models/eft/common/tables/IItem"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "../models/eft/trade/IProcessSellTradeRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { Upd } from "../models/eft/common/tables/IItem"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class TradeHelper -{ +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { RagfairServer } from "../servers/RagfairServer"; +import { FenceService } from "../services/FenceService"; +import { PaymentService } from "../services/PaymentService"; +export declare class TradeHelper { private logger; private itemEventRouter; private traderHelper; diff --git a/TypeScript/5ReplaceMethod/types/helpers/TraderAssortHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/TraderAssortHelper.d.ts index 1f2c067..d95879c 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/TraderAssortHelper.d.ts @@ -8,8 +8,7 @@ import { TraderAssortService } from "../services/TraderAssortService"; import { JsonUtil } from "../utils/JsonUtil"; import { AssortHelper } from "./AssortHelper"; import { ProfileHelper } from "./ProfileHelper"; -export declare class TraderAssortHelper -{ +export declare class TraderAssortHelper { private logger; private jsonUtil; private databaseServer; diff --git a/TypeScript/5ReplaceMethod/types/helpers/TraderHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/TraderHelper.d.ts index 4efe453..5440afe 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/TraderHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/TraderHelper.d.ts @@ -10,8 +10,7 @@ import { IBarterScheme, ITraderAssort, ITraderBase, LoyaltyLevel } from "../mode import { IPmcData } from "../models/eft/common/IPmcData"; import { ConfigServer } from "../servers/ConfigServer"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class TraderHelper -{ +export declare class TraderHelper { private logger; private databaseServer; private saveServer; diff --git a/TypeScript/5ReplaceMethod/types/helpers/UtilityHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/UtilityHelper.d.ts index 48a6583..5d9f482 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/UtilityHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/UtilityHelper.d.ts @@ -1,4 +1,3 @@ -export declare class UtilityHelper -{ +export declare class UtilityHelper { arrayIntersect(a: T[], b: T[]): T[]; } diff --git a/TypeScript/5ReplaceMethod/types/helpers/WeightedRandomHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/WeightedRandomHelper.d.ts index 4514817..9aa0d29 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/WeightedRandomHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/WeightedRandomHelper.d.ts @@ -1,5 +1,4 @@ -export declare class WeightedRandomHelper -{ +export declare class WeightedRandomHelper { /** * Gets a tplId from a weighted dictionary * @param {tplId: weighting[]} itemArray diff --git a/TypeScript/5ReplaceMethod/types/loaders/BundleLoader.d.ts b/TypeScript/5ReplaceMethod/types/loaders/BundleLoader.d.ts index 58a4e9d..9abfe9f 100644 --- a/TypeScript/5ReplaceMethod/types/loaders/BundleLoader.d.ts +++ b/TypeScript/5ReplaceMethod/types/loaders/BundleLoader.d.ts @@ -1,8 +1,7 @@ import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; -declare class BundleInfo -{ +declare class BundleInfo { private httpServerHelper; key: string; path: string; @@ -10,8 +9,7 @@ declare class BundleInfo dependencyKeys: string[]; constructor(modpath: string, bundle: any, httpServerHelper: HttpServerHelper); } -export declare class BundleLoader -{ +export declare class BundleLoader { private httpServerHelper; private vfs; private jsonUtil; diff --git a/TypeScript/5ReplaceMethod/types/loaders/DelayedModLoader.d.ts b/TypeScript/5ReplaceMethod/types/loaders/DelayedModLoader.d.ts index c2a87d0..7d0009f 100644 --- a/TypeScript/5ReplaceMethod/types/loaders/DelayedModLoader.d.ts +++ b/TypeScript/5ReplaceMethod/types/loaders/DelayedModLoader.d.ts @@ -1,12 +1,10 @@ -import { DependencyContainer } from "tsyringe"; -import { VFS } from "../utils/VFS"; -import { InitialModLoader } from "./InitialModLoader"; -import { BundleLoader } from "./BundleLoader"; import { HandbookController } from "../controllers/HandbookController"; import { IModLoader } from "../models/spt/mod/IModLoader"; import { ModCompilerService } from "../services/ModCompilerService"; -export declare class DelayedModLoader implements IModLoader -{ +import { VFS } from "../utils/VFS"; +import { BundleLoader } from "./BundleLoader"; +import { InitialModLoader } from "./InitialModLoader"; +export declare class DelayedModLoader implements IModLoader { private bundleLoader; private handbookController; private vfs; @@ -17,7 +15,7 @@ export declare class DelayedModLoader implements IModLoader getBundle(key: string, local: boolean): void; getImportedModsNames(): string[]; getModPath(mod: string): string; - load(container: DependencyContainer): void; + load(): void; private executeMods; private addBundles; } diff --git a/TypeScript/5ReplaceMethod/types/loaders/InitialModLoader.d.ts b/TypeScript/5ReplaceMethod/types/loaders/InitialModLoader.d.ts index 7816d4e..d30a3fe 100644 --- a/TypeScript/5ReplaceMethod/types/loaders/InitialModLoader.d.ts +++ b/TypeScript/5ReplaceMethod/types/loaders/InitialModLoader.d.ts @@ -1,24 +1,22 @@ import { DependencyContainer } from "tsyringe"; -import { JsonUtil } from "../utils/JsonUtil"; -import { VFS } from "../utils/VFS"; +import { IModLoader } from "../models/spt/mod/IModLoader"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { ModCompilerService } from "../services/ModCompilerService"; -import { HashCacheService } from "../services/HashCacheService"; -import { IModLoader } from "../models/spt/mod/IModLoader"; -export declare class InitialModLoader implements IModLoader -{ +import { JsonUtil } from "../utils/JsonUtil"; +import { VFS } from "../utils/VFS"; +export declare class InitialModLoader implements IModLoader { private logger; private vfs; private jsonUtil; private modCompilerService; - private hashCacheService; private configServer; + private static container; private readonly basepath; private imported; private onLoad; private akiConfig; - constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, hashCacheService: HashCacheService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, configServer: ConfigServer); load(container: DependencyContainer): Promise; getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; @@ -30,10 +28,10 @@ export declare class InitialModLoader implements IModLoader private executeMods; private sortModsLoadOrder; private addMod; - private compileModIfNeeded; private areModDependenciesFulfilled; private isModCompatible; private validMod; private getLoadOrderRecursive; private getLoadOrder; + getContainer(): DependencyContainer; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/bot/IGenerateBotsRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/bot/IGenerateBotsRequestData.d.ts index bb2a252..c49cef7 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/bot/IGenerateBotsRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/bot/IGenerateBotsRequestData.d.ts @@ -1,9 +1,7 @@ -export interface IGenerateBotsRequestData -{ +export interface IGenerateBotsRequestData { conditions: Condition[]; } -export interface Condition -{ +export interface Condition { Role: string; Limit: number; Difficulty: string; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/IEmptyRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/IEmptyRequestData.d.ts index eff2008..284d16e 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/IEmptyRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/IEmptyRequestData.d.ts @@ -1,3 +1,2 @@ -export interface IEmptyRequestData -{ +export interface IEmptyRequestData { } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/IGlobals.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/IGlobals.d.ts index 88c6ce0..456895c 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/IGlobals.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/IGlobals.d.ts @@ -1,14 +1,12 @@ import { Item } from "./tables/IItem"; -export interface IGlobals -{ +export interface IGlobals { time: number; config: Config; bot_presets: BotPreset[]; BotWeaponScatterings: BotWeaponScattering[]; ItemPresets: Record; } -export interface Config -{ +export interface Config { content: Content; AimPunchMagnitude: number; WeaponSkillProgressRate: number; @@ -85,14 +83,12 @@ export interface Config Inertia: Inertia; Ballistic: Ballistic; } -export interface Content -{ +export interface Content { ip: string; port: number; root: string; } -export interface Exp -{ +export interface Exp { heal: Heal; match_end: MatchEnd; kill: Kill; @@ -102,14 +98,12 @@ export interface Exp expForLockedDoorBreach: number; triggerMult: number; } -export interface Heal -{ +export interface Heal { expForHeal: number; expForHydration: number; expForEnergy: number; } -export interface MatchEnd -{ +export interface MatchEnd { README: string; survived_exp_requirement: number; survived_seconds_requirement: number; @@ -122,8 +116,7 @@ export interface MatchEnd runnerMult: number; killedMult: number; } -export interface Kill -{ +export interface Kill { combo: Combo[]; victimLevelExp: number; headShotMult: number; @@ -132,12 +125,10 @@ export interface Kill bloodLossToLitre: number; victimBotLevelExp: number; } -export interface Combo -{ +export interface Combo { percent: number; } -export interface Level -{ +export interface Level { exp_table: ExpTable[]; trade_level: number; savage_level: number; @@ -145,39 +136,32 @@ export interface Level mastering1: number; mastering2: number; } -export interface ExpTable -{ +export interface ExpTable { exp: number; } -export interface LootAttempt -{ +export interface LootAttempt { k_exp: number; } -export interface Armor -{ +export interface Armor { class: Class[]; } -export interface Class -{ +export interface Class { resistance: number; } -export interface Mastering -{ +export interface Mastering { Name: string; Templates: string[]; Level2: number; Level3: number; } -export interface Customization -{ +export interface Customization { SavageHead: SavageHead; SavageBody: SavageBody; SavageFeet: SavageFeet; CustomizationVoice: CustomizationVoice[]; BodyParts: BodyParts; } -export interface SavageHead -{ +export interface SavageHead { wild_head_1: WildHead; wild_head_2: WildHead; wild_head_3: WildHead; @@ -199,14 +183,12 @@ export interface SavageHead usec_head_4: WildHead; usec_head_5: WildHead; } -export interface WildHead -{ +export interface WildHead { head: string; isNotRandom: boolean; NotRandom: boolean; } -export interface SavageBody -{ +export interface SavageBody { wild_body: WildBody; wild_body_1: WildBody; wild_body_2: WildBody; @@ -247,14 +229,12 @@ export interface SavageBody wild_body_bomber: WildBody; wild_top_yellowcoat: WildBody; } -export interface WildBody -{ +export interface WildBody { body: string; hands: string; isNotRandom: boolean; } -export interface SavageFeet -{ +export interface SavageFeet { wild_feet: WildFeet; wild_feet_1: WildFeet; wild_feet_2: WildFeet; @@ -278,27 +258,23 @@ export interface SavageFeet wild_feet_bomber: WildFeet; wild_pants_yellowcoat: WildFeet; } -export interface WildFeet -{ +export interface WildFeet { feet: string; isNotRandom: boolean; NotRandom: boolean; } -export interface CustomizationVoice -{ +export interface CustomizationVoice { voice: string; side: string[]; isNotRandom: boolean; } -export interface BodyParts -{ +export interface BodyParts { Head: string; Body: string; Feet: string; Hands: string; } -export interface ArmorMaterials -{ +export interface ArmorMaterials { UHMWPE: ArmorType; Aramid: ArmorType; Combined: ArmorType; @@ -308,8 +284,7 @@ export interface ArmorMaterials Ceramic: ArmorType; Glass: ArmorType; } -export interface ArmorType -{ +export interface ArmorType { Destructibility: number; MinRepairDegradation: number; MaxRepairDegradation: number; @@ -317,20 +292,17 @@ export interface ArmorType MinRepairKitDegradation: number; MaxRepairKitDegradation: number; } -export interface Health -{ +export interface Health { Falling: Falling; Effects: Effects; HealPrice: HealPrice; ProfileHealthSettings: ProfileHealthSettings; } -export interface Falling -{ +export interface Falling { DamagePerMeter: number; SafeHeight: number; } -export interface Effects -{ +export interface Effects { Existence: Existence; Dehydration: Dehydration; BreakPart: BreakPart; @@ -357,8 +329,7 @@ export interface Effects LightBleeding: LightBleeding2; BodyTemperature: BodyTemperature; } -export interface Existence -{ +export interface Existence { EnergyLoopTime: number; HydrationLoopTime: number; EnergyDamage: number; @@ -366,8 +337,7 @@ export interface Existence DestroyedStomachEnergyTimeFactor: number; DestroyedStomachHydrationTimeFactor: number; } -export interface Dehydration -{ +export interface Dehydration { DefaultDelay: number; DefaultResidueTime: number; BleedingHealth: number; @@ -376,8 +346,7 @@ export interface Dehydration DamageOnStrongDehydration: number; StrongDehydrationLoopTime: number; } -export interface BreakPart -{ +export interface BreakPart { DefaultDelay: number; DefaultResidueTime: number; HealExperience: number; @@ -388,38 +357,31 @@ export interface BreakPart BulletHitProbability: Probability; FallingProbability: Probability; } -export interface Contusion -{ +export interface Contusion { Dummy: number; } -export interface Disorientation -{ +export interface Disorientation { Dummy: number; } -export interface Exhaustion -{ +export interface Exhaustion { DefaultDelay: number; DefaultResidueTime: number; Damage: number; DamageLoopTime: number; } -export interface LowEdgeHealth -{ +export interface LowEdgeHealth { DefaultDelay: number; DefaultResidueTime: number; StartCommonHealth: number; } -export interface RadExposure -{ +export interface RadExposure { Damage: number; DamageLoopTime: number; } -export interface Stun -{ +export interface Stun { Dummy: number; } -export interface Intoxication -{ +export interface Intoxication { DefaultDelay: number; DefaultResidueTime: number; DamageHealth: number; @@ -430,8 +392,7 @@ export interface Intoxication HealExperience: number; RemovePrice: number; } -export interface Regeneration -{ +export interface Regeneration { LoopTime: number; MinimumHealthPercentage: number; Energy: number; @@ -439,8 +400,7 @@ export interface Regeneration BodyHealth: BodyHealth; Influences: Influences; } -export interface BodyHealth -{ +export interface BodyHealth { Head: BodyHealthValue; Chest: BodyHealthValue; Stomach: BodyHealthValue; @@ -449,42 +409,35 @@ export interface BodyHealth LeftLeg: BodyHealthValue; RightLeg: BodyHealthValue; } -export interface BodyHealthValue -{ +export interface BodyHealthValue { Value: number; } -export interface Influences -{ +export interface Influences { LightBleeding: Influence; HeavyBleeding: Influence; Fracture: Influence; RadExposure: Influence; Intoxication: Influence; } -export interface Influence -{ +export interface Influence { HealthSlowDownPercentage: number; EnergySlowDownPercentage: number; HydrationSlowDownPercentage: number; } -export interface Wound -{ +export interface Wound { WorkingTime: number; ThresholdMin: number; ThresholdMax: number; } -export interface Berserk -{ +export interface Berserk { DefaultDelay: number; WorkingTime: number; DefaultResidueTime: number; } -export interface Flash -{ +export interface Flash { Dummy: number; } -export interface MedEffect -{ +export interface MedEffect { LoopTime: number; StartDelay: number; DrinkStartDelay: number; @@ -494,26 +447,21 @@ export interface MedEffect MedicalStartDelay: number; StimulatorStartDelay: number; } -export interface Pain -{ +export interface Pain { TremorDelay: number; HealExperience: number; } -export interface PainKiller -{ +export interface PainKiller { Dummy: number; } -export interface SandingScreen -{ +export interface SandingScreen { Dummy: number; } -export interface Stimulator -{ +export interface Stimulator { BuffLoopTime: number; Buffs: Buffs; } -export interface Buffs -{ +export interface Buffs { BuffsSJ1TGLabs: Buff[]; BuffsSJ6TGLabs: Buff[]; BuffsPropital: Buff[]; @@ -556,8 +504,7 @@ export interface Buffs Buffs_food_slippers: Buff[]; Buffs_knife: Buff[]; } -export interface Buff -{ +export interface Buff { BuffType: string; Chance: number; Delay: number; @@ -566,20 +513,17 @@ export interface Buff AbsoluteValue: boolean; SkillName: string; } -export interface Tremor -{ +export interface Tremor { DefaultDelay: number; DefaultResidueTime: number; } -export interface ChronicStaminaFatigue -{ +export interface ChronicStaminaFatigue { EnergyRate: number; WorkingTime: number; TicksEvery: number; EnergyRatePerStack: number; } -export interface Fracture2 -{ +export interface Fracture2 { DefaultDelay: number; DefaultResidueTime: number; HealExperience: number; @@ -590,8 +534,7 @@ export interface Fracture2 BulletHitProbability: Probability; FallingProbability: Probability; } -export interface HeavyBleeding2 -{ +export interface HeavyBleeding2 { DefaultDelay: number; DefaultResidueTime: number; DamageEnergy: number; @@ -609,15 +552,13 @@ export interface HeavyBleeding2 RemovedAfterDeath: boolean; Probability: Probability; } -export interface Probability -{ +export interface Probability { FunctionType: string; K: number; B: number; Threshold: number; } -export interface LightBleeding2 -{ +export interface LightBleeding2 { DefaultDelay: number; DefaultResidueTime: number; DamageEnergy: number; @@ -635,27 +576,23 @@ export interface LightBleeding2 RemovedAfterDeath: boolean; Probability: Probability; } -export interface BodyTemperature -{ +export interface BodyTemperature { DefaultBuildUpTime: number; DefaultResidueTime: number; LoopTime: number; } -export interface HealPrice -{ +export interface HealPrice { HealthPointPrice: number; HydrationPointPrice: number; EnergyPointPrice: number; TrialLevels: number; TrialRaids: number; } -export interface ProfileHealthSettings -{ +export interface ProfileHealthSettings { BodyPartsSettings: BodyPartsSettings; HealthFactorsSettings: HealthFactorsSettings; } -export interface BodyPartsSettings -{ +export interface BodyPartsSettings { Head: BodyPartsSetting; Chest: BodyPartsSetting; Stomach: BodyPartsSetting; @@ -664,35 +601,30 @@ export interface BodyPartsSettings LeftLeg: BodyPartsSetting; RightLeg: BodyPartsSetting; } -export interface BodyPartsSetting -{ +export interface BodyPartsSetting { Minimum: number; Maximum: number; Default: number; OverDamageReceivedMultiplier: number; } -export interface HealthFactorsSettings -{ +export interface HealthFactorsSettings { Energy: HealthFactorSetting; Hydration: HealthFactorSetting; Temperature: HealthFactorSetting; Poisoning: HealthFactorSetting; Radiation: HealthFactorSetting; } -export interface HealthFactorSetting -{ +export interface HealthFactorSetting { Minimum: number; Maximum: number; Default: number; } -export interface Rating -{ +export interface Rating { levelRequired: number; limit: number; categories: Categories; } -export interface Categories -{ +export interface Categories { experience: boolean; kd: boolean; surviveRatio: boolean; @@ -704,18 +636,15 @@ export interface Categories inventoryFullCost: boolean; ragFairStanding: boolean; } -export interface Tournament -{ +export interface Tournament { categories: Categories2; limit: number; levelRequired: number; } -export interface Categories2 -{ +export interface Categories2 { dogtags: boolean; } -export interface RagFair -{ +export interface RagFair { enabled: boolean; priceStabilizerEnabled: boolean; includePveTraderSales: boolean; @@ -751,29 +680,24 @@ export interface RagFair isOnlyFoundInRaidAllowed: boolean; sellInOnePiece: number; } -export interface MaxActiveOfferCount -{ +export interface MaxActiveOfferCount { from: number; to: number; count: number; } -export interface MaxSumForRarity -{ +export interface MaxSumForRarity { Common: RarityMaxSum; Rare: RarityMaxSum; Superrare: RarityMaxSum; Not_exist: RarityMaxSum; } -export interface RarityMaxSum -{ +export interface RarityMaxSum { value: number; } -export interface Handbook -{ +export interface Handbook { defaultCategory: string; } -export interface Stamina -{ +export interface Stamina { Capacity: number; SprintDrainRate: number; BaseRestorationRate: number; @@ -820,8 +744,7 @@ export interface Stamina PoseLevelDecreaseSpeed: xyz; PoseLevelConsumptionPerNotch: xyz; } -export interface StaminaRestoration -{ +export interface StaminaRestoration { LowerLeftPoint: number; LowerRightPoint: number; LeftPlatoPoint: number; @@ -829,8 +752,7 @@ export interface StaminaRestoration RightLimit: number; ZeroValue: number; } -export interface StaminaDrain -{ +export interface StaminaDrain { LowerLeftPoint: number; LowerRightPoint: number; LeftPlatoPoint: number; @@ -838,29 +760,24 @@ export interface StaminaDrain RightLimit: number; ZeroValue: number; } -export interface RequirementReferences -{ +export interface RequirementReferences { Alpinist: Alpinist[]; } -export interface Alpinist -{ +export interface Alpinist { Requirement: string; Id: string; Count: number; RequiredSlot: string; RequirementTip: string; } -export interface RestrictionsInRaid -{ +export interface RestrictionsInRaid { TemplateId: string; Value: number; } -export interface Insurance -{ +export interface Insurance { MaxStorageTimeInHour: number; } -export interface SkillsSettings -{ +export interface SkillsSettings { SkillProgressRate: number; WeaponSkillProgressRate: number; WeaponSkillRecoilBonusPerLevel: number; @@ -929,13 +846,11 @@ export interface SkillsSettings BotSound: any[]; TroubleShooting: TroubleShooting; } -export interface ArmorSkills -{ +export interface ArmorSkills { WearAmountRepairLVestsReducePerLevel: number; WearChanceRepairLVestsReduceEliteLevel: number; } -export interface HideoutManagement -{ +export interface HideoutManagement { SkillPointsPerAreaUpgrade: number; SkillPointsPerCraft: number; ConsumptionReductionPerLevel: number; @@ -943,32 +858,27 @@ export interface HideoutManagement SkillPointsRate: SkillPointsRate; EliteSlots: EliteSlots; } -export interface SkillPointsRate -{ +export interface SkillPointsRate { Generator: Generator; AirFilteringUnit: SkillPointRate; WaterCollector: SkillPointRate; SolarPower: SkillPointRate; } -export interface SkillPointRate -{ +export interface SkillPointRate { ResourceSpent: number; PointsGained: number; } -export interface EliteSlots -{ +export interface EliteSlots { Generator: EliteSlot; AirFilteringUnit: EliteSlot; WaterCollector: EliteSlot; BitcoinFarm: EliteSlot; } -export interface EliteSlot -{ +export interface EliteSlot { Slots: number; Container: number; } -export interface Crafting -{ +export interface Crafting { PointsPerCraftingCycle: number; CraftingCycleHours: number; PointsPerUniqueCraftCycle: number; @@ -978,30 +888,26 @@ export interface Crafting EliteExtraProductions: number; CraftingPointsToInteligence: number; } -export interface Metabolism -{ +export interface Metabolism { HydrationRecoveryRate: number; EnergyRecoveryRate: number; IncreasePositiveEffectDurationRate: number; DecreaseNegativeEffectDurationRate: number; DecreasePoisonDurationRate: number; } -export interface Immunity -{ +export interface Immunity { ImmunityMiscEffects: number; ImmunityPoisonBuff: number; ImmunityPainKiller: number; HealthNegativeEffect: number; StimulatorNegativeBuff: number; } -export interface Endurance -{ +export interface Endurance { MovementAction: number; SprintAction: number; GainPerFatigueStack: number; } -export interface Strength -{ +export interface Strength { SprintActionMin: number; SprintActionMax: number; MovementActionMin: number; @@ -1011,66 +917,54 @@ export interface Strength FistfightAction: number; ThrowAction: number; } -export interface Vitality -{ +export interface Vitality { DamageTakenAction: number; HealthNegativeEffect: number; } -export interface Health2 -{ +export interface Health2 { SkillProgress: number; } -export interface StressResistance -{ +export interface StressResistance { HealthNegativeEffect: number; LowHPDuration: number; } -export interface Throwing -{ +export interface Throwing { ThrowAction: number; } -export interface RecoilControl -{ +export interface RecoilControl { RecoilAction: number; RecoilBonusPerLevel: number; } -export interface WeaponSkills -{ +export interface WeaponSkills { WeaponReloadAction: number; WeaponShotAction: number; WeaponFixAction: number; WeaponChamberAction: number; } -export interface CovertMovement -{ +export interface CovertMovement { MovementAction: number; } -export interface Search -{ +export interface Search { SearchAction: number; FindAction: number; } -export interface WeaponTreatment -{ +export interface WeaponTreatment { DurLossReducePerLevel: number; SkillPointsPerRepair: number; Filter: any[]; WearAmountRepairGunsReducePerLevel: number; WearChanceRepairGunsReduceEliteLevel: number; } -export interface MagDrills -{ +export interface MagDrills { RaidLoadedAmmoAction: number; RaidUnloadedAmmoAction: number; MagazineCheckAction: number; } -export interface Perception -{ +export interface Perception { OnlineAction: number; UniqueLoot: number; } -export interface Intellect -{ +export interface Intellect { ExamineAction: number; SkillProgress: number; RepairAction: number; @@ -1078,42 +972,35 @@ export interface Intellect WearChanceReduceEliteLevel: number; RepairPointsCostReduction: number; } -export interface Attention -{ +export interface Attention { ExamineWithInstruction: number; FindActionFalse: number; FindActionTrue: number; } -export interface Charisma -{ +export interface Charisma { SkillProgressInt: number; SkillProgressAtn: number; SkillProgressPer: number; } -export interface Memory -{ +export interface Memory { AnySkillUp: number; SkillProgress: number; } -export interface Surgery -{ +export interface Surgery { SurgeryAction: number; SkillProgress: number; } -export interface AimDrills -{ +export interface AimDrills { WeaponShotAction: number; } -export interface TroubleShooting -{ +export interface TroubleShooting { MalfRepairSpeedBonusPerLevel: number; SkillPointsPerMalfFix: number; EliteDurabilityChanceReduceMult: number; EliteAmmoChanceReduceMult: number; EliteMagChanceReduceMult: number; } -export interface Aiming -{ +export interface Aiming { ProceduralIntensityByPose: xyz; AimProceduralIntensity: number; HeavyWeight: number; @@ -1134,8 +1021,7 @@ export interface Aiming RecoilVertBonus: number; RecoilBackBonus: number; } -export interface Malfunction -{ +export interface Malfunction { AmmoMalfChanceMult: number; MagazineMalfChanceMult: number; MalfRepairHardSlideMult: number; @@ -1162,8 +1048,7 @@ export interface Malfunction OverheatHardSlideMinWt: number; OverheatHardSlideMaxWt: number; } -export interface Overheat -{ +export interface Overheat { MinOverheat: number; MaxOverheat: number; OverheatProblemsStart: number; @@ -1193,14 +1078,12 @@ export interface Overheat AutoshotPossibilityDuration: number; MaxOverheatCoolCoef: number; } -export interface FenceSettings -{ +export interface FenceSettings { FenceId: string; Levels: Record; paidExitStandingNumerator: number; } -export interface FenceLevel -{ +export interface FenceLevel { SavageCooldownModifier: number; ScavCaseTimeModifier: number; PaidExitCostModifier: number; @@ -1213,8 +1096,7 @@ export interface FenceLevel ExfiltrationPriceModifier: number; AvailableExits: number; } -export interface Inertia -{ +export interface Inertia { InertiaLimits: xyz; InertiaLimitsStep: number; ExitMovementStateSpeedThreshold: xyz; @@ -1251,24 +1133,20 @@ export interface Inertia MinMovementAccelerationRangeRight: xyz; MaxMovementAccelerationRangeRight: xyz; } -export interface xyz -{ +export interface xyz { x: number; y: number; z: number; } -export interface Ballistic -{ +export interface Ballistic { GlobalDamageDegradationCoefficient: number; } -export interface RepairKitSettings -{ +export interface RepairKitSettings { armorClassDivisor: number; durabilityPointCostArmor: number; durabilityPointCostGuns: number; } -export interface BotPreset -{ +export interface BotPreset { UseThis: boolean; Role: string; BotDifficulty: string; @@ -1281,15 +1159,13 @@ export interface BotPreset FIRST_CONTACT_ADD_SEC: number; COEF_IF_MOVE: number; } -export interface BotWeaponScattering -{ +export interface BotWeaponScattering { Name: string; PriorityScatter1meter: number; PriorityScatter10meter: number; PriorityScatter100meter: number; } -export interface Preset -{ +export interface Preset { _id: string; _type: string; _changeWeaponName: boolean; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/ILocation.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/ILocation.d.ts index 7046e43..42fac06 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/ILocation.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/ILocation.d.ts @@ -1,7 +1,6 @@ import { ILocationBase } from "./ILocationBase"; import { ILooseLoot } from "./ILooseLoot"; -export interface ILocation -{ +export interface ILocation { base: ILocationBase; looseLoot: ILooseLoot; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/ILocationBase.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/ILocationBase.d.ts index 671552d..ad48d32 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/ILocationBase.d.ts @@ -1,5 +1,4 @@ -export interface ILocationBase -{ +export interface ILocationBase { AccessKeys: string[]; AirdropParameters: AirdropParameter[]; Area: number; @@ -73,14 +72,12 @@ export interface ILocationBase users_summon_seconds: number; waves: Wave[]; } -export interface ILimit -{ +export interface ILimit { min: number; max: number; items: any[]; } -export interface AirdropParameter -{ +export interface AirdropParameter { AirdropPointDeactivateDistance: number; MinPlayersCountToSpawnAirdrop: number; PlaneAirdropChance: number; @@ -92,18 +89,15 @@ export interface AirdropParameter PlaneAirdropStartMin: number; UnsuccessfulTryPenalty: number; } -export interface Banner -{ +export interface Banner { id: string; pic: Pic; } -export interface Pic -{ +export interface Pic { path: string; rcid: string; } -export interface BossLocationSpawn -{ +export interface BossLocationSpawn { BossChance: number; BossDifficult: string; BossEscortAmount: string; @@ -113,9 +107,17 @@ export interface BossLocationSpawn BossPlayer: boolean; BossZone: string; Time: number; + TriggerId: string; + TriggerName: string; + Delay?: number; + Supports?: BossSupport[]; } -export interface BotLocationModifier -{ +export interface BossSupport { + BossEscortAmount: string; + BossEscortDifficult: string[]; + BossEscortType: string; +} +export interface BotLocationModifier { AccuracySpeed: number; DistToActivate: number; DistToPersueAxemanCoef: number; @@ -127,24 +129,20 @@ export interface BotLocationModifier Scattering: number; VisibleDistance: number; } -export interface MinMaxBot -{ +export interface MinMaxBot { WildSpawnType: string; max: number; min: number; } -export interface Preview -{ +export interface Preview { path: string; rcid: string; } -export interface Scene -{ +export interface Scene { path: string; rcid: string; } -export interface SpawnPointParam -{ +export interface SpawnPointParam { BotZoneName: string; Categories: string[]; ColliderParams: ColliderParams; @@ -155,24 +153,20 @@ export interface SpawnPointParam Rotation: number; Sides: string[]; } -export interface ColliderParams -{ +export interface ColliderParams { _parent: string; _props: Props; } -export interface Props -{ +export interface Props { Center: xyz; Radius: number; } -export interface xyz -{ +export interface xyz { x: number; y: number; z: number; } -export interface Exit -{ +export interface Exit { Chance: number; Count: number; EntryPoints: string; @@ -186,13 +180,11 @@ export interface Exit PlayersCount: number; RequirementTip: string; } -export interface MaxItemCountInLocation -{ +export interface MaxItemCountInLocation { TemplateId: string; Value: number; } -export interface Wave -{ +export interface Wave { BotPreset: string; BotSide: string; SpawnPoints: string; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/ILocationsSourceDestinationBase.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/ILocationsSourceDestinationBase.d.ts index ca66c09..7f8d915 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/ILocationsSourceDestinationBase.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/ILocationsSourceDestinationBase.d.ts @@ -1,11 +1,9 @@ import { ILocations } from "../../spt/server/ILocations"; -export interface ILocationsGenerateAllResponse -{ +export interface ILocationsGenerateAllResponse { locations: ILocations; paths: Path[]; } -export interface Path -{ +export interface Path { Source: string; Destination: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/ILooseLoot.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/ILooseLoot.d.ts index eead19c..14b795e 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/ILooseLoot.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/ILooseLoot.d.ts @@ -1,22 +1,18 @@ -export interface ILooseLoot -{ +export interface ILooseLoot { spawnpointCount: SpawnpointCount; spawnpointsForced: SpawnpointsForced[]; spawnpoints: Spawnpoint[]; } -export interface SpawnpointCount -{ +export interface SpawnpointCount { mean: number; std: number; } -export interface SpawnpointsForced -{ +export interface SpawnpointsForced { locationId: string; probability: number; template: SpawnpointTemplate; } -export interface SpawnpointTemplate -{ +export interface SpawnpointTemplate { Id: string; IsStatic: boolean; useGravity: boolean; @@ -28,26 +24,22 @@ export interface SpawnpointTemplate Root: any; Items: Item[]; } -export interface Item -{ +export interface Item { _id: string; _tpl?: string; } -export interface Spawnpoint -{ +export interface Spawnpoint { locationId: string; probability: number; template: SpawnpointTemplate; itemDistribution: ItemDistribution[]; } -export interface Xyz -{ +export interface Xyz { x: number; y: number; z: number; } -export interface ItemDistribution -{ +export interface ItemDistribution { tpl: string; relativeProbability: number; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/IMetricsTableData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/IMetricsTableData.d.ts index 0df5051..873ef82 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/IMetricsTableData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/IMetricsTableData.d.ts @@ -1,5 +1,4 @@ -export interface IMetricsTableData -{ +export interface IMetricsTableData { Keys: number[]; NetProcessingBins: number[]; RenderBins: number[]; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/IPmcData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/IPmcData.d.ts index b8883ba..2360147 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/IPmcData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/IPmcData.d.ts @@ -3,8 +3,7 @@ import { IPmcDataRepeatableQuest } from "./tables/IRepeatableQuests"; import { Item, Upd } from "./tables/IItem"; import { HideoutAreasEnum } from "../hideout/HideoutAreasEnum"; import { MemberCategory } from "./MemberCategory"; -export interface IPmcData -{ +export interface IPmcData { _id: string; aid: string; savage: string; @@ -29,16 +28,14 @@ export interface IPmcData CarExtractCounts: CarExtractCounts; SurvivorClass: SurvivorClass; } -export declare enum SurvivorClass - { +export declare enum SurvivorClass { Unknown = 0, Neutralizer = 1, Marauder = 2, Paramedic = 3, Survivor = 4 } -export interface Info -{ +export interface Info { EntryPoint: string; Nickname: string; LowerNickname: string; @@ -60,21 +57,18 @@ export interface Info BannedState: boolean; BannedUntil: number; } -export interface Settings -{ +export interface Settings { Role: string; BotDifficulty: string; Experience: number; StandingForKill: number; AggressorBonus: number; } -export interface IBan -{ +export interface IBan { type: BanType; dateTime: number; } -export declare enum BanType - { +export declare enum BanType { Chat = 0, RagFair = 1, Voip = 2, @@ -83,32 +77,27 @@ export declare enum BanType Friends = 5, ChangeNickname = 6 } -export interface Notes -{ +export interface Notes { Notes: Note[]; } -export interface Note -{ +export interface Note { Time: number; Text: string; } -export interface Customization -{ +export interface Customization { Head: string; Body: string; Feet: string; Hands: string; } -export interface Health -{ +export interface Health { Hydration: CurrentMax; Energy: CurrentMax; Temperature: CurrentMax; BodyParts: BodyPartsHealth; UpdateTime: number; } -export interface BodyPartsHealth -{ +export interface BodyPartsHealth { Head: BodyPartHealth; Chest: BodyPartHealth; Stomach: BodyPartHealth; @@ -117,18 +106,15 @@ export interface BodyPartsHealth LeftLeg: BodyPartHealth; RightLeg: BodyPartHealth; } -export interface BodyPartHealth -{ +export interface BodyPartHealth { Health: CurrentMax; Effects?: Record; } -export interface CurrentMax -{ +export interface CurrentMax { Current: number; Maximum: number; } -export interface Inventory -{ +export interface Inventory { items: Item[]; equipment: string; stash: string; @@ -137,30 +123,25 @@ export interface Inventory questStashItems: string; fastPanel: FastPanel; } -export interface FastPanel -{ +export interface FastPanel { } -export interface Skills -{ +export interface Skills { Common: Common[]; Mastering: Mastering[]; Bonuses?: any[]; Points: number; } -export interface Common -{ +export interface Common { Id: string; Progress: number; PointsEarnedDuringSession: number; LastAccess: number; } -export interface Mastering -{ +export interface Mastering { Id: string; Progress: number; } -export interface Stats -{ +export interface Stats { CarriedQuestItems: string[]; Victims: Victim[]; TotalSessionExperience: number; @@ -178,19 +159,16 @@ export interface Stats TotalInGameTime: number; SurvivorClass?: string; } -export interface IDroppedItem -{ +export interface IDroppedItem { QuestId: string; ItemId: string; ZoneId: string; } -export interface FoundInRaidItem -{ +export interface FoundInRaidItem { QuestId: string; ItemId: string; } -export interface Victim -{ +export interface Victim { AccountId: string; ProfileId: string; Name: string; @@ -202,21 +180,17 @@ export interface Victim Weapon: string; Role: string; } -export interface SessionCounters -{ +export interface SessionCounters { Items: CounterKeyValue[]; } -export interface OverallCounters -{ +export interface OverallCounters { Items: CounterKeyValue[]; } -export interface CounterKeyValue -{ +export interface CounterKeyValue { Key: string[]; Value: number; } -export interface Aggressor -{ +export interface Aggressor { AccountId: string; ProfileId: string; MainProfileNickname: string; @@ -227,14 +201,12 @@ export interface Aggressor WeaponName: string; Category: string; } -export interface DamageHistory -{ +export interface DamageHistory { LethalDamagePart: string; LethalDamage: LethalDamage; BodyParts: BodyPartsDamageHistory; } -export interface LethalDamage -{ +export interface LethalDamage { Amount: number; Type: string; SourceId: string; @@ -242,8 +214,7 @@ export interface LethalDamage Blunt: boolean; ImpactsCount: number; } -export interface BodyPartsDamageHistory -{ +export interface BodyPartsDamageHistory { Head: DamageStats[]; Chest: DamageStats[]; Stomach: DamageStats[]; @@ -253,8 +224,7 @@ export interface BodyPartsDamageHistory RightLeg: DamageStats[]; Common: DamageStats[]; } -export interface DamageStats -{ +export interface DamageStats { Amount: number; Type: string; SourceId: string; @@ -262,76 +232,63 @@ export interface DamageStats Blunt: boolean; ImpactsCount: number; } -export interface DeathCause -{ +export interface DeathCause { DamageType: string; Side: string; Role: string; WeaponId: string; } -export interface LastPlayerState -{ +export interface LastPlayerState { Info: LastPlayerStateInfo; Customization: Record; Equipment: any; } -export interface LastPlayerStateInfo -{ +export interface LastPlayerStateInfo { Nickname: string; Side: string; Level: number; MemberCategory: string; } -export interface ConditionCounters -{ +export interface ConditionCounters { Counters: Counter[]; } -export interface Counter -{ +export interface Counter { id: string; value: number; qid: string; } -export interface BackendCounter -{ +export interface BackendCounter { id: string; qid?: string; value: number; } -export interface InsuredItem -{ +export interface InsuredItem { tid: string; itemId: string; } -export interface Hideout -{ +export interface Hideout { Production: Record; Areas: HideoutArea[]; } -export interface Productive -{ +export interface Productive { Products: Product[]; Progress?: number; inProgress?: boolean; StartTimestamp?: number; } -export interface Product -{ +export interface Product { _id: string; _tpl: string; upd?: Upd; } -export interface ScavCase extends Productive -{ +export interface ScavCase extends Productive { } -export interface Production extends Productive -{ +export interface Production extends Productive { RecipeId: string; SkipTime: number; ProductionTime: number; } -export interface HideoutArea -{ +export interface HideoutArea { type: HideoutAreasEnum; level: number; active: boolean; @@ -341,18 +298,15 @@ export interface HideoutArea slots: HideoutSlot[]; lastRecipe: string; } -export interface HideoutSlot -{ +export interface HideoutSlot { item: HideoutItem[]; } -export interface HideoutItem -{ +export interface HideoutItem { _id: string; _tpl: string; upd?: Upd; } -export interface Bonus -{ +export interface Bonus { type: string; templateId?: string; passive?: boolean; @@ -361,32 +315,27 @@ export interface Bonus value?: number; icon?: string; } -export interface Quest -{ +export interface Quest { qid: string; startTime: number; status: string; statusTimers?: StatusTimer; completedConditions?: string[]; } -export interface StatusTimer -{ +export interface StatusTimer { AvailableForStart?: number; } -export interface TraderInfo -{ +export interface TraderInfo { loyaltyLevel: number; salesSum: number; standing: number; nextResupply: number; unlocked: boolean; } -export interface RagfairInfo -{ +export interface RagfairInfo { rating: number; isRatingGrowing: boolean; offers: IRagfairOffer[]; } -export interface CarExtractCounts -{ +export interface CarExtractCounts { } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/MemberCategory.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/MemberCategory.d.ts index 039c961..3bd9a21 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/MemberCategory.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/MemberCategory.d.ts @@ -1,5 +1,4 @@ -export declare enum MemberCategory - { +export declare enum MemberCategory { Default = 0, Developer = 1, UniqueId = 2, diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/request/IBaseInteractionRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/request/IBaseInteractionRequestData.d.ts index 2d69db5..7303275 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/request/IBaseInteractionRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/request/IBaseInteractionRequestData.d.ts @@ -1,11 +1,9 @@ -export interface IBaseInteractionRequestData -{ +export interface IBaseInteractionRequestData { Action: string; fromOwner?: OwnerInfo; toOwner?: OwnerInfo; } -export interface OwnerInfo -{ +export interface OwnerInfo { id: string; type: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IBotBase.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IBotBase.d.ts index 1cfd64a..677fd49 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IBotBase.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IBotBase.d.ts @@ -1,7 +1,6 @@ import { BackendCounter, Bonus } from "../IPmcData"; import { Item } from "./IItem"; -export interface IBotBase -{ +export interface IBotBase { _id: string; aid: string; savage: any; @@ -18,8 +17,7 @@ export interface IBotBase Hideout: Hideout; Bonuses: Bonus[]; } -export interface Info -{ +export interface Info { Nickname: string; LowerNickname: string; Side: string; @@ -41,26 +39,22 @@ export interface Info BannedUntil: number; IsStreamerModeAvailable: boolean; } -export interface Settings -{ +export interface Settings { Role: string; BotDifficulty: string; Experience: number; StandingForKill: number; AggressorBonus: number; } -export interface Customization -{ +export interface Customization { Head: string; Body: string; Feet: string; Hands: string; } -export interface Health -{ +export interface Health { } -export interface Inventory -{ +export interface Inventory { items: Item[]; equipment: string; stash: string; @@ -69,42 +63,33 @@ export interface Inventory questStashItems: string; fastPanel: FastPanel; } -export interface FastPanel -{ +export interface FastPanel { } -export interface Skills -{ +export interface Skills { Common: any[]; Mastering: any[]; Points: number; } -export interface Stats -{ +export interface Stats { SessionCounters: SessionCounters; OverallCounters: OverallCounters; } -export interface SessionCounters -{ +export interface SessionCounters { Items: any[]; } -export interface OverallCounters -{ +export interface OverallCounters { Items: any[]; } -export interface ConditionCounters -{ +export interface ConditionCounters { Counters: any[]; } -export interface Hideout -{ +export interface Hideout { Production: Production; Areas: Area[]; } -export interface Production -{ +export interface Production { } -export interface Area -{ +export interface Area { type: number; level: number; active: boolean; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IBotCore.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IBotCore.d.ts index ddc946b..16a782d 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IBotCore.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IBotCore.d.ts @@ -1,5 +1,4 @@ -export interface IBotCore -{ +export interface IBotCore { SAVAGE_KILL_DIST: number; SOUND_DOOR_BREACH_METERS: number; SOUND_DOOR_OPEN_METERS: number; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IBotType.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IBotType.d.ts index 2a9197d..01be0be 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IBotType.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IBotType.d.ts @@ -1,5 +1,4 @@ -export interface IBotType -{ +export interface IBotType { appearance: Appearance; chances: Chances; difficulty: Difficulties; @@ -11,21 +10,18 @@ export interface IBotType lastName: string[]; skills: Skills; } -export interface Appearance -{ +export interface Appearance { body: string[]; feet: string[]; hands: string[]; head: string[]; voice: string[]; } -export interface Chances -{ +export interface Chances { equipment: EquipmentChances; mods: ModsChances; } -export interface EquipmentChances -{ +export interface EquipmentChances { ArmBand: number; ArmorVest: number; Backpack: number; @@ -41,8 +37,7 @@ export interface EquipmentChances SecuredContainer: number; TacticalVest: number; } -export interface ModsChances -{ +export interface ModsChances { mod_charge: number; mod_equipment: number; mod_equipment_000: number; @@ -71,15 +66,13 @@ export interface ModsChances mod_tactical_002: number; mod_tactical_003: number; } -export interface Difficulties -{ +export interface Difficulties { easy: Difficulty; normal: Difficulty; hard: Difficulty; impossible: Difficulty; } -export interface Difficulty -{ +export interface Difficulty { Aiming: Record; Boss: Record; Change: Record; @@ -95,34 +88,31 @@ export interface Difficulty Scattering: Record; Shoot: Record; } -export interface Experience -{ +export interface Experience { aggressorBonus: number; level: MinMax; reward: MinMax; standingForKill: number; } -export interface Generation -{ +export interface Generation { items: ItemMinMax; } -export interface ItemMinMax -{ +export interface ItemMinMax { grenades: MinMax; healing: MinMax; + drugs: MinMax; + stims: MinMax; looseLoot: MinMax; magazines: MinMax; specialItems: MinMax; } -export interface Health -{ +export interface Health { BodyParts: BodyPart[]; Energy: MinMax; Hydration: MinMax; Temperature: MinMax; } -export interface BodyPart -{ +export interface BodyPart { Chest: MinMax; Head: MinMax; LeftArm: MinMax; @@ -131,19 +121,16 @@ export interface BodyPart RightLeg: MinMax; Stomach: MinMax; } -export interface MinMax -{ +export interface MinMax { max: number; min: number; } -export interface Inventory -{ +export interface Inventory { equipment: Equipment; items: Items; mods: Mods; } -export interface Equipment -{ +export interface Equipment { ArmBand: Record; ArmorVest: Record; Backpack: Record; @@ -159,8 +146,7 @@ export interface Equipment SecuredContainer: Record; TacticalVest: Record; } -export interface Items -{ +export interface Items { Backpack: string[]; Pockets: string[]; SecuredContainer: string[]; @@ -168,22 +154,19 @@ export interface Items TacticalVest: string[]; } export declare type Mods = Record>; -export interface Skills -{ +export interface Skills { Common: Common[]; Bonuses?: any; Mastering: Mastering[]; Points: number; } -export interface Mastering -{ +export interface Mastering { Id: string; Progress: number; max?: number; min?: number; } -export interface Common -{ +export interface Common { Id: string; Progress: number; PointsEarnedDuringSession?: number; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ICustomizationItem.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ICustomizationItem.d.ts index fb8ee64..8bfeece 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ICustomizationItem.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ICustomizationItem.d.ts @@ -1,5 +1,4 @@ -export interface ICustomizationItem -{ +export interface ICustomizationItem { _id: string; _name: string; _parent: string; @@ -7,8 +6,7 @@ export interface ICustomizationItem _props: Props; _proto: string; } -export interface Props -{ +export interface Props { Name: string; ShortName: string; Description: string; @@ -24,13 +22,11 @@ export interface Props WatchPosition: Xyz; WatchRotation: Xyz; } -export interface Prefab -{ +export interface Prefab { path: string; rcid: string; } -export interface Xyz -{ +export interface Xyz { x: number; y: number; z: number; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IHandbookBase.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IHandbookBase.d.ts index 9935ebe..7d7db07 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IHandbookBase.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IHandbookBase.d.ts @@ -1,18 +1,15 @@ -export interface IHandbookBase -{ +export interface IHandbookBase { Categories: Category[]; Items: HandbookItem[]; } -export interface Category -{ +export interface Category { Id: string; ParentId?: string; Icon: string; Color: string; Order: string; } -export interface HandbookItem -{ +export interface HandbookItem { Id: string; ParentId: string; Price: number; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IItem.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IItem.d.ts index 853909b..2dd2c03 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IItem.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IItem.d.ts @@ -1,5 +1,4 @@ -export interface Item -{ +export interface Item { _id: string; _tpl: string; parentId?: string; @@ -7,8 +6,7 @@ export interface Item location?: Location | number; upd?: Upd; } -export interface Upd -{ +export interface Upd { OriginalStackObjectsCount?: number; Togglable?: Togglable; Map?: Map; @@ -33,71 +31,56 @@ export interface Upd SideEffect?: SideEffect; RepairKit?: RepairKit; } -export interface Togglable -{ +export interface Togglable { On: boolean; } -export interface Map -{ +export interface Map { Markers: MapMarker[]; } -export interface MapMarker -{ +export interface MapMarker { X: number; Y: number; } -export interface Tag -{ +export interface Tag { Color: number; Name: string; } -export interface FaceShield -{ +export interface FaceShield { Hits: number; } -export interface Repairable -{ +export interface Repairable { Durability: number; MaxDurability: number; } -export interface MedKit -{ +export interface MedKit { HpResource: number; } -export interface Sight -{ +export interface Sight { ScopesCurrentCalibPointIndexes: number[]; ScopesSelectedModes: number[]; SelectedScope: number; } -export interface Foldable -{ +export interface Foldable { Folded: boolean; } -export interface FireMode -{ +export interface FireMode { FireMode: string; } -export interface FoodDrink -{ +export interface FoodDrink { HpPercent: number; } -export interface Key -{ +export interface Key { NumberOfUsages: number; } -export interface Resource -{ +export interface Resource { Value: number; UnitsConsumed: number; } -export interface Light -{ +export interface Light { IsActive: boolean; SelectedMode: number; } -export interface Dogtag -{ +export interface Dogtag { AccountId: string; ProfileId: string; Nickname: string; @@ -110,19 +93,16 @@ export interface Dogtag KillerName: string; WeaponName: string; } -export interface Location -{ +export interface Location { x: number; y: number; r: string | number; isSearched?: boolean; rotation?: string; } -export interface SideEffect -{ +export interface SideEffect { Value: number; } -export interface RepairKit -{ +export interface RepairKit { Resource: number; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ILocationsBase.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ILocationsBase.d.ts index 672dce7..2c96af3 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ILocationsBase.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ILocationsBase.d.ts @@ -1,13 +1,10 @@ -export interface ILocationsBase -{ +export interface ILocationsBase { locations: Locations; paths: Path[]; } -export interface Locations -{ +export interface Locations { } -export interface Path -{ +export interface Path { Source: string; Destination: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ILootBase.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ILootBase.d.ts index bdc0c1f..e4baac5 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ILootBase.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ILootBase.d.ts @@ -1,23 +1,19 @@ import { Item } from "./IItem"; -export interface ILootBase -{ +export interface ILootBase { staticAmmo: Record; staticContainers: Record; staticLoot: Record; } -export interface IStaticAmmoDetails -{ +export interface IStaticAmmoDetails { tpl: string; relativeProbability: number; } -export interface IStaticContainerDetails -{ +export interface IStaticContainerDetails { staticWeapons: IStaticWeaponProps[]; staticContainers: IStaticContainerProps[]; staticForced: IStaticForcedProps[]; } -export interface IStaticWeaponProps -{ +export interface IStaticWeaponProps { Id: string; IsStatic: boolean; useGravity: boolean; @@ -29,8 +25,7 @@ export interface IStaticWeaponProps Root: string; Items: Item[]; } -export interface IStaticContainerProps -{ +export interface IStaticContainerProps { Id: string; IsStatic: boolean; useGravity: boolean; @@ -42,34 +37,28 @@ export interface IStaticContainerProps Root: any; Items: StaticItem[]; } -export interface Xyz -{ +export interface Xyz { x: number; y: number; z: number; } -export interface StaticItem -{ +export interface StaticItem { _id: any; _tpl: string; } -export interface IStaticForcedProps -{ +export interface IStaticForcedProps { containerId: string; itemTpl: string; } -export interface IStaticLootDetails -{ +export interface IStaticLootDetails { itemcountDistribution: ItemCountDistribution[]; itemDistribution: ItemDistribution[]; } -export interface ItemCountDistribution -{ +export interface ItemCountDistribution { count: number; relativeProbability: number; } -export interface ItemDistribution -{ +export interface ItemDistribution { tpl: string; relativeProbability: number; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IQuest.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IQuest.d.ts index a035b5c..0aa7a4e 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IQuest.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IQuest.d.ts @@ -1,6 +1,5 @@ import { Item } from "./IItem"; -export interface IQuest -{ +export interface IQuest { QuestName: string; _id: string; canShowNotificationsInGame: boolean; @@ -25,22 +24,19 @@ export interface IQuest KeyQuest: boolean; changeQuestMessageText: string; } -export interface Conditions -{ +export interface Conditions { Started: AvailableForConditions[]; AvailableForFinish: AvailableForConditions[]; AvailableForStart: AvailableForConditions[]; Success: AvailableForConditions[]; Fail: AvailableForConditions[]; } -export interface AvailableForConditions -{ +export interface AvailableForConditions { _parent: string; _props: AvailableForProps; dynamicLocale: boolean; } -export interface AvailableForProps -{ +export interface AvailableForProps { id: string; index: number; parentId: string; @@ -48,18 +44,16 @@ export interface AvailableForProps value?: number; compareMethod?: string; visibilityConditions?: VisibilityCondition[]; - target?: string; + target?: string | string[]; status?: number[]; } -export interface VisibilityCondition -{ +export interface VisibilityCondition { id: string; value: number; dynamicLocale: boolean; oneSessionOnly: boolean; } -export interface Rewards -{ +export interface Rewards { AvailableForStart: Reward[]; AvailableForFinish: Reward[]; Started: Reward[]; @@ -68,8 +62,7 @@ export interface Rewards FailRestartable: Reward[]; Expired: Reward[]; } -export interface Reward -{ +export interface Reward { value?: string; id: string; type: string; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IRepeatableQuests.d.ts index e8e9cff..e23ec73 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IRepeatableQuests.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IRepeatableQuests.d.ts @@ -1,27 +1,23 @@ import { Item } from "./IItem"; -export interface IReward -{ +export interface IReward { index: number; type: string; value: number; target?: string; items?: Item[]; } -export interface IRepeatableQuestDatabase -{ +export interface IRepeatableQuestDatabase { templates: ITemplates; rewards: IRewardOptions; data: IOptions; samples: ISampleQuests[]; } -export interface ITemplates -{ +export interface ITemplates { Elimination: IRepeatableQuest; Completion: IRepeatableQuest; Exploration: IRepeatableQuest; } -export interface IPmcDataRepeatableQuest -{ +export interface IPmcDataRepeatableQuest { id?: string; name: string; activeQuests: IRepeatableQuest[]; @@ -30,18 +26,15 @@ export interface IPmcDataRepeatableQuest changeRequirement: TChangeRequirementRecord; } export declare type TChangeRequirementRecord = Record; -export interface IChangeRequirement -{ +export interface IChangeRequirement { changeCost: IChangeCost[]; changeStandingCost: number; } -export interface IChangeCost -{ +export interface IChangeCost { templateId: string; count: number; } -export interface IRepeatableQuest -{ +export interface IRepeatableQuest { _id: any; traderId: string; location: any; @@ -65,26 +58,22 @@ export interface IRepeatableQuest changeCost: IChangeCost[]; changeStandingCost: number; } -export interface IRewards -{ +export interface IRewards { Started: IReward[]; Success: IReward[]; Fail: IReward[]; } -export interface IConditions -{ +export interface IConditions { AvailableForStart: any[]; AvailableForFinish: IAvailableFor[]; Fail: any[]; } -export interface IAvailableFor -{ +export interface IAvailableFor { _props: IAvailableForProps; _parent: string; dynamicLocale: boolean; } -export interface IAvailableForProps -{ +export interface IAvailableForProps { id: string; parentId: string; dynamicLocale: boolean; @@ -92,154 +81,122 @@ export interface IAvailableForProps visibilityConditions: IVisibilityCondition[]; value: number; } -export interface IVisibilityCondition -{ +export interface IVisibilityCondition { id: string; oneSessionOnly: boolean; value: number; index: number; dynamicLocale: boolean; } -export interface IAvailableForPropsCounter extends IAvailableForProps -{ +export interface IAvailableForPropsCounter extends IAvailableForProps { type: string; oneSessionOnly: boolean; doNotResetIfCounterCompleted: boolean; counter: ICounter; } -export interface ICounter -{ +export interface ICounter { id: string; conditions: ICondition[]; } -export interface ICondition -{ +export interface ICondition { _props: IConditionProps; _parent: string; } -export interface IConditionProps -{ +export interface IConditionProps { id: string; dynamicLocale: boolean; } -export interface IElimination extends IRepeatableQuest -{ +export interface IElimination extends IRepeatableQuest { conditions: IEliminationConditions; } -export interface IEliminationConditions extends IConditions -{ +export interface IEliminationConditions extends IConditions { AvailableForFinish: IEliminationAvailableFor[]; } -export interface IEliminationAvailableFor extends IAvailableFor -{ +export interface IEliminationAvailableFor extends IAvailableFor { _props: IEliminationAvailableForProps; } -export interface IEliminationAvailableForProps extends IAvailableForPropsCounter -{ +export interface IEliminationAvailableForProps extends IAvailableForPropsCounter { counter: IEliminationCounter; } -export interface IEliminationCounter extends ICounter -{ +export interface IEliminationCounter extends ICounter { conditions: IEliminationCondition[]; } -export interface IEliminationCondition extends ICondition -{ +export interface IEliminationCondition extends ICondition { _props: ILocationConditionProps | IKillConditionProps; } -export interface IExploration extends IRepeatableQuest -{ +export interface IExploration extends IRepeatableQuest { conditions: IExplorationConditions; } -export interface IExplorationConditions extends IConditions -{ +export interface IExplorationConditions extends IConditions { AvailableForFinish: IExplorationAvailableFor[]; } -export interface IExplorationAvailableFor extends IAvailableFor -{ +export interface IExplorationAvailableFor extends IAvailableFor { _props: IExplorationAvailableForProps; } -export interface IExplorationAvailableForProps extends IAvailableForPropsCounter -{ +export interface IExplorationAvailableForProps extends IAvailableForPropsCounter { counter: IExplorationCounter; } -export interface IExplorationCounter extends ICounter -{ +export interface IExplorationCounter extends ICounter { conditions: IExplorationCondition[]; } -export interface IExplorationCondition extends ICondition -{ +export interface IExplorationCondition extends ICondition { _props: ILocationConditionProps | IExitStatusConditionProps | IExitNameConditionProps; } -export interface ICompletion extends IRepeatableQuest -{ +export interface ICompletion extends IRepeatableQuest { conditions: ICompletionConditions; } -export interface ICompletionConditions extends IConditions -{ +export interface ICompletionConditions extends IConditions { AvailableForFinish: ICompletionAvailableFor[]; } -export interface ICompletionAvailableFor extends IAvailableFor -{ +export interface ICompletionAvailableFor extends IAvailableFor { _props: ICompletionAvailableForProps; } -export interface ICompletionAvailableForProps extends IAvailableForProps -{ +export interface ICompletionAvailableForProps extends IAvailableForProps { target: string[]; minDurability: number; maxDurability: number; dogtagLevel: number; onlyFoundInRaid: boolean; } -export interface ILocationConditionProps extends IConditionProps -{ +export interface ILocationConditionProps extends IConditionProps { target: string[]; } -export interface IKillConditionProps extends IConditionProps -{ +export interface IKillConditionProps extends IConditionProps { target: string; value: number; savageRole?: string[]; bodyPart?: string[]; distance?: IDistanceCheck; } -export interface IDistanceCheck -{ +export interface IDistanceCheck { compareMethod: string; value: number; } -export interface IExitStatusConditionProps extends IConditionProps -{ +export interface IExitStatusConditionProps extends IConditionProps { status: string[]; } -export interface IExitNameConditionProps extends IConditionProps -{ +export interface IExitNameConditionProps extends IConditionProps { exitName: string; } -export interface IRewardOptions -{ +export interface IRewardOptions { itemsBlacklist: string[]; } -export interface IOptions -{ +export interface IOptions { Completion: ICompletionFilter; } -export interface ICompletionFilter -{ +export interface ICompletionFilter { itemsBlacklist: ItemsBlacklist[]; itemsWhitelist: ItemsWhitelist[]; } -export interface ItemsBlacklist -{ +export interface ItemsBlacklist { minPlayerLevel: number; itemIds: string[]; } -export interface ItemsWhitelist -{ +export interface ItemsWhitelist { minPlayerLevel: number; itemIds: string[]; } -export interface ISampleQuests -{ +export interface ISampleQuests { _id: string; traderId: string; location: string; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ITemplateItem.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ITemplateItem.d.ts index b4afcd0..c2ba762 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ITemplateItem.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ITemplateItem.d.ts @@ -1,5 +1,4 @@ -export interface ITemplateItem -{ +export interface ITemplateItem { _id: string; _name: string; _parent: string; @@ -7,8 +6,7 @@ export interface ITemplateItem _props: Props; _proto: string; } -export interface Props -{ +export interface Props { Name: string; ShortName: string; Description: string; @@ -288,21 +286,18 @@ export interface Props apResource: number; krResource: number; } -export interface Prefab -{ +export interface Prefab { path: string; rcid: string; } -export interface Grid -{ +export interface Grid { _name: string; _id: string; _parent: string; _props: GridProps; _proto: string; } -export interface GridProps -{ +export interface GridProps { filters: GridFilter[]; cellsH: number; cellsV: number; @@ -311,13 +306,11 @@ export interface GridProps maxWeight: number; isSortingTable: boolean; } -export interface GridFilter -{ +export interface GridFilter { Filter: string[]; ExcludedFilter: string[]; } -export interface Slot -{ +export interface Slot { _name: string; _id: string; _parent: string; @@ -326,12 +319,10 @@ export interface Slot _mergeSlotWithChildren: boolean; _proto: string; } -export interface SlotProps -{ +export interface SlotProps { filters: Filter[]; } -export interface Chamber -{ +export interface Chamber { _name: string; _id: string; _parent: string; @@ -340,22 +331,18 @@ export interface Chamber _mergeSlotWithChildren: boolean; _proto: string; } -export interface ChamberProps -{ +export interface ChamberProps { filters: FilterProps[]; } -export interface FilterProps -{ +export interface FilterProps { Filter: string[]; } -export interface Xyz -{ +export interface Xyz { x: number; y: number; z: number; } -export interface StackSlot -{ +export interface StackSlot { _name?: string; _id: string; _sptTpl: string; @@ -367,37 +354,30 @@ export interface StackSlot _proto?: string; upd: any; } -export interface StackSlotProps -{ +export interface StackSlotProps { filters: Filter[]; } -export interface EffectsHealth -{ +export interface EffectsHealth { Hydration: Hydration; } -export interface Hydration -{ +export interface Hydration { value: number; } -export interface EffectsDamage -{ +export interface EffectsDamage { Pain: Pain; Contusion: Contusion; } -export interface Pain -{ +export interface Pain { delay: number; duration: number; fadeOut: number; } -export interface Contusion -{ +export interface Contusion { delay: number; duration: number; fadeOut: number; } -export interface Cartridge -{ +export interface Cartridge { _name: string; _id: string; _parent: string; @@ -405,18 +385,15 @@ export interface Cartridge _props: CartridgeProps; _proto: string; } -export interface CartridgeProps -{ +export interface CartridgeProps { filters: Filter[]; } -export interface Filter -{ +export interface Filter { Shift?: number; Filter: string[]; AnimationIndex?: number; } -export interface Color -{ +export interface Color { r: number; g: number; b: number; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ITrader.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ITrader.d.ts index cf53d57..f0fe2b5 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ITrader.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ITrader.d.ts @@ -1,14 +1,12 @@ import { Item } from "./IItem"; -export interface ITrader -{ +export interface ITrader { assort: ITraderAssort; base: ITraderBase; dialogue?: Record; questassort: Record>; suits?: ISuit[]; } -export interface ITraderBase -{ +export interface ITraderBase { refreshAssort: boolean; _id: string; avatar: string; @@ -33,8 +31,7 @@ export interface ITraderBase surname: string; unlockedByDefault: boolean; } -export interface Insurance -{ +export interface Insurance { availability: boolean; excluded_category: string[]; max_return_hour: number; @@ -42,8 +39,7 @@ export interface Insurance min_payment: number; min_return_hour: number; } -export interface LoyaltyLevel -{ +export interface LoyaltyLevel { buy_price_coef: number; exchange_price_coef: number; heal_price_coef: number; @@ -53,8 +49,7 @@ export interface LoyaltyLevel minStanding: number; repair_price_coef: number; } -export interface Repair -{ +export interface Repair { availability: boolean; currency: string; currency_coefficient: number; @@ -62,29 +57,25 @@ export interface Repair excluded_id_list: any[]; quality: string; } -export interface ITraderAssort -{ +export interface ITraderAssort { nextResupply?: number; items: Item[]; barter_scheme: Record; loyal_level_items: Record; } -export interface IBarterScheme -{ +export interface IBarterScheme { count: number; _tpl: string; onlyFunctional?: boolean; } -export interface ISuit -{ +export interface ISuit { _id: string; tid: string; suiteId: string; isActive: boolean; requirements: Requirements; } -export interface Requirements -{ +export interface Requirements { loyaltyLevel: number; profileLevel: number; standing: number; @@ -92,8 +83,7 @@ export interface Requirements questRequirements: string[]; itemRequirements: ItemRequirement[]; } -export interface ItemRequirement -{ +export interface ItemRequirement { count: number; _tpl: string; onlyFunctional: boolean; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/customization/IBuyClothingRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/customization/IBuyClothingRequestData.d.ts index 878a92d..d19b70d 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/customization/IBuyClothingRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/customization/IBuyClothingRequestData.d.ts @@ -1,11 +1,9 @@ -export interface IBuyClothingRequestData -{ +export interface IBuyClothingRequestData { Action: "CustomizationBuy"; offer: string; items: ClothingItem[]; } -export interface ClothingItem -{ +export interface ClothingItem { del: boolean; id: string; count: number; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/customization/IWearClothingRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/customization/IWearClothingRequestData.d.ts index 1a8653d..122d9cf 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/customization/IWearClothingRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/customization/IWearClothingRequestData.d.ts @@ -1,5 +1,4 @@ -export interface IWearClothingRequestData -{ +export interface IWearClothingRequestData { Action: "CustomizationWear"; suites: string[]; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/dialog/IFriendRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IFriendRequestData.d.ts index 5b8b0b7..9c326ac 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/dialog/IFriendRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IFriendRequestData.d.ts @@ -1,4 +1,3 @@ -export interface IFriendRequestData -{ +export interface IFriendRequestData { to: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts index 366a169..53d8289 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts @@ -1,4 +1,3 @@ -export interface IGetAllAttachmentsRequestData -{ +export interface IGetAllAttachmentsRequestData { dialogId: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts index adf40ca..076d414 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts @@ -1,6 +1,5 @@ import { Message } from "../profile/IAkiProfile"; -export interface IGetAllAttachmentsResponse -{ +export interface IGetAllAttachmentsResponse { messages: Message[]; profiles: any[]; hasMessagesWithRewards: boolean; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetChatServerListRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetChatServerListRequestData.d.ts index 213a760..8f1beac 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetChatServerListRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetChatServerListRequestData.d.ts @@ -1,4 +1,3 @@ -export interface IGetChatServerListRequestData -{ +export interface IGetChatServerListRequestData { VersionId: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetFriendListDataResponse.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetFriendListDataResponse.d.ts index cb121b0..41858c9 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetFriendListDataResponse.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetFriendListDataResponse.d.ts @@ -1,17 +1,14 @@ import { MemberCategory } from "../common/MemberCategory"; -export interface IGetFriendListDataResponse -{ +export interface IGetFriendListDataResponse { Friends: Friend[]; Ignore: any[]; InIgnoreList: any[]; } -export interface Friend -{ +export interface Friend { _id: string; Info: Info; } -export interface Info -{ +export interface Info { Nickname: string; Side: string; Level: number; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts index ab27832..eed84b1 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts @@ -1,4 +1,3 @@ -export interface IGetMailDialogInfoRequestData -{ +export interface IGetMailDialogInfoRequestData { dialogId: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts index 4affe93..f8fbf5d 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts @@ -1,5 +1,4 @@ -export interface IGetMailDialogListRequestData -{ +export interface IGetMailDialogListRequestData { limit: number; offset: number; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts index e519066..db45477 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts @@ -1,6 +1,5 @@ import { MessageType } from "../profile/IAkiProfile"; -export interface IGetMailDialogViewRequestData -{ +export interface IGetMailDialogViewRequestData { type: MessageType; dialogId: string; limit: number; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts index 2174a2d..4f8b946 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts @@ -1,7 +1,6 @@ import { IPmcData } from "../common/IPmcData"; import { Message } from "../profile/IAkiProfile"; -export interface IGetMailDialogViewResponseData -{ +export interface IGetMailDialogViewResponseData { messages: Message[]; profiles: IPmcData[]; hasMessagesWithRewards: boolean; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/dialog/IPinDialogRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IPinDialogRequestData.d.ts index 0f85751..57b8a00 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/dialog/IPinDialogRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IPinDialogRequestData.d.ts @@ -1,4 +1,3 @@ -export interface IPinDialogRequestData -{ +export interface IPinDialogRequestData { dialogId: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/dialog/IRemoveDialogRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IRemoveDialogRequestData.d.ts index 31a4705..874b828 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/dialog/IRemoveDialogRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IRemoveDialogRequestData.d.ts @@ -1,4 +1,3 @@ -export interface IRemoveDialogRequestData -{ +export interface IRemoveDialogRequestData { dialogId: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/dialog/ISendMessageRequest.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/dialog/ISendMessageRequest.d.ts index d9e628f..5f140c7 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/dialog/ISendMessageRequest.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/dialog/ISendMessageRequest.d.ts @@ -1,6 +1,5 @@ import { MessageType } from "../profile/IAkiProfile"; -export interface ISendMessageRequest -{ +export interface ISendMessageRequest { dialogId: string; type: MessageType; text: string; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/dialog/ISetDialogReadRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/dialog/ISetDialogReadRequestData.d.ts index 15f611d..2076232 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/dialog/ISetDialogReadRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/dialog/ISetDialogReadRequestData.d.ts @@ -1,4 +1,3 @@ -export interface ISetDialogReadRequestData -{ +export interface ISetDialogReadRequestData { dialogs: string[]; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/game/IGameConfigResponse.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/game/IGameConfigResponse.d.ts index 84a53ee..eb37a39 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/game/IGameConfigResponse.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/game/IGameConfigResponse.d.ts @@ -1,5 +1,4 @@ -export interface IGameConfigResponse -{ +export interface IGameConfigResponse { aid: string; lang: string; languages: Record; @@ -12,8 +11,7 @@ export interface IGameConfigResponse reportAvailable: boolean; twitchEventMember: boolean; } -export interface Backend -{ +export interface Backend { Trading: string; Messaging: string; Main: string; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/game/IGameEmptyCrcRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/game/IGameEmptyCrcRequestData.d.ts index bd58e7d..a3ecad9 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/game/IGameEmptyCrcRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/game/IGameEmptyCrcRequestData.d.ts @@ -1,4 +1,3 @@ -export interface IGameEmptyCrcRequestData -{ +export interface IGameEmptyCrcRequestData { crc: number; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/game/IVersionValidateRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/game/IVersionValidateRequestData.d.ts index b19801e..0aa0fed 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/game/IVersionValidateRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/game/IVersionValidateRequestData.d.ts @@ -1,10 +1,8 @@ -export interface IVersionValidateRequestData -{ +export interface IVersionValidateRequestData { version: Version; develop: boolean; } -export interface Version -{ +export interface Version { major: string; minor: string; game: string; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/health/IHealthTreatmentRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/health/IHealthTreatmentRequestData.d.ts index f888b7b..7fb80a8 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/health/IHealthTreatmentRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/health/IHealthTreatmentRequestData.d.ts @@ -1,24 +1,20 @@ -export interface IHealthTreatmentRequestData -{ +export interface IHealthTreatmentRequestData { Action: "RestoreHealth"; trader: string; items: Item[]; difference: Difference; timestamp: number; } -export interface Item -{ +export interface Item { id: string; count: number; } -export interface Difference -{ +export interface Difference { BodyParts: BodyParts; Energy: number; Hydration: number; } -export interface BodyParts -{ +export interface BodyParts { Head: BodyPart; Chest: BodyPart; Stomach: BodyPart; @@ -27,8 +23,7 @@ export interface BodyParts LeftLeg: BodyPart; RightLeg: BodyPart; } -export interface BodyPart -{ +export interface BodyPart { Health: number; Effects: string[]; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/health/IOffraidEatRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/health/IOffraidEatRequestData.d.ts index 39809a4..8e2b6c3 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/health/IOffraidEatRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/health/IOffraidEatRequestData.d.ts @@ -1,6 +1,5 @@ import { IBaseInteractionRequestData } from "../common/request/IBaseInteractionRequestData"; -export interface IOffraidEatRequestData extends IBaseInteractionRequestData -{ +export interface IOffraidEatRequestData extends IBaseInteractionRequestData { Action: "Eat"; item: string; count: number; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/health/IOffraidHealRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/health/IOffraidHealRequestData.d.ts index 12afd56..c242300 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/health/IOffraidHealRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/health/IOffraidHealRequestData.d.ts @@ -1,14 +1,12 @@ import { IBaseInteractionRequestData } from "../common/request/IBaseInteractionRequestData"; -export interface IOffraidHealRequestData extends IBaseInteractionRequestData -{ +export interface IOffraidHealRequestData extends IBaseInteractionRequestData { Action: "Heal"; item: string; part: BodyPart; count: number; time: number; } -export declare enum BodyPart - { +export declare enum BodyPart { Head = 0, Chest = 1, Stomach = 2, diff --git a/TypeScript/5ReplaceMethod/types/models/eft/health/ISyncHealthRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/health/ISyncHealthRequestData.d.ts index 38999fb..20e32f6 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/health/ISyncHealthRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/health/ISyncHealthRequestData.d.ts @@ -1,13 +1,11 @@ -export interface ISyncHealthRequestData -{ +export interface ISyncHealthRequestData { Health: Health; IsAlive: boolean; Hydration?: number; Energy?: number; Temperature?: number; } -export interface Health -{ +export interface Health { Head?: BodyPartHealth; Chest?: BodyPartHealth; Stomach?: BodyPartHealth; @@ -16,8 +14,7 @@ export interface Health LeftLeg?: BodyPartHealth; RightLeg?: BodyPartHealth; } -export interface BodyPartHealth -{ +export interface BodyPartHealth { Maximum: number; Current: number; Effects: Record; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/hideout/HideoutAreasEnum.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/HideoutAreasEnum.d.ts index 5be14e8..10f851b 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/hideout/HideoutAreasEnum.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/hideout/HideoutAreasEnum.d.ts @@ -1,5 +1,4 @@ -export declare enum HideoutAreasEnum - { +export declare enum HideoutAreasEnum { NOTSET = -1, VENTS = 0, SECURITY = 1, diff --git a/TypeScript/5ReplaceMethod/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts index 6a5c8a4..8583e8d 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts @@ -1,5 +1,4 @@ -export interface HideoutUpgradeCompleteRequestData -{ +export interface HideoutUpgradeCompleteRequestData { Action: string; areaType: number; timestamp: number; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutArea.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutArea.d.ts index 7333724..d9fd2bf 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutArea.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutArea.d.ts @@ -1,5 +1,4 @@ -export interface IHideoutArea -{ +export interface IHideoutArea { _id: string; type: number; enabled: boolean; @@ -8,16 +7,14 @@ export interface IHideoutArea craftGivesExp: boolean; stages: Record; } -export interface Stage -{ +export interface Stage { requirements: Requirement[]; bonuses: StageBonus[]; slots: number; constructionTime: number; description: string; } -export interface Requirement -{ +export interface Requirement { areaType?: number; requiredLevel?: number; type: string; @@ -29,8 +26,7 @@ export interface Requirement skillName?: string; skillLevel?: number; } -export interface StageBonus -{ +export interface StageBonus { value: number; passive: boolean; production: boolean; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts index b028fcd..dba83eb 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts @@ -1,5 +1,4 @@ -export interface IHideoutContinousProductionStartRequestData -{ +export interface IHideoutContinousProductionStartRequestData { Action: "HideoutContinuousProductionStart"; recipeId: string; timestamp: number; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutProduction.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutProduction.d.ts index 329598d..ce878be 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutProduction.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutProduction.d.ts @@ -1,5 +1,4 @@ -export interface IHideoutProduction -{ +export interface IHideoutProduction { _id: string; areaType: number; requirements: Requirement[]; @@ -10,8 +9,7 @@ export interface IHideoutProduction count: number; productionLimitCount: number; } -export interface Requirement -{ +export interface Requirement { templateId?: string; count?: number; isFunctional?: boolean; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts index 6ac0ce8..8326c55 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts @@ -1,12 +1,10 @@ -export interface IHideoutPutItemInRequestData -{ +export interface IHideoutPutItemInRequestData { Action: "HideoutPutItemsInAreaSlots"; areaType: number; items: Record; timestamp: number; } -export interface ItemDetails -{ +export interface ItemDetails { count: number; id: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutScavCase.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutScavCase.d.ts index 5f3ab9e..25abcf3 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutScavCase.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutScavCase.d.ts @@ -1,25 +1,21 @@ -export interface IHideoutScavCase -{ +export interface IHideoutScavCase { _id: string; ProductionTime: number; Requirements: Requirement[]; EndProducts: EndProducts; } -export interface Requirement -{ +export interface Requirement { templateId: string; count: number; isFunctional: boolean; type: string; } -export interface EndProducts -{ +export interface EndProducts { Common: MinMax; Rare: MinMax; Superrare: MinMax; } -export interface MinMax -{ +export interface MinMax { min: string; max: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts index 46ef667..72fda86 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts @@ -1,18 +1,15 @@ -export interface IHideoutScavCaseStartRequestData -{ +export interface IHideoutScavCaseStartRequestData { Action: "HideoutScavCaseProductionStart"; recipeId: string; items: HideoutItem[]; tools: Tool[]; timestamp: number; } -export interface HideoutItem -{ +export interface HideoutItem { id: string; count: number; } -export interface Tool -{ +export interface Tool { id: string; count: number; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutSettingsBase.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutSettingsBase.d.ts index dcc1025..8e45939 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutSettingsBase.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutSettingsBase.d.ts @@ -1,5 +1,4 @@ -export interface IHideoutSettingsBase -{ +export interface IHideoutSettingsBase { generatorSpeedWithoutFuel: number; generatorFuelFlowRate: number; airFilterUnitFlowRate: number; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts index 2e747c4..1ed542a 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts @@ -1,12 +1,10 @@ -export interface IHideoutSingleProductionStartRequestData -{ +export interface IHideoutSingleProductionStartRequestData { Action: "HideoutSingleProductionStart"; recipeId: string; items: Item[]; timestamp: number; } -export interface Item -{ +export interface Item { id: string; count: number; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts index db44583..83a740a 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts @@ -1,5 +1,4 @@ -export interface IHideoutTakeItemOutRequestData -{ +export interface IHideoutTakeItemOutRequestData { Action: "HideoutTakeItemsFromAreaSlots"; areaType: number; slots: number[]; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts index b837d9b..a6847ef 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts @@ -1,5 +1,4 @@ -export interface IHideoutTakeProductionRequestData -{ +export interface IHideoutTakeProductionRequestData { Action: "HideoutTakeProduction"; recipeId: string; timestamp: number; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts index aa5fea1..cdea513 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts @@ -1,5 +1,4 @@ -export interface IHideoutToggleAreaRequestData -{ +export interface IHideoutToggleAreaRequestData { Action: "HideoutToggleArea"; areaType: number; enabled: boolean; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts index a946fbf..545311e 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts @@ -1,5 +1,4 @@ -export interface IHideoutUpgradeCompleteRequestData -{ +export interface IHideoutUpgradeCompleteRequestData { Action: "HideoutUpgradeComplete"; areaType: number; timestamp: number; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts index 51b1a4e..dfbfdca 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts @@ -1,12 +1,10 @@ -export interface IHideoutUpgradeRequestData -{ +export interface IHideoutUpgradeRequestData { Action: "HideoutUpgrade"; areaType: number; items: HideoutItem[]; timestamp: number; } -export interface HideoutItem -{ +export interface HideoutItem { count: number; id: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/httpResponse/IGetBodyResponseData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/httpResponse/IGetBodyResponseData.d.ts index 77283e8..b5dc5c1 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/httpResponse/IGetBodyResponseData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/httpResponse/IGetBodyResponseData.d.ts @@ -1,5 +1,4 @@ -export interface IGetBodyResponseData -{ +export interface IGetBodyResponseData { err: number; errmsg: any; (data: Type): Type; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/httpResponse/INullResponseData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/httpResponse/INullResponseData.d.ts index 4253e05..a3ae838 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/httpResponse/INullResponseData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/httpResponse/INullResponseData.d.ts @@ -1,5 +1,4 @@ -export interface INullResponseData -{ +export interface INullResponseData { err: number; errmsg: any; data: null; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts index f5a13f5..e2d9cf1 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts @@ -1,5 +1,4 @@ -export interface IRegisterPlayerRequestData -{ +export interface IRegisterPlayerRequestData { crc: number; locationId: string; variantId: number; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/inRaid/ISaveProgressRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inRaid/ISaveProgressRequestData.d.ts index 0414ed7..6930261 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/inRaid/ISaveProgressRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/inRaid/ISaveProgressRequestData.d.ts @@ -1,7 +1,6 @@ import { IPmcData } from "../common/IPmcData"; import { ISyncHealthRequestData } from "../health/ISyncHealthRequestData"; -export interface ISaveProgressRequestData -{ +export interface ISaveProgressRequestData { exit: string; profile: IPmcData; isPlayerScav: boolean; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts index e3514cb..0e32e96 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts @@ -1,5 +1,4 @@ -export interface IGetInsuranceCostRequestData -{ +export interface IGetInsuranceCostRequestData { traders: string[]; items: string[]; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/insurance/IInsureRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/insurance/IInsureRequestData.d.ts index 71ae164..f657bb7 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/insurance/IInsureRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/insurance/IInsureRequestData.d.ts @@ -1,6 +1,5 @@ import { IBaseInteractionRequestData } from "../common/request/IBaseInteractionRequestData"; -export interface IInsureRequestData extends IBaseInteractionRequestData -{ +export interface IInsureRequestData extends IBaseInteractionRequestData { Action: "Insure"; tid: string; items: string[]; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IAddItemRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IAddItemRequestData.d.ts new file mode 100644 index 0000000..53db97a --- /dev/null +++ b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IAddItemRequestData.d.ts @@ -0,0 +1,4 @@ +export interface IAddItemRequestData { + tid: string; + items: any[]; +} diff --git a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryAddRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryAddRequestData.d.ts index c61eb2f..462e0de 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryAddRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryAddRequestData.d.ts @@ -1,6 +1,5 @@ import { Container, IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; -export interface IInventoryAddRequestData extends IInventoryBaseActionRequestData -{ +export interface IInventoryAddRequestData extends IInventoryBaseActionRequestData { Action: "Add"; item: string; container: Container; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts index 7f897f8..b45e459 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts @@ -1,29 +1,24 @@ import { IBaseInteractionRequestData } from "../common/request/IBaseInteractionRequestData"; -export interface IInventoryBaseActionRequestData extends IBaseInteractionRequestData -{ +export interface IInventoryBaseActionRequestData extends IBaseInteractionRequestData { } -export interface To -{ +export interface To { id: string; container: string; location?: ToLocation | number; } -export interface ToLocation -{ +export interface ToLocation { x: number; y: number; r: string; rotation?: string; isSearched: boolean; } -export interface Container -{ +export interface Container { id: string; container: string; location: Location | number; } -export interface Location -{ +export interface Location { x: number; y: number; r: string; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryBindRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryBindRequestData.d.ts index fc2af88..ff35066 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryBindRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryBindRequestData.d.ts @@ -1,6 +1,5 @@ import { IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; -export interface IInventoryBindRequestData extends IInventoryBaseActionRequestData -{ +export interface IInventoryBindRequestData extends IInventoryBaseActionRequestData { Action: "Bind"; item: string; index: number; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts index 5b91807..1e1ecef 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts @@ -1,12 +1,10 @@ import { IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; -export interface IInventoryCreateMarkerRequestData extends IInventoryBaseActionRequestData -{ +export interface IInventoryCreateMarkerRequestData extends IInventoryBaseActionRequestData { Action: "CreateMapMarker"; item: string; mapMarker: MapMarker; } -export interface MapMarker -{ +export interface MapMarker { Type: string; X: number; Y: number; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts index a78bb8b..0657e1b 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts @@ -1,6 +1,5 @@ import { IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; -export interface IInventoryDeleteMarkerRequestData extends IInventoryBaseActionRequestData -{ +export interface IInventoryDeleteMarkerRequestData extends IInventoryBaseActionRequestData { Action: "DeleteMapMarker"; item: string; X: number; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts index 747fc12..e2857e1 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts @@ -1,14 +1,12 @@ import { IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; -export interface IInventoryEditMarkerRequestData extends IInventoryBaseActionRequestData -{ +export interface IInventoryEditMarkerRequestData extends IInventoryBaseActionRequestData { Action: "EditMapMarker"; item: string; X: number; Y: number; mapMarker: MapMarker; } -export interface MapMarker -{ +export interface MapMarker { Type: string; X: number; Y: number; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryExamineRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryExamineRequestData.d.ts index 5c2d19d..614711f 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryExamineRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryExamineRequestData.d.ts @@ -1,12 +1,10 @@ import { IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; -export interface IInventoryExamineRequestData extends IInventoryBaseActionRequestData -{ +export interface IInventoryExamineRequestData extends IInventoryBaseActionRequestData { Action: "Examine"; item: string; fromOwner: IFromOwner; } -export interface IFromOwner -{ +export interface IFromOwner { id: string; type: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryFoldRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryFoldRequestData.d.ts index cd3d329..a5fb2a1 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryFoldRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryFoldRequestData.d.ts @@ -1,6 +1,5 @@ import { IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; -export interface IInventoryFoldRequestData extends IInventoryBaseActionRequestData -{ +export interface IInventoryFoldRequestData extends IInventoryBaseActionRequestData { Action: "Fold"; item: string; value: boolean; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryMergeRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryMergeRequestData.d.ts index bae8e55..3fcfa35 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryMergeRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryMergeRequestData.d.ts @@ -1,6 +1,5 @@ import { IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; -export interface IInventoryMergeRequestData extends IInventoryBaseActionRequestData -{ +export interface IInventoryMergeRequestData extends IInventoryBaseActionRequestData { Action: "Merge"; item: string; with: string; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryMoveRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryMoveRequestData.d.ts index e0f5043..b767908 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryMoveRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryMoveRequestData.d.ts @@ -1,6 +1,5 @@ import { IInventoryBaseActionRequestData, To } from "./IInventoryBaseActionRequestData"; -export interface IInventoryMoveRequestData extends IInventoryBaseActionRequestData -{ +export interface IInventoryMoveRequestData extends IInventoryBaseActionRequestData { Action: "Move"; item: string; to: To; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts index b0b280f..5487b20 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts @@ -1,6 +1,5 @@ import { IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; -export interface IInventoryReadEncyclopediaRequestData extends IInventoryBaseActionRequestData -{ +export interface IInventoryReadEncyclopediaRequestData extends IInventoryBaseActionRequestData { Action: "ReadEncyclopedia"; ids: string[]; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts index 2c5671f..07d1a52 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts @@ -1,6 +1,5 @@ import { IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; -export interface IInventoryRemoveRequestData extends IInventoryBaseActionRequestData -{ +export interface IInventoryRemoveRequestData extends IInventoryBaseActionRequestData { Action: "Remove"; item: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventorySortRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventorySortRequestData.d.ts index e0a61dd..a0b7928 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventorySortRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventorySortRequestData.d.ts @@ -1,12 +1,10 @@ import { Upd } from "../common/tables/IItem"; import { IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; -export interface IInventorySortRequestData extends IInventoryBaseActionRequestData -{ +export interface IInventorySortRequestData extends IInventoryBaseActionRequestData { Action: "ApplyInventoryChanges"; changedItems: ChangedItem[]; } -export interface ChangedItem -{ +export interface ChangedItem { _id: string; _tpl: string; parentId: string; @@ -14,8 +12,7 @@ export interface ChangedItem location: Location; upd: Upd; } -export interface Location -{ +export interface Location { x: number; y: number; r: string; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventorySplitRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventorySplitRequestData.d.ts index 0585c38..730ae71 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventorySplitRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventorySplitRequestData.d.ts @@ -1,6 +1,5 @@ import { Container, IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; -export interface IInventorySplitRequestData extends IInventoryBaseActionRequestData -{ +export interface IInventorySplitRequestData extends IInventoryBaseActionRequestData { Action: "Split"; item: string; container: Container; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventorySwapRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventorySwapRequestData.d.ts index e8e052a..1b0464d 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventorySwapRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventorySwapRequestData.d.ts @@ -1,7 +1,6 @@ import { OwnerInfo } from "../common/request/IBaseInteractionRequestData"; import { IInventoryBaseActionRequestData, To } from "./IInventoryBaseActionRequestData"; -export interface IInventorySwapRequestData extends IInventoryBaseActionRequestData -{ +export interface IInventorySwapRequestData extends IInventoryBaseActionRequestData { Action: "Swap"; item: string; to: To; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryTagRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryTagRequestData.d.ts index e3b333b..f021661 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryTagRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryTagRequestData.d.ts @@ -1,6 +1,5 @@ import { IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; -export interface IInventoryTagRequestData extends IInventoryBaseActionRequestData -{ +export interface IInventoryTagRequestData extends IInventoryBaseActionRequestData { Action: "Tag"; item: string; TagName: string; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryToggleRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryToggleRequestData.d.ts index 1c22b24..0955440 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryToggleRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryToggleRequestData.d.ts @@ -1,6 +1,5 @@ import { IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; -export interface IInventoryToggleRequestData extends IInventoryBaseActionRequestData -{ +export interface IInventoryToggleRequestData extends IInventoryBaseActionRequestData { Action: "Toggle"; item: string; value: boolean; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryTransferRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryTransferRequestData.d.ts index 1c54577..cf4391b 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryTransferRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryTransferRequestData.d.ts @@ -1,6 +1,5 @@ import { IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; -export interface IInventoryTransferRequestData extends IInventoryBaseActionRequestData -{ +export interface IInventoryTransferRequestData extends IInventoryBaseActionRequestData { Action: "Transfer"; item: string; with: string; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts index adfe489..689fe75 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts @@ -1,5 +1,4 @@ import { IItemEventRouterBase } from "./IItemEventRouterBase"; -export interface IEmptyItemEventRouterResponse extends IItemEventRouterBase -{ +export interface IEmptyItemEventRouterResponse extends IItemEventRouterBase { profileChanges: ""; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/itemEvent/IItemEventRouterBase.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/itemEvent/IItemEventRouterBase.d.ts index 2a6d218..31e62fe 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/itemEvent/IItemEventRouterBase.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/itemEvent/IItemEventRouterBase.d.ts @@ -3,20 +3,17 @@ import { Item, Upd } from "../common/tables/IItem"; import { IQuest } from "../common/tables/IQuest"; import { IPmcDataRepeatableQuest } from "../common/tables/IRepeatableQuests"; import { IRagfairOffer } from "../ragfair/IRagfairOffer"; -export interface IItemEventRouterBase -{ +export interface IItemEventRouterBase { warnings: Warning[]; profileChanges: TProfileChanges | ""; } export declare type TProfileChanges = Record; -export interface Warning -{ +export interface Warning { index: number; err: string; errmsg: string; } -export interface ProfileChange -{ +export interface ProfileChange { _id: string; experience: number; quests: IQuest[]; @@ -28,21 +25,18 @@ export interface ProfileChange traderRelations: Record; repeatableQuests?: IPmcDataRepeatableQuest[]; } -export interface BuildChange -{ +export interface BuildChange { id: string; name: string; root: string; items: Item[]; } -export interface ItemChanges -{ +export interface ItemChanges { new: Product[]; change: Product[]; del: Product[]; } -export interface Production -{ +export interface Production { Progress: number; StartTimestamp: number; ProductionTime: number; @@ -50,8 +44,7 @@ export interface Production RecipeId: string; Products: Product[]; } -export interface Product -{ +export interface Product { _id: string; _tpl?: string; parentId?: string; @@ -59,15 +52,13 @@ export interface Product location?: ItemChangeLocation; upd?: Upd; } -export interface ItemChangeLocation -{ +export interface ItemChangeLocation { x: number; y: number; r: number; isSearched?: boolean; } -export interface TraderRelations -{ +export interface TraderRelations { salesSum?: number; standing?: number; loyalty?: number; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts index 05a0923..515b49a 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts @@ -1,23 +1,19 @@ -export interface IItemEventRouterRequest -{ +export interface IItemEventRouterRequest { data: Daum[]; tm: number; reload: number; } -export interface Daum -{ +export interface Daum { Action: string; item: string; to: To; } -export interface To -{ +export interface To { id: string; container: string; location?: Location; } -export interface Location -{ +export interface Location { x: number; y: number; r: string; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts index 52868a0..72a9b5b 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts @@ -1,4 +1,3 @@ import { IItemEventRouterBase } from "./IItemEventRouterBase"; -export interface IItemEventRouterResponse extends IItemEventRouterBase -{ +export interface IItemEventRouterResponse extends IItemEventRouterBase { } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/launcher/IChangeRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/launcher/IChangeRequestData.d.ts index 312051c..f0a7838 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/launcher/IChangeRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/launcher/IChangeRequestData.d.ts @@ -1,5 +1,4 @@ import { ILoginRequestData } from "./ILoginRequestData"; -export interface IChangeRequestData extends ILoginRequestData -{ +export interface IChangeRequestData extends ILoginRequestData { change: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts index 5dbc48d..a14c7c9 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts @@ -1,5 +1,4 @@ -export interface IGetMiniProfileRequestData -{ +export interface IGetMiniProfileRequestData { username: string; password: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/launcher/ILoginRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/launcher/ILoginRequestData.d.ts index a872bcd..e965813 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/launcher/ILoginRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/launcher/ILoginRequestData.d.ts @@ -1,5 +1,4 @@ -export interface ILoginRequestData -{ +export interface ILoginRequestData { username: string; password: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/launcher/IMiniProfile.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/launcher/IMiniProfile.d.ts index 6136fc3..c12661a 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/launcher/IMiniProfile.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/launcher/IMiniProfile.d.ts @@ -1,5 +1,4 @@ -export interface IMiniProfile -{ +export interface IMiniProfile { username: string; nickname: string; side: string; @@ -10,7 +9,6 @@ export interface IMiniProfile maxlvl: number; akiData: AkiData; } -export interface AkiData -{ +export interface AkiData { version: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/launcher/IRegisterData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/launcher/IRegisterData.d.ts index 6f85ffd..61a8bbe 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/launcher/IRegisterData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/launcher/IRegisterData.d.ts @@ -1,5 +1,4 @@ import { ILoginRequestData } from "./ILoginRequestData"; -export interface IRegisterData extends ILoginRequestData -{ +export interface IRegisterData extends ILoginRequestData { edition: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/location/IGetLocationRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/location/IGetLocationRequestData.d.ts index 0f15598..04e84d9 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/location/IGetLocationRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/location/IGetLocationRequestData.d.ts @@ -1,5 +1,4 @@ -export interface IGetLocationRequestData -{ +export interface IGetLocationRequestData { crc: number; locationId: string; variantId: number; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/match/IEndOfflineRaidRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/match/IEndOfflineRaidRequestData.d.ts index 69c4cae..811e9a2 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/match/IEndOfflineRaidRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/match/IEndOfflineRaidRequestData.d.ts @@ -1,5 +1,4 @@ -export interface IEndOfflineRaidRequestData -{ +export interface IEndOfflineRaidRequestData { crc: number; exitStatus: string; exitName: any; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/match/IGetProfileRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/match/IGetProfileRequestData.d.ts new file mode 100644 index 0000000..86b5bbd --- /dev/null +++ b/TypeScript/5ReplaceMethod/types/models/eft/match/IGetProfileRequestData.d.ts @@ -0,0 +1,3 @@ +export interface IGetProfileRequestData { + profileId: string; +} diff --git a/TypeScript/5ReplaceMethod/types/models/eft/match/IStartOffineRaidRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/match/IStartOffineRaidRequestData.d.ts index beba972..84bccc8 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/match/IStartOffineRaidRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/match/IStartOffineRaidRequestData.d.ts @@ -1,30 +1,25 @@ -export interface IStartOfflineRaidRequestData -{ +export interface IStartOfflineRaidRequestData { locationName: string; entryPoint: string; startTime: number; dateTime: string; gameSettings: GameSettings; } -export interface GameSettings -{ +export interface GameSettings { timeAndWeatherSettings: TimeAndWeatherSettings; botsSettings: BotsSettings; wavesSettings: WavesSettings; } -export interface TimeAndWeatherSettings -{ +export interface TimeAndWeatherSettings { isRandomTime: boolean; isRandomWeather: boolean; } -export interface BotsSettings -{ +export interface BotsSettings { isEnabled: boolean; isScavWars: boolean; botAmount: string; } -export interface WavesSettings -{ +export interface WavesSettings { botDifficulty: string; isBosses: boolean; isTaggedAndCursed: boolean; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/notes/INoteActionData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/notes/INoteActionData.d.ts index 0684c30..610657f 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/notes/INoteActionData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/notes/INoteActionData.d.ts @@ -1,12 +1,10 @@ import { IBaseInteractionRequestData } from "../common/request/IBaseInteractionRequestData"; -export interface INoteActionData extends IBaseInteractionRequestData -{ +export interface INoteActionData extends IBaseInteractionRequestData { Action: string; index: number; note: INote; } -export interface INote -{ +export interface INote { Time: number; Text: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/notifier/INotifier.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/notifier/INotifier.d.ts index b624e4d..8c48260 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/notifier/INotifier.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/notifier/INotifier.d.ts @@ -1,5 +1,4 @@ -export interface INotifierChannel -{ +export interface INotifierChannel { "server": string; "channel_id": string; "url": string; @@ -7,8 +6,7 @@ export interface INotifierChannel "ws": string; } import { Message } from "../profile/IAkiProfile"; -export interface INotification -{ +export interface INotification { type: "RagfairOfferSold" | "new_message" | "ping"; eventId: string; dialogId?: string; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/notifier/ISelectProfileRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/notifier/ISelectProfileRequestData.d.ts index cb1f5a9..2bc3d1e 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/notifier/ISelectProfileRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/notifier/ISelectProfileRequestData.d.ts @@ -1,4 +1,3 @@ -export interface ISelectProfileRequestData -{ +export interface ISelectProfileRequestData { uid: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index 24158b3..dcd14a2 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -1,6 +1,5 @@ import { Skills } from "../common/IPmcData"; -export interface IPlayerIncrementSkillLevelRequestData -{ +export interface IPlayerIncrementSkillLevelRequestData { _id: string; experience: number; quests: any[]; @@ -11,15 +10,12 @@ export interface IPlayerIncrementSkillLevelRequestData skills: Skills; traderRelations: TraderRelations; } -export interface Items -{ +export interface Items { new: any[]; change: any[]; del: any[]; } -export interface Production -{ +export interface Production { } -export interface TraderRelations -{ +export interface TraderRelations { } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts index 028d969..99c61f1 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts @@ -1,30 +1,25 @@ -export interface IPresetBuildActionRequestData -{ +export interface IPresetBuildActionRequestData { Action: string; id: string; name: string; root: string; items: Item[]; } -export interface Item -{ +export interface Item { _id: string; _tpl: string; upd?: Upd; parentId?: string; slotId?: string; } -export interface Upd -{ +export interface Upd { Repairable: Repairable; FireMode: FireMode; } -export interface Repairable -{ +export interface Repairable { MaxDurability: number; Durability: number; } -export interface FireMode -{ +export interface FireMode { FireMode: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/profile/IAkiProfile.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/profile/IAkiProfile.d.ts index 87f5ce6..f95e9a8 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/profile/IAkiProfile.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/profile/IAkiProfile.d.ts @@ -1,7 +1,6 @@ import { IPmcData } from "../common/IPmcData"; import { Item } from "../common/tables/IItem"; -export interface IAkiProfile -{ +export interface IAkiProfile { info: Info; characters: Characters; suits: string[]; @@ -12,36 +11,31 @@ export interface IAkiProfile inraid: Inraid; insurance: Insurance[]; } -export interface Info -{ +export interface Info { id: string; username: string; password: string; wipe: boolean; edition: string; } -export interface Characters -{ +export interface Characters { pmc: IPmcData; scav: IPmcData; } -export interface WeaponBuild -{ +export interface WeaponBuild { id: string; name: string; root: string; items: Item[]; } -export interface Dialogue -{ +export interface Dialogue { _id: string; messages: Message[]; pinned: boolean; new: number; attachmentsNew: number; } -export interface DialogueInfo -{ +export interface DialogueInfo { _id: string; type: MessageType; message: MessagePreview; @@ -49,8 +43,7 @@ export interface DialogueInfo new: number; attachmentsNew: number; } -export declare enum MessageType - { +export declare enum MessageType { USER_MESSAGE = 1, NPC_TRADER = 2, AUCTION_MESSAGE = 3, @@ -66,8 +59,7 @@ export declare enum MessageType MESSAGE_WITH_ITEMS = 13, INITIAL_SUPPORT = 14 } -export interface Message -{ +export interface Message { _id: string; uid: string; type: MessageType; @@ -83,21 +75,18 @@ export interface Message maxStorageTime?: number; systemData?: ISystemData; } -export interface MessagePreview -{ +export interface MessagePreview { uid: string; type: MessageType; dt: number; templateId: string; text?: string; } -export interface Items -{ +export interface Items { stash?: string; data?: Item[]; } -export interface ISystemData -{ +export interface ISystemData { date?: string; time?: string; location?: string; @@ -105,8 +94,7 @@ export interface ISystemData soldItem?: string; itemCount?: number; } -export interface IUpdatableChatMember -{ +export interface IUpdatableChatMember { Nickname: string; Side: string; Level: number; @@ -114,22 +102,18 @@ export interface IUpdatableChatMember Ignored: boolean; Banned: boolean; } -export interface DateTime -{ +export interface DateTime { date: string; time: string; } -export interface Aki -{ +export interface Aki { version: string; } -export interface Vitality -{ +export interface Vitality { health: Health; effects: Effects; } -export interface Health -{ +export interface Health { Hydration: number; Energy: number; Temperature: number; @@ -141,8 +125,7 @@ export interface Health LeftLeg: number; RightLeg: number; } -export interface Effects -{ +export interface Effects { Head: Head; Chest: Chest; Stomach: Stomach; @@ -151,41 +134,31 @@ export interface Effects LeftLeg: LeftLeg; RightLeg: RightLeg; } -export interface Head -{ +export interface Head { } -export interface Chest -{ +export interface Chest { } -export interface Stomach -{ +export interface Stomach { } -export interface LeftArm -{ +export interface LeftArm { } -export interface RightArm -{ +export interface RightArm { } -export interface LeftLeg -{ +export interface LeftLeg { } -export interface RightLeg -{ +export interface RightLeg { } -export interface Inraid -{ +export interface Inraid { location: string; character: string; } -export interface Insurance -{ +export interface Insurance { scheduledTime: number; traderId: string; messageContent: MessageContent; items: Item[]; } -export interface MessageContent -{ +export interface MessageContent { ragfair?: MessageContentRagfair; text?: string; templateId: string; @@ -193,14 +166,12 @@ export interface MessageContent maxStorageTime?: number; systemData?: MessageContentData; } -export interface MessageContentRagfair -{ +export interface MessageContentRagfair { offerId: string; count: number; handbookId: string; } -export interface MessageContentData -{ +export interface MessageContentData { date: string; time: string; location: string; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts index bf58408..4a61196 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts @@ -1,4 +1,3 @@ -export interface IProfileChangeNicknameRequestData -{ +export interface IProfileChangeNicknameRequestData { nickname: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts index b3006ef..91058ce 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts @@ -1,4 +1,3 @@ -export interface IProfileChangeVoiceRequestData -{ +export interface IProfileChangeVoiceRequestData { voice: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/profile/IProfileCreateRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/profile/IProfileCreateRequestData.d.ts index b9c1b36..93cc656 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/profile/IProfileCreateRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/profile/IProfileCreateRequestData.d.ts @@ -1,5 +1,4 @@ -export interface IProfileCreateRequestData -{ +export interface IProfileCreateRequestData { side: string; nickname: string; headId: string; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/profile/ISearchFriendRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/profile/ISearchFriendRequestData.d.ts index 3d19aee..e63e386 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/profile/ISearchFriendRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/profile/ISearchFriendRequestData.d.ts @@ -1,4 +1,3 @@ -export interface ISearchFriendRequestData -{ +export interface ISearchFriendRequestData { nickname: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/profile/ISearchFriendResponse.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/profile/ISearchFriendResponse.d.ts index 947343b..96d88b2 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/profile/ISearchFriendResponse.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/profile/ISearchFriendResponse.d.ts @@ -1,10 +1,8 @@ -export interface ISearchFriendResponse -{ +export interface ISearchFriendResponse { _id: string; Info: Info; } -export interface Info -{ +export interface Info { Nickname: string; Side: string; Level: number; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/profile/IValidateNicknameRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/profile/IValidateNicknameRequestData.d.ts index 1f4968a..9cca7e7 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/profile/IValidateNicknameRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/profile/IValidateNicknameRequestData.d.ts @@ -1,4 +1,3 @@ -export interface IValidateNicknameRequestData -{ +export interface IValidateNicknameRequestData { nickname: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/quests/IAcceptQuestRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/quests/IAcceptQuestRequestData.d.ts index 6c5eab2..0e4821a 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/quests/IAcceptQuestRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/quests/IAcceptQuestRequestData.d.ts @@ -1,5 +1,4 @@ -export interface IAcceptQuestRequestData -{ +export interface IAcceptQuestRequestData { Action: "QuestAccept"; qid: string; type: string; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/quests/ICompleteQuestRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/quests/ICompleteQuestRequestData.d.ts index e79cff1..cc67404 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/quests/ICompleteQuestRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/quests/ICompleteQuestRequestData.d.ts @@ -1,5 +1,4 @@ -export interface ICompleteQuestRequestData -{ +export interface ICompleteQuestRequestData { Action: string; qid: string; removeExcessItems: boolean; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/quests/IHandoverQuestRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/quests/IHandoverQuestRequestData.d.ts index e06970c..63f10a8 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/quests/IHandoverQuestRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/quests/IHandoverQuestRequestData.d.ts @@ -1,12 +1,10 @@ -export interface IHandoverQuestRequestData -{ +export interface IHandoverQuestRequestData { Action: "QuestHandover"; qid: string; conditionId: string; items: Item[]; } -export interface Item -{ +export interface Item { id: string; count: number; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/quests/IListQuestsRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/quests/IListQuestsRequestData.d.ts index 96ceaaa..91f0b8c 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/quests/IListQuestsRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/quests/IListQuestsRequestData.d.ts @@ -1,4 +1,3 @@ -export interface IListQuestsRequestData -{ +export interface IListQuestsRequestData { completed: boolean; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts index b949832..015f58e 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts @@ -1,5 +1,4 @@ -export interface IRepeatableQuestChangeRequest -{ +export interface IRepeatableQuestChangeRequest { Action: "RepeatableQuestChange"; qid: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IAddOfferRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IAddOfferRequestData.d.ts index c7c58c5..465ee02 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IAddOfferRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IAddOfferRequestData.d.ts @@ -1,12 +1,10 @@ -export interface IAddOfferRequestData -{ +export interface IAddOfferRequestData { Action: string; sellInOnePiece: boolean; items: string[]; requirements: Requirement[]; } -export interface Requirement -{ +export interface Requirement { _tpl: string; count: number; level: number; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IExtendOfferRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IExtendOfferRequestData.d.ts index ac93aba..2a4a876 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IExtendOfferRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IExtendOfferRequestData.d.ts @@ -1,5 +1,4 @@ -export interface IExtendOfferRequestData -{ +export interface IExtendOfferRequestData { offerId: string; renewalTime: number; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IGetItemPriceResult.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IGetItemPriceResult.d.ts index 1ebdaf6..676322a 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IGetItemPriceResult.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IGetItemPriceResult.d.ts @@ -1,5 +1,4 @@ -export interface IGetItemPriceResult -{ +export interface IGetItemPriceResult { avg: number; min: number; max: number; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts index 4237146..00f8f17 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts @@ -1,4 +1,3 @@ -export interface IGetMarketPriceRequestData -{ +export interface IGetMarketPriceRequestData { templateId: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IGetOffersResult.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IGetOffersResult.d.ts index 2e11082..1c11422 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IGetOffersResult.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IGetOffersResult.d.ts @@ -1,6 +1,5 @@ import { IRagfairOffer } from "./IRagfairOffer"; -export interface IGetOffersResult -{ +export interface IGetOffersResult { categories: Record; offers: IRagfairOffer[]; offersCount: number; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IRagfairOffer.d.ts index 29134cf..6620a00 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IRagfairOffer.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IRagfairOffer.d.ts @@ -1,7 +1,6 @@ import { MemberCategory } from "../common/MemberCategory"; import { Item } from "../common/tables/IItem"; -export interface IRagfairOffer -{ +export interface IRagfairOffer { sellResult?: SellResult[]; _id: string; items: Item[]; @@ -24,14 +23,12 @@ export interface IRagfairOffer CurrentItemCount: number; priority: boolean; } -export interface OfferRequirement -{ +export interface OfferRequirement { _tpl: string; count: number; onlyFunctional: boolean; } -export interface IRagfairOfferUser -{ +export interface IRagfairOfferUser { id: string; nickname: string; rating: number; @@ -39,8 +36,7 @@ export interface IRagfairOfferUser avatar: string; isRatingGrowing: boolean; } -export interface SellResult -{ +export interface SellResult { sellTime: number; amount: number; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts index c578d9e..d926615 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts @@ -1,5 +1,4 @@ -export interface IRemoveOfferRequestData -{ +export interface IRemoveOfferRequestData { Action: string; offerId: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/ragfair/ISearchRequestData.d.ts index b9b5f16..08e7fd3 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/ragfair/ISearchRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/ragfair/ISearchRequestData.d.ts @@ -1,5 +1,4 @@ -export interface ISearchRequestData -{ +export interface ISearchRequestData { page: number; limit: number; sortType: number; @@ -24,12 +23,10 @@ export interface ISearchRequestData tm: number; reload: number; } -export declare enum OfferOwnerType - { +export declare enum OfferOwnerType { ANYOWNERTYPE = 0, TRADEROWNERTYPE = 1, PLAYEROWNERTYPE = 2 } -export interface BuildItems -{ +export interface BuildItems { } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts index b9df8a6..e645fb3 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts @@ -1,4 +1,3 @@ -export interface IBaseRepairActionDataRequest -{ +export interface IBaseRepairActionDataRequest { Action: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/repair/IRepairActionDataRequest.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/repair/IRepairActionDataRequest.d.ts index 64001a9..263d400 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/repair/IRepairActionDataRequest.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/repair/IRepairActionDataRequest.d.ts @@ -1,12 +1,10 @@ import { IBaseRepairActionDataRequest } from "./IBaseRepairActionDataRequest"; -export interface IRepairActionDataRequest extends IBaseRepairActionDataRequest -{ +export interface IRepairActionDataRequest extends IBaseRepairActionDataRequest { Action: "Repair"; repairKitsInfo: RepairKitsInfo[]; target: string; } -export interface RepairKitsInfo -{ +export interface RepairKitsInfo { _id: string; count: number; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts index a199ba5..e3d469d 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts @@ -1,12 +1,10 @@ import { IBaseRepairActionDataRequest } from "./IBaseRepairActionDataRequest"; -export interface ITraderRepairActionDataRequest extends IBaseRepairActionDataRequest -{ +export interface ITraderRepairActionDataRequest extends IBaseRepairActionDataRequest { Action: "TraderRepair"; tid: string; repairItems: RepairItem[]; } -export interface RepairItem -{ +export interface RepairItem { _id: string; count: number; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts index defce88..a9ef757 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts @@ -1,5 +1,4 @@ -export interface IProcessBaseTradeRequestData -{ +export interface IProcessBaseTradeRequestData { Action: string; type: string; tid: string; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts index 8cc7d4a..a9e4c17 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts @@ -1,6 +1,5 @@ import { IProcessBaseTradeRequestData } from "./IProcessBaseTradeRequestData"; -export interface IProcessBuyTradeRequestData extends IProcessBaseTradeRequestData -{ +export interface IProcessBuyTradeRequestData extends IProcessBaseTradeRequestData { Action: "buy_from_trader" | "TradingConfirm" | "RestoreHealth" | ""; type: string; tid: string; @@ -9,8 +8,7 @@ export interface IProcessBuyTradeRequestData extends IProcessBaseTradeRequestDat scheme_id: number; scheme_items: SchemeItem[]; } -export interface SchemeItem -{ +export interface SchemeItem { id: string; count: number; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts index c7e5a0d..889dfd1 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts @@ -1,16 +1,13 @@ -export interface IProcessRagfairTradeRequestData -{ +export interface IProcessRagfairTradeRequestData { Action: string; offers: Offer[]; } -export interface Offer -{ +export interface Offer { id: string; count: number; items: Item[]; } -export interface Item -{ +export interface Item { id: string; count: number; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/trade/IProcessSellTradeRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/trade/IProcessSellTradeRequestData.d.ts index db83f9c..f1d555f 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/trade/IProcessSellTradeRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/trade/IProcessSellTradeRequestData.d.ts @@ -1,13 +1,11 @@ import { IProcessBaseTradeRequestData } from "./IProcessBaseTradeRequestData"; -export interface IProcessSellTradeRequestData extends IProcessBaseTradeRequestData -{ +export interface IProcessSellTradeRequestData extends IProcessBaseTradeRequestData { Action: "sell_to_trader"; type: string; tid: string; items: Item[]; } -export interface Item -{ +export interface Item { id: string; count: number; scheme_id: number; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/weather/IWeatherData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/weather/IWeatherData.d.ts index 91e7fa9..ecc96ce 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/weather/IWeatherData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/weather/IWeatherData.d.ts @@ -1,12 +1,10 @@ -export interface IWeatherData -{ +export interface IWeatherData { acceleration: number; time: string; date: string; weather: IWeather; } -export interface IWeather -{ +export interface IWeather { pressure: number; temp: number; fog: string; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/wishlist/IWishlistActionData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/wishlist/IWishlistActionData.d.ts index 86ebb6f..9217864 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/wishlist/IWishlistActionData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/wishlist/IWishlistActionData.d.ts @@ -1,5 +1,4 @@ -export interface IWishlistActionData -{ +export interface IWishlistActionData { Action: string; templateId: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/external/mod.d.ts b/TypeScript/5ReplaceMethod/types/models/external/mod.d.ts index b1731d6..ecef460 100644 --- a/TypeScript/5ReplaceMethod/types/models/external/mod.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/external/mod.d.ts @@ -1,6 +1,5 @@ import { DependencyContainer } from "./tsyringe"; -export interface IMod -{ +export interface IMod { load: (container: DependencyContainer) => void; delayedLoad: (container: DependencyContainer) => void; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/bindings/Route.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/bindings/Route.d.ts index 511d0f8..1b29d7d 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/bindings/Route.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/bindings/Route.d.ts @@ -1,4 +1,3 @@ -export interface IRoute -{ +export interface IRoute { aki: any; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IBotCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IBotCallbacks.d.ts index f09f56c..2c42813 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IBotCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IBotCallbacks.d.ts @@ -2,8 +2,7 @@ import { IGenerateBotsRequestData } from "../../eft/bot/IGenerateBotsRequestData import { IEmptyRequestData } from "../../eft/common/IEmptyRequestData"; import { IBotBase } from "../../eft/common/tables/IBotBase"; import { IGetBodyResponseData } from "../../eft/httpResponse/IGetBodyResponseData"; -export interface IBotCallbacks -{ +export interface IBotCallbacks { getBotLimit(url: string, info: IEmptyRequestData, sessionID: string): string; getBotDifficulty(url: string, info: IEmptyRequestData, sessionID: string): string; generateBots(url: string, info: IGenerateBotsRequestData, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IBundleCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IBundleCallbacks.d.ts index 53776c9..7e37c6e 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IBundleCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IBundleCallbacks.d.ts @@ -1,5 +1,4 @@ -export interface IBundleCallbacks -{ +export interface IBundleCallbacks { sendBundle(sessionID: string, req: any, resp: any, body: any): any; getBundles(url: string, info: any, sessionID: string): string; getBundle(url: string, info: any, sessionID: string): string; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/ICustomizationCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/ICustomizationCallbacks.d.ts index ef6c616..d10027f 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/ICustomizationCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/ICustomizationCallbacks.d.ts @@ -4,8 +4,7 @@ import { IWearClothingRequestData } from "../../eft/customization/IWearClothingR import { IGetBodyResponseData } from "../../eft/httpResponse/IGetBodyResponseData"; import { ISuit } from "../../eft/common/tables/ITrader"; import { IItemEventRouterResponse } from "../../eft/itemEvent/IItemEventRouterResponse"; -export interface ICustomizationCallbacks -{ +export interface ICustomizationCallbacks { getSuits(url: string, info: any, sessionID: string): IGetBodyResponseData; getTraderSuits(url: string, info: any, sessionID: string): IGetBodyResponseData; wearClothing(pmcData: IPmcData, body: IWearClothingRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IDataCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IDataCallbacks.d.ts index 1c038ec..a098560 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IDataCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IDataCallbacks.d.ts @@ -8,8 +8,7 @@ import { IHideoutSettingsBase } from "../../eft/hideout/IHideoutSettingsBase"; import { IGetBodyResponseData } from "../../eft/httpResponse/IGetBodyResponseData"; import { ILanguageBase } from "../server/ILocaleBase"; import { ISettingsBase } from "../server/ISettingsBase"; -export interface IDataCallbacks -{ +export interface IDataCallbacks { getSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getGlobals(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getTemplateItems(url: string, info: IEmptyRequestData, sessionID: string): string; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IDialogueCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IDialogueCallbacks.d.ts index b8c8229..fe2115a 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IDialogueCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IDialogueCallbacks.d.ts @@ -15,8 +15,7 @@ import { ISendMessageRequest } from "../../eft/dialog/ISendMessageRequest"; import { IGetMailDialogViewResponseData } from "../../eft/dialog/IGetMailDialogViewResponseData"; import { IGetAllAttachmentsResponse } from "../../eft/dialog/IGetAllAttachmentsResponse"; import { DialogueInfo } from "../../eft/profile/IAkiProfile"; -export interface IDialogueCallbacks -{ +export interface IDialogueCallbacks { getFriendList(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getChatServerList(url: string, info: IGetChatServerListRequestData, sessionID: string): IGetBodyResponseData; getMailDialogList(url: string, info: IGetMailDialogListRequestData, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IGameCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IGameCallbacks.d.ts index c3ffe2c..38ebc5f 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IGameCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IGameCallbacks.d.ts @@ -4,8 +4,7 @@ import { IVersionValidateRequestData } from "../../eft/game/IVersionValidateRequ import { IGetBodyResponseData } from "../../eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../../eft/httpResponse/INullResponseData"; import { IGameConfigResponse } from "../../eft/game/IGameConfigResponse"; -export interface IGameCallbacks -{ +export interface IGameCallbacks { versionValidate(url: string, info: IVersionValidateRequestData, sessionID: string): INullResponseData; gameStart(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; gameLogout(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IHandbookCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IHandbookCallbacks.d.ts index c08448a..5857a3e 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IHandbookCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IHandbookCallbacks.d.ts @@ -1,4 +1,3 @@ -export interface IHandbookCallbacks -{ +export interface IHandbookCallbacks { load(): void; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IHealthCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IHealthCallbacks.d.ts index a4a8068..d238c7a 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IHealthCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IHealthCallbacks.d.ts @@ -4,8 +4,7 @@ import { ISyncHealthRequestData } from "../../eft/health/ISyncHealthRequestData" import { IOffraidEatRequestData } from "../../eft/health/IOffraidEatRequestData"; import { IOffraidHealRequestData } from "../../eft/health/IOffraidHealRequestData"; import { IHealthTreatmentRequestData } from "../../eft/health/IHealthTreatmentRequestData"; -export interface IHealthCallbacks -{ +export interface IHealthCallbacks { onLoad(sessionID: string): IAkiProfile; syncHealth(url: string, info: ISyncHealthRequestData, sessionID: string): any; offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): any; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IHideoutCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IHideoutCallbacks.d.ts index aafccac..e9badb6 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IHideoutCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IHideoutCallbacks.d.ts @@ -9,8 +9,7 @@ import { IHideoutSingleProductionStartRequestData } from "../../eft/hideout/IHid import { IHideoutContinousProductionStartRequestData } from "../../eft/hideout/IHideoutContinousProductionStartRequestData"; import { IHideoutTakeProductionRequestData } from "../../eft/hideout/IHideoutTakeProductionRequestData"; import { IItemEventRouterResponse } from "../../eft/itemEvent/IItemEventRouterResponse"; -export interface IHideoutCallbacks -{ +export interface IHideoutCallbacks { upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; upgradeComplete(pmcData: IPmcData, body: IHideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse; putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IHttpCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IHttpCallbacks.d.ts index db0947b..3ecd945 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IHttpCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IHttpCallbacks.d.ts @@ -1,5 +1,4 @@ -export interface IHttpCallbacks -{ +export interface IHttpCallbacks { load(): void; sendImage(sessionID: string, req: any, resp: any, body: any): void; getImage(): string; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IInraidCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IInraidCallbacks.d.ts index 919bb45..e959b98 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IInraidCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IInraidCallbacks.d.ts @@ -3,8 +3,7 @@ import { IAkiProfile } from "../../eft/profile/IAkiProfile"; import { IEmptyRequestData } from "../../eft/common/IEmptyRequestData"; import { IRegisterPlayerRequestData } from "../../eft/inRaid/IRegisterPlayerRequestData"; import { ISaveProgressRequestData } from "../../eft/inRaid/ISaveProgressRequestData"; -export interface IInraidCallbacks -{ +export interface IInraidCallbacks { onLoad(sessionID: string): IAkiProfile; registerPlayer(url: string, info: IRegisterPlayerRequestData, sessionID: string): INullResponseData; saveProgress(url: string, info: ISaveProgressRequestData, sessionID: string): INullResponseData; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IInsuranceCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IInsuranceCallbacks.d.ts index 5e99622..082112d 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IInsuranceCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IInsuranceCallbacks.d.ts @@ -2,8 +2,7 @@ import { IPmcData } from "../../eft/common/IPmcData"; import { IAkiProfile } from "../../eft/profile/IAkiProfile"; import { IGetInsuranceCostRequestData } from "../../eft/insurance/IGetInsuranceCostRequestData"; import { IInsureRequestData } from "../../eft/insurance/IInsureRequestData"; -export interface IInsuranceCallbacks -{ +export interface IInsuranceCallbacks { onLoad(sessionID: string): IAkiProfile; getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): any; insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): any; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IInventoryCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IInventoryCallbacks.d.ts index c61ffe1..e53f7d0 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IInventoryCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IInventoryCallbacks.d.ts @@ -16,8 +16,7 @@ import { IInventoryCreateMarkerRequestData } from "../../eft/inventory/IInventor import { IInventoryDeleteMarkerRequestData } from "../../eft/inventory/IInventoryDeleteMarkerRequestData"; import { IInventoryEditMarkerRequestData } from "../../eft/inventory/IInventoryEditMarkerRequestData"; import { IItemEventRouterResponse } from "../../eft/itemEvent/IItemEventRouterResponse"; -export interface IInventoryCallbacks -{ +export interface IInventoryCallbacks { moveItem(pmcData: IPmcData, body: IInventoryMoveRequestData, sessionID: string): IItemEventRouterResponse; removeItem(pmcData: IPmcData, body: IInventoryRemoveRequestData, sessionID: string): IItemEventRouterResponse; splitItem(pmcData: IPmcData, body: IInventorySplitRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IItemEventCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IItemEventCallbacks.d.ts index 834a719..59db771 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IItemEventCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IItemEventCallbacks.d.ts @@ -1,7 +1,6 @@ import { IGetBodyResponseData } from "../../eft/httpResponse/IGetBodyResponseData"; import { IItemEventRouterRequest } from "../../eft/itemEvent/IItemEventRouterRequest"; import { IItemEventRouterResponse } from "../../eft/itemEvent/IItemEventRouterResponse"; -export interface IItemEventCallbacks -{ +export interface IItemEventCallbacks { handleEvents(url: string, info: IItemEventRouterRequest, sessionID: string): IGetBodyResponseData; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/ILauncherCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/ILauncherCallbacks.d.ts index b1d0935..52dfec6 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/ILauncherCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/ILauncherCallbacks.d.ts @@ -3,8 +3,7 @@ import { IRemoveProfileData } from "../../eft/launcher/IRemoveProfileData"; import { ILoginRequestData } from "../../eft/launcher/ILoginRequestData"; import { IChangeRequestData } from "../../eft/launcher/IChangeRequestData"; import { IGetMiniProfileRequestData } from "../../eft/launcher/IGetMiniProfileRequestData.js"; -export interface ILauncherCallbacks -{ +export interface ILauncherCallbacks { connect(): string; login(url: string, info: ILoginRequestData, sessionID: string): string; register(url: string, info: IRegisterData, sessionID: string): "FAILED" | "OK"; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/ILocationCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/ILocationCallbacks.d.ts index 3dd330e..71656a4 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/ILocationCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/ILocationCallbacks.d.ts @@ -2,8 +2,7 @@ import { IGetLocationRequestData } from "../../eft/location/IGetLocationRequestD import { IGetBodyResponseData } from "../../eft/httpResponse/IGetBodyResponseData"; import { ILocationsGenerateAllResponse } from "../../eft/common/ILocationsSourceDestinationBase"; import { ILocationBase } from "../../eft/common/ILocationBase"; -export interface ILocationCallbacks -{ +export interface ILocationCallbacks { getLocationData(url: string, info: any, sessionID: string): IGetBodyResponseData; getLocation(url: string, info: IGetLocationRequestData, sessionID: string): IGetBodyResponseData; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IMatchCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IMatchCallbacks.d.ts index 0681664..fcbf173 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IMatchCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IMatchCallbacks.d.ts @@ -3,8 +3,7 @@ import { IEndOfflineRaidRequestData } from "../../eft/match/IEndOfflineRaidReque import { INullResponseData } from "../../eft/httpResponse/INullResponseData"; import { IGetBodyResponseData } from "../../eft/httpResponse/IGetBodyResponseData"; import { IPmcData } from "../../eft/common/IPmcData"; -export interface IMatchCallbacks -{ +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; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IModCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IModCallbacks.d.ts index bdade83..1a4cd7b 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IModCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IModCallbacks.d.ts @@ -1,5 +1,4 @@ -export interface IModCallbacks -{ +export interface IModCallbacks { load(): void; sendBundle(sessionID: string, req: any, resp: any, body: any): void; getBundles(url: string, info: any, sessionID: string): string; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/INoteCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/INoteCallbacks.d.ts index 57a7c1c..8453a4f 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/INoteCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/INoteCallbacks.d.ts @@ -1,8 +1,7 @@ import { IPmcData } from "../../eft/common/IPmcData"; import { INoteActionData } from "../../eft/notes/INoteActionData"; import { IItemEventRouterResponse } from "../../eft/itemEvent/IItemEventRouterResponse"; -export interface INoteCallbacks -{ +export interface INoteCallbacks { addNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; editNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; deleteNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/INotifierCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/INotifierCallbacks.d.ts index 1c6e057..a211310 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/INotifierCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/INotifierCallbacks.d.ts @@ -2,8 +2,7 @@ import { IEmptyRequestData } from "../../eft/common/IEmptyRequestData"; import { IGetBodyResponseData } from "../../eft/httpResponse/IGetBodyResponseData"; import { INotifierChannel } from "../../eft/notifier/INotifier"; import { ISelectProfileRequestData } from "../../eft/notifier/ISelectProfileRequestData"; -export interface INotifierCallbacks -{ +export interface INotifierCallbacks { /** * If we don't have anything to send, it's ok to not send anything back * because notification requests can be long-polling. In fact, we SHOULD wait diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts index 0122203..97c6487 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts @@ -3,8 +3,7 @@ import { IPresetBuildActionRequestData } from "../../eft/presetBuild/IPresetBuil import { IItemEventRouterResponse } from "../../eft/itemEvent/IItemEventRouterResponse"; import { IGetBodyResponseData } from "../../eft/httpResponse/IGetBodyResponseData"; import { WeaponBuild } from "../../eft/profile/IAkiProfile"; -export interface IPresetBuildCallbacks -{ +export interface IPresetBuildCallbacks { getHandbookUserlist(url: string, info: any, sessionID: string): IGetBodyResponseData; saveBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse; removeBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IPresetCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IPresetCallbacks.d.ts index 0bbab53..4169857 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IPresetCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IPresetCallbacks.d.ts @@ -1,4 +1,3 @@ -export interface IPresetCallbacks -{ +export interface IPresetCallbacks { load(): void; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IProfileCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IProfileCallbacks.d.ts index 7a01607..9d4d2df 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IProfileCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IProfileCallbacks.d.ts @@ -7,8 +7,7 @@ import { IProfileCreateRequestData } from "../../eft/profile/IProfileCreateReque import { IValidateNicknameRequestData } from "../../eft/profile/IValidateNicknameRequestData"; import { ISearchFriendRequestData } from "../../eft/profile/ISearchFriendRequestData"; import { ISearchFriendResponse } from "../../eft/profile/ISearchFriendResponse"; -export interface IProfileCallbacks -{ +export interface IProfileCallbacks { onLoad(sessionID: string): any; createProfile(url: string, info: IProfileCreateRequestData, sessionID: string): IGetBodyResponseData; getProfileData(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IQuestCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IQuestCallbacks.d.ts index b2fb36e..1c4d0c3 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IQuestCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IQuestCallbacks.d.ts @@ -9,8 +9,7 @@ import { IItemEventRouterResponse } from "../../eft/itemEvent/IItemEventRouterRe import { IQuest } from "../../eft/common/tables/IQuest"; import { IPmcDataRepeatableQuest } from "../../eft/common/tables/IRepeatableQuests"; import { IRepeatableQuestChangeRequest } from "../../eft/quests/IRepeatableQuestChangeRequest"; -export interface IQuestCallbacks -{ +export interface IQuestCallbacks { changeRepeatableQuest(pmcData: IPmcData, body: IRepeatableQuestChangeRequest, sessionID: string): IItemEventRouterResponse; acceptQuest(pmcData: IPmcData, body: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse; completeQuest(pmcData: IPmcData, body: ICompleteQuestRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IRagfairCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IRagfairCallbacks.d.ts index 35ec0c8..9282bd4 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IRagfairCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IRagfairCallbacks.d.ts @@ -8,8 +8,7 @@ import { IRemoveOfferRequestData } from "../../eft/ragfair/IRemoveOfferRequestDa import { IExtendOfferRequestData } from "../../eft/ragfair/IExtendOfferRequestData"; import { IItemEventRouterResponse } from "../../eft/itemEvent/IItemEventRouterResponse"; import { IGetItemPriceResult } from "../../eft/ragfair/IGetItemPriceResult"; -export interface IRagfairCallbacks -{ +export interface IRagfairCallbacks { load(): void; search(url: string, info: ISearchRequestData, sessionID: string): IGetBodyResponseData; getMarketPrice(url: string, info: IGetMarketPriceRequestData, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IRepairCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IRepairCallbacks.d.ts index 9058f36..e8183c9 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IRepairCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IRepairCallbacks.d.ts @@ -2,8 +2,7 @@ import { IPmcData } from "../../eft/common/IPmcData"; import { IItemEventRouterResponse } from "../../eft/itemEvent/IItemEventRouterResponse"; import { IRepairActionDataRequest } from "../../eft/repair/IRepairActionDataRequest"; import { ITraderRepairActionDataRequest } from "../../eft/repair/ITraderRepairActionDataRequest"; -export interface IRepairCallbacks -{ +export interface IRepairCallbacks { traderRepair(pmcData: IPmcData, body: ITraderRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; repair(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/ISaveCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/ISaveCallbacks.d.ts index 9255e8e..1ad3b82 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/ISaveCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/ISaveCallbacks.d.ts @@ -1,5 +1,4 @@ -export interface ISaveCallbacks -{ +export interface ISaveCallbacks { load(): void; update(secondsSinceLastRun: number): boolean; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/ITradeCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/ITradeCallbacks.d.ts index 9fccc4a..2f41d54 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/ITradeCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/ITradeCallbacks.d.ts @@ -2,8 +2,7 @@ import { IPmcData } from "../../eft/common/IPmcData"; import { IProcessRagfairTradeRequestData } from "../../eft/trade/IProcessRagfairTradeRequestData"; import { IItemEventRouterResponse } from "../../eft/itemEvent/IItemEventRouterResponse"; import { IProcessBaseTradeRequestData } from "../../eft/trade/IProcessBaseTradeRequestData"; -export interface ITradeCallbacks -{ +export interface ITradeCallbacks { processTrade(pmcData: IPmcData, body: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; processRagfairTrade(pmcData: IPmcData, body: IProcessRagfairTradeRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/ITraderCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/ITraderCallbacks.d.ts index d33e31c..e0d7d06 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/ITraderCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/ITraderCallbacks.d.ts @@ -1,8 +1,7 @@ import { IEmptyRequestData } from "../../eft/common/IEmptyRequestData"; import { IBarterScheme, ITraderAssort, ITraderBase } from "../../eft/common/tables/ITrader"; import { IGetBodyResponseData } from "../../eft/httpResponse/IGetBodyResponseData"; -export interface ITraderCallbacks -{ +export interface ITraderCallbacks { load(): void; getTraderSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getProfilePurchases(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData>; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IWeatherCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IWeatherCallbacks.d.ts index f140239..9ac72ae 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IWeatherCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IWeatherCallbacks.d.ts @@ -1,6 +1,5 @@ import { IGetBodyResponseData } from "../../eft/httpResponse/IGetBodyResponseData"; import { IEmptyRequestData } from "../../eft/common/IEmptyRequestData"; -export interface IWeatherCallbacks -{ +export interface IWeatherCallbacks { getWeather(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IWishlistCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IWishlistCallbacks.d.ts index 43b0439..e5d519c 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IWishlistCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IWishlistCallbacks.d.ts @@ -1,8 +1,7 @@ import { IPmcData } from "../../eft/common/IPmcData"; import { IWishlistActionData } from "../../eft/wishlist/IWishlistActionData"; import { IItemEventRouterResponse } from "../../eft/itemEvent/IItemEventRouterResponse"; -export interface IWishlistCallbacks -{ +export interface IWishlistCallbacks { addToWishlist(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse; removeFromWishlist(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/config/IAirdropConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/IAirdropConfig.d.ts index 367b8b8..f4aee89 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/config/IAirdropConfig.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/config/IAirdropConfig.d.ts @@ -1,6 +1,5 @@ import { IBaseConfig } from "./IBaseConfig"; -export interface IAirdropConfig extends IBaseConfig -{ +export interface IAirdropConfig extends IBaseConfig { kind: "aki-airdrop"; airdropChancePercent: AirdropChancePercent; airdropMinOpenHeight: number; @@ -11,8 +10,7 @@ export interface IAirdropConfig extends IBaseConfig airdropMinStartTimeSeconds: number; airdropMaxStartTimeSeconds: number; } -export interface AirdropChancePercent -{ +export interface AirdropChancePercent { bigmap: number; woods: number; lighthouse: number; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/config/IBaseConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/IBaseConfig.d.ts index 70e4dbd..8b6ba88 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/config/IBaseConfig.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/config/IBaseConfig.d.ts @@ -1,4 +1,3 @@ -export interface IBaseConfig -{ +export interface IBaseConfig { kind: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/config/IBotConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/IBotConfig.d.ts index 6cd85ce..f8ea940 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/config/IBotConfig.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/config/IBotConfig.d.ts @@ -1,6 +1,5 @@ import { IBaseConfig } from "./IBaseConfig"; -export interface IBotConfig extends IBaseConfig -{ +export interface IBotConfig extends IBaseConfig { kind: "aki-bot"; presetBatch: PresetBatch; bosses: string[]; @@ -10,8 +9,7 @@ export interface IBotConfig extends IBaseConfig showTypeInNickname: boolean; maxBotCap: number; } -export interface PresetBatch -{ +export interface PresetBatch { assault: number; bossBully: number; bossGluhar: number; @@ -38,8 +36,7 @@ export interface PresetBatch test: number; exUsec: number; } -export interface Durability -{ +export interface Durability { default: DefaultDurability; pmc: PmcDurability; boss: BotDurability; @@ -52,52 +49,43 @@ export interface Durability sectantpriest: BotDurability; sectantwarrior: BotDurability; } -export interface DefaultDurability -{ +export interface DefaultDurability { armor: DefaultArmor; weapon: WeaponDurability; } -export interface DefaultArmor -{ +export interface DefaultArmor { maxDelta: number; minDelta: number; } -export interface WeaponDurability -{ +export interface WeaponDurability { lowestMax: number; highestMax: number; maxDelta: number; minDelta: number; } -export interface PmcDurability -{ +export interface PmcDurability { armor: PmcDurabilityArmor; weapon: WeaponDurability; } -export interface PmcDurabilityArmor -{ +export interface PmcDurabilityArmor { lowestMaxPercent: number; highestMaxPercent: number; maxDelta: number; minDelta: number; } -export interface BotDurability -{ +export interface BotDurability { armor: ArmorDurability; weapon: WeaponDurability; } -export interface ArmorDurability -{ +export interface ArmorDurability { maxDelta: number; minDelta: number; } -export interface LootNvalue -{ +export interface LootNvalue { scav: number; pmc: number; } -export interface PmcConfig -{ +export interface PmcConfig { dynamicLoot: DynamicLoot; cartridgeBlacklist: string[]; difficulty: string; @@ -110,15 +98,13 @@ export interface PmcConfig maxVestLootTotalRub: number; types: Types; } -export interface DynamicLoot -{ +export interface DynamicLoot { whitelist: string[]; blacklist: string[]; spawnLimits: Record; moneyStackLimits: Record; } -export interface Types -{ +export interface Types { assault: number; cursedAssault: number; pmcBot: number; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/config/ICoreConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/ICoreConfig.d.ts index 6c823e4..cfcaf61 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/config/ICoreConfig.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/config/ICoreConfig.d.ts @@ -1,6 +1,5 @@ import { IBaseConfig } from "./IBaseConfig"; -export interface ICoreConfig extends IBaseConfig -{ +export interface ICoreConfig extends IBaseConfig { kind: "aki-core"; akiVersion: string; projectName: string; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/config/IHealthConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/IHealthConfig.d.ts index 575e305..fdbf656 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/config/IHealthConfig.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/config/IHealthConfig.d.ts @@ -1,17 +1,14 @@ import { IBaseConfig } from "./IBaseConfig"; -export interface IHealthConfig extends IBaseConfig -{ +export interface IHealthConfig extends IBaseConfig { kind: "aki-health"; healthMultipliers: HealthMultipliers; save: Save; } -export interface HealthMultipliers -{ +export interface HealthMultipliers { death: number; blacked: number; } -export interface Save -{ +export interface Save { health: boolean; effects: boolean; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/config/IHideoutConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/IHideoutConfig.d.ts index 725e152..4658fa6 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/config/IHideoutConfig.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/config/IHideoutConfig.d.ts @@ -1,32 +1,27 @@ import { IBaseConfig } from "./IBaseConfig"; -export interface IHideoutConfig extends IBaseConfig -{ +export interface IHideoutConfig extends IBaseConfig { kind: "aki-hideout"; runIntervalSeconds: number; scavCase: ScavCase; fuelDrainRateMultipler: number; } -export interface ScavCase -{ +export interface ScavCase { rewardParentBlacklist: string[]; rewardItemBlacklist: any[]; ammoRewards: AmmoRewards; moneyRewards: MoneyRewards; } -export interface AmmoRewards -{ +export interface AmmoRewards { giveMultipleOfTen: boolean; minAmount: number; } -export interface MoneyRewards -{ +export interface MoneyRewards { enabled: boolean; rub: MinMax; usd: MinMax; eur: MinMax; } -export interface MinMax -{ +export interface MinMax { min: number; max: number; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/config/IHttpConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/IHttpConfig.d.ts index 359ee32..c41d035 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/config/IHttpConfig.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/config/IHttpConfig.d.ts @@ -1,6 +1,5 @@ import { IBaseConfig } from "./IBaseConfig"; -export interface IHttpConfig extends IBaseConfig -{ +export interface IHttpConfig extends IBaseConfig { kind: "aki-http"; ip: string; port: number; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/config/IInRaidConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/IInRaidConfig.d.ts index 360ee49..baaf083 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/config/IInRaidConfig.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/config/IInRaidConfig.d.ts @@ -1,6 +1,5 @@ import { IBaseConfig } from "./IBaseConfig"; -export interface IInRaidConfig extends IBaseConfig -{ +export interface IInRaidConfig extends IBaseConfig { kind: "aki-inraid"; MIAOnRaidEnd: boolean; raidMenuSettings: RaidMenuSettings; @@ -9,16 +8,14 @@ export interface IInRaidConfig extends IBaseConfig carExtractBaseStandingGain: number; scavExtractGain: number; } -export interface RaidMenuSettings -{ +export interface RaidMenuSettings { aiAmount: string; aiDifficulty: string; bossEnabled: boolean; scavWars: boolean; taggedAndCursed: boolean; } -export interface Save -{ +export interface Save { loot: boolean; durability: boolean; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/config/IInsuranceConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/IInsuranceConfig.d.ts index 305ba99..6e9c744 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/config/IInsuranceConfig.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/config/IInsuranceConfig.d.ts @@ -1,6 +1,5 @@ import { IBaseConfig } from "./IBaseConfig"; -export interface IInsuranceConfig extends IBaseConfig -{ +export interface IInsuranceConfig extends IBaseConfig { kind: "aki-insurance"; insuranceMultiplier: Record; returnChancePercent: Record; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/config/IInventoryConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/IInventoryConfig.d.ts index 6f0231d..ffffa41 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/config/IInventoryConfig.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/config/IInventoryConfig.d.ts @@ -1,6 +1,5 @@ import { IBaseConfig } from "./IBaseConfig"; -export interface IInventoryConfig extends IBaseConfig -{ +export interface IInventoryConfig extends IBaseConfig { kind: "aki-inventory"; newItemsMarkedFound: boolean; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/config/ILocationConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/ILocationConfig.d.ts index 8fbadac..0551d57 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/config/ILocationConfig.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/config/ILocationConfig.d.ts @@ -1,12 +1,10 @@ import { IBaseConfig } from "./IBaseConfig"; -export interface ILocationConfig extends IBaseConfig -{ +export interface ILocationConfig extends IBaseConfig { kind: "aki-location"; looseLootMultiplier: LootMultiplier; staticLootMultiplier: LootMultiplier; } -export interface LootMultiplier -{ +export interface LootMultiplier { bigmap: number; develop: number; factory4_day: number; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/config/IMatchConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/IMatchConfig.d.ts index c15aec2..92c4d77 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/config/IMatchConfig.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/config/IMatchConfig.d.ts @@ -1,6 +1,5 @@ import { IBaseConfig } from "./IBaseConfig"; -export interface IMatchConfig extends IBaseConfig -{ +export interface IMatchConfig extends IBaseConfig { kind: "aki-match"; enabled: boolean; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/config/IQuestConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/IQuestConfig.d.ts index 1e5d16a..03dc890 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/config/IQuestConfig.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/config/IQuestConfig.d.ts @@ -1,12 +1,10 @@ import { IBaseConfig } from "./IBaseConfig"; -export interface IQuestConfig extends IBaseConfig -{ +export interface IQuestConfig extends IBaseConfig { kind: "aki-quest"; redeemTime: number; repeatableQuests: IRepeatableQuestConfig[]; } -export interface IRepeatableQuestConfig -{ +export interface IRepeatableQuestConfig { name: string; types: string[]; resetTime: number; @@ -17,8 +15,7 @@ export interface IRepeatableQuestConfig traderWhitelist: ITraderWhitelist[]; questConfig: IQuestConfig; } -export declare enum ELocationName - { +export declare enum ELocationName { FACTORY_DAY = "factory4_day", BIGMAP = "bigmap", WOODS = "Woods", @@ -29,8 +26,7 @@ export declare enum ELocationName RESERVE = "RezervBase", ANY = "any" } -export interface IRewardScaling -{ +export interface IRewardScaling { levels: number[]; experience: number[]; roubles: number[]; @@ -38,29 +34,24 @@ export interface IRewardScaling reputation: number[]; rewardSpread: number; } -export interface ITraderWhitelist -{ +export interface ITraderWhitelist { traderId: string; questTypes: string[]; } -export interface IQuestConfig -{ +export interface IQuestConfig { Exploration: IExploration; Completion: ICompletion; Elimination: IElimination; } -export interface IExploration -{ +export interface IExploration { maxExtracts: number; specificExits: ISpecificExits; } -export interface ISpecificExits -{ +export interface ISpecificExits { probability: number; passageRequirementWhitelist: string[]; } -export interface ICompletion -{ +export interface ICompletion { minRequestedAmount: number; maxRequestedAmount: number; minRequestedBulletAmount: number; @@ -68,8 +59,7 @@ export interface ICompletion useWhitelist: boolean; useBlacklist: boolean; } -export interface IElimination -{ +export interface IElimination { targets: ITarget[]; bodyPartProb: number; bodyParts: IBodyPart[]; @@ -81,21 +71,17 @@ export interface IElimination maxKills: number; minKills: number; } -export interface IProbabilityObject -{ +export interface IProbabilityObject { key: string; relativeProbability: number; data?: any; } -export interface ITarget extends IProbabilityObject -{ +export interface ITarget extends IProbabilityObject { data: IBossInfo; } -export interface IBossInfo -{ +export interface IBossInfo { isBoss: boolean; } -export interface IBodyPart extends IProbabilityObject -{ +export interface IBodyPart extends IProbabilityObject { data: string[]; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/config/IRagfairConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/IRagfairConfig.d.ts index 0b24035..2d151ca 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/config/IRagfairConfig.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/config/IRagfairConfig.d.ts @@ -1,38 +1,32 @@ import { IBaseConfig } from "./IBaseConfig"; -export interface IRagfairConfig extends IBaseConfig -{ +export interface IRagfairConfig extends IBaseConfig { kind: "aki-ragfair"; runIntervalSeconds: number; sell: Sell; traders: Record; dynamic: Dynamic; } -export interface Sell -{ +export interface Sell { fees: boolean; chance: Chance; time: Time; reputation: Reputation; } -export interface Chance -{ +export interface Chance { base: number; overprices: number; underpriced: number; } -export interface Time -{ +export interface Time { base: number; min: number; max: number; } -export interface Reputation -{ +export interface Reputation { gain: number; loss: number; } -export interface Dynamic -{ +export interface Dynamic { expiredOfferThreshold: number; offerItemCount: MinMax; price: MinMax; @@ -45,19 +39,16 @@ export interface Dynamic showAsSingleStack: string[]; blacklist: Blacklist; } -export interface MinMax -{ +export interface MinMax { min: number; max: number; } -export interface Condition -{ +export interface Condition { conditionChance: number; min: number; max: number; } -export interface Blacklist -{ +export interface Blacklist { /** * show/hide trader items that are blacklisted by bsg */ diff --git a/TypeScript/5ReplaceMethod/types/models/spt/config/IRepairConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/IRepairConfig.d.ts index 4cbf1a6..4966eb5 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/config/IRepairConfig.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/config/IRepairConfig.d.ts @@ -1,6 +1,5 @@ import { IBaseConfig } from "./IBaseConfig"; -export interface IRepairConfig extends IBaseConfig -{ +export interface IRepairConfig extends IBaseConfig { kind: "aki-repair"; priceMultiplier: number; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/config/ITraderConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/ITraderConfig.d.ts index ef1883c..dab73e3 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/config/ITraderConfig.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/config/ITraderConfig.d.ts @@ -1,6 +1,5 @@ import { IBaseConfig } from "./IBaseConfig"; -export interface ITraderConfig extends IBaseConfig -{ +export interface ITraderConfig extends IBaseConfig { kind: "aki-trader"; updateTime: UpdateTime[]; updateTimeDefault: number; @@ -10,8 +9,7 @@ export interface ITraderConfig extends IBaseConfig minDurabilityForSale: number; fenceItemIgnoreList: string[]; } -export interface UpdateTime -{ +export interface UpdateTime { traderId: string; seconds: number; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/config/IWeatherConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/IWeatherConfig.d.ts index e147d86..c52cab3 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/config/IWeatherConfig.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/config/IWeatherConfig.d.ts @@ -1,12 +1,10 @@ import { IBaseConfig } from "./IBaseConfig"; -export interface IWeatherConfig extends IBaseConfig -{ +export interface IWeatherConfig extends IBaseConfig { kind: "aki-weather"; acceleration: number; weather: Weather; } -export interface Weather -{ +export interface Weather { clouds: MinMax; windSpeed: MinMax; windDirection: MinMax; @@ -17,8 +15,7 @@ export interface Weather temp: MinMax; pressure: MinMax; } -export interface MinMax -{ +export interface MinMax { min: number; max: number; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/controllers/IBotController.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/controllers/IBotController.d.ts index 820813d..010e208 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/controllers/IBotController.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/controllers/IBotController.d.ts @@ -2,8 +2,7 @@ import { IGenerateBotsRequestData } from "../../eft/bot/IGenerateBotsRequestData import { IBotBase } from "../../eft/common/tables/IBotBase"; import { IBotCore } from "../../eft/common/tables/IBotCore"; import { Difficulty } from "../../eft/common/tables/IBotType"; -export interface IBotController -{ +export interface IBotController { getBotLimit(type: string): number; getBotDifficulty(type: string, difficulty: string): IBotCore | Difficulty; isBotPmc(botRole: string): boolean; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/generators/IBotGenerator.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/generators/IBotGenerator.d.ts index f67fbc3..f3e8586 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/generators/IBotGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/generators/IBotGenerator.d.ts @@ -1,11 +1,9 @@ import { Inventory as PmcInventory } from "../../eft/common/IPmcData"; import { Inventory, Chances, Generation } from "../../eft/common/tables/IBotType"; -export interface IBotGenerator -{ +export interface IBotGenerator { generateInventory(templateInventory: Inventory, equipmentChances: Chances, generation: Generation, botRole: string, isPmc: boolean): PmcInventory; } -export interface IExhaustableArray -{ +export interface IExhaustableArray { getRandomValue(): T; getFirstValue(): T; hasValues(): boolean; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/generators/ILocationGenerator.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/generators/ILocationGenerator.d.ts index 6277f05..530ceca 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/generators/ILocationGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/generators/ILocationGenerator.d.ts @@ -1,7 +1,6 @@ import { IStaticContainerProps, IStaticLootDetails, IStaticAmmoDetails, IStaticForcedProps } from "../../eft/common/tables/ILootBase"; import { ILooseLoot, SpawnpointTemplate } from "../../eft/common/ILooseLoot"; -export interface ILocationGenerator -{ +export interface ILocationGenerator { generateContainerLoot(containerIn: IStaticContainerProps, staticForced: IStaticForcedProps[], staticLootDist: Record, staticAmmoDist: Record, locationName: string): IStaticContainerProps; generateDynamicLoot(dynamicLootDist: ILooseLoot, staticAmmoDist: Record, locationName: string): SpawnpointTemplate[]; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/generators/IPMCLootGenerator.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/generators/IPMCLootGenerator.d.ts index df3aa4e..a9db89b 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/generators/IPMCLootGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/generators/IPMCLootGenerator.d.ts @@ -1,5 +1,4 @@ -export interface IPMCLootGenerator -{ +export interface IPMCLootGenerator { generatePMCPocketLootPool(): string[]; generatePMCBackpackLootPool(): string[]; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/generators/IRagfairAssortGenerator.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/generators/IRagfairAssortGenerator.d.ts index 49cad61..6670540 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/generators/IRagfairAssortGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/generators/IRagfairAssortGenerator.d.ts @@ -1,5 +1,4 @@ import { Item } from "../../eft/common/tables/IItem"; -export interface IRagfairAssortGenerator -{ +export interface IRagfairAssortGenerator { getAssortItems(): Item[]; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/generators/IRagfairOfferGenerator.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/generators/IRagfairOfferGenerator.d.ts index ece2f6d..30b4be5 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/generators/IRagfairOfferGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/generators/IRagfairOfferGenerator.d.ts @@ -1,7 +1,6 @@ import { IBarterScheme } from "../../eft/common/tables/ITrader"; import { IRagfairOffer } from "../../eft/ragfair/IRagfairOffer"; import { Item } from "../../eft/common/tables/IItem"; -export interface IRagfairOfferGenerator -{ +export interface IRagfairOfferGenerator { createOffer(userID: string, time: number, items: Item[], barterScheme: IBarterScheme[], loyalLevel: number, price: number, sellInOnePiece: boolean): IRagfairOffer; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/helpers/Traders.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/helpers/Traders.d.ts index 26f7987..163cd71 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/helpers/Traders.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/helpers/Traders.d.ts @@ -1,5 +1,4 @@ -export declare enum Traders - { +export declare enum Traders { PRAPOR = "54cb50c76803fa8b248b4571", THERAPIST = "54cb57776803fa99248b456e", FENCE = "579dc571d53a0658a154fbec", diff --git a/TypeScript/5ReplaceMethod/types/models/spt/mod/IMod.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/mod/IMod.d.ts index 5411f1c..623e3dd 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/mod/IMod.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/mod/IMod.d.ts @@ -1,7 +1,5 @@ -declare namespace ModLoader -{ - interface IMod - { +declare namespace ModLoader { + interface IMod { name: string; version: string; main?: string; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/mod/IModLoader.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/mod/IModLoader.d.ts index dd5e412..5398c9b 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/mod/IModLoader.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/mod/IModLoader.d.ts @@ -1,6 +1,5 @@ import { DependencyContainer } from "tsyringe"; -export interface IModLoader -{ +export interface IModLoader { load(container: DependencyContainer): void; getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/mod/IPackageJsonData.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/mod/IPackageJsonData.d.ts index cec77ac..09472cd 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/mod/IPackageJsonData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/mod/IPackageJsonData.d.ts @@ -1,5 +1,4 @@ -export interface IPackageJsonData -{ +export interface IPackageJsonData { incompatibilities?: string[]; dependencies?: string[]; name: string; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/ragfair/IRagfairServerPrices.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/ragfair/IRagfairServerPrices.d.ts index 6f6569a..c7d246a 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/ragfair/IRagfairServerPrices.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/ragfair/IRagfairServerPrices.d.ts @@ -1,5 +1,4 @@ -export interface IRagfairServerPrices -{ +export interface IRagfairServerPrices { static: Record; dynamic: Record; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/server/IDatabaseTables.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/server/IDatabaseTables.d.ts index 737868c..dbb71be 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/server/IDatabaseTables.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/server/IDatabaseTables.d.ts @@ -17,8 +17,7 @@ import { ILocaleBase } from "./ILocaleBase"; import { ILocations } from "./ILocations"; import { IServerBase } from "./IServerBase"; import { ISettingsBase } from "./ISettingsBase"; -export interface IDatabaseTables -{ +export interface IDatabaseTables { bots: { types: Record; base: IBotBase; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/server/IHttpServer.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/server/IHttpServer.d.ts index d942854..50e5c91 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/server/IHttpServer.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/server/IHttpServer.d.ts @@ -1,8 +1,7 @@ /// import http, { ServerResponse } from "http"; import { INotification } from "../../eft/notifier/INotifier"; -export interface IHttpServer -{ +export interface IHttpServer { load(): void; getCookies(req: http.IncomingMessage): any; sendFile(resp: ServerResponse, file: any): void; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/server/ILocaleBase.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/server/ILocaleBase.d.ts index 9eadd74..a20084d 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/server/ILocaleBase.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/server/ILocaleBase.d.ts @@ -1,11 +1,9 @@ -export interface ILocaleBase -{ +export interface ILocaleBase { global: ILocaleGlobalBase; menu: Record; languages: ILanguageBase[]; } -export interface ILocaleGlobalBase -{ +export interface ILocaleGlobalBase { interface: Record; enum: any[]; mail: Record; @@ -20,8 +18,7 @@ export interface ILocaleGlobalBase banners: ILocaleBannersBase; trading: ILocaleTradingBase; } -export interface ILocaleQuest -{ +export interface ILocaleQuest { name: string; description: string; note: string; @@ -31,42 +28,34 @@ export interface ILocaleQuest conditions: Record; location: string; } -export interface ILocalePreset -{ +export interface ILocalePreset { Name: string; } -export interface ILocaleTemplateBase -{ +export interface ILocaleTemplateBase { templates: Record; } -export interface ILocaleLocationsBase -{ +export interface ILocaleLocationsBase { locations: Record; } -export interface ILocaleBannersBase -{ +export interface ILocaleBannersBase { locations: Record; } -export interface ILocaleProps -{ +export interface ILocaleProps { Name: string; ShortName: string; Description: string; } -export interface ILocaleTradingBase -{ +export interface ILocaleTradingBase { locations: Record; } -export interface ILocaleTradingProps -{ +export interface ILocaleTradingProps { FullName: string; FirstName: string; Nickname: string; Location: string; Description: string; } -export interface ILanguageBase -{ +export interface ILanguageBase { ShortName: string; Name: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/server/ILocations.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/server/ILocations.d.ts index 86b97ea..18f0262 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/server/ILocations.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/server/ILocations.d.ts @@ -1,8 +1,7 @@ import { ILocationBase } from "../../eft/common/ILocationBase"; import { ILooseLoot } from "../../eft/common/ILooseLoot"; import { ILocationsBase } from "../../eft/common/tables/ILocationsBase"; -export interface ILocations -{ +export interface ILocations { bigmap?: ILocationData; develop?: ILocationData; factory4_day?: ILocationData; @@ -21,8 +20,7 @@ export interface ILocations woods?: ILocationData; base?: ILocationsBase; } -export interface ILocationData -{ +export interface ILocationData { base: ILocationBase; looseLoot?: ILooseLoot; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/server/IServerBase.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/server/IServerBase.d.ts index dba8fd3..d033db3 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/server/IServerBase.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/server/IServerBase.d.ts @@ -1,5 +1,4 @@ -export interface IServerBase -{ +export interface IServerBase { ip: string; port: number; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/server/ISettingsBase.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/server/ISettingsBase.d.ts index c2de17e..c067cda 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/server/ISettingsBase.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/server/ISettingsBase.d.ts @@ -1,9 +1,7 @@ -export interface ISettingsBase -{ +export interface ISettingsBase { config: Config; } -export interface Config -{ +export interface Config { AFKTimeoutSeconds: number; AdditionalRandomDelaySeconds: number; ClientSendRateLimit: number; @@ -25,14 +23,12 @@ export interface Config WeaponOverlapDistanceCulling: number; WebDiagnosticsEnabled: boolean; } -export interface FramerateLimit -{ +export interface FramerateLimit { MaxFramerateGameLimit: number; MaxFramerateLobbyLimit: number; MinFramerateLimit: number; } -export interface MemoryManagementSettings -{ +export interface MemoryManagementSettings { AggressiveGC: boolean; GigabytesRequiredToDisableGCDuringRaid: number; HeapPreAllocationEnabled: boolean; @@ -40,8 +36,7 @@ export interface MemoryManagementSettings OverrideRamCleanerSettings: boolean; RamCleanerEnabled: boolean; } -export interface ReleaseProfiler -{ +export interface ReleaseProfiler { Enabled: boolean; MaxRecords: number; RecordTriggerValue: number; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/utils/IAsyncQueue.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/utils/IAsyncQueue.d.ts index abf2cae..2be801a 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/utils/IAsyncQueue.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/utils/IAsyncQueue.d.ts @@ -1,5 +1,4 @@ import { ICommand } from "./ICommand"; -export interface IAsyncQueue -{ +export interface IAsyncQueue { waitFor(command: ICommand): Promise; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/utils/ICommand.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/utils/ICommand.d.ts index f417016..696bb83 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/utils/ICommand.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/utils/ICommand.d.ts @@ -1,5 +1,4 @@ -export interface ICommand -{ +export interface ICommand { uuid: string; cmd: () => Promise; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/utils/ILogger.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/utils/ILogger.d.ts index 22ad989..c983701 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/utils/ILogger.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/utils/ILogger.d.ts @@ -1,6 +1,5 @@ import { Daum } from "../../eft/itemEvent/IItemEventRouterRequest"; -export interface ILogger -{ +export interface ILogger { writeToLogFile(data: string | Daum): void; log(data: string | Record | Error, color: string): void; error(data: string): void; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/utils/IUuidGenerator.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/utils/IUuidGenerator.d.ts index e9359b7..3870469 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/utils/IUuidGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/utils/IUuidGenerator.d.ts @@ -1,4 +1,3 @@ -export interface IUUidGenerator -{ +export interface IUUidGenerator { generate(): string; } diff --git a/TypeScript/5ReplaceMethod/types/models/spt/utils/IWatermark.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/utils/IWatermark.d.ts deleted file mode 100644 index 9e311a5..0000000 --- a/TypeScript/5ReplaceMethod/types/models/spt/utils/IWatermark.d.ts +++ /dev/null @@ -1,24 +0,0 @@ -export interface IWatermarkLocale -{ - getLocale(): string; - getDescription(): string[]; - getWarning(): string[]; -} -export interface IWatermark -{ - initialize(): void; - getVersionTag(): string; - /** - * Set window title - */ - setTitle(): void; - /** - * Reset console cursor to top - */ - resetCursor(): void; - /** - * Draw the watermark - */ - draw(): void; - getVersionLabel(): string; -} diff --git a/TypeScript/5ReplaceMethod/types/routers/HttpRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/HttpRouter.d.ts index 3b783fc..44edc0b 100644 --- a/TypeScript/5ReplaceMethod/types/routers/HttpRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/HttpRouter.d.ts @@ -1,8 +1,7 @@ /// import { IncomingMessage } from "http"; import { DynamicRouter, StaticRouter } from "../di/Router"; -export declare class HttpRouter -{ +export declare class HttpRouter { private staticRouters; private dynamicRoutes; constructor(staticRouters: StaticRouter[], dynamicRoutes: DynamicRouter[]); diff --git a/TypeScript/5ReplaceMethod/types/routers/ImageRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/ImageRouter.d.ts index 0ee8735..07a0606 100644 --- a/TypeScript/5ReplaceMethod/types/routers/ImageRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/ImageRouter.d.ts @@ -2,8 +2,7 @@ import { IncomingMessage, ServerResponse } from "http"; import { VFS } from "../utils/VFS"; import { IHttpServer } from "../models/spt/server/IHttpServer"; -export declare class ImageRouter -{ +export declare class ImageRouter { private vfs; constructor(vfs: VFS); private onRoute; diff --git a/TypeScript/5ReplaceMethod/types/routers/ItemEventRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/ItemEventRouter.d.ts index cbbe290..bb20152 100644 --- a/TypeScript/5ReplaceMethod/types/routers/ItemEventRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/ItemEventRouter.d.ts @@ -4,8 +4,7 @@ import { IItemEventRouterRequest } from "../models/eft/itemEvent/IItemEventRoute import { ProfileHelper } from "../helpers/ProfileHelper"; import { ItemEventRouterDefinition } from "../di/Router"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class ItemEventRouter -{ +export declare class ItemEventRouter { private logger; private jsonUtil; private profileHelper; diff --git a/TypeScript/5ReplaceMethod/types/routers/dynamic/BotDynamicRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/dynamic/BotDynamicRouter.d.ts index c9d3cc9..dd2f68a 100644 --- a/TypeScript/5ReplaceMethod/types/routers/dynamic/BotDynamicRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/dynamic/BotDynamicRouter.d.ts @@ -1,10 +1,6 @@ import { BotCallbacks } from "../../callbacks/BotCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; -export declare class BotDynamicRouter extends DynamicRouter -{ +import { DynamicRouter } from "../../di/Router"; +export declare class BotDynamicRouter extends DynamicRouter { private botCallbacks; constructor(botCallbacks: BotCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/5ReplaceMethod/types/routers/dynamic/BundleDynamicRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/dynamic/BundleDynamicRouter.d.ts index 3d4bccd..be27008 100644 --- a/TypeScript/5ReplaceMethod/types/routers/dynamic/BundleDynamicRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/dynamic/BundleDynamicRouter.d.ts @@ -1,10 +1,6 @@ import { BundleCallbacks } from "../../callbacks/BundleCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; -export declare class BundleDynamicRouter extends DynamicRouter -{ +import { DynamicRouter } from "../../di/Router"; +export declare class BundleDynamicRouter extends DynamicRouter { private bundleCallbacks; constructor(bundleCallbacks: BundleCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/5ReplaceMethod/types/routers/dynamic/CustomizationDynamicRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/dynamic/CustomizationDynamicRouter.d.ts index dc1df73..03a5967 100644 --- a/TypeScript/5ReplaceMethod/types/routers/dynamic/CustomizationDynamicRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/dynamic/CustomizationDynamicRouter.d.ts @@ -1,10 +1,6 @@ import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; -export declare class CustomizationDynamicRouter extends DynamicRouter -{ +import { DynamicRouter } from "../../di/Router"; +export declare class CustomizationDynamicRouter extends DynamicRouter { private customizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/5ReplaceMethod/types/routers/dynamic/DataDynamicRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/dynamic/DataDynamicRouter.d.ts index 837c34c..c30501a 100644 --- a/TypeScript/5ReplaceMethod/types/routers/dynamic/DataDynamicRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/dynamic/DataDynamicRouter.d.ts @@ -1,10 +1,6 @@ import { DataCallbacks } from "../../callbacks/DataCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; -export declare class DataDynamicRouter extends DynamicRouter -{ +import { DynamicRouter } from "../../di/Router"; +export declare class DataDynamicRouter extends DynamicRouter { private dataCallbacks; constructor(dataCallbacks: DataCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/5ReplaceMethod/types/routers/dynamic/HttpDynamicRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/dynamic/HttpDynamicRouter.d.ts index 3eee271..b2933e9 100644 --- a/TypeScript/5ReplaceMethod/types/routers/dynamic/HttpDynamicRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/dynamic/HttpDynamicRouter.d.ts @@ -1,10 +1,6 @@ -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; import { ImageRouter } from "../ImageRouter"; -export declare class HttpDynamicRouter extends DynamicRouter -{ +export declare class HttpDynamicRouter extends DynamicRouter { private imageRouter; constructor(imageRouter: ImageRouter); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/5ReplaceMethod/types/routers/dynamic/InraidDynamicRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/dynamic/InraidDynamicRouter.d.ts index 2b07109..ea4a9ae 100644 --- a/TypeScript/5ReplaceMethod/types/routers/dynamic/InraidDynamicRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/dynamic/InraidDynamicRouter.d.ts @@ -1,11 +1,7 @@ import { InraidCallbacks } from "../../callbacks/InraidCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; -export declare class InraidDynamicRouter extends DynamicRouter -{ +import { DynamicRouter } from "../../di/Router"; +export declare class InraidDynamicRouter extends DynamicRouter { private inraidCallbacks; constructor(inraidCallbacks: InraidCallbacks); - private readonly _routes; getTopLevelRoute(): string; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/5ReplaceMethod/types/routers/dynamic/LocationDynamicRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/dynamic/LocationDynamicRouter.d.ts index cac9ad4..30741db 100644 --- a/TypeScript/5ReplaceMethod/types/routers/dynamic/LocationDynamicRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/dynamic/LocationDynamicRouter.d.ts @@ -1,11 +1,7 @@ import { LocationCallbacks } from "../../callbacks/LocationCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; -export declare class LocationDynamicRouter extends DynamicRouter -{ +import { DynamicRouter } from "../../di/Router"; +export declare class LocationDynamicRouter extends DynamicRouter { private locationCallbacks; constructor(locationCallbacks: LocationCallbacks); - private readonly _routes; getTopLevelRoute(): string; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/5ReplaceMethod/types/routers/dynamic/NotifierDynamicRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/dynamic/NotifierDynamicRouter.d.ts index c2064af..4786817 100644 --- a/TypeScript/5ReplaceMethod/types/routers/dynamic/NotifierDynamicRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/dynamic/NotifierDynamicRouter.d.ts @@ -1,10 +1,6 @@ import { NotifierCallbacks } from "../../callbacks/NotifierCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; -export declare class NotifierDynamicRouter extends DynamicRouter -{ +import { DynamicRouter } from "../../di/Router"; +export declare class NotifierDynamicRouter extends DynamicRouter { private notifierCallbacks; constructor(notifierCallbacks: NotifierCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/5ReplaceMethod/types/routers/dynamic/TraderDynamicRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/dynamic/TraderDynamicRouter.d.ts index 71ca80a..a100b4c 100644 --- a/TypeScript/5ReplaceMethod/types/routers/dynamic/TraderDynamicRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/dynamic/TraderDynamicRouter.d.ts @@ -1,10 +1,6 @@ import { TraderCallbacks } from "../../callbacks/TraderCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; -export declare class TraderDynamicRouter extends DynamicRouter -{ +import { DynamicRouter } from "../../di/Router"; +export declare class TraderDynamicRouter extends DynamicRouter { private traderCallbacks; constructor(traderCallbacks: TraderCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/5ReplaceMethod/types/routers/item_events/CustomizationItemEventRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/item_events/CustomizationItemEventRouter.d.ts index 5ea826a..3025e2c 100644 --- a/TypeScript/5ReplaceMethod/types/routers/item_events/CustomizationItemEventRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/item_events/CustomizationItemEventRouter.d.ts @@ -2,8 +2,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"; -export declare class CustomizationItemEventRouter extends ItemEventRouterDefinition -{ +export declare class CustomizationItemEventRouter extends ItemEventRouterDefinition { private customizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); getHandledRoutes(): HandledRoute[]; diff --git a/TypeScript/5ReplaceMethod/types/routers/item_events/HealthItemEventRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/item_events/HealthItemEventRouter.d.ts index 6a59156..bad9af2 100644 --- a/TypeScript/5ReplaceMethod/types/routers/item_events/HealthItemEventRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/item_events/HealthItemEventRouter.d.ts @@ -2,8 +2,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"; -export declare class HealthItemEventRouter extends ItemEventRouterDefinition -{ +export declare class HealthItemEventRouter extends ItemEventRouterDefinition { private healthCallbacks; constructor(healthCallbacks: HealthCallbacks); getHandledRoutes(): HandledRoute[]; diff --git a/TypeScript/5ReplaceMethod/types/routers/item_events/HideoutItemEventRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/item_events/HideoutItemEventRouter.d.ts index c8ee1d0..2cec18b 100644 --- a/TypeScript/5ReplaceMethod/types/routers/item_events/HideoutItemEventRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/item_events/HideoutItemEventRouter.d.ts @@ -2,8 +2,7 @@ import { IPmcData } from "../../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; import { HideoutCallbacks } from "../../callbacks/HideoutCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; -export declare class HideoutItemEventRouter extends ItemEventRouterDefinition -{ +export declare class HideoutItemEventRouter extends ItemEventRouterDefinition { private hideoutCallbacks; constructor(hideoutCallbacks: HideoutCallbacks); getHandledRoutes(): HandledRoute[]; diff --git a/TypeScript/5ReplaceMethod/types/routers/item_events/InsuranceItemEventRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/item_events/InsuranceItemEventRouter.d.ts index e7d63a8..8efc2c2 100644 --- a/TypeScript/5ReplaceMethod/types/routers/item_events/InsuranceItemEventRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/item_events/InsuranceItemEventRouter.d.ts @@ -2,8 +2,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"; -export declare class InsuranceItemEventRouter extends ItemEventRouterDefinition -{ +export declare class InsuranceItemEventRouter extends ItemEventRouterDefinition { private insuranceCallbacks; constructor(insuranceCallbacks: InsuranceCallbacks); getHandledRoutes(): HandledRoute[]; diff --git a/TypeScript/5ReplaceMethod/types/routers/item_events/InventoryItemEventRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/item_events/InventoryItemEventRouter.d.ts index c97f484..1d93e7b 100644 --- a/TypeScript/5ReplaceMethod/types/routers/item_events/InventoryItemEventRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/item_events/InventoryItemEventRouter.d.ts @@ -2,8 +2,7 @@ import { IPmcData } from "../../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; import { InventoryCallbacks } from "../../callbacks/InventoryCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; -export declare class InventoryItemEventRouter extends ItemEventRouterDefinition -{ +export declare class InventoryItemEventRouter extends ItemEventRouterDefinition { private inventoryCallbacks; constructor(inventoryCallbacks: InventoryCallbacks); getHandledRoutes(): HandledRoute[]; diff --git a/TypeScript/5ReplaceMethod/types/routers/item_events/NoteItemEventRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/item_events/NoteItemEventRouter.d.ts index a1d2bb6..12af594 100644 --- a/TypeScript/5ReplaceMethod/types/routers/item_events/NoteItemEventRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/item_events/NoteItemEventRouter.d.ts @@ -2,8 +2,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"; -export declare class NoteItemEventRouter extends ItemEventRouterDefinition -{ +export declare class NoteItemEventRouter extends ItemEventRouterDefinition { private noteCallbacks; constructor(noteCallbacks: NoteCallbacks); getHandledRoutes(): HandledRoute[]; diff --git a/TypeScript/5ReplaceMethod/types/routers/item_events/PresetBuildItemEventRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/item_events/PresetBuildItemEventRouter.d.ts index efcf918..7298c52 100644 --- a/TypeScript/5ReplaceMethod/types/routers/item_events/PresetBuildItemEventRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/item_events/PresetBuildItemEventRouter.d.ts @@ -2,8 +2,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"; -export declare class PresetBuildItemEventRouter extends ItemEventRouterDefinition -{ +export declare class PresetBuildItemEventRouter extends ItemEventRouterDefinition { private presetBuildCallbacks; constructor(presetBuildCallbacks: PresetBuildCallbacks); getHandledRoutes(): HandledRoute[]; diff --git a/TypeScript/5ReplaceMethod/types/routers/item_events/QuestItemEventRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/item_events/QuestItemEventRouter.d.ts index 7503c5e..9944ae9 100644 --- a/TypeScript/5ReplaceMethod/types/routers/item_events/QuestItemEventRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/item_events/QuestItemEventRouter.d.ts @@ -2,8 +2,7 @@ import { IPmcData } from "../../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; import { QuestCallbacks } from "../../callbacks/QuestCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; -export declare class QuestItemEventRouter extends ItemEventRouterDefinition -{ +export declare class QuestItemEventRouter extends ItemEventRouterDefinition { private questCallbacks; constructor(questCallbacks: QuestCallbacks); getHandledRoutes(): HandledRoute[]; diff --git a/TypeScript/5ReplaceMethod/types/routers/item_events/RagfairItemEventRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/item_events/RagfairItemEventRouter.d.ts index 23369f3..88e52ba 100644 --- a/TypeScript/5ReplaceMethod/types/routers/item_events/RagfairItemEventRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/item_events/RagfairItemEventRouter.d.ts @@ -2,8 +2,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"; -export declare class RagfairItemEventRouter extends ItemEventRouterDefinition -{ +export declare class RagfairItemEventRouter extends ItemEventRouterDefinition { private ragfairCallbacks; constructor(ragfairCallbacks: RagfairCallbacks); getHandledRoutes(): HandledRoute[]; diff --git a/TypeScript/5ReplaceMethod/types/routers/item_events/RepairItemEventRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/item_events/RepairItemEventRouter.d.ts index 76e84cd..b292ded 100644 --- a/TypeScript/5ReplaceMethod/types/routers/item_events/RepairItemEventRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/item_events/RepairItemEventRouter.d.ts @@ -2,8 +2,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"; -export declare class RepairItemEventRouter extends ItemEventRouterDefinition -{ +export declare class RepairItemEventRouter extends ItemEventRouterDefinition { private repairCallbacks; constructor(repairCallbacks: RepairCallbacks); getHandledRoutes(): HandledRoute[]; diff --git a/TypeScript/5ReplaceMethod/types/routers/item_events/TradeItemEventRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/item_events/TradeItemEventRouter.d.ts index a0b3337..1bca2b8 100644 --- a/TypeScript/5ReplaceMethod/types/routers/item_events/TradeItemEventRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/item_events/TradeItemEventRouter.d.ts @@ -2,8 +2,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"; -export declare class TradeItemEventRouter extends ItemEventRouterDefinition -{ +export declare class TradeItemEventRouter extends ItemEventRouterDefinition { private tradeCallbacks; constructor(tradeCallbacks: TradeCallbacks); getHandledRoutes(): HandledRoute[]; diff --git a/TypeScript/5ReplaceMethod/types/routers/item_events/WishlistItemEventRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/item_events/WishlistItemEventRouter.d.ts index d1ebe78..38831f6 100644 --- a/TypeScript/5ReplaceMethod/types/routers/item_events/WishlistItemEventRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/item_events/WishlistItemEventRouter.d.ts @@ -2,8 +2,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"; -export declare class WishlistItemEventRouter extends ItemEventRouterDefinition -{ +export declare class WishlistItemEventRouter extends ItemEventRouterDefinition { private wishlistCallbacks; constructor(wishlistCallbacks: WishlistCallbacks); getHandledRoutes(): HandledRoute[]; diff --git a/TypeScript/5ReplaceMethod/types/routers/save_load/HealthSaveLoadRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/save_load/HealthSaveLoadRouter.d.ts index f1a6c2b..114f5b2 100644 --- a/TypeScript/5ReplaceMethod/types/routers/save_load/HealthSaveLoadRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/save_load/HealthSaveLoadRouter.d.ts @@ -1,7 +1,6 @@ import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; -export declare class HealthSaveLoadRouter extends SaveLoadRouter -{ +export declare class HealthSaveLoadRouter extends SaveLoadRouter { constructor(); getHandledRoutes(): HandledRoute[]; handleLoad(profile: IAkiProfile): IAkiProfile; diff --git a/TypeScript/5ReplaceMethod/types/routers/save_load/InraidSaveLoadRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/save_load/InraidSaveLoadRouter.d.ts index ea07c27..4c00b40 100644 --- a/TypeScript/5ReplaceMethod/types/routers/save_load/InraidSaveLoadRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/save_load/InraidSaveLoadRouter.d.ts @@ -1,7 +1,6 @@ import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; -export declare class InraidSaveLoadRouter extends SaveLoadRouter -{ +export declare class InraidSaveLoadRouter extends SaveLoadRouter { constructor(); getHandledRoutes(): HandledRoute[]; handleLoad(profile: IAkiProfile): IAkiProfile; diff --git a/TypeScript/5ReplaceMethod/types/routers/save_load/InsuranceSaveLoadRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/save_load/InsuranceSaveLoadRouter.d.ts index 10b9280..30ce98e 100644 --- a/TypeScript/5ReplaceMethod/types/routers/save_load/InsuranceSaveLoadRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/save_load/InsuranceSaveLoadRouter.d.ts @@ -1,7 +1,6 @@ import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; -export declare class InsuranceSaveLoadRouter extends SaveLoadRouter -{ +export declare class InsuranceSaveLoadRouter extends SaveLoadRouter { constructor(); getHandledRoutes(): HandledRoute[]; handleLoad(profile: IAkiProfile): IAkiProfile; diff --git a/TypeScript/5ReplaceMethod/types/routers/save_load/ProfileSaveLoadRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/save_load/ProfileSaveLoadRouter.d.ts index 734ec29..16c7619 100644 --- a/TypeScript/5ReplaceMethod/types/routers/save_load/ProfileSaveLoadRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/save_load/ProfileSaveLoadRouter.d.ts @@ -1,7 +1,6 @@ import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; -export declare class ProfileSaveLoadRouter extends SaveLoadRouter -{ +export declare class ProfileSaveLoadRouter extends SaveLoadRouter { constructor(); getHandledRoutes(): HandledRoute[]; handleLoad(profile: IAkiProfile): IAkiProfile; diff --git a/TypeScript/5ReplaceMethod/types/routers/serializers/BundleSerializer.d.ts b/TypeScript/5ReplaceMethod/types/routers/serializers/BundleSerializer.d.ts index 7097009..5f275c4 100644 --- a/TypeScript/5ReplaceMethod/types/routers/serializers/BundleSerializer.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/serializers/BundleSerializer.d.ts @@ -2,8 +2,7 @@ import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { ILogger } from "../../models/spt/utils/ILogger"; import { Serializer } from "../../di/Serializer"; import { BundleLoader } from "../../loaders/BundleLoader"; -export declare class BundleSerializer extends Serializer -{ +export declare class BundleSerializer extends Serializer { private logger; private bundleLoader; constructor(logger: ILogger, bundleLoader: BundleLoader); diff --git a/TypeScript/5ReplaceMethod/types/routers/serializers/ImageSerializer.d.ts b/TypeScript/5ReplaceMethod/types/routers/serializers/ImageSerializer.d.ts index 0c00040..29340d0 100644 --- a/TypeScript/5ReplaceMethod/types/routers/serializers/ImageSerializer.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/serializers/ImageSerializer.d.ts @@ -1,8 +1,7 @@ import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { Serializer } from "../../di/Serializer"; import { ImageRouter } from "../ImageRouter"; -export declare class ImageSerializer extends Serializer -{ +export declare class ImageSerializer extends Serializer { private imageRouter; constructor(imageRouter: ImageRouter); serialize(sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; diff --git a/TypeScript/5ReplaceMethod/types/routers/serializers/NotifySerializer.d.ts b/TypeScript/5ReplaceMethod/types/routers/serializers/NotifySerializer.d.ts index eebfc3a..8be8ac2 100644 --- a/TypeScript/5ReplaceMethod/types/routers/serializers/NotifySerializer.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/serializers/NotifySerializer.d.ts @@ -1,9 +1,8 @@ -import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { NotifierController } from "../../controllers/NotifierController"; import { Serializer } from "../../di/Serializer"; import { HttpServerHelper } from "../../helpers/HttpServerHelper"; -export declare class NotifySerializer extends Serializer -{ +import { IHttpServer } from "../../models/spt/server/IHttpServer"; +export declare class NotifySerializer extends Serializer { private notifierController; private httpServerHelper; constructor(notifierController: NotifierController, httpServerHelper: HttpServerHelper); diff --git a/TypeScript/5ReplaceMethod/types/routers/static/BotStaticRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/static/BotStaticRouter.d.ts index 3e39794..d8b0bf4 100644 --- a/TypeScript/5ReplaceMethod/types/routers/static/BotStaticRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/static/BotStaticRouter.d.ts @@ -1,9 +1,6 @@ import { BotCallbacks } from "../../callbacks/BotCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; -export declare class BotStaticRouter extends StaticRouter -{ +import { StaticRouter } from "../../di/Router"; +export declare class BotStaticRouter extends StaticRouter { private botCallbacks; constructor(botCallbacks: BotCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/5ReplaceMethod/types/routers/static/BundleStaticRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/static/BundleStaticRouter.d.ts index b257843..3905b82 100644 --- a/TypeScript/5ReplaceMethod/types/routers/static/BundleStaticRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/static/BundleStaticRouter.d.ts @@ -1,9 +1,6 @@ import { BundleCallbacks } from "../../callbacks/BundleCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; -export declare class BundleStaticRouter extends StaticRouter -{ +import { StaticRouter } from "../../di/Router"; +export declare class BundleStaticRouter extends StaticRouter { private bundleCallbacks; constructor(bundleCallbacks: BundleCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/5ReplaceMethod/types/routers/static/CustomizationStaticRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/static/CustomizationStaticRouter.d.ts index 3503fd4..46c71b8 100644 --- a/TypeScript/5ReplaceMethod/types/routers/static/CustomizationStaticRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/static/CustomizationStaticRouter.d.ts @@ -1,9 +1,6 @@ import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; -export declare class CustomizationStaticRouter extends StaticRouter -{ +import { StaticRouter } from "../../di/Router"; +export declare class CustomizationStaticRouter extends StaticRouter { private customizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/5ReplaceMethod/types/routers/static/DataStaticRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/static/DataStaticRouter.d.ts index ce02554..a493d3a 100644 --- a/TypeScript/5ReplaceMethod/types/routers/static/DataStaticRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/static/DataStaticRouter.d.ts @@ -1,9 +1,6 @@ import { DataCallbacks } from "../../callbacks/DataCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; -export declare class DataStaticRouter extends StaticRouter -{ +import { StaticRouter } from "../../di/Router"; +export declare class DataStaticRouter extends StaticRouter { private dataCallbacks; constructor(dataCallbacks: DataCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/5ReplaceMethod/types/routers/static/DialogStaticRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/static/DialogStaticRouter.d.ts index f4f23f1..a59fb14 100644 --- a/TypeScript/5ReplaceMethod/types/routers/static/DialogStaticRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/static/DialogStaticRouter.d.ts @@ -1,9 +1,6 @@ import { DialogueCallbacks } from "../../callbacks/DialogueCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; -export declare class DialogStaticRouter extends StaticRouter -{ +import { StaticRouter } from "../../di/Router"; +export declare class DialogStaticRouter extends StaticRouter { private dialogueCallbacks; constructor(dialogueCallbacks: DialogueCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/5ReplaceMethod/types/routers/static/GameStaticRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/static/GameStaticRouter.d.ts index e247f88..988b673 100644 --- a/TypeScript/5ReplaceMethod/types/routers/static/GameStaticRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/static/GameStaticRouter.d.ts @@ -1,9 +1,6 @@ import { GameCallbacks } from "../../callbacks/GameCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; -export declare class GameStaticRouter extends StaticRouter -{ +import { StaticRouter } from "../../di/Router"; +export declare class GameStaticRouter extends StaticRouter { private gameCallbacks; constructor(gameCallbacks: GameCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/5ReplaceMethod/types/routers/static/HealthStaticRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/static/HealthStaticRouter.d.ts index 6172697..e644861 100644 --- a/TypeScript/5ReplaceMethod/types/routers/static/HealthStaticRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/static/HealthStaticRouter.d.ts @@ -1,9 +1,6 @@ import { HealthCallbacks } from "../../callbacks/HealthCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; -export declare class HealthStaticRouter extends StaticRouter -{ +import { StaticRouter } from "../../di/Router"; +export declare class HealthStaticRouter extends StaticRouter { private healthCallbacks; constructor(healthCallbacks: HealthCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/5ReplaceMethod/types/routers/static/InraidStaticRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/static/InraidStaticRouter.d.ts index 12fa1f9..66ed860 100644 --- a/TypeScript/5ReplaceMethod/types/routers/static/InraidStaticRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/static/InraidStaticRouter.d.ts @@ -1,9 +1,6 @@ import { InraidCallbacks } from "../../callbacks/InraidCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; -export declare class InraidStaticRouter extends StaticRouter -{ +import { StaticRouter } from "../../di/Router"; +export declare class InraidStaticRouter extends StaticRouter { private inraidCallbacks; constructor(inraidCallbacks: InraidCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/5ReplaceMethod/types/routers/static/InsuranceStaticRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/static/InsuranceStaticRouter.d.ts index d3a19e7..8da26b3 100644 --- a/TypeScript/5ReplaceMethod/types/routers/static/InsuranceStaticRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/static/InsuranceStaticRouter.d.ts @@ -1,9 +1,6 @@ import { InsuranceCallbacks } from "../../callbacks/InsuranceCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; -export declare class InsuranceStaticRouter extends StaticRouter -{ +import { StaticRouter } from "../../di/Router"; +export declare class InsuranceStaticRouter extends StaticRouter { private insuranceCallbacks; constructor(insuranceCallbacks: InsuranceCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/5ReplaceMethod/types/routers/static/ItemEventStaticRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/static/ItemEventStaticRouter.d.ts index f2b525b..08ba6bb 100644 --- a/TypeScript/5ReplaceMethod/types/routers/static/ItemEventStaticRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/static/ItemEventStaticRouter.d.ts @@ -1,9 +1,6 @@ import { ItemEventCallbacks } from "../../callbacks/ItemEventCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; -export declare class ItemEventStaticRouter extends StaticRouter -{ +import { StaticRouter } from "../../di/Router"; +export declare class ItemEventStaticRouter extends StaticRouter { private itemEventCallbacks; constructor(itemEventCallbacks: ItemEventCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/5ReplaceMethod/types/routers/static/LauncherStaticRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/static/LauncherStaticRouter.d.ts index a30c054..9d07f78 100644 --- a/TypeScript/5ReplaceMethod/types/routers/static/LauncherStaticRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/static/LauncherStaticRouter.d.ts @@ -1,9 +1,6 @@ import { LauncherCallbacks } from "../../callbacks/LauncherCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; -export declare class LauncherStaticRouter extends StaticRouter -{ +import { StaticRouter } from "../../di/Router"; +export declare class LauncherStaticRouter extends StaticRouter { private launcherCallbacks; constructor(launcherCallbacks: LauncherCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): string; } diff --git a/TypeScript/5ReplaceMethod/types/routers/static/LocationStaticRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/static/LocationStaticRouter.d.ts index 7352ebb..9c5c52e 100644 --- a/TypeScript/5ReplaceMethod/types/routers/static/LocationStaticRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/static/LocationStaticRouter.d.ts @@ -1,9 +1,6 @@ import { LocationCallbacks } from "../../callbacks/LocationCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; -export declare class LocationStaticRouter extends StaticRouter -{ +import { StaticRouter } from "../../di/Router"; +export declare class LocationStaticRouter extends StaticRouter { private locationCallbacks; constructor(locationCallbacks: LocationCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/5ReplaceMethod/types/routers/static/MatchStaticRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/static/MatchStaticRouter.d.ts index 3527005..d746381 100644 --- a/TypeScript/5ReplaceMethod/types/routers/static/MatchStaticRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/static/MatchStaticRouter.d.ts @@ -1,9 +1,6 @@ import { MatchCallbacks } from "../../callbacks/MatchCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; -export declare class MatchStaticRouter extends StaticRouter -{ +import { StaticRouter } from "../../di/Router"; +export declare class MatchStaticRouter extends StaticRouter { private matchCallbacks; constructor(matchCallbacks: MatchCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/5ReplaceMethod/types/routers/static/NotifierStaticRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/static/NotifierStaticRouter.d.ts index d58b711..1c8566d 100644 --- a/TypeScript/5ReplaceMethod/types/routers/static/NotifierStaticRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/static/NotifierStaticRouter.d.ts @@ -1,9 +1,6 @@ import { NotifierCallbacks } from "../../callbacks/NotifierCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; -export declare class NotifierStaticRouter extends StaticRouter -{ +import { StaticRouter } from "../../di/Router"; +export declare class NotifierStaticRouter extends StaticRouter { private notifierCallbacks; constructor(notifierCallbacks: NotifierCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/5ReplaceMethod/types/routers/static/PresetStaticRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/static/PresetStaticRouter.d.ts index 612227b..2272f82 100644 --- a/TypeScript/5ReplaceMethod/types/routers/static/PresetStaticRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/static/PresetStaticRouter.d.ts @@ -1,9 +1,6 @@ import { PresetBuildCallbacks } from "../../callbacks/PresetBuildCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; -export declare class PresetStaticRouter extends StaticRouter -{ +import { StaticRouter } from "../../di/Router"; +export declare class PresetStaticRouter extends StaticRouter { private presetCallbacks; constructor(presetCallbacks: PresetBuildCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/5ReplaceMethod/types/routers/static/ProfileStaticRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/static/ProfileStaticRouter.d.ts index b5c59a5..fd787f1 100644 --- a/TypeScript/5ReplaceMethod/types/routers/static/ProfileStaticRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/static/ProfileStaticRouter.d.ts @@ -1,9 +1,6 @@ import { ProfileCallbacks } from "../../callbacks/ProfileCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; -export declare class ProfileStaticRouter extends StaticRouter -{ +import { StaticRouter } from "../../di/Router"; +export declare class ProfileStaticRouter extends StaticRouter { private profileCallbacks; constructor(profileCallbacks: ProfileCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/5ReplaceMethod/types/routers/static/QuestStaticRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/static/QuestStaticRouter.d.ts index f0647a9..fda3c23 100644 --- a/TypeScript/5ReplaceMethod/types/routers/static/QuestStaticRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/static/QuestStaticRouter.d.ts @@ -1,9 +1,6 @@ import { QuestCallbacks } from "../../callbacks/QuestCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; -export declare class QuestStaticRouter extends StaticRouter -{ +import { StaticRouter } from "../../di/Router"; +export declare class QuestStaticRouter extends StaticRouter { private questCallbacks; constructor(questCallbacks: QuestCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/5ReplaceMethod/types/routers/static/RagfairStaticRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/static/RagfairStaticRouter.d.ts index 180354a..618374f 100644 --- a/TypeScript/5ReplaceMethod/types/routers/static/RagfairStaticRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/static/RagfairStaticRouter.d.ts @@ -1,9 +1,6 @@ import { RagfairCallbacks } from "../../callbacks/RagfairCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; -export declare class RagfairStaticRouter extends StaticRouter -{ +import { StaticRouter } from "../../di/Router"; +export declare class RagfairStaticRouter extends StaticRouter { private ragfairCallbacks; constructor(ragfairCallbacks: RagfairCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/5ReplaceMethod/types/routers/static/TraderStaticRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/static/TraderStaticRouter.d.ts index 37bc173..18f0629 100644 --- a/TypeScript/5ReplaceMethod/types/routers/static/TraderStaticRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/static/TraderStaticRouter.d.ts @@ -1,9 +1,6 @@ import { TraderCallbacks } from "../../callbacks/TraderCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; -export declare class TraderStaticRouter extends StaticRouter -{ +import { StaticRouter } from "../../di/Router"; +export declare class TraderStaticRouter extends StaticRouter { private traderCallbacks; constructor(traderCallbacks: TraderCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/5ReplaceMethod/types/routers/static/WeatherStaticRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/static/WeatherStaticRouter.d.ts index 8afe025..61b904d 100644 --- a/TypeScript/5ReplaceMethod/types/routers/static/WeatherStaticRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/static/WeatherStaticRouter.d.ts @@ -1,9 +1,6 @@ import { WeatherCallbacks } from "../../callbacks/WeatherCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; -export declare class WeatherStaticRouter extends StaticRouter -{ +import { StaticRouter } from "../../di/Router"; +export declare class WeatherStaticRouter extends StaticRouter { private weatherCallbacks; constructor(weatherCallbacks: WeatherCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/5ReplaceMethod/types/servers/ConfigServer.d.ts b/TypeScript/5ReplaceMethod/types/servers/ConfigServer.d.ts index b6f0b8c..9c2e114 100644 --- a/TypeScript/5ReplaceMethod/types/servers/ConfigServer.d.ts +++ b/TypeScript/5ReplaceMethod/types/servers/ConfigServer.d.ts @@ -1,8 +1,7 @@ import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class ConfigServer -{ +export declare class ConfigServer { private logger; private vfs; private jsonUtil; @@ -11,8 +10,7 @@ export declare class ConfigServer getConfig(configType: ConfigTypes): T; initialize(): void; } -export declare const enum ConfigTypes - { +export declare const enum ConfigTypes { AIRDROP = "aki-airdrop", BOT = "aki-bot", CORE = "aki-core", diff --git a/TypeScript/5ReplaceMethod/types/servers/DatabaseServer.d.ts b/TypeScript/5ReplaceMethod/types/servers/DatabaseServer.d.ts index 7885a2a..521bcf9 100644 --- a/TypeScript/5ReplaceMethod/types/servers/DatabaseServer.d.ts +++ b/TypeScript/5ReplaceMethod/types/servers/DatabaseServer.d.ts @@ -1,6 +1,5 @@ import { IDatabaseTables } from "../models/spt/server/IDatabaseTables"; -export declare class DatabaseServer -{ +export declare class DatabaseServer { private tableData; getTables(): IDatabaseTables; setTables(any: any): void; diff --git a/TypeScript/5ReplaceMethod/types/servers/HttpServer.d.ts b/TypeScript/5ReplaceMethod/types/servers/HttpServer.d.ts index e020e30..d0db7e4 100644 --- a/TypeScript/5ReplaceMethod/types/servers/HttpServer.d.ts +++ b/TypeScript/5ReplaceMethod/types/servers/HttpServer.d.ts @@ -1,20 +1,21 @@ /// -import { HttpRouter } from "../routers/HttpRouter"; -import { JsonUtil } from "../utils/JsonUtil"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { DatabaseServer } from "./DatabaseServer"; -import { Serializer } from "../di/Serializer"; import http, { ServerResponse } from "http"; -import { INotification } from "../models/eft/notifier/INotifier"; -import { NotifierHelper } from "../helpers/NotifierHelper"; -import { ConfigServer } from "./ConfigServer"; -import { ILogger } from "../models/spt/utils/ILogger"; +import { Serializer } from "../di/Serializer"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; +import { NotifierHelper } from "../helpers/NotifierHelper"; +import { INotification } from "../models/eft/notifier/INotifier"; import { IHttpServer } from "../models/spt/server/IHttpServer"; -export declare class HttpServer implements IHttpServer -{ +import { ILogger } from "../models/spt/utils/ILogger"; +import { HttpRouter } from "../routers/HttpRouter"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { JsonUtil } from "../utils/JsonUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +import { ConfigServer } from "./ConfigServer"; +import { DatabaseServer } from "./DatabaseServer"; +export declare class HttpServer implements IHttpServer { private httpRouter; private logger; + private randomUtil; private jsonUtil; private httpResponse; private databaseServer; @@ -22,7 +23,8 @@ export declare class HttpServer implements IHttpServer private httpServerHelper; private serializers; private configServer; - constructor(httpRouter: HttpRouter, logger: ILogger, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); + constructor(httpRouter: HttpRouter, // TODO: delay required + logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); private buffers; private onReceive; private onRespond; @@ -40,5 +42,6 @@ export declare class HttpServer implements IHttpServer sendResponse(sessionID: string, req: any, resp: any, body: Buffer): void; handleRequest(req: http.IncomingMessage, resp: http.ServerResponse): void; load(): void; + private getRandomisedMessage; wsOnConnection(ws: any, req: any): void; } diff --git a/TypeScript/5ReplaceMethod/types/servers/RagfairServer.d.ts b/TypeScript/5ReplaceMethod/types/servers/RagfairServer.d.ts index 784991d..d103625 100644 --- a/TypeScript/5ReplaceMethod/types/servers/RagfairServer.d.ts +++ b/TypeScript/5ReplaceMethod/types/servers/RagfairServer.d.ts @@ -13,8 +13,7 @@ import { ConfigServer } from "./ConfigServer"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class RagfairServer -{ +export declare class RagfairServer { private logger; private ragfairOfferGenerator; private ragfairServerHelper; diff --git a/TypeScript/5ReplaceMethod/types/servers/SaveServer.d.ts b/TypeScript/5ReplaceMethod/types/servers/SaveServer.d.ts index f2a20aa..fdf92e4 100644 --- a/TypeScript/5ReplaceMethod/types/servers/SaveServer.d.ts +++ b/TypeScript/5ReplaceMethod/types/servers/SaveServer.d.ts @@ -4,8 +4,7 @@ import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; import { SaveLoadRouter } from "../di/Router"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class SaveServer -{ +export declare class SaveServer { private vfs; private saveLoadRouters; private jsonUtil; diff --git a/TypeScript/5ReplaceMethod/types/services/FenceService.d.ts b/TypeScript/5ReplaceMethod/types/services/FenceService.d.ts index 2b4af1e..eef87b3 100644 --- a/TypeScript/5ReplaceMethod/types/services/FenceService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/FenceService.d.ts @@ -10,8 +10,7 @@ import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class FenceService -{ +export declare class FenceService { private logger; private hashUtil; private jsonUtil; diff --git a/TypeScript/5ReplaceMethod/types/services/HashCacheService.d.ts b/TypeScript/5ReplaceMethod/types/services/HashCacheService.d.ts index 7accf6c..c9b0170 100644 --- a/TypeScript/5ReplaceMethod/types/services/HashCacheService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/HashCacheService.d.ts @@ -2,8 +2,7 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; -export declare class HashCacheService -{ +export declare class HashCacheService { private vfs; private hashUtil; private jsonUtil; diff --git a/TypeScript/5ReplaceMethod/types/services/InsuranceService.d.ts b/TypeScript/5ReplaceMethod/types/services/InsuranceService.d.ts index cfc5c8a..160faba 100644 --- a/TypeScript/5ReplaceMethod/types/services/InsuranceService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/InsuranceService.d.ts @@ -1,17 +1,16 @@ +import { DialogueHelper } from "../helpers/DialogueHelper"; +import { SecureContainerHelper } from "../helpers/SecureContainerHelper"; +import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ILogger } from "../models/spt/utils/ILogger"; -import { DialogueHelper } from "../helpers/DialogueHelper"; -import { SecureContainerHelper } from "../helpers/SecureContainerHelper"; -import { TraderHelper } from "../helpers/TraderHelper"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; -export declare class InsuranceService -{ +export declare class InsuranceService { private logger; private databaseServer; private secureContainerHelper; diff --git a/TypeScript/5ReplaceMethod/types/services/MatchLocationService.d.ts b/TypeScript/5ReplaceMethod/types/services/MatchLocationService.d.ts index 6133e85..f7b7d3b 100644 --- a/TypeScript/5ReplaceMethod/types/services/MatchLocationService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/MatchLocationService.d.ts @@ -1,6 +1,5 @@ import { TimeUtil } from "../utils/TimeUtil"; -export declare class MatchLocationService -{ +export declare class MatchLocationService { private timeUtil; private locations; constructor(timeUtil: TimeUtil); diff --git a/TypeScript/5ReplaceMethod/types/services/ModCompilerService.d.ts b/TypeScript/5ReplaceMethod/types/services/ModCompilerService.d.ts index 9c4cfd5..d316e48 100644 --- a/TypeScript/5ReplaceMethod/types/services/ModCompilerService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/ModCompilerService.d.ts @@ -1,11 +1,12 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { VFS } from "../utils/VFS"; -export declare class ModCompilerService -{ +import { HashCacheService } from "./HashCacheService"; +export declare class ModCompilerService { private logger; + private hashCacheService; private vfs; - constructor(logger: ILogger, vfs: VFS); - compileMod(path: string, modTypeScriptFiles: string[]): Promise; + constructor(logger: ILogger, hashCacheService: HashCacheService, vfs: VFS); + compileMod(modName: string, path: string, modTypeScriptFiles: string[]): Promise; private compile; private areFilesReady; private delay; diff --git a/TypeScript/5ReplaceMethod/types/services/NotificationService.d.ts b/TypeScript/5ReplaceMethod/types/services/NotificationService.d.ts index 1518e6d..9c6c143 100644 --- a/TypeScript/5ReplaceMethod/types/services/NotificationService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/NotificationService.d.ts @@ -1,6 +1,5 @@ import { INotification } from "../models/eft/notifier/INotifier"; -export declare class NotificationService -{ +export declare class NotificationService { private messageQueue; getMessageQueue(): {}; getMessageFromQueue(sessionId: string): any; diff --git a/TypeScript/5ReplaceMethod/types/services/PaymentService.d.ts b/TypeScript/5ReplaceMethod/types/services/PaymentService.d.ts index d4fc282..0a6c4d6 100644 --- a/TypeScript/5ReplaceMethod/types/services/PaymentService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/PaymentService.d.ts @@ -1,17 +1,16 @@ +import { HandbookHelper } from "../helpers/HandbookHelper"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { ItemHelper } from "../helpers/ItemHelper"; -import { DatabaseServer } from "../servers/DatabaseServer"; +import { PaymentHelper } from "../helpers/PaymentHelper"; +import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "../models/eft/trade/IProcessSellTradeRequestData"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { PaymentHelper } from "../helpers/PaymentHelper"; -import { HandbookHelper } from "../helpers/HandbookHelper"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class PaymentService -{ +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +export declare class PaymentService { private logger; private httpResponse; private databaseServer; diff --git a/TypeScript/5ReplaceMethod/types/services/PlayerService.d.ts b/TypeScript/5ReplaceMethod/types/services/PlayerService.d.ts index a186454..99e5986 100644 --- a/TypeScript/5ReplaceMethod/types/services/PlayerService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/PlayerService.d.ts @@ -1,9 +1,8 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IPlayerIncrementSkillLevelRequestData } from "../models/eft/player/IPlayerIncrementSkillLevelRequestData"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class PlayerService -{ +import { DatabaseServer } from "../servers/DatabaseServer"; +export declare class PlayerService { private logger; private databaseServer; constructor(logger: ILogger, databaseServer: DatabaseServer); diff --git a/TypeScript/5ReplaceMethod/types/services/RagfairCategoriesService.d.ts b/TypeScript/5ReplaceMethod/types/services/RagfairCategoriesService.d.ts index 5ffe395..fb9efa2 100644 --- a/TypeScript/5ReplaceMethod/types/services/RagfairCategoriesService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/RagfairCategoriesService.d.ts @@ -1,6 +1,5 @@ import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; -export declare class RagfairCategoriesService -{ +export declare class RagfairCategoriesService { updateCategories(offers: IRagfairOffer[]): void; private categories; getCategories(): Record; diff --git a/TypeScript/5ReplaceMethod/types/services/RagfairLinkedItemService.d.ts b/TypeScript/5ReplaceMethod/types/services/RagfairLinkedItemService.d.ts index ab5e8bf..d5dc58e 100644 --- a/TypeScript/5ReplaceMethod/types/services/RagfairLinkedItemService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/RagfairLinkedItemService.d.ts @@ -1,6 +1,5 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -export declare class RagfairLinkedItemService -{ +export declare class RagfairLinkedItemService { private databaseServer; private linkedItemsCache; constructor(databaseServer: DatabaseServer); diff --git a/TypeScript/5ReplaceMethod/types/services/RagfairOfferService.d.ts b/TypeScript/5ReplaceMethod/types/services/RagfairOfferService.d.ts index 82057ec..4e4ae26 100644 --- a/TypeScript/5ReplaceMethod/types/services/RagfairOfferService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/RagfairOfferService.d.ts @@ -4,8 +4,7 @@ import { SaveServer } from "../servers/SaveServer"; import { TimeUtil } from "../utils/TimeUtil"; import { Item } from "../models/eft/common/tables/IItem"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; -export declare class RagfairOfferService -{ +export declare class RagfairOfferService { private timeUtil; private databaseServer; private saveServer; diff --git a/TypeScript/5ReplaceMethod/types/services/RagfairPriceService.d.ts b/TypeScript/5ReplaceMethod/types/services/RagfairPriceService.d.ts index 8a80190..7cc42f9 100644 --- a/TypeScript/5ReplaceMethod/types/services/RagfairPriceService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/RagfairPriceService.d.ts @@ -7,8 +7,7 @@ import { PresetHelper } from "../helpers/PresetHelper"; import { Item } from "../models/eft/common/tables/IItem"; import { IBarterScheme } from "../models/eft/common/tables/ITrader"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class RagfairPriceService -{ +export declare class RagfairPriceService { private handbookHelper; private databaseServer; private logger; diff --git a/TypeScript/5ReplaceMethod/types/services/RagfairRequiredItemsService.d.ts b/TypeScript/5ReplaceMethod/types/services/RagfairRequiredItemsService.d.ts index df6146a..e4582d0 100644 --- a/TypeScript/5ReplaceMethod/types/services/RagfairRequiredItemsService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/RagfairRequiredItemsService.d.ts @@ -1,8 +1,7 @@ import { PaymentHelper } from "../helpers/PaymentHelper"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class RagfairRequiredItemsService -{ +export declare class RagfairRequiredItemsService { private logger; private paymentHelper; private ragfairOfferService; diff --git a/TypeScript/5ReplaceMethod/types/services/TraderAssortService.d.ts b/TypeScript/5ReplaceMethod/types/services/TraderAssortService.d.ts index 591eeac..ccb9e45 100644 --- a/TypeScript/5ReplaceMethod/types/services/TraderAssortService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/TraderAssortService.d.ts @@ -1,6 +1,5 @@ import { ITraderAssort } from "../models/eft/common/tables/ITrader"; -export declare class TraderAssortService -{ +export declare class TraderAssortService { private pristineTraderAssorts; getPristineTraderAssort(traderId: string): ITraderAssort; setPristineTraderAssort(traderId: string, assort: ITraderAssort): void; diff --git a/TypeScript/5ReplaceMethod/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts b/TypeScript/5ReplaceMethod/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts new file mode 100644 index 0000000..abfe237 --- /dev/null +++ b/TypeScript/5ReplaceMethod/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts @@ -0,0 +1,6 @@ +import { DynamicRouter, RouteAction } from "../../../di/Router"; +export declare class DynamicRouterMod extends DynamicRouter { + private topLevelRoute; + constructor(routes: RouteAction[], topLevelRoute: string); + getTopLevelRoute(): string; +} diff --git a/TypeScript/5ReplaceMethod/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/5ReplaceMethod/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts new file mode 100644 index 0000000..6742fc6 --- /dev/null +++ b/TypeScript/5ReplaceMethod/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -0,0 +1,7 @@ +import { DependencyContainer } from "tsyringe"; +import { RouteAction } from "../../../di/Router"; +export declare class DynamicRouterModService { + private container; + constructor(container: DependencyContainer); + registerDynamicRouter(name: string, routes: RouteAction[], topLevelRoute: string): void; +} diff --git a/TypeScript/5ReplaceMethod/types/services/mod/onLoad/OnLoadMod.d.ts b/TypeScript/5ReplaceMethod/types/services/mod/onLoad/OnLoadMod.d.ts new file mode 100644 index 0000000..53fb062 --- /dev/null +++ b/TypeScript/5ReplaceMethod/types/services/mod/onLoad/OnLoadMod.d.ts @@ -0,0 +1,8 @@ +import { OnLoad } from "../../../di/OnLoad"; +export declare class OnLoadMod extends OnLoad { + private onLoadOverride; + private getRouteOverride; + constructor(onLoadOverride: () => void, getRouteOverride: () => string); + onLoad(): void; + getRoute(): string; +} diff --git a/TypeScript/5ReplaceMethod/types/services/mod/onLoad/OnLoadModService.d.ts b/TypeScript/5ReplaceMethod/types/services/mod/onLoad/OnLoadModService.d.ts new file mode 100644 index 0000000..89bad14 --- /dev/null +++ b/TypeScript/5ReplaceMethod/types/services/mod/onLoad/OnLoadModService.d.ts @@ -0,0 +1,6 @@ +import { DependencyContainer } from "tsyringe"; +export declare class OnLoadModService { + private container; + constructor(container: DependencyContainer); + registerOnLoad(name: string, onLoad: () => void, getRoute: () => string): void; +} diff --git a/TypeScript/5ReplaceMethod/types/services/mod/onUpdate/OnUpdateMod.d.ts b/TypeScript/5ReplaceMethod/types/services/mod/onUpdate/OnUpdateMod.d.ts new file mode 100644 index 0000000..ee89043 --- /dev/null +++ b/TypeScript/5ReplaceMethod/types/services/mod/onUpdate/OnUpdateMod.d.ts @@ -0,0 +1,8 @@ +import { OnUpdate } from "../../../di/OnUpdate"; +export declare class OnUpdateMod extends OnUpdate { + private onUpdateOverride; + private getRouteOverride; + constructor(onUpdateOverride: (timeSinceLastRun: number) => boolean, getRouteOverride: () => string); + onUpdate(timeSinceLastRun: number): boolean; + getRoute(): string; +} diff --git a/TypeScript/5ReplaceMethod/types/services/mod/onUpdate/OnUpdateModService.d.ts b/TypeScript/5ReplaceMethod/types/services/mod/onUpdate/OnUpdateModService.d.ts new file mode 100644 index 0000000..32419f4 --- /dev/null +++ b/TypeScript/5ReplaceMethod/types/services/mod/onUpdate/OnUpdateModService.d.ts @@ -0,0 +1,6 @@ +import { DependencyContainer } from "tsyringe"; +export declare class OnUpdateModService { + private container; + constructor(container: DependencyContainer); + registerOnUpdate(name: string, onUpdate: (timeSinceLastRun: number) => boolean, getRoute: () => string): void; +} diff --git a/TypeScript/5ReplaceMethod/types/services/mod/staticRouter/StaticRouterMod.d.ts b/TypeScript/5ReplaceMethod/types/services/mod/staticRouter/StaticRouterMod.d.ts new file mode 100644 index 0000000..1e62747 --- /dev/null +++ b/TypeScript/5ReplaceMethod/types/services/mod/staticRouter/StaticRouterMod.d.ts @@ -0,0 +1,6 @@ +import { RouteAction, StaticRouter } from "../../../di/Router"; +export declare class StaticRouterMod extends StaticRouter { + private topLevelRoute; + constructor(routes: RouteAction[], topLevelRoute: string); + getTopLevelRoute(): string; +} diff --git a/TypeScript/5ReplaceMethod/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/5ReplaceMethod/types/services/mod/staticRouter/StaticRouterModService.d.ts new file mode 100644 index 0000000..d4c42aa --- /dev/null +++ b/TypeScript/5ReplaceMethod/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -0,0 +1,7 @@ +import { DependencyContainer } from "tsyringe"; +import { RouteAction } from "../../../di/Router"; +export declare class StaticRouterModService { + private container; + constructor(container: DependencyContainer); + registerStaticRouter(name: string, routes: RouteAction[], topLevelRoute: string): void; +} diff --git a/TypeScript/5ReplaceMethod/types/utils/App.d.ts b/TypeScript/5ReplaceMethod/types/utils/App.d.ts index e534112..a11f576 100644 --- a/TypeScript/5ReplaceMethod/types/utils/App.d.ts +++ b/TypeScript/5ReplaceMethod/types/utils/App.d.ts @@ -2,8 +2,7 @@ import { TimeUtil } from "./TimeUtil"; import { OnLoad } from "../di/OnLoad"; import { OnUpdate } from "../di/OnUpdate"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class App -{ +export declare class App { private logger; private timeUtil; private onLoadComponents; diff --git a/TypeScript/5ReplaceMethod/types/utils/AyncQueue.d.ts b/TypeScript/5ReplaceMethod/types/utils/AyncQueue.d.ts index 932b4ac..a99aa37 100644 --- a/TypeScript/5ReplaceMethod/types/utils/AyncQueue.d.ts +++ b/TypeScript/5ReplaceMethod/types/utils/AyncQueue.d.ts @@ -1,8 +1,7 @@ import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; import { ICommand } from "../models/spt/utils/ICommand"; -export declare class AsyncQueue implements IAsyncQueue -{ - commandsQueue: ICommand[]; +export declare class AsyncQueue implements IAsyncQueue { + private commandsQueue; constructor(); waitFor(command: ICommand): Promise; } diff --git a/TypeScript/5ReplaceMethod/types/utils/DatabaseImporter.d.ts b/TypeScript/5ReplaceMethod/types/utils/DatabaseImporter.d.ts index c25f84c..97dda30 100644 --- a/TypeScript/5ReplaceMethod/types/utils/DatabaseImporter.d.ts +++ b/TypeScript/5ReplaceMethod/types/utils/DatabaseImporter.d.ts @@ -4,8 +4,7 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { ImageRouter } from "../routers/ImageRouter"; import { OnLoad } from "../di/OnLoad"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class DatabaseImporter extends OnLoad -{ +export declare class DatabaseImporter extends OnLoad { private logger; private vfs; private jsonUtil; diff --git a/TypeScript/5ReplaceMethod/types/utils/HashUtil.d.ts b/TypeScript/5ReplaceMethod/types/utils/HashUtil.d.ts index 4994e8c..cf92b47 100644 --- a/TypeScript/5ReplaceMethod/types/utils/HashUtil.d.ts +++ b/TypeScript/5ReplaceMethod/types/utils/HashUtil.d.ts @@ -1,8 +1,7 @@ /// import crypto from "crypto"; import { TimeUtil } from "./TimeUtil"; -export declare class HashUtil -{ +export declare class HashUtil { private timeUtil; constructor(timeUtil: TimeUtil); generate(): string; diff --git a/TypeScript/5ReplaceMethod/types/utils/HttpResponseUtil.d.ts b/TypeScript/5ReplaceMethod/types/utils/HttpResponseUtil.d.ts index 313a24c..85c28bd 100644 --- a/TypeScript/5ReplaceMethod/types/utils/HttpResponseUtil.d.ts +++ b/TypeScript/5ReplaceMethod/types/utils/HttpResponseUtil.d.ts @@ -2,8 +2,7 @@ import { JsonUtil } from "./JsonUtil"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -export declare class HttpResponseUtil -{ +export declare class HttpResponseUtil { private jsonUtil; constructor(jsonUtil: JsonUtil); private clearString; diff --git a/TypeScript/5ReplaceMethod/types/utils/JsonUtil.d.ts b/TypeScript/5ReplaceMethod/types/utils/JsonUtil.d.ts index c9ab28e..20b7448 100644 --- a/TypeScript/5ReplaceMethod/types/utils/JsonUtil.d.ts +++ b/TypeScript/5ReplaceMethod/types/utils/JsonUtil.d.ts @@ -1,8 +1,7 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { HashUtil } from "./HashUtil"; import { VFS } from "./VFS"; -export declare class JsonUtil -{ +export declare class JsonUtil { private vfs; private hashUtil; private logger; diff --git a/TypeScript/5ReplaceMethod/types/utils/Logger.d.ts b/TypeScript/5ReplaceMethod/types/utils/Logger.d.ts index cf89050..9d5b32a 100644 --- a/TypeScript/5ReplaceMethod/types/utils/Logger.d.ts +++ b/TypeScript/5ReplaceMethod/types/utils/Logger.d.ts @@ -4,8 +4,7 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; import fs from "fs"; -export declare class WinstonLogger implements ILogger -{ +export declare class WinstonLogger implements ILogger { private asyncQueue; private uuidGenerator; private showDebugInConsole; diff --git a/TypeScript/5ReplaceMethod/types/utils/MathUtil.d.ts b/TypeScript/5ReplaceMethod/types/utils/MathUtil.d.ts index 7cad2ed..ea5fd69 100644 --- a/TypeScript/5ReplaceMethod/types/utils/MathUtil.d.ts +++ b/TypeScript/5ReplaceMethod/types/utils/MathUtil.d.ts @@ -1,5 +1,4 @@ -export declare class MathUtil -{ +export declare class MathUtil { /** * Helper to create the sum of all array elements * @param {array} values The array with numbers of which to calculate the sum diff --git a/TypeScript/5ReplaceMethod/types/utils/ObjectId.d.ts b/TypeScript/5ReplaceMethod/types/utils/ObjectId.d.ts index 243dd32..b100572 100644 --- a/TypeScript/5ReplaceMethod/types/utils/ObjectId.d.ts +++ b/TypeScript/5ReplaceMethod/types/utils/ObjectId.d.ts @@ -1,7 +1,6 @@ /// import { TimeUtil } from "./TimeUtil"; -export declare class ObjectId -{ +export declare class ObjectId { private timeUtil; constructor(timeUtil: TimeUtil); private randomBytes; diff --git a/TypeScript/5ReplaceMethod/types/utils/RandomUtil.d.ts b/TypeScript/5ReplaceMethod/types/utils/RandomUtil.d.ts index 11e0ac2..3a3ecb6 100644 --- a/TypeScript/5ReplaceMethod/types/utils/RandomUtil.d.ts +++ b/TypeScript/5ReplaceMethod/types/utils/RandomUtil.d.ts @@ -16,8 +16,7 @@ import { MathUtil } from "./MathUtil"; * // count the elements which should be distributed according to the relative probabilities * res.filter(x => x==="b").reduce((sum, x) => sum + 1 , 0) */ -export declare class ProbabilityObjectArray extends Array> -{ +export declare class ProbabilityObjectArray extends Array> { private mathUtil; constructor(mathUtil: MathUtil, ...items: ProbabilityObject[]); filter(callbackfn: (value: ProbabilityObject, index: number, array: ProbabilityObject[]) => any): ProbabilityObjectArray; @@ -91,8 +90,7 @@ export declare class ProbabilityObjectArray extends Array -{ +export declare class ProbabilityObject { key: K; relativeProbability: number; data: V; @@ -104,8 +102,7 @@ export declare class ProbabilityObject */ constructor(key: K, relativeProbability: number, data?: V); } -export declare class RandomUtil -{ +export declare class RandomUtil { private jsonUtil; private logger; constructor(jsonUtil: JsonUtil, logger: ILogger); diff --git a/TypeScript/5ReplaceMethod/types/utils/TimeUtil.d.ts b/TypeScript/5ReplaceMethod/types/utils/TimeUtil.d.ts index 3ad77ba..9733be9 100644 --- a/TypeScript/5ReplaceMethod/types/utils/TimeUtil.d.ts +++ b/TypeScript/5ReplaceMethod/types/utils/TimeUtil.d.ts @@ -1,5 +1,4 @@ -export declare class TimeUtil -{ +export declare class TimeUtil { static readonly oneHourAsSeconds = 3600; formatTime(date: Date): string; formatDate(date: Date): string; diff --git a/TypeScript/5ReplaceMethod/types/utils/UUidGenerator.d.ts b/TypeScript/5ReplaceMethod/types/utils/UUidGenerator.d.ts index 3834737..000b719 100644 --- a/TypeScript/5ReplaceMethod/types/utils/UUidGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/utils/UUidGenerator.d.ts @@ -1,5 +1,4 @@ import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; -export declare class UUidGenerator implements IUUidGenerator -{ +export declare class UUidGenerator implements IUUidGenerator { generate: () => string; } diff --git a/TypeScript/5ReplaceMethod/types/utils/VFS.d.ts b/TypeScript/5ReplaceMethod/types/utils/VFS.d.ts index 7af20cf..b064cf4 100644 --- a/TypeScript/5ReplaceMethod/types/utils/VFS.d.ts +++ b/TypeScript/5ReplaceMethod/types/utils/VFS.d.ts @@ -3,8 +3,7 @@ import "reflect-metadata"; import fs from "fs"; import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; -export declare class VFS -{ +export declare class VFS { private asyncQueue; private uuidGenerator; accessFilePromisify: (path: fs.PathLike, mode?: number) => Promise; diff --git a/TypeScript/5ReplaceMethod/types/utils/Watermark.d.ts b/TypeScript/5ReplaceMethod/types/utils/Watermark.d.ts index e78ada1..e7b9883 100644 --- a/TypeScript/5ReplaceMethod/types/utils/Watermark.d.ts +++ b/TypeScript/5ReplaceMethod/types/utils/Watermark.d.ts @@ -1,15 +1,12 @@ -import { IWatermark, IWatermarkLocale } from "../models/spt/utils/IWatermark"; import { ConfigServer } from "../servers/ConfigServer"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class WatermarkLocale implements IWatermarkLocale -{ +export declare class WatermarkLocale { private locales; getLocale(): string; getDescription(): string[]; getWarning(): string[]; } -export declare class Watermark implements IWatermark -{ +export declare class Watermark { private logger; private configServer; private watermarkLocale?; diff --git a/TypeScript/6ReferenceAnotherClass/.eslintignore b/TypeScript/6ReferenceAnotherClass/.eslintignore new file mode 100644 index 0000000..9922d9a --- /dev/null +++ b/TypeScript/6ReferenceAnotherClass/.eslintignore @@ -0,0 +1,9 @@ +# Exclude these folders from linting +node_modules +dist/ +types/ + +# Exclude these filetypes from linting +*.json +*.txt +*.exe \ No newline at end of file diff --git a/TypeScript/6ReferenceAnotherClass/.eslintrc.json b/TypeScript/6ReferenceAnotherClass/.eslintrc.json new file mode 100644 index 0000000..c505160 --- /dev/null +++ b/TypeScript/6ReferenceAnotherClass/.eslintrc.json @@ -0,0 +1,75 @@ +{ + "root": true, + "parser": "@typescript-eslint/parser", + "plugins": [ + "@typescript-eslint" + ], + "extends": [ + "eslint:recommended", + "plugin:@typescript-eslint/eslint-recommended", + "plugin:@typescript-eslint/recommended" + ], + "rules": { + "@typescript-eslint/no-explicit-any": 0, + "@typescript-eslint/no-unused-vars": 1, + "@typescript-eslint/no-empty-interface": 0, + "@typescript-eslint/no-namespace": 0, + "@typescript-eslint/comma-dangle": 1, + "@typescript-eslint/func-call-spacing": 2, + "@typescript-eslint/quotes": 1, + "@typescript-eslint/brace-style": [ + "warn", + "allman" + ], + "@typescript-eslint/naming-convention": [ + "warn", + { + "selector": "default", + "format": ["camelCase"], + "leadingUnderscore": "allow" + }, + { + "selector": "typeLike", + "format": ["PascalCase"] + }, + { + "selector": "objectLiteralProperty", + "format": ["PascalCase", "camelCase"], + "leadingUnderscore": "allow" + }, + { + "selector": "typeProperty", + "format": ["PascalCase", "camelCase"], + "leadingUnderscore": "allow" + }, + { + "selector": "enumMember", + "format": ["UPPER_CASE"] + } + ], + "@typescript-eslint/indent": [ + "warn", + 4 + ], + "@typescript-eslint/no-unused-expressions": [ + "warn", + { + "allowShortCircuit": false, + "allowTernary": false + } + ], + "@typescript-eslint/keyword-spacing": [ + "warn", + { + "before": true, + "after": true + } + ], + "@typescript-eslint/explicit-module-boundary-types": [ + "warn", + { + "allowArgumentsExplicitlyTypedAsAny": true + } + ] + } +} \ No newline at end of file diff --git a/TypeScript/6ReferenceAnotherClass/README.md b/TypeScript/6ReferenceAnotherClass/README.md new file mode 100644 index 0000000..efc31a4 --- /dev/null +++ b/TypeScript/6ReferenceAnotherClass/README.md @@ -0,0 +1,64 @@ + +This project was created to automate most parts of building and setting up an environment. + +## **NodeJS 14.15.3:** + +The first step would be to install nodejs on your pc, the version you NEED is **14.15.3** + +That version is the one that has been used to test the mod templates and build scripts. + +It can be downloaded from here: https://nodejs.org/download/release/v14.15.3/ + +A system reboot may be needed after install. + +## **IDE:** + +The second step is having an IDE ready. For the currect purpose we've setup a VSCodium workspace file. + +You CAN use Visual Studio Code if you so desire, just keep in mind that our dev tests on the mod files was done using VSCodium. + +You can get VSCodium here: https://vscodium.com/#install + +## **Workspace:** + +Once you have NodeJS and VSCodium ready, open the mod.code-workspace file with VSCodium (File->Open Worspace from File...). + +Once the project loads into VSCodium you will be recommended to install the ESLint plugin. This is HIGHLY recommended. + +## **Environment Setup:** + +There is a task that will automatically setup your environment to use typescript. + +To run it, you just need to go to: + +> Terminal->Run Task...->Show All Tasks...->npm: install + +After running this task, your environment will be ready to start coding. + +DO NOT remove the node_modules folder, this is an auto generated directory that has the required dependencies to be able to use typescript and more. + +## **IMPORTANT:** + +Before starting to work on your mod, we suggest you read about Dependency Injection and Inversion of Control as this is the adopted architecture SPT-AKI has adopted. + +It will be difficult to understand some of the problems you may be having if you dont understand the basics of it. + +A guide explaining all the essentials will be available on the hub on release for you to read about. + +## **Coding:** + +All your work should be centered around the mod.ts file as an entry point. +You can ONLY change the following properties from the package.json file: `"name"`, `"version"`, `"license"`: `"MIT"`, `"author"`, `"akiVersion"`. + +If you have never used typescript before, you can read about it here: https://www.typescriptlang.org/docs/ + +## **Distributing your mod:** + +The project has been set up with an automatic task that will copy and zip ALL required files for your mod to work on SPT-AKI. +To run this task you just need to go to: + +> Terminal->Run Task...->Show All Tasks...->npm: build:zip + +The output will be a mod.zip file that will appear on the root of the project. + +Always verify that all files were included into the zip file. \ No newline at end of file diff --git a/TypeScript/6ReferenceAnotherClass/mod.code-workspace b/TypeScript/6ReferenceAnotherClass/mod.code-workspace new file mode 100644 index 0000000..6732c67 --- /dev/null +++ b/TypeScript/6ReferenceAnotherClass/mod.code-workspace @@ -0,0 +1,12 @@ +{ + "folders": [ + { + "path": "." + } + ], + "extensions": { + "recommendations": [ + "dbaeumer.vscode-eslint" + ] + } +} \ No newline at end of file diff --git a/TypeScript/6ReferenceAnotherClass/package.json b/TypeScript/6ReferenceAnotherClass/package.json index c1f5ba5..1f9f8ed 100644 --- a/TypeScript/6ReferenceAnotherClass/package.json +++ b/TypeScript/6ReferenceAnotherClass/package.json @@ -1,17 +1,25 @@ { - "name": "ReferenceAnotherClass", - "version": "1.0.0", - "main": "src/mod.js", - "license": "MIT", - "author": "Chomp", - "akiVersion": "3.0.0", - "scripts": { - "install": "npx handpick --target=devDependencies", - "build": "tsc" - }, - "devDependencies": { - "@types/node": "^17.0.31", - "tsyringe": "^4.6.0", - "typescript": "^4.6.4" - } + "name": "ReferenceAnotherClass", + "version": "1.0.0", + "main": "src/mod.js", + "license": "MIT", + "author": "Chomp", + "akiVersion": "3.0.0", + "scripts": { + "setup:environment": "npm i", + "build:unzipped": "copyfiles -e \"./node_modules/**/*.*\" -e \"./dist/**/*.*\" -e \"./package-lock.json\" -e \"./tsconfig.json\" -e \"./README.txt\" -e \"./mod.code-workspace\" ./**/*.* ./dist", + "zip:files": "cd dist/ && bestzip ../mod.zip *", + "build:zip": "npm run clean:environment && npm run build:unzipped && npm run zip:files", + "clean:environment": "node -e \"require('fs').rm('mod.zip', ()=>{})\" && node -e \"require('fs').rmdir('./dist/',{recursive:true},()=>{})\"" + }, + "devDependencies": { + "@types/node": "^14.15.3", + "@typescript-eslint/eslint-plugin": "^4.33.0", + "@typescript-eslint/parser": "^4.33.0", + "copyfiles": "2.4.1", + "eslint": "7.26.0", + "tsyringe": "4.6.0", + "typescript": "4.6.4", + "bestzip": "2.2.1" + } } diff --git a/TypeScript/6ReferenceAnotherClass/types/Config.d.ts b/TypeScript/6ReferenceAnotherClass/types/Config.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/Config.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/BotCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/BotCallbacks.d.ts index 358d5e3..9602975 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/BotCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/BotCallbacks.d.ts @@ -1,8 +1,8 @@ import { BotController } from "../controllers/BotController"; import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IBotBase } from "../models/eft/common/tables/IBotBase"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class BotCallbacks { private botController; diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/BundleCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/BundleCallbacks.d.ts index 08c33c0..b007ab8 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/BundleCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/BundleCallbacks.d.ts @@ -1,8 +1,8 @@ import { BundleLoader } from "../loaders/BundleLoader"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class BundleCallbacks { private logger; private httpResponse; diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/CustomizationCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/CustomizationCallbacks.d.ts index 0a4265b..918b8b6 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/CustomizationCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/CustomizationCallbacks.d.ts @@ -1,22 +1,23 @@ -import { SaveServer } from "../servers/SaveServer"; import { CustomizationController } from "../controllers/CustomizationController"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { ISuit } from "../models/eft/common/tables/ITrader"; import { IBuyClothingRequestData } from "../models/eft/customization/IBuyClothingRequestData"; import { IWearClothingRequestData } from "../models/eft/customization/IWearClothingRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { ISuit } from "../models/eft/common/tables/ITrader"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class CustomizationCallbacks { private customizationController; private saveServer; private httpResponse; constructor(customizationController: CustomizationController, saveServer: SaveServer, httpResponse: HttpResponseUtil); - getSuits(url: string, info: any, sessionID: string): IGetBodyResponseData<{ + getSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<{ _id: string; suites: string[]; }>; - getTraderSuits(url: string, info: any, sessionID: string): IGetBodyResponseData; + getTraderSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; wearClothing(pmcData: IPmcData, body: IWearClothingRequestData, sessionID: string): IItemEventRouterResponse; buyClothing(pmcData: IPmcData, body: IBuyClothingRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/DataCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/DataCallbacks.d.ts index ac9cab7..018420e 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/DataCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/DataCallbacks.d.ts @@ -1,4 +1,3 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGlobals } from "../models/eft/common/IGlobals"; import { ICustomizationItem } from "../models/eft/common/tables/ICustomizationItem"; @@ -10,6 +9,7 @@ import { IHideoutSettingsBase } from "../models/eft/hideout/IHideoutSettingsBase import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { ILanguageBase } from "../models/spt/server/ILocaleBase"; import { ISettingsBase } from "../models/spt/server/ISettingsBase"; +import { DatabaseServer } from "../servers/DatabaseServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class DataCallbacks { private httpResponse; diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/DialogueCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/DialogueCallbacks.d.ts index e81255c..3b6fbd1 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/DialogueCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/DialogueCallbacks.d.ts @@ -1,25 +1,25 @@ -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { HashUtil } from "../utils/HashUtil"; -import { TimeUtil } from "../utils/TimeUtil"; import { DialogueController } from "../controllers/DialogueController"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { DialogueInfo } from "../models/eft/profile/IAkiProfile"; -import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; -import { IGetMailDialogViewRequestData } from "../models/eft/dialog/IGetMailDialogViewRequestData"; -import { IGetMailDialogInfoRequestData } from "../models/eft/dialog/IGetMailDialogInfoRequestData"; -import { IRemoveDialogRequestData } from "../models/eft/dialog/IRemoveDialogRequestData"; -import { IGetMailDialogListRequestData } from "../models/eft/dialog/IGetMailDialogListRequestData"; +import { OnUpdate } from "../di/OnUpdate"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IFriendRequestData } from "../models/eft/dialog/IFriendRequestData"; -import { IPinDialogRequestData } from "../models/eft/dialog/IPinDialogRequestData"; -import { ISetDialogReadRequestData } from "../models/eft/dialog/ISetDialogReadRequestData"; import { IGetAllAttachmentsRequestData } from "../models/eft/dialog/IGetAllAttachmentsRequestData"; +import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachmentsResponse"; import { IGetChatServerListRequestData } from "../models/eft/dialog/IGetChatServerListRequestData"; import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse"; -import { ISendMessageRequest } from "../models/eft/dialog/ISendMessageRequest"; +import { IGetMailDialogInfoRequestData } from "../models/eft/dialog/IGetMailDialogInfoRequestData"; +import { IGetMailDialogListRequestData } from "../models/eft/dialog/IGetMailDialogListRequestData"; +import { IGetMailDialogViewRequestData } from "../models/eft/dialog/IGetMailDialogViewRequestData"; import { IGetMailDialogViewResponseData } from "../models/eft/dialog/IGetMailDialogViewResponseData"; -import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachmentsResponse"; -import { OnUpdate } from "../di/OnUpdate"; +import { IPinDialogRequestData } from "../models/eft/dialog/IPinDialogRequestData"; +import { IRemoveDialogRequestData } from "../models/eft/dialog/IRemoveDialogRequestData"; +import { ISendMessageRequest } from "../models/eft/dialog/ISendMessageRequest"; +import { ISetDialogReadRequestData } from "../models/eft/dialog/ISetDialogReadRequestData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +import { DialogueInfo } from "../models/eft/profile/IAkiProfile"; +import { HashUtil } from "../utils/HashUtil"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export declare class DialogueCallbacks extends OnUpdate { private hashUtil; private timeUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/GameCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/GameCallbacks.d.ts index 9481129..44a30ea 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/GameCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/GameCallbacks.d.ts @@ -1,17 +1,17 @@ import { GameController } from "../controllers/GameController"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; import { IGameEmptyCrcRequestData } from "../models/eft/game/IGameEmptyCrcRequestData"; import { IVersionValidateRequestData } from "../models/eft/game/IVersionValidateRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; -import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { IWatermark } from "../models/spt/utils/IWatermark"; +import { Watermark } from "../utils/Watermark"; declare class GameCallbacks { private httpResponse; private watermark; private gameController; - constructor(httpResponse: HttpResponseUtil, watermark: IWatermark, gameController: GameController); + constructor(httpResponse: HttpResponseUtil, watermark: Watermark, gameController: GameController); versionValidate(url: string, info: IVersionValidateRequestData, sessionID: string): INullResponseData; gameStart(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; gameLogout(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/HealthCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/HealthCallbacks.d.ts index b223bb3..a50dd42 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/HealthCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/HealthCallbacks.d.ts @@ -1,13 +1,13 @@ import { HealthController } from "../controllers/HealthController"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; +import { IHealthTreatmentRequestData } from "../models/eft/health/IHealthTreatmentRequestData"; import { IOffraidEatRequestData } from "../models/eft/health/IOffraidEatRequestData"; import { IOffraidHealRequestData } from "../models/eft/health/IOffraidHealRequestData"; -import { IHealthTreatmentRequestData } from "../models/eft/health/IHealthTreatmentRequestData"; -import { ProfileHelper } from "../helpers/ProfileHelper"; +import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class HealthCallbacks { private httpResponse; private profileHelper; diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/HideoutCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/HideoutCallbacks.d.ts index b574232..3698176 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/HideoutCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/HideoutCallbacks.d.ts @@ -1,22 +1,23 @@ import { HideoutController } from "../controllers/HideoutController"; +import { OnUpdate } from "../di/OnUpdate"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; -import { IHideoutUpgradeCompleteRequestData } from "../models/eft/hideout/IHideoutUpgradeCompleteRequestData"; -import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; -import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData"; -import { IHideoutTakeItemOutRequestData } from "../models/eft/hideout/IHideoutTakeItemOutRequestData"; -import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutToggleAreaRequestData"; -import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; +import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData"; +import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; +import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; +import { IHideoutTakeItemOutRequestData } from "../models/eft/hideout/IHideoutTakeItemOutRequestData"; import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; +import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutToggleAreaRequestData"; +import { IHideoutUpgradeCompleteRequestData } from "../models/eft/hideout/IHideoutUpgradeCompleteRequestData"; +import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ConfigServer } from "../servers/ConfigServer"; -import { OnUpdate } from "../di/OnUpdate"; export declare class HideoutCallbacks extends OnUpdate { private hideoutController; private configServer; private hideoutConfig; - constructor(hideoutController: HideoutController, configServer: ConfigServer); + constructor(hideoutController: HideoutController, // TODO: delay needed + configServer: ConfigServer); upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; upgradeComplete(pmcData: IPmcData, body: IHideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse; putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/HttpCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/HttpCallbacks.d.ts index 7072297..9fe387d 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/HttpCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/HttpCallbacks.d.ts @@ -1,5 +1,5 @@ -import { IHttpServer } from "../models/spt/server/IHttpServer"; import { OnLoad } from "../di/OnLoad"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class HttpCallbacks extends OnLoad { private httpServer; constructor(httpServer: IHttpServer); diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/InraidCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/InraidCallbacks.d.ts index 1948d01..2d53227 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/InraidCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/InraidCallbacks.d.ts @@ -1,6 +1,6 @@ import { InraidController } from "../controllers/InraidController"; -import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ConfigServer } from "../servers/ConfigServer"; diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/InsuranceCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/InsuranceCallbacks.d.ts index 73b7bd9..79feb67 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/InsuranceCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/InsuranceCallbacks.d.ts @@ -1,13 +1,13 @@ import { InsuranceController } from "../controllers/InsuranceController"; +import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData"; import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { ConfigServer } from "../servers/ConfigServer"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; -import { InsuranceService } from "../services/InsuranceService"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { ConfigServer } from "../servers/ConfigServer"; +import { InsuranceService } from "../services/InsuranceService"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class InsuranceCallbacks extends OnLoadOnUpdate { private insuranceController; private insuranceService; diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/InventoryCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/InventoryCallbacks.d.ts index 90d6936..9795aa0 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/InventoryCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/InventoryCallbacks.d.ts @@ -1,21 +1,21 @@ import { InventoryController } from "../controllers/InventoryController"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IInventoryFoldRequestData } from "../models/eft/inventory/IInventoryFoldRequestData"; -import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; -import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; -import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData"; -import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData"; -import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwapRequestData"; -import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData"; -import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData"; import { IInventoryBindRequestData } from "../models/eft/inventory/IInventoryBindRequestData"; -import { IInventoryExamineRequestData } from "../models/eft/inventory/IInventoryExamineRequestData"; -import { IInventoryReadEncyclopediaRequestData } from "../models/eft/inventory/IInventoryReadEncyclopediaRequestData"; -import { IInventorySortRequestData } from "../models/eft/inventory/IInventorySortRequestData"; import { IInventoryCreateMarkerRequestData } from "../models/eft/inventory/IInventoryCreateMarkerRequestData"; import { IInventoryDeleteMarkerRequestData } from "../models/eft/inventory/IInventoryDeleteMarkerRequestData"; import { IInventoryEditMarkerRequestData } from "../models/eft/inventory/IInventoryEditMarkerRequestData"; +import { IInventoryExamineRequestData } from "../models/eft/inventory/IInventoryExamineRequestData"; +import { IInventoryFoldRequestData } from "../models/eft/inventory/IInventoryFoldRequestData"; +import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; +import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; +import { IInventoryReadEncyclopediaRequestData } from "../models/eft/inventory/IInventoryReadEncyclopediaRequestData"; +import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData"; +import { IInventorySortRequestData } from "../models/eft/inventory/IInventorySortRequestData"; +import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; +import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwapRequestData"; +import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData"; +import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData"; +import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class InventoryCallbacks { private inventoryController; diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/LauncherCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/LauncherCallbacks.d.ts index addf76b..4bd5e2c 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/LauncherCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/LauncherCallbacks.d.ts @@ -1,17 +1,18 @@ -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { SaveServer } from "../servers/SaveServer"; import { LauncherController } from "../controllers/LauncherController"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IChangeRequestData } from "../models/eft/launcher/IChangeRequestData"; +import { ILoginRequestData } from "../models/eft/launcher/ILoginRequestData"; import { IRegisterData } from "../models/eft/launcher/IRegisterData"; import { IRemoveProfileData } from "../models/eft/launcher/IRemoveProfileData"; -import { ILoginRequestData } from "../models/eft/launcher/ILoginRequestData"; -import { IChangeRequestData } from "../models/eft/launcher/IChangeRequestData"; -import { IWatermark } from "../models/spt/utils/IWatermark"; +import { SaveServer } from "../servers/SaveServer"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { Watermark } from "../utils/Watermark"; declare class LauncherCallbacks { private httpResponse; private launcherController; private saveServer; private watermark; - constructor(httpResponse: HttpResponseUtil, launcherController: LauncherController, saveServer: SaveServer, watermark: IWatermark); + constructor(httpResponse: HttpResponseUtil, launcherController: LauncherController, saveServer: SaveServer, watermark: Watermark); connect(): string; login(url: string, info: ILoginRequestData, sessionID: string): string; register(url: string, info: IRegisterData, sessionID: string): "FAILED" | "OK"; @@ -20,7 +21,7 @@ declare class LauncherCallbacks { changePassword(url: string, info: IChangeRequestData, sessionID: string): "FAILED" | "OK"; wipe(url: string, info: IRegisterData, sessionID: string): "FAILED" | "OK"; getServerVersion(): string; - ping(url: string, info: any, sessionID: string): string; + ping(url: string, info: IEmptyRequestData, sessionID: string): string; removeProfile(url: string, info: IRemoveProfileData, sessionID: string): string; getCompatibleTarkovVersion(): string; } diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/LocationCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/LocationCallbacks.d.ts index 346893b..5ecab74 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/LocationCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/LocationCallbacks.d.ts @@ -1,13 +1,14 @@ import { LocationController } from "../controllers/LocationController"; -import { IGetLocationRequestData } from "../models/eft/location/IGetLocationRequestData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSourceDestinationBase"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { ILocationBase } from "../models/eft/common/ILocationBase"; +import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSourceDestinationBase"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IGetLocationRequestData } from "../models/eft/location/IGetLocationRequestData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class LocationCallbacks { private httpResponse; private locationController; constructor(httpResponse: HttpResponseUtil, locationController: LocationController); - getLocationData(url: string, info: any, sessionID: string): IGetBodyResponseData; + getLocationData(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getLocation(url: string, info: IGetLocationRequestData, sessionID: string): IGetBodyResponseData; } diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/MatchCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/MatchCallbacks.d.ts index 9364a2f..63d38d9 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/MatchCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/MatchCallbacks.d.ts @@ -1,10 +1,11 @@ import { MatchController } from "../controllers/MatchController"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; -import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; -import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; +import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData"; +import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { DatabaseServer } from "../servers/DatabaseServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class MatchCallbacks { @@ -22,7 +23,7 @@ export declare class MatchCallbacks { 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; + getProfile(url: string, info: IGetProfileRequestData, sessionID: string): IGetBodyResponseData; serverAvailable(url: string, info: any, sessionID: string): IGetBodyResponseData | IGetBodyResponseData; joinMatch(url: string, info: any, sessionID: string): IGetBodyResponseData; getMetrics(url: string, info: any, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/ModCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/ModCallbacks.d.ts index b4c18c2..2011f0e 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/ModCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/ModCallbacks.d.ts @@ -1,9 +1,9 @@ -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { OnLoad } from "../di/OnLoad"; import { DelayedModLoader } from "../loaders/DelayedModLoader"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from '../models/spt/utils/ILogger'; -import { IHttpServer } from '../models/spt/server/IHttpServer'; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; declare class ModCallbacks extends OnLoad { private logger; private httpResponse; diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/NoteCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/NoteCallbacks.d.ts index 36cbd44..fd7c5ca 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/NoteCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/NoteCallbacks.d.ts @@ -1,7 +1,7 @@ import { NoteController } from "../controllers/NoteController"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { INoteActionData } from "../models/eft/notes/INoteActionData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { INoteActionData } from "../models/eft/notes/INoteActionData"; export declare class NoteCallbacks { private noteController; constructor(noteController: NoteController); diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/NotifierCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/NotifierCallbacks.d.ts index f47dcc9..416e6a3 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/NotifierCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/NotifierCallbacks.d.ts @@ -1,10 +1,10 @@ -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { NotifierController } from "../controllers/NotifierController"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INotifierChannel } from "../models/eft/notifier/INotifier"; import { ISelectProfileRequestData } from "../models/eft/notifier/ISelectProfileRequestData"; -import { NotifierController } from "../controllers/NotifierController"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class NotifierCallbacks { private httpServerHelper; private httpResponse; diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/PresetBuildCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/PresetBuildCallbacks.d.ts index fd22c8f..639c33f 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/PresetBuildCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/PresetBuildCallbacks.d.ts @@ -1,8 +1,8 @@ import { PresetBuildController } from "../controllers/PresetBuildController"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IPresetBuildActionRequestData } from "../models/eft/presetBuild/IPresetBuildActionRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IPresetBuildActionRequestData } from "../models/eft/presetBuild/IPresetBuildActionRequestData"; import { WeaponBuild } from "../models/eft/profile/IAkiProfile"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class PresetBuildCallbacks { diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/ProfileCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/ProfileCallbacks.d.ts index e50c130..efce47d 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/ProfileCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/ProfileCallbacks.d.ts @@ -1,16 +1,16 @@ -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { TimeUtil } from "../utils/TimeUtil"; import { ProfileController } from "../controllers/ProfileController"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +import { IGetMiniProfileRequestData } from "../models/eft/launcher/IGetMiniProfileRequestData"; import { IProfileChangeNicknameRequestData } from "../models/eft/profile/IProfileChangeNicknameRequestData"; import { IProfileChangeVoiceRequestData } from "../models/eft/profile/IProfileChangeVoiceRequestData"; import { IProfileCreateRequestData } from "../models/eft/profile/IProfileCreateRequestData"; -import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { ISearchFriendRequestData } from "../models/eft/profile/ISearchFriendRequestData"; import { ISearchFriendResponse } from "../models/eft/profile/ISearchFriendResponse"; -import { IGetMiniProfileRequestData } from "../models/eft/launcher/IGetMiniProfileRequestData"; +import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export declare class ProfileCallbacks { private httpResponse; private timeUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/QuestCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/QuestCallbacks.d.ts index 1f3964b..f742096 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/QuestCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/QuestCallbacks.d.ts @@ -1,15 +1,15 @@ import { QuestController } from "../controllers/QuestController"; import { RepeatableQuestController } from "../controllers/RepeatableQuestController"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { IListQuestsRequestData } from "../models/eft/quests/IListQuestsRequestData"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; -import { IHandoverQuestRequestData } from "../models/eft/quests/IHandoverQuestRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { IQuest } from "../models/eft/common/tables/IQuest"; import { IPmcDataRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; +import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; +import { IHandoverQuestRequestData } from "../models/eft/quests/IHandoverQuestRequestData"; +import { IListQuestsRequestData } from "../models/eft/quests/IListQuestsRequestData"; import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class QuestCallbacks { diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/RagfairCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/RagfairCallbacks.d.ts index 260fd13..152475f 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/RagfairCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/RagfairCallbacks.d.ts @@ -1,20 +1,20 @@ -import { RagfairServer } from "../servers/RagfairServer"; 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"; -import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData"; -import { IAddOfferRequestData } from "../models/eft/ragfair/IAddOfferRequestData"; -import { IRemoveOfferRequestData } from "../models/eft/ragfair/IRemoveOfferRequestData"; -import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IAddOfferRequestData } from "../models/eft/ragfair/IAddOfferRequestData"; +import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData"; import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult"; +import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData"; +import { IRemoveOfferRequestData } from "../models/eft/ragfair/IRemoveOfferRequestData"; +import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; +import { RagfairServer } from "../servers/RagfairServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; -import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; -import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairCallbacks extends OnLoadOnUpdate { private httpResponse; private logger; diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/RepairCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/RepairCallbacks.d.ts index 4acd364..f63ec18 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/RepairCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/RepairCallbacks.d.ts @@ -1,8 +1,8 @@ import { RepairController } from "../controllers/RepairController"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest"; import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepairActionDataRequest"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class RepairCallbacks { private repairController; constructor(repairController: RepairController); diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/SaveCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/SaveCallbacks.d.ts index 52d5faf..b7219a0 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/SaveCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/SaveCallbacks.d.ts @@ -1,5 +1,5 @@ -import { SaveServer } from "../servers/SaveServer"; import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; +import { SaveServer } from "../servers/SaveServer"; export declare class SaveCallbacks extends OnLoadOnUpdate { private saveServer; constructor(saveServer: SaveServer); diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/TradeCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/TradeCallbacks.d.ts index 4cf8497..9928951 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/TradeCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/TradeCallbacks.d.ts @@ -1,8 +1,8 @@ import { TradeController } from "../controllers/TradeController"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData"; +import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData"; export declare class TradeCallbacks { private tradeController; constructor(tradeController: TradeController); diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/TraderCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/TraderCallbacks.d.ts index 264ef94..2a8af7f 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/TraderCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/TraderCallbacks.d.ts @@ -1,9 +1,9 @@ -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; 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 { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class TraderCallbacks extends OnLoadOnUpdate { private httpResponse; private traderController; diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/WeatherCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/WeatherCallbacks.d.ts index 2474417..e40ab3e 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/WeatherCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/WeatherCallbacks.d.ts @@ -1,6 +1,6 @@ import { WeatherController } from "../controllers/WeatherController"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class WeatherCallbacks { private httpResponse; diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/WishlistCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/WishlistCallbacks.d.ts index 1816600..e0249fd 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/WishlistCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/WishlistCallbacks.d.ts @@ -1,7 +1,7 @@ import { WishlistController } from "../controllers/WishlistController"; 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 WishlistCallbacks { private wishlistController; constructor(wishlistController: WishlistController); diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/GameController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/GameController.d.ts index 614d270..5c9a464 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/GameController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/GameController.d.ts @@ -1,10 +1,10 @@ +import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; -import { ConfigServer } from "../servers/ConfigServer"; import { ILogger } from "../models/spt/utils/ILogger"; -import { IWatermark } from "../models/spt/utils/IWatermark"; -import { HttpServerHelper } from "../helpers/HttpServerHelper"; +import { ConfigServer } from "../servers/ConfigServer"; +import { Watermark } from "../utils/Watermark"; export declare class GameController { private logger; private watermark; @@ -12,7 +12,7 @@ export declare class GameController { private profileHelper; private configServer; private httpConfig; - constructor(logger: ILogger, watermark: IWatermark, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); + constructor(logger: ILogger, watermark: Watermark, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); gameStart(url: string, info: IEmptyRequestData, sessionID: string): void; getGameConfig(sessionID: string): IGameConfigResponse; getServer(): any[]; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/InsuranceController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/InsuranceController.d.ts index 44c61fa..50437a6 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/InsuranceController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/InsuranceController.d.ts @@ -28,7 +28,8 @@ export declare class InsuranceController { private insuranceService; private configServer; private insuranceConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, itemEventRouter: ItemEventRouter, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileHelper: ProfileHelper, dialogueHelper: DialogueHelper, paymentService: PaymentService, insuranceService: InsuranceService, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, itemEventRouter: ItemEventRouter, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileHelper: ProfileHelper, dialogueHelper: DialogueHelper, paymentService: PaymentService, // TODO: delay required + insuranceService: InsuranceService, configServer: ConfigServer); processReturn(): void; insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse; cost(info: IGetInsuranceCostRequestData, sessionID: string): any; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/InventoryController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/InventoryController.d.ts index 4ff07b8..8235082 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/InventoryController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/InventoryController.d.ts @@ -1,30 +1,31 @@ import { InventoryHelper } from "../helpers/InventoryHelper"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; +import { PaymentHelper } from "../helpers/PaymentHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { PaymentHelper } from "../helpers/PaymentHelper"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { DatabaseServer } from "../servers/DatabaseServer"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; -import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData"; -import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; -import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwapRequestData"; -import { IInventoryFoldRequestData } from "../models/eft/inventory/IInventoryFoldRequestData"; -import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData"; -import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData"; +import { IAddItemRequestData } from "../models/eft/inventory/IAddItemRequestData"; import { IInventoryBindRequestData } from "../models/eft/inventory/IInventoryBindRequestData"; -import { IInventoryExamineRequestData } from "../models/eft/inventory/IInventoryExamineRequestData"; -import { IInventoryReadEncyclopediaRequestData } from "../models/eft/inventory/IInventoryReadEncyclopediaRequestData"; -import { IInventorySortRequestData } from "../models/eft/inventory/IInventorySortRequestData"; import { IInventoryCreateMarkerRequestData } from "../models/eft/inventory/IInventoryCreateMarkerRequestData"; import { IInventoryDeleteMarkerRequestData } from "../models/eft/inventory/IInventoryDeleteMarkerRequestData"; import { IInventoryEditMarkerRequestData } from "../models/eft/inventory/IInventoryEditMarkerRequestData"; +import { IInventoryExamineRequestData } from "../models/eft/inventory/IInventoryExamineRequestData"; +import { IInventoryFoldRequestData } from "../models/eft/inventory/IInventoryFoldRequestData"; +import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; +import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; +import { IInventoryReadEncyclopediaRequestData } from "../models/eft/inventory/IInventoryReadEncyclopediaRequestData"; +import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData"; +import { IInventorySortRequestData } from "../models/eft/inventory/IInventorySortRequestData"; +import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; +import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwapRequestData"; +import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData"; +import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData"; +import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HashUtil } from "../utils/HashUtil"; +import { JsonUtil } from "../utils/JsonUtil"; export declare class InventoryController { private logger; private hashUtil; @@ -77,7 +78,7 @@ export declare class InventoryController { * Give Item * its used for "add" item like gifts etc. */ - addItem(pmcData: IPmcData, body: any, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; + addItem(pmcData: IPmcData, body: IAddItemRequestData, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; /** * Handles folding of Weapons */ diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/MatchController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/MatchController.d.ts index 229b884..84abbe3 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/MatchController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/MatchController.d.ts @@ -1,8 +1,9 @@ -import { TraderHelper } from "../helpers/TraderHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; -import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; +import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData"; +import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; import { ConfigServer } from "../servers/ConfigServer"; import { SaveServer } from "../servers/SaveServer"; import { MatchLocationService } from "../services/MatchLocationService"; @@ -16,7 +17,7 @@ export declare class MatchController { private inraidConfig; constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, configServer: ConfigServer); getEnabled(): boolean; - getProfile(info: any): IPmcData[]; + getProfile(info: IGetProfileRequestData): IPmcData[]; private getMatch; createGroup(sessionID: string, info: any): any; deleteGroup(info: any): void; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/RagfairController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/RagfairController.d.ts index 6e71edd..5b94a95 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/RagfairController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/RagfairController.d.ts @@ -1,37 +1,37 @@ -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { RagfairServer } from "../servers/RagfairServer"; -import { SaveServer } from "../servers/SaveServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { PaymentService } from "../services/PaymentService"; -import { RagfairPriceService } from "../services/RagfairPriceService"; -import { RagfairOfferService } from "../services/RagfairOfferService"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { HandbookHelper } from "../helpers/HandbookHelper"; -import { PaymentHelper } from "../helpers/PaymentHelper"; -import { InventoryHelper } from "../helpers/InventoryHelper"; -import { RagfairHelper } from "../helpers/RagfairHelper"; -import { RagfairSellHelper } from "../helpers/RagfairSellHelper"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IAddOfferRequestData, Requirement } from "../models/eft/ragfair/IAddOfferRequestData"; -import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData"; -import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData"; -import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { Item } from "../models/eft/common/tables/IItem"; -import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult"; -import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; -import { ConfigServer } from "../servers/ConfigServer"; -import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; -import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; +import { HandbookHelper } from "../helpers/HandbookHelper"; +import { InventoryHelper } from "../helpers/InventoryHelper"; +import { ItemHelper } from "../helpers/ItemHelper"; +import { PaymentHelper } from "../helpers/PaymentHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { RagfairHelper } from "../helpers/RagfairHelper"; +import { RagfairOfferHelper } from "../helpers/RagfairOfferHelper"; +import { RagfairSellHelper } from "../helpers/RagfairSellHelper"; import { RagfairSortHelper } from "../helpers/RagfairSortHelper"; import { RagfairTaxHelper } from "../helpers/RagfairTaxHelper"; -import { RagfairOfferHelper } from "../helpers/RagfairOfferHelper"; -import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { IAddOfferRequestData, Requirement } from "../models/eft/ragfair/IAddOfferRequestData"; +import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData"; +import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult"; +import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData"; +import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { RagfairServer } from "../servers/RagfairServer"; +import { SaveServer } from "../servers/SaveServer"; +import { PaymentService } from "../services/PaymentService"; +import { RagfairOfferService } from "../services/RagfairOfferService"; +import { RagfairPriceService } from "../services/RagfairPriceService"; +import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export declare class RagfairController { private logger; private timeUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/RepeatableQuestController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/RepeatableQuestController.d.ts index d2de5df..bd5e5a1 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/RepeatableQuestController.d.ts @@ -1,24 +1,24 @@ -import { TimeUtil } from "../utils/TimeUtil"; -import { ObjectId } from "../utils/ObjectId"; -import { RandomUtil, ProbabilityObjectArray, ProbabilityObject } from "../utils/RandomUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { MathUtil } from "../utils/MathUtil"; import { ItemHelper } from "../helpers/ItemHelper"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IPmcData, TraderInfo } from "../models/eft/common/IPmcData"; -import { IRepeatableQuestConfig, ELocationName } from "../models/spt/config/IQuestConfig"; -import { IExploration, IRepeatableQuest, IReward, IRewards, IExplorationCondition, ICompletionAvailableFor, IEliminationCondition, ICompletion, IElimination, IPmcDataRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; -import { Exit } from "../models/eft/common/ILocationBase"; -import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { PresetHelper } from "../helpers/PresetHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { PaymentService } from "../services/PaymentService"; -import { ConfigServer } from "../servers/ConfigServer"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { Exit } from "../models/eft/common/ILocationBase"; +import { IPmcData, TraderInfo } from "../models/eft/common/IPmcData"; +import { ICompletion, ICompletionAvailableFor, IElimination, IEliminationCondition, IExploration, IExplorationCondition, IPmcDataRepeatableQuest, IRepeatableQuest, IReward, IRewards } from "../models/eft/common/tables/IRepeatableQuests"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; +import { ELocationName, IRepeatableQuestConfig } from "../models/spt/config/IQuestConfig"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { PaymentService } from "../services/PaymentService"; +import { JsonUtil } from "../utils/JsonUtil"; +import { MathUtil } from "../utils/MathUtil"; +import { ObjectId } from "../utils/ObjectId"; +import { ProbabilityObject, ProbabilityObjectArray, RandomUtil } from "../utils/RandomUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export interface IQuestTypePool { types: string[]; pool: IQuestPool; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/TraderController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/TraderController.d.ts index 5cd85c9..36eac75 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/TraderController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/TraderController.d.ts @@ -1,13 +1,12 @@ -import { JsonUtil } from "../utils/JsonUtil"; -import { TimeUtil } from "../utils/TimeUtil"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { TraderAssortHelper } from "../helpers/TraderAssortHelper"; +import { TraderHelper } from "../helpers/TraderHelper"; +import { IBarterScheme, ITraderAssort, ITraderBase } from "../models/eft/common/tables/ITrader"; +import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { TraderAssortService } from "../services/TraderAssortService"; -import { IBarterScheme, ITraderAssort, ITraderBase } from "../models/eft/common/tables/ITrader"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { TraderAssortHelper } from "../helpers/TraderAssortHelper"; +import { JsonUtil } from "../utils/JsonUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export declare class TraderController { private logger; private databaseServer; @@ -17,9 +16,7 @@ export declare class TraderController { private timeUtil; private traderAssortService; private jsonUtil; - private configServer; - private traderConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, timeUtil: TimeUtil, traderAssortService: TraderAssortService, jsonUtil: JsonUtil, configServer: ConfigServer); + constructor(logger: ILogger, databaseServer: DatabaseServer, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, timeUtil: TimeUtil, traderAssortService: TraderAssortService, jsonUtil: JsonUtil); load(): void; getTrader(traderID: string, sessionID: string): ITraderBase; getAllTraders(sessionID: string): ITraderBase[]; diff --git a/TypeScript/6ReferenceAnotherClass/types/di/Container.d.ts b/TypeScript/6ReferenceAnotherClass/types/di/Container.d.ts index b67523f..17791b0 100644 --- a/TypeScript/6ReferenceAnotherClass/types/di/Container.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/di/Container.d.ts @@ -1,6 +1,7 @@ import { DependencyContainer } from "tsyringe"; export declare class Container { static registerTypes(depContainer: DependencyContainer): void; + static registerListTypes(depContainer: DependencyContainer): void; private static registerUtils; private static registerRouters; private static registerGenerators; diff --git a/TypeScript/6ReferenceAnotherClass/types/di/OnSaveLoad.d.ts b/TypeScript/6ReferenceAnotherClass/types/di/OnSaveLoad.d.ts new file mode 100644 index 0000000..1edf37e --- /dev/null +++ b/TypeScript/6ReferenceAnotherClass/types/di/OnSaveLoad.d.ts @@ -0,0 +1,4 @@ +export declare class OnSaveLoad { + onSaveLoad(): void; + getRoute(): string; +} diff --git a/TypeScript/6ReferenceAnotherClass/types/di/Router.d.ts b/TypeScript/6ReferenceAnotherClass/types/di/Router.d.ts index ac48587..2fb98e0 100644 --- a/TypeScript/6ReferenceAnotherClass/types/di/Router.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/di/Router.d.ts @@ -3,18 +3,22 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; export declare class Router { private handledRoutes; - constructor(); getTopLevelRoute(): string; protected getHandledRoutes(): HandledRoute[]; + private getInternalHandledRoutes; canHandle(url: string, partialMatch?: boolean): boolean; } export declare class StaticRouter extends Router { - constructor(); + private routes; + constructor(routes: RouteAction[]); handleStatic(url: string, info: any, sessionID: string, output: string): any; + getHandledRoutes(): HandledRoute[]; } export declare class DynamicRouter extends Router { - constructor(); + private routes; + constructor(routes: RouteAction[]); handleDynamic(url: string, info: any, sessionID: string, output: string): any; + getHandledRoutes(): HandledRoute[]; } export declare class ItemEventRouterDefinition extends Router { constructor(); @@ -29,3 +33,8 @@ export declare class HandledRoute { dynamic: boolean; constructor(route: string, dynamic: boolean); } +export declare class RouteAction { + url: string; + action: (url: string, info: any, sessionID: string, output: string) => any; + constructor(url: string, action: (url: string, info: any, sessionID: string, output: string) => any); +} diff --git a/TypeScript/6ReferenceAnotherClass/types/generators/BotInventoryGenerator.d.ts b/TypeScript/6ReferenceAnotherClass/types/generators/BotInventoryGenerator.d.ts index e9f09de..0cdbacb 100644 --- a/TypeScript/6ReferenceAnotherClass/types/generators/BotInventoryGenerator.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/generators/BotInventoryGenerator.d.ts @@ -17,7 +17,6 @@ export declare class BotInventoryGenerator { private botLootGenerator; private botGeneratorHelper; private weightedRandomHelper; - private botConfig; constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, botWeaponGenerator: BotWeaponGenerator, botLootGenerator: BotLootGenerator, botGeneratorHelper: BotGeneratorHelper, weightedRandomHelper: WeightedRandomHelper); generateInventory(templateInventory: Inventory, equipmentChances: Chances, generation: Generation, botRole: string, isPmc: boolean): PmcInventory; private generateEquipment; diff --git a/TypeScript/6ReferenceAnotherClass/types/generators/BotWeaponGenerator.d.ts b/TypeScript/6ReferenceAnotherClass/types/generators/BotWeaponGenerator.d.ts index 3e9d59c..e8f91cb 100644 --- a/TypeScript/6ReferenceAnotherClass/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/generators/BotWeaponGenerator.d.ts @@ -1,11 +1,11 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { MinMax, ModsChances, Mods } from "../models/eft/common/tables/IBotType"; -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -import { HashUtil } from "../utils/HashUtil"; +import { ItemHelper } from "../helpers/ItemHelper"; +import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; +import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { MinMax, Mods, ModsChances } from "../models/eft/common/tables/IBotType"; import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; export declare class BotWeaponGenerator { private logger; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/BotGeneratorHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/BotGeneratorHelper.d.ts index c3cf4d3..6abdc07 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/BotGeneratorHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/BotGeneratorHelper.d.ts @@ -1,17 +1,17 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ConfigServer } from "../servers/ConfigServer"; +import { DurabilityLimitsHelper } from "../helpers/DurabilityLimitsHelper"; import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { ModsChances, Mods } from "../models/eft/common/tables/IBotType"; +import { Mods, ModsChances } from "../models/eft/common/tables/IBotType"; import { Item, Upd } from "../models/eft/common/tables/IItem"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { DurabilityLimitsHelper } from "../helpers/DurabilityLimitsHelper"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; -import { InventoryHelper } from "./InventoryHelper"; import { ContainerHelper } from "./ContainerHelper"; +import { InventoryHelper } from "./InventoryHelper"; import { ItemHelper } from "./ItemHelper"; -import { ILogger } from "../models/spt/utils/ILogger"; declare class BotGeneratorHelper { private logger; private jsonUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/ExtendedProfileHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/ExtendedProfileHelper.d.ts index 22ead31..4dd7d3a 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/ExtendedProfileHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/ExtendedProfileHelper.d.ts @@ -1,16 +1,16 @@ +import { BotGenerator } from "../generators/BotGenerator"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { FenceService } from "../services/FenceService"; -import { IPmcData } from "../models/eft/common/IPmcData"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; +import { Watermark } from "../utils/Watermark"; import { ItemHelper } from "./ItemHelper"; -import { IWatermark } from "../models/spt/utils/IWatermark"; -import { BotGenerator } from "../generators/BotGenerator"; import { ProfileHelper } from "./ProfileHelper"; export declare class ExtendedProfileHelper extends ProfileHelper { private botGenerator; - constructor(jsonUtil: JsonUtil, watermark: IWatermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService, botGenerator: BotGenerator); + constructor(jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService, botGenerator: BotGenerator); generatePlayerScav(sessionID: string): IPmcData; private getScavSkills; private removeSecureContainer; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/HideoutHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/HideoutHelper.d.ts index d60e370..5b4a5ad 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/HideoutHelper.d.ts @@ -1,21 +1,21 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; import { IPmcData, Production, Productive } from "../models/eft/common/IPmcData"; -import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; -import { StageBonus } from "../models/eft/hideout/IHideoutArea"; -import { TimeUtil } from "../utils/TimeUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { HashUtil } from "../utils/HashUtil"; -import { ProfileHelper } from "./ProfileHelper"; -import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { ConfigServer } from "../servers/ConfigServer"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { PlayerService } from "../services/PlayerService"; -import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; -import { InventoryHelper } from "./InventoryHelper"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { StageBonus } from "../models/eft/hideout/IHideoutArea"; +import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; +import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; +import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +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"; export declare class HideoutHelper { private logger; private hashUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/InventoryHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/InventoryHelper.d.ts index 4b3460c..00e95d3 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/InventoryHelper.d.ts @@ -1,21 +1,22 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; +import { IAddItemRequestData } from "../models/eft/inventory/IAddItemRequestData"; +import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; +import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; +import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { FenceService } from "../services/FenceService"; -import { ContainerHelper } from "./ContainerHelper"; -import { ItemHelper } from "./ItemHelper"; -import { PaymentHelper } from "./PaymentHelper"; -import { ProfileHelper } from "./ProfileHelper"; -import { DialogueHelper } from "./DialogueHelper"; import { HashUtil } from "../utils/HashUtil"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; -import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; -import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; -import { ILogger } from "../models/spt/utils/ILogger"; +import { ContainerHelper } from "./ContainerHelper"; +import { DialogueHelper } from "./DialogueHelper"; +import { ItemHelper } from "./ItemHelper"; +import { PaymentHelper } from "./PaymentHelper"; +import { ProfileHelper } from "./ProfileHelper"; import { TraderAssortHelper } from "./TraderAssortHelper"; export interface OwnerInventoryItems { from: Item[]; @@ -39,7 +40,7 @@ export declare class InventoryHelper { private configServer; private inventoryConfig; 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, configServer: ConfigServer); - addItem(pmcData: IPmcData, body: any, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; + addItem(pmcData: IPmcData, body: IAddItemRequestData, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; removeItem(pmcData: IPmcData, itemId: string, sessionID: string, output?: IItemEventRouterResponse): IItemEventRouterResponse; getItemSize(itemTpl: string, itemID: string, inventoryItem: Item[]): Record; private getSizeByInventoryItemHash; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/ProfileHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/ProfileHelper.d.ts index 515e55e..508443c 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/ProfileHelper.d.ts @@ -1,22 +1,22 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { FenceService } from "../services/FenceService"; import { IPmcData, Stats } from "../models/eft/common/IPmcData"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { SaveServer } from "../servers/SaveServer"; +import { FenceService } from "../services/FenceService"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; +import { Watermark } from "../utils/Watermark"; import { ItemHelper } from "./ItemHelper"; -import { IWatermark } from "../models/spt/utils/IWatermark"; export declare class ProfileHelper { protected jsonUtil: JsonUtil; - protected watermark: IWatermark; + protected watermark: Watermark; protected timeUtil: TimeUtil; protected saveServer: SaveServer; protected databaseServer: DatabaseServer; protected itemHelper: ItemHelper; protected fenceService: FenceService; - constructor(jsonUtil: JsonUtil, watermark: IWatermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService); + constructor(jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService); resetProfileQuestCondition(sessionID: string, conditionId: string): void; getCompleteProfile(sessionID: string): IPmcData[]; isNicknameTaken(info: IValidateNicknameRequestData, sessionID: string): boolean; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/QuestHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/QuestHelper.d.ts index 3474884..9e2dd5e 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/QuestHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/QuestHelper.d.ts @@ -1,21 +1,21 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { ItemHelper } from "./ItemHelper"; -import { ProfileHelper } from "./ProfileHelper"; -import { DialogueHelper } from "./DialogueHelper"; -import { PaymentHelper } from "./PaymentHelper"; -import { TraderHelper } from "./TraderHelper"; import { IPmcData, Quest } from "../models/eft/common/IPmcData"; 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 { ConfigServer } from "../servers/ConfigServer"; -import { RagfairServerHelper } from "./RagfairServerHelper"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HashUtil } from "../utils/HashUtil"; +import { JsonUtil } from "../utils/JsonUtil"; +import { TimeUtil } from "../utils/TimeUtil"; +import { DialogueHelper } from "./DialogueHelper"; +import { ItemHelper } from "./ItemHelper"; +import { PaymentHelper } from "./PaymentHelper"; +import { ProfileHelper } from "./ProfileHelper"; +import { RagfairServerHelper } from "./RagfairServerHelper"; +import { TraderHelper } from "./TraderHelper"; export declare class QuestHelper { private logger; private jsonUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairHelper.d.ts index 2bce4a6..8e70bcd 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairHelper.d.ts @@ -1,16 +1,16 @@ -import { JsonUtil } from "../utils/JsonUtil"; import { Item } from "../models/eft/common/tables/IItem"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { RagfairLinkedItemService } from "../services/RagfairLinkedItemService"; +import { JsonUtil } from "../utils/JsonUtil"; import { HandbookHelper } from "./HandbookHelper"; import { ItemHelper } from "./ItemHelper"; -import { RagfairLinkedItemService } from "../services/RagfairLinkedItemService"; -import { UtilityHelper } from "./UtilityHelper"; -import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from "../models/spt/utils/ILogger"; import { TraderAssortHelper } from "./TraderAssortHelper"; +import { UtilityHelper } from "./UtilityHelper"; export declare class RagfairHelper { private logger; private jsonUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairOfferHelper.d.ts index da3ceb8..3bf8add 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairOfferHelper.d.ts @@ -1,23 +1,23 @@ -import { HashUtil } from "../utils/HashUtil"; -import { TimeUtil } from "../utils/TimeUtil"; import { IPmcData } from "../models/eft/common/IPmcData"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { RagfairOfferService } from "../services/RagfairOfferService"; +import { HashUtil } from "../utils/HashUtil"; +import { TimeUtil } from "../utils/TimeUtil"; import { DialogueHelper } from "./DialogueHelper"; import { ItemHelper } from "./ItemHelper"; import { PaymentHelper } from "./PaymentHelper"; import { PresetHelper } from "./PresetHelper"; import { ProfileHelper } from "./ProfileHelper"; -import { RagfairServerHelper } from "./RagfairServerHelper"; -import { ConfigServer } from "../servers/ConfigServer"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { RagfairSortHelper } from "./RagfairSortHelper"; import { RagfairHelper } from "./RagfairHelper"; -import { ILogger } from "../models/spt/utils/ILogger"; +import { RagfairServerHelper } from "./RagfairServerHelper"; +import { RagfairSortHelper } from "./RagfairSortHelper"; export declare class RagfairOfferHelper { private logger; private timeUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairServerHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairServerHelper.d.ts index 9a26261..0f32a66 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairServerHelper.d.ts @@ -1,15 +1,15 @@ -import { SaveServer } from "../servers/SaveServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { ItemHelper } from "./ItemHelper"; -import { ProfileHelper } from "./ProfileHelper"; import { MemberCategory } from "../models/eft/common/MemberCategory"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { SaveServer } from "../servers/SaveServer"; +import { HashUtil } from "../utils/HashUtil"; +import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { DialogueHelper } from "./DialogueHelper"; -import { Item } from "../models/eft/common/tables/IItem"; -import { JsonUtil } from "../utils/JsonUtil"; -import { HashUtil } from "../utils/HashUtil"; +import { ItemHelper } from "./ItemHelper"; +import { ProfileHelper } from "./ProfileHelper"; export declare class RagfairServerHelper { private randomUtil; private hashUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/TradeHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/TradeHelper.d.ts index 0712ff4..a78cd20 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/TradeHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/TradeHelper.d.ts @@ -1,16 +1,16 @@ -import { RagfairServer } from "../servers/RagfairServer"; import { InventoryHelper } from "../helpers/InventoryHelper"; +import { ItemHelper } from "../helpers/ItemHelper"; import { TraderHelper } from "../helpers/TraderHelper"; -import { FenceService } from "../services/FenceService"; -import { PaymentService } from "../services/PaymentService"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { Upd } from "../models/eft/common/tables/IItem"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "../models/eft/trade/IProcessSellTradeRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { Upd } from "../models/eft/common/tables/IItem"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { RagfairServer } from "../servers/RagfairServer"; +import { FenceService } from "../services/FenceService"; +import { PaymentService } from "../services/PaymentService"; export declare class TradeHelper { private logger; private itemEventRouter; diff --git a/TypeScript/6ReferenceAnotherClass/types/loaders/DelayedModLoader.d.ts b/TypeScript/6ReferenceAnotherClass/types/loaders/DelayedModLoader.d.ts index db86c75..7d0009f 100644 --- a/TypeScript/6ReferenceAnotherClass/types/loaders/DelayedModLoader.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/loaders/DelayedModLoader.d.ts @@ -1,10 +1,9 @@ -import { DependencyContainer } from 'tsyringe'; -import { VFS } from "../utils/VFS"; -import { InitialModLoader } from "./InitialModLoader"; -import { BundleLoader } from "./BundleLoader"; 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 { InitialModLoader } from "./InitialModLoader"; export declare class DelayedModLoader implements IModLoader { private bundleLoader; private handbookController; @@ -16,7 +15,7 @@ export declare class DelayedModLoader implements IModLoader { getBundle(key: string, local: boolean): void; getImportedModsNames(): string[]; getModPath(mod: string): string; - load(container: DependencyContainer): void; + load(): void; private executeMods; private addBundles; } diff --git a/TypeScript/6ReferenceAnotherClass/types/loaders/InitialModLoader.d.ts b/TypeScript/6ReferenceAnotherClass/types/loaders/InitialModLoader.d.ts index 35503c8..d30a3fe 100644 --- a/TypeScript/6ReferenceAnotherClass/types/loaders/InitialModLoader.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/loaders/InitialModLoader.d.ts @@ -1,23 +1,22 @@ import { DependencyContainer } from "tsyringe"; -import { JsonUtil } from "../utils/JsonUtil"; -import { VFS } from "../utils/VFS"; +import { IModLoader } from "../models/spt/mod/IModLoader"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { ModCompilerService } from "../services/ModCompilerService"; -import { HashCacheService } from "../services/HashCacheService"; -import { IModLoader } from "../models/spt/mod/IModLoader"; +import { JsonUtil } from "../utils/JsonUtil"; +import { VFS } from "../utils/VFS"; export declare class InitialModLoader implements IModLoader { private logger; private vfs; private jsonUtil; private modCompilerService; - private hashCacheService; private configServer; + private static container; private readonly basepath; private imported; private onLoad; private akiConfig; - constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, hashCacheService: HashCacheService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, configServer: ConfigServer); load(container: DependencyContainer): Promise; getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; @@ -29,10 +28,10 @@ export declare class InitialModLoader implements IModLoader { private executeMods; private sortModsLoadOrder; private addMod; - private compileModIfNeeded; private areModDependenciesFulfilled; private isModCompatible; private validMod; private getLoadOrderRecursive; private getLoadOrder; + getContainer(): DependencyContainer; } diff --git a/TypeScript/6ReferenceAnotherClass/types/models/eft/common/ILocationBase.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/ILocationBase.d.ts index 0d092f6..ad48d32 100644 --- a/TypeScript/6ReferenceAnotherClass/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/ILocationBase.d.ts @@ -107,6 +107,15 @@ export interface BossLocationSpawn { BossPlayer: boolean; BossZone: string; Time: number; + TriggerId: string; + TriggerName: string; + Delay?: number; + Supports?: BossSupport[]; +} +export interface BossSupport { + BossEscortAmount: string; + BossEscortDifficult: string[]; + BossEscortType: string; } export interface BotLocationModifier { AccuracySpeed: number; diff --git a/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IBotType.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IBotType.d.ts index e0f39d9..01be0be 100644 --- a/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IBotType.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IBotType.d.ts @@ -100,6 +100,8 @@ export interface Generation { export interface ItemMinMax { grenades: MinMax; healing: MinMax; + drugs: MinMax; + stims: MinMax; looseLoot: MinMax; magazines: MinMax; specialItems: MinMax; diff --git a/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IQuest.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IQuest.d.ts index 1582a2f..0aa7a4e 100644 --- a/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IQuest.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IQuest.d.ts @@ -44,7 +44,7 @@ export interface AvailableForProps { value?: number; compareMethod?: string; visibilityConditions?: VisibilityCondition[]; - target?: string; + target?: string | string[]; status?: number[]; } export interface VisibilityCondition { diff --git a/TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IAddItemRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IAddItemRequestData.d.ts new file mode 100644 index 0000000..53db97a --- /dev/null +++ b/TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IAddItemRequestData.d.ts @@ -0,0 +1,4 @@ +export interface IAddItemRequestData { + tid: string; + items: any[]; +} diff --git a/TypeScript/6ReferenceAnotherClass/types/models/eft/match/IGetProfileRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/match/IGetProfileRequestData.d.ts new file mode 100644 index 0000000..86b5bbd --- /dev/null +++ b/TypeScript/6ReferenceAnotherClass/types/models/eft/match/IGetProfileRequestData.d.ts @@ -0,0 +1,3 @@ +export interface IGetProfileRequestData { + profileId: string; +} diff --git a/TypeScript/6ReferenceAnotherClass/types/models/spt/utils/IWatermark.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/utils/IWatermark.d.ts deleted file mode 100644 index a15f5d7..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/models/spt/utils/IWatermark.d.ts +++ /dev/null @@ -1,22 +0,0 @@ -export interface IWatermarkLocale { - getLocale(): string; - getDescription(): string[]; - getWarning(): string[]; -} -export interface IWatermark { - initialize(): void; - getVersionTag(): string; - /** - * Set window title - */ - setTitle(): void; - /** - * Reset console cursor to top - */ - resetCursor(): void; - /** - * Draw the watermark - */ - draw(): void; - getVersionLabel(): string; -} diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/BotDynamicRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/BotDynamicRouter.d.ts index 51e52f7..dd2f68a 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/BotDynamicRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/BotDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { BotCallbacks } from "../../callbacks/BotCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class BotDynamicRouter extends DynamicRouter { private botCallbacks; constructor(botCallbacks: BotCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/BundleDynamicRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/BundleDynamicRouter.d.ts index 6cec61d..be27008 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/BundleDynamicRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/BundleDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { BundleCallbacks } from "../../callbacks/BundleCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class BundleDynamicRouter extends DynamicRouter { private bundleCallbacks; constructor(bundleCallbacks: BundleCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/CustomizationDynamicRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/CustomizationDynamicRouter.d.ts index e8a27ff..03a5967 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/CustomizationDynamicRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/CustomizationDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class CustomizationDynamicRouter extends DynamicRouter { private customizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/DataDynamicRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/DataDynamicRouter.d.ts index 9b6f632..c30501a 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/DataDynamicRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/DataDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { DataCallbacks } from "../../callbacks/DataCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class DataDynamicRouter extends DynamicRouter { private dataCallbacks; constructor(dataCallbacks: DataCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/HttpDynamicRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/HttpDynamicRouter.d.ts index 17706d5..b2933e9 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/HttpDynamicRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/HttpDynamicRouter.d.ts @@ -1,9 +1,6 @@ -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; import { ImageRouter } from "../ImageRouter"; export declare class HttpDynamicRouter extends DynamicRouter { private imageRouter; constructor(imageRouter: ImageRouter); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/InraidDynamicRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/InraidDynamicRouter.d.ts index cb1e8c0..ea4a9ae 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/InraidDynamicRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/InraidDynamicRouter.d.ts @@ -1,10 +1,7 @@ import { InraidCallbacks } from "../../callbacks/InraidCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class InraidDynamicRouter extends DynamicRouter { private inraidCallbacks; constructor(inraidCallbacks: InraidCallbacks); - private readonly _routes; getTopLevelRoute(): string; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/LocationDynamicRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/LocationDynamicRouter.d.ts index 9d85230..30741db 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/LocationDynamicRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/LocationDynamicRouter.d.ts @@ -1,10 +1,7 @@ import { LocationCallbacks } from "../../callbacks/LocationCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class LocationDynamicRouter extends DynamicRouter { private locationCallbacks; constructor(locationCallbacks: LocationCallbacks); - private readonly _routes; getTopLevelRoute(): string; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/NotifierDynamicRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/NotifierDynamicRouter.d.ts index e087b40..4786817 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/NotifierDynamicRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/NotifierDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { NotifierCallbacks } from "../../callbacks/NotifierCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class NotifierDynamicRouter extends DynamicRouter { private notifierCallbacks; constructor(notifierCallbacks: NotifierCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/TraderDynamicRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/TraderDynamicRouter.d.ts index d957e0e..a100b4c 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/TraderDynamicRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/dynamic/TraderDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { TraderCallbacks } from "../../callbacks/TraderCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class TraderDynamicRouter extends DynamicRouter { private traderCallbacks; constructor(traderCallbacks: TraderCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/serializers/NotifySerializer.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/serializers/NotifySerializer.d.ts index 7be87ef..8be8ac2 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/serializers/NotifySerializer.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/serializers/NotifySerializer.d.ts @@ -1,7 +1,7 @@ -import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { NotifierController } from "../../controllers/NotifierController"; import { Serializer } from "../../di/Serializer"; import { HttpServerHelper } from "../../helpers/HttpServerHelper"; +import { IHttpServer } from "../../models/spt/server/IHttpServer"; export declare class NotifySerializer extends Serializer { private notifierController; private httpServerHelper; diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/static/BotStaticRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/static/BotStaticRouter.d.ts index 7b23da6..d8b0bf4 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/static/BotStaticRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/static/BotStaticRouter.d.ts @@ -1,8 +1,6 @@ import { BotCallbacks } from "../../callbacks/BotCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class BotStaticRouter extends StaticRouter { private botCallbacks; constructor(botCallbacks: BotCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/static/BundleStaticRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/static/BundleStaticRouter.d.ts index 9283003..3905b82 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/static/BundleStaticRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/static/BundleStaticRouter.d.ts @@ -1,8 +1,6 @@ import { BundleCallbacks } from "../../callbacks/BundleCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class BundleStaticRouter extends StaticRouter { private bundleCallbacks; constructor(bundleCallbacks: BundleCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/static/CustomizationStaticRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/static/CustomizationStaticRouter.d.ts index 0d29578..46c71b8 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/static/CustomizationStaticRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/static/CustomizationStaticRouter.d.ts @@ -1,8 +1,6 @@ import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class CustomizationStaticRouter extends StaticRouter { private customizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/static/DataStaticRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/static/DataStaticRouter.d.ts index b8d2fea..a493d3a 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/static/DataStaticRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/static/DataStaticRouter.d.ts @@ -1,8 +1,6 @@ import { DataCallbacks } from "../../callbacks/DataCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class DataStaticRouter extends StaticRouter { private dataCallbacks; constructor(dataCallbacks: DataCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/static/DialogStaticRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/static/DialogStaticRouter.d.ts index 5e7285e..a59fb14 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/static/DialogStaticRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/static/DialogStaticRouter.d.ts @@ -1,8 +1,6 @@ import { DialogueCallbacks } from "../../callbacks/DialogueCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class DialogStaticRouter extends StaticRouter { private dialogueCallbacks; constructor(dialogueCallbacks: DialogueCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/static/GameStaticRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/static/GameStaticRouter.d.ts index e8eca40..988b673 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/static/GameStaticRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/static/GameStaticRouter.d.ts @@ -1,8 +1,6 @@ import { GameCallbacks } from "../../callbacks/GameCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class GameStaticRouter extends StaticRouter { private gameCallbacks; constructor(gameCallbacks: GameCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/static/HealthStaticRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/static/HealthStaticRouter.d.ts index aa0b8b3..e644861 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/static/HealthStaticRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/static/HealthStaticRouter.d.ts @@ -1,8 +1,6 @@ import { HealthCallbacks } from "../../callbacks/HealthCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class HealthStaticRouter extends StaticRouter { private healthCallbacks; constructor(healthCallbacks: HealthCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/static/InraidStaticRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/static/InraidStaticRouter.d.ts index 417d9d7..66ed860 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/static/InraidStaticRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/static/InraidStaticRouter.d.ts @@ -1,8 +1,6 @@ import { InraidCallbacks } from "../../callbacks/InraidCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class InraidStaticRouter extends StaticRouter { private inraidCallbacks; constructor(inraidCallbacks: InraidCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/static/InsuranceStaticRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/static/InsuranceStaticRouter.d.ts index 6fbffe5..8da26b3 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/static/InsuranceStaticRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/static/InsuranceStaticRouter.d.ts @@ -1,8 +1,6 @@ import { InsuranceCallbacks } from "../../callbacks/InsuranceCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class InsuranceStaticRouter extends StaticRouter { private insuranceCallbacks; constructor(insuranceCallbacks: InsuranceCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/static/ItemEventStaticRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/static/ItemEventStaticRouter.d.ts index 1a869e1..08ba6bb 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/static/ItemEventStaticRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/static/ItemEventStaticRouter.d.ts @@ -1,8 +1,6 @@ import { ItemEventCallbacks } from "../../callbacks/ItemEventCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class ItemEventStaticRouter extends StaticRouter { private itemEventCallbacks; constructor(itemEventCallbacks: ItemEventCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/static/LauncherStaticRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/static/LauncherStaticRouter.d.ts index 0d5e231..9d07f78 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/static/LauncherStaticRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/static/LauncherStaticRouter.d.ts @@ -1,8 +1,6 @@ import { LauncherCallbacks } from "../../callbacks/LauncherCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class LauncherStaticRouter extends StaticRouter { private launcherCallbacks; constructor(launcherCallbacks: LauncherCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): string; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/static/LocationStaticRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/static/LocationStaticRouter.d.ts index 0b9b063..9c5c52e 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/static/LocationStaticRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/static/LocationStaticRouter.d.ts @@ -1,8 +1,6 @@ import { LocationCallbacks } from "../../callbacks/LocationCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class LocationStaticRouter extends StaticRouter { private locationCallbacks; constructor(locationCallbacks: LocationCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/static/MatchStaticRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/static/MatchStaticRouter.d.ts index 55c9640..d746381 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/static/MatchStaticRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/static/MatchStaticRouter.d.ts @@ -1,8 +1,6 @@ import { MatchCallbacks } from "../../callbacks/MatchCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class MatchStaticRouter extends StaticRouter { private matchCallbacks; constructor(matchCallbacks: MatchCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/static/NotifierStaticRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/static/NotifierStaticRouter.d.ts index 0d992db..1c8566d 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/static/NotifierStaticRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/static/NotifierStaticRouter.d.ts @@ -1,8 +1,6 @@ import { NotifierCallbacks } from "../../callbacks/NotifierCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class NotifierStaticRouter extends StaticRouter { private notifierCallbacks; constructor(notifierCallbacks: NotifierCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/static/PresetStaticRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/static/PresetStaticRouter.d.ts index a1bda56..2272f82 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/static/PresetStaticRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/static/PresetStaticRouter.d.ts @@ -1,8 +1,6 @@ import { PresetBuildCallbacks } from "../../callbacks/PresetBuildCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class PresetStaticRouter extends StaticRouter { private presetCallbacks; constructor(presetCallbacks: PresetBuildCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/static/ProfileStaticRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/static/ProfileStaticRouter.d.ts index d03b782..fd787f1 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/static/ProfileStaticRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/static/ProfileStaticRouter.d.ts @@ -1,8 +1,6 @@ import { ProfileCallbacks } from "../../callbacks/ProfileCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class ProfileStaticRouter extends StaticRouter { private profileCallbacks; constructor(profileCallbacks: ProfileCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/static/QuestStaticRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/static/QuestStaticRouter.d.ts index d375409..fda3c23 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/static/QuestStaticRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/static/QuestStaticRouter.d.ts @@ -1,8 +1,6 @@ import { QuestCallbacks } from "../../callbacks/QuestCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class QuestStaticRouter extends StaticRouter { private questCallbacks; constructor(questCallbacks: QuestCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/static/RagfairStaticRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/static/RagfairStaticRouter.d.ts index d5ed312..618374f 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/static/RagfairStaticRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/static/RagfairStaticRouter.d.ts @@ -1,8 +1,6 @@ import { RagfairCallbacks } from "../../callbacks/RagfairCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class RagfairStaticRouter extends StaticRouter { private ragfairCallbacks; constructor(ragfairCallbacks: RagfairCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/static/TraderStaticRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/static/TraderStaticRouter.d.ts index e3406fb..18f0629 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/static/TraderStaticRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/static/TraderStaticRouter.d.ts @@ -1,8 +1,6 @@ import { TraderCallbacks } from "../../callbacks/TraderCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class TraderStaticRouter extends StaticRouter { private traderCallbacks; constructor(traderCallbacks: TraderCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/static/WeatherStaticRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/static/WeatherStaticRouter.d.ts index aec3575..61b904d 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/static/WeatherStaticRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/static/WeatherStaticRouter.d.ts @@ -1,8 +1,6 @@ import { WeatherCallbacks } from "../../callbacks/WeatherCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class WeatherStaticRouter extends StaticRouter { private weatherCallbacks; constructor(weatherCallbacks: WeatherCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/6ReferenceAnotherClass/types/servers/HttpServer.d.ts b/TypeScript/6ReferenceAnotherClass/types/servers/HttpServer.d.ts index 0ba20c6..d0db7e4 100644 --- a/TypeScript/6ReferenceAnotherClass/types/servers/HttpServer.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/servers/HttpServer.d.ts @@ -1,19 +1,21 @@ /// -import { HttpRouter } from "../routers/HttpRouter"; -import { JsonUtil } from "../utils/JsonUtil"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { DatabaseServer } from "./DatabaseServer"; -import { Serializer } from "../di/Serializer"; import http, { ServerResponse } from "http"; -import { INotification } from "../models/eft/notifier/INotifier"; -import { NotifierHelper } from "../helpers/NotifierHelper"; -import { ConfigServer } from "./ConfigServer"; -import { ILogger } from "../models/spt/utils/ILogger"; +import { Serializer } from "../di/Serializer"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; +import { NotifierHelper } from "../helpers/NotifierHelper"; +import { INotification } from "../models/eft/notifier/INotifier"; import { IHttpServer } from "../models/spt/server/IHttpServer"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { HttpRouter } from "../routers/HttpRouter"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { JsonUtil } from "../utils/JsonUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +import { ConfigServer } from "./ConfigServer"; +import { DatabaseServer } from "./DatabaseServer"; export declare class HttpServer implements IHttpServer { private httpRouter; private logger; + private randomUtil; private jsonUtil; private httpResponse; private databaseServer; @@ -21,7 +23,8 @@ export declare class HttpServer implements IHttpServer { private httpServerHelper; private serializers; private configServer; - constructor(httpRouter: HttpRouter, logger: ILogger, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); + constructor(httpRouter: HttpRouter, // TODO: delay required + logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); private buffers; private onReceive; private onRespond; @@ -39,5 +42,6 @@ export declare class HttpServer implements IHttpServer { sendResponse(sessionID: string, req: any, resp: any, body: Buffer): void; handleRequest(req: http.IncomingMessage, resp: http.ServerResponse): void; load(): void; + private getRandomisedMessage; wsOnConnection(ws: any, req: any): void; } diff --git a/TypeScript/6ReferenceAnotherClass/types/services/InsuranceService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/InsuranceService.d.ts index 35f0dbc..160faba 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/InsuranceService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/InsuranceService.d.ts @@ -1,10 +1,10 @@ +import { DialogueHelper } from "../helpers/DialogueHelper"; +import { SecureContainerHelper } from "../helpers/SecureContainerHelper"; +import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ILogger } from "../models/spt/utils/ILogger"; -import { DialogueHelper } from "../helpers/DialogueHelper"; -import { SecureContainerHelper } from "../helpers/SecureContainerHelper"; -import { TraderHelper } from "../helpers/TraderHelper"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; diff --git a/TypeScript/6ReferenceAnotherClass/types/services/ModCompilerService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/ModCompilerService.d.ts index 7e750c3..d316e48 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/ModCompilerService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/ModCompilerService.d.ts @@ -1,10 +1,12 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { VFS } from "../utils/VFS"; +import { HashCacheService } from "./HashCacheService"; export declare class ModCompilerService { private logger; + private hashCacheService; private vfs; - constructor(logger: ILogger, vfs: VFS); - compileMod(path: string, modTypeScriptFiles: string[]): Promise; + constructor(logger: ILogger, hashCacheService: HashCacheService, vfs: VFS); + compileMod(modName: string, path: string, modTypeScriptFiles: string[]): Promise; private compile; private areFilesReady; private delay; diff --git a/TypeScript/6ReferenceAnotherClass/types/services/PaymentService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/PaymentService.d.ts index 20cee50..0a6c4d6 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/PaymentService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/PaymentService.d.ts @@ -1,15 +1,15 @@ +import { HandbookHelper } from "../helpers/HandbookHelper"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { ItemHelper } from "../helpers/ItemHelper"; -import { DatabaseServer } from "../servers/DatabaseServer"; +import { PaymentHelper } from "../helpers/PaymentHelper"; +import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "../models/eft/trade/IProcessSellTradeRequestData"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { PaymentHelper } from "../helpers/PaymentHelper"; -import { HandbookHelper } from "../helpers/HandbookHelper"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class PaymentService { private logger; private httpResponse; diff --git a/TypeScript/6ReferenceAnotherClass/types/services/PlayerService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/PlayerService.d.ts index 4a74b4a..99e5986 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/PlayerService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/PlayerService.d.ts @@ -1,7 +1,7 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; 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"; export declare class PlayerService { private logger; private databaseServer; diff --git a/TypeScript/6ReferenceAnotherClass/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts new file mode 100644 index 0000000..abfe237 --- /dev/null +++ b/TypeScript/6ReferenceAnotherClass/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts @@ -0,0 +1,6 @@ +import { DynamicRouter, RouteAction } from "../../../di/Router"; +export declare class DynamicRouterMod extends DynamicRouter { + private topLevelRoute; + constructor(routes: RouteAction[], topLevelRoute: string); + getTopLevelRoute(): string; +} diff --git a/TypeScript/6ReferenceAnotherClass/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts new file mode 100644 index 0000000..6742fc6 --- /dev/null +++ b/TypeScript/6ReferenceAnotherClass/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -0,0 +1,7 @@ +import { DependencyContainer } from "tsyringe"; +import { RouteAction } from "../../../di/Router"; +export declare class DynamicRouterModService { + private container; + constructor(container: DependencyContainer); + registerDynamicRouter(name: string, routes: RouteAction[], topLevelRoute: string): void; +} diff --git a/TypeScript/6ReferenceAnotherClass/types/services/mod/onLoad/OnLoadMod.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/mod/onLoad/OnLoadMod.d.ts new file mode 100644 index 0000000..53fb062 --- /dev/null +++ b/TypeScript/6ReferenceAnotherClass/types/services/mod/onLoad/OnLoadMod.d.ts @@ -0,0 +1,8 @@ +import { OnLoad } from "../../../di/OnLoad"; +export declare class OnLoadMod extends OnLoad { + private onLoadOverride; + private getRouteOverride; + constructor(onLoadOverride: () => void, getRouteOverride: () => string); + onLoad(): void; + getRoute(): string; +} diff --git a/TypeScript/6ReferenceAnotherClass/types/services/mod/onLoad/OnLoadModService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/mod/onLoad/OnLoadModService.d.ts new file mode 100644 index 0000000..89bad14 --- /dev/null +++ b/TypeScript/6ReferenceAnotherClass/types/services/mod/onLoad/OnLoadModService.d.ts @@ -0,0 +1,6 @@ +import { DependencyContainer } from "tsyringe"; +export declare class OnLoadModService { + private container; + constructor(container: DependencyContainer); + registerOnLoad(name: string, onLoad: () => void, getRoute: () => string): void; +} diff --git a/TypeScript/6ReferenceAnotherClass/types/services/mod/onUpdate/OnUpdateMod.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/mod/onUpdate/OnUpdateMod.d.ts new file mode 100644 index 0000000..ee89043 --- /dev/null +++ b/TypeScript/6ReferenceAnotherClass/types/services/mod/onUpdate/OnUpdateMod.d.ts @@ -0,0 +1,8 @@ +import { OnUpdate } from "../../../di/OnUpdate"; +export declare class OnUpdateMod extends OnUpdate { + private onUpdateOverride; + private getRouteOverride; + constructor(onUpdateOverride: (timeSinceLastRun: number) => boolean, getRouteOverride: () => string); + onUpdate(timeSinceLastRun: number): boolean; + getRoute(): string; +} diff --git a/TypeScript/6ReferenceAnotherClass/types/services/mod/onUpdate/OnUpdateModService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/mod/onUpdate/OnUpdateModService.d.ts new file mode 100644 index 0000000..32419f4 --- /dev/null +++ b/TypeScript/6ReferenceAnotherClass/types/services/mod/onUpdate/OnUpdateModService.d.ts @@ -0,0 +1,6 @@ +import { DependencyContainer } from "tsyringe"; +export declare class OnUpdateModService { + private container; + constructor(container: DependencyContainer); + registerOnUpdate(name: string, onUpdate: (timeSinceLastRun: number) => boolean, getRoute: () => string): void; +} diff --git a/TypeScript/6ReferenceAnotherClass/types/services/mod/staticRouter/StaticRouterMod.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/mod/staticRouter/StaticRouterMod.d.ts new file mode 100644 index 0000000..1e62747 --- /dev/null +++ b/TypeScript/6ReferenceAnotherClass/types/services/mod/staticRouter/StaticRouterMod.d.ts @@ -0,0 +1,6 @@ +import { RouteAction, StaticRouter } from "../../../di/Router"; +export declare class StaticRouterMod extends StaticRouter { + private topLevelRoute; + constructor(routes: RouteAction[], topLevelRoute: string); + getTopLevelRoute(): string; +} diff --git a/TypeScript/6ReferenceAnotherClass/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/mod/staticRouter/StaticRouterModService.d.ts new file mode 100644 index 0000000..d4c42aa --- /dev/null +++ b/TypeScript/6ReferenceAnotherClass/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -0,0 +1,7 @@ +import { DependencyContainer } from "tsyringe"; +import { RouteAction } from "../../../di/Router"; +export declare class StaticRouterModService { + private container; + constructor(container: DependencyContainer); + registerStaticRouter(name: string, routes: RouteAction[], topLevelRoute: string): void; +} diff --git a/TypeScript/6ReferenceAnotherClass/types/utils/AyncQueue.d.ts b/TypeScript/6ReferenceAnotherClass/types/utils/AyncQueue.d.ts index 8f1559b..a99aa37 100644 --- a/TypeScript/6ReferenceAnotherClass/types/utils/AyncQueue.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/utils/AyncQueue.d.ts @@ -1,7 +1,7 @@ import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; import { ICommand } from "../models/spt/utils/ICommand"; export declare class AsyncQueue implements IAsyncQueue { - commandsQueue: ICommand[]; + private commandsQueue; constructor(); waitFor(command: ICommand): Promise; } diff --git a/TypeScript/6ReferenceAnotherClass/types/utils/Watermark.d.ts b/TypeScript/6ReferenceAnotherClass/types/utils/Watermark.d.ts index 598d5a6..e7b9883 100644 --- a/TypeScript/6ReferenceAnotherClass/types/utils/Watermark.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/utils/Watermark.d.ts @@ -1,13 +1,12 @@ -import { IWatermark, IWatermarkLocale } from "../models/spt/utils/IWatermark"; import { ConfigServer } from "../servers/ConfigServer"; import { ILogger } from "../models/spt/utils/ILogger"; -export declare class WatermarkLocale implements IWatermarkLocale { +export declare class WatermarkLocale { private locales; getLocale(): string; getDescription(): string[]; getWarning(): string[]; } -export declare class Watermark implements IWatermark { +export declare class Watermark { private logger; private configServer; private watermarkLocale?; diff --git a/TypeScript/7OnLoadHook/.eslintignore b/TypeScript/7OnLoadHook/.eslintignore new file mode 100644 index 0000000..9922d9a --- /dev/null +++ b/TypeScript/7OnLoadHook/.eslintignore @@ -0,0 +1,9 @@ +# Exclude these folders from linting +node_modules +dist/ +types/ + +# Exclude these filetypes from linting +*.json +*.txt +*.exe \ No newline at end of file diff --git a/TypeScript/7OnLoadHook/.eslintrc.json b/TypeScript/7OnLoadHook/.eslintrc.json new file mode 100644 index 0000000..c505160 --- /dev/null +++ b/TypeScript/7OnLoadHook/.eslintrc.json @@ -0,0 +1,75 @@ +{ + "root": true, + "parser": "@typescript-eslint/parser", + "plugins": [ + "@typescript-eslint" + ], + "extends": [ + "eslint:recommended", + "plugin:@typescript-eslint/eslint-recommended", + "plugin:@typescript-eslint/recommended" + ], + "rules": { + "@typescript-eslint/no-explicit-any": 0, + "@typescript-eslint/no-unused-vars": 1, + "@typescript-eslint/no-empty-interface": 0, + "@typescript-eslint/no-namespace": 0, + "@typescript-eslint/comma-dangle": 1, + "@typescript-eslint/func-call-spacing": 2, + "@typescript-eslint/quotes": 1, + "@typescript-eslint/brace-style": [ + "warn", + "allman" + ], + "@typescript-eslint/naming-convention": [ + "warn", + { + "selector": "default", + "format": ["camelCase"], + "leadingUnderscore": "allow" + }, + { + "selector": "typeLike", + "format": ["PascalCase"] + }, + { + "selector": "objectLiteralProperty", + "format": ["PascalCase", "camelCase"], + "leadingUnderscore": "allow" + }, + { + "selector": "typeProperty", + "format": ["PascalCase", "camelCase"], + "leadingUnderscore": "allow" + }, + { + "selector": "enumMember", + "format": ["UPPER_CASE"] + } + ], + "@typescript-eslint/indent": [ + "warn", + 4 + ], + "@typescript-eslint/no-unused-expressions": [ + "warn", + { + "allowShortCircuit": false, + "allowTernary": false + } + ], + "@typescript-eslint/keyword-spacing": [ + "warn", + { + "before": true, + "after": true + } + ], + "@typescript-eslint/explicit-module-boundary-types": [ + "warn", + { + "allowArgumentsExplicitlyTypedAsAny": true + } + ] + } +} \ No newline at end of file diff --git a/TypeScript/7OnLoadHook/README.md b/TypeScript/7OnLoadHook/README.md new file mode 100644 index 0000000..efc31a4 --- /dev/null +++ b/TypeScript/7OnLoadHook/README.md @@ -0,0 +1,64 @@ + +This project was created to automate most parts of building and setting up an environment. + +## **NodeJS 14.15.3:** + +The first step would be to install nodejs on your pc, the version you NEED is **14.15.3** + +That version is the one that has been used to test the mod templates and build scripts. + +It can be downloaded from here: https://nodejs.org/download/release/v14.15.3/ + +A system reboot may be needed after install. + +## **IDE:** + +The second step is having an IDE ready. For the currect purpose we've setup a VSCodium workspace file. + +You CAN use Visual Studio Code if you so desire, just keep in mind that our dev tests on the mod files was done using VSCodium. + +You can get VSCodium here: https://vscodium.com/#install + +## **Workspace:** + +Once you have NodeJS and VSCodium ready, open the mod.code-workspace file with VSCodium (File->Open Worspace from File...). + +Once the project loads into VSCodium you will be recommended to install the ESLint plugin. This is HIGHLY recommended. + +## **Environment Setup:** + +There is a task that will automatically setup your environment to use typescript. + +To run it, you just need to go to: + +> Terminal->Run Task...->Show All Tasks...->npm: install + +After running this task, your environment will be ready to start coding. + +DO NOT remove the node_modules folder, this is an auto generated directory that has the required dependencies to be able to use typescript and more. + +## **IMPORTANT:** + +Before starting to work on your mod, we suggest you read about Dependency Injection and Inversion of Control as this is the adopted architecture SPT-AKI has adopted. + +It will be difficult to understand some of the problems you may be having if you dont understand the basics of it. + +A guide explaining all the essentials will be available on the hub on release for you to read about. + +## **Coding:** + +All your work should be centered around the mod.ts file as an entry point. +You can ONLY change the following properties from the package.json file: `"name"`, `"version"`, `"license"`: `"MIT"`, `"author"`, `"akiVersion"`. + +If you have never used typescript before, you can read about it here: https://www.typescriptlang.org/docs/ + +## **Distributing your mod:** + +The project has been set up with an automatic task that will copy and zip ALL required files for your mod to work on SPT-AKI. +To run this task you just need to go to: + +> Terminal->Run Task...->Show All Tasks...->npm: build:zip + +The output will be a mod.zip file that will appear on the root of the project. + +Always verify that all files were included into the zip file. \ No newline at end of file diff --git a/TypeScript/7OnLoadHook/mod.code-workspace b/TypeScript/7OnLoadHook/mod.code-workspace new file mode 100644 index 0000000..6732c67 --- /dev/null +++ b/TypeScript/7OnLoadHook/mod.code-workspace @@ -0,0 +1,12 @@ +{ + "folders": [ + { + "path": "." + } + ], + "extensions": { + "recommendations": [ + "dbaeumer.vscode-eslint" + ] + } +} \ No newline at end of file diff --git a/TypeScript/7OnLoadHook/package.json b/TypeScript/7OnLoadHook/package.json index d806727..6373fe2 100644 --- a/TypeScript/7OnLoadHook/package.json +++ b/TypeScript/7OnLoadHook/package.json @@ -1,17 +1,25 @@ { - "name": "OnLoadHook", - "version": "1.0.0", - "main": "src/mod.js", - "license": "MIT", - "author": "Chomp", - "akiVersion": "3.0.0", - "scripts": { - "install": "npx handpick --target=devDependencies", - "build": "tsc" - }, - "devDependencies": { - "@types/node": "^17.0.31", - "tsyringe": "^4.6.0", - "typescript": "^4.6.4" - } + "name": "OnLoadHook", + "version": "1.0.0", + "main": "src/mod.js", + "license": "MIT", + "author": "Chomp", + "akiVersion": "3.0.0", + "scripts": { + "setup:environment": "npm i", + "build:unzipped": "copyfiles -e \"./node_modules/**/*.*\" -e \"./dist/**/*.*\" -e \"./package-lock.json\" -e \"./tsconfig.json\" -e \"./README.txt\" -e \"./mod.code-workspace\" ./**/*.* ./dist", + "zip:files": "cd dist/ && bestzip ../mod.zip *", + "build:zip": "npm run clean:environment && npm run build:unzipped && npm run zip:files", + "clean:environment": "node -e \"require('fs').rm('mod.zip', ()=>{})\" && node -e \"require('fs').rmdir('./dist/',{recursive:true},()=>{})\"" + }, + "devDependencies": { + "@types/node": "^14.15.3", + "@typescript-eslint/eslint-plugin": "^4.33.0", + "@typescript-eslint/parser": "^4.33.0", + "copyfiles": "2.4.1", + "eslint": "7.26.0", + "tsyringe": "4.6.0", + "typescript": "4.6.4", + "bestzip": "2.2.1" + } } diff --git a/TypeScript/7OnLoadHook/types/callbacks/CustomizationCallbacks.d.ts b/TypeScript/7OnLoadHook/types/callbacks/CustomizationCallbacks.d.ts index 2853e68..918b8b6 100644 --- a/TypeScript/7OnLoadHook/types/callbacks/CustomizationCallbacks.d.ts +++ b/TypeScript/7OnLoadHook/types/callbacks/CustomizationCallbacks.d.ts @@ -1,5 +1,5 @@ -import { IEmptyRequestData } from "../../types/models/eft/common/IEmptyRequestData"; import { CustomizationController } from "../controllers/CustomizationController"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IPmcData } from "../models/eft/common/IPmcData"; import { ISuit } from "../models/eft/common/tables/ITrader"; import { IBuyClothingRequestData } from "../models/eft/customization/IBuyClothingRequestData"; diff --git a/TypeScript/7OnLoadHook/types/callbacks/LauncherCallbacks.d.ts b/TypeScript/7OnLoadHook/types/callbacks/LauncherCallbacks.d.ts index 7dde83a..4bd5e2c 100644 --- a/TypeScript/7OnLoadHook/types/callbacks/LauncherCallbacks.d.ts +++ b/TypeScript/7OnLoadHook/types/callbacks/LauncherCallbacks.d.ts @@ -1,5 +1,5 @@ -import { IEmptyRequestData } from "../../types/models/eft/common/IEmptyRequestData"; import { LauncherController } from "../controllers/LauncherController"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IChangeRequestData } from "../models/eft/launcher/IChangeRequestData"; import { ILoginRequestData } from "../models/eft/launcher/ILoginRequestData"; import { IRegisterData } from "../models/eft/launcher/IRegisterData"; diff --git a/TypeScript/7OnLoadHook/types/callbacks/LocationCallbacks.d.ts b/TypeScript/7OnLoadHook/types/callbacks/LocationCallbacks.d.ts index 3405368..5ecab74 100644 --- a/TypeScript/7OnLoadHook/types/callbacks/LocationCallbacks.d.ts +++ b/TypeScript/7OnLoadHook/types/callbacks/LocationCallbacks.d.ts @@ -1,5 +1,5 @@ -import { IEmptyRequestData } from "../../types/models/eft/common/IEmptyRequestData"; import { LocationController } from "../controllers/LocationController"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { ILocationBase } from "../models/eft/common/ILocationBase"; import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSourceDestinationBase"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; diff --git a/TypeScript/7OnLoadHook/types/di/OnSaveLoad.d.ts b/TypeScript/7OnLoadHook/types/di/OnSaveLoad.d.ts new file mode 100644 index 0000000..1edf37e --- /dev/null +++ b/TypeScript/7OnLoadHook/types/di/OnSaveLoad.d.ts @@ -0,0 +1,4 @@ +export declare class OnSaveLoad { + onSaveLoad(): void; + getRoute(): string; +} diff --git a/TypeScript/7OnLoadHook/types/di/Router.d.ts b/TypeScript/7OnLoadHook/types/di/Router.d.ts index ac48587..2fb98e0 100644 --- a/TypeScript/7OnLoadHook/types/di/Router.d.ts +++ b/TypeScript/7OnLoadHook/types/di/Router.d.ts @@ -3,18 +3,22 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; export declare class Router { private handledRoutes; - constructor(); getTopLevelRoute(): string; protected getHandledRoutes(): HandledRoute[]; + private getInternalHandledRoutes; canHandle(url: string, partialMatch?: boolean): boolean; } export declare class StaticRouter extends Router { - constructor(); + private routes; + constructor(routes: RouteAction[]); handleStatic(url: string, info: any, sessionID: string, output: string): any; + getHandledRoutes(): HandledRoute[]; } export declare class DynamicRouter extends Router { - constructor(); + private routes; + constructor(routes: RouteAction[]); handleDynamic(url: string, info: any, sessionID: string, output: string): any; + getHandledRoutes(): HandledRoute[]; } export declare class ItemEventRouterDefinition extends Router { constructor(); @@ -29,3 +33,8 @@ export declare class HandledRoute { dynamic: boolean; constructor(route: string, dynamic: boolean); } +export declare class RouteAction { + url: string; + action: (url: string, info: any, sessionID: string, output: string) => any; + constructor(url: string, action: (url: string, info: any, sessionID: string, output: string) => any); +} diff --git a/TypeScript/7OnLoadHook/types/loaders/DelayedModLoader.d.ts b/TypeScript/7OnLoadHook/types/loaders/DelayedModLoader.d.ts index 7e7d8d0..7d0009f 100644 --- a/TypeScript/7OnLoadHook/types/loaders/DelayedModLoader.d.ts +++ b/TypeScript/7OnLoadHook/types/loaders/DelayedModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { HandbookController } from "../controllers/HandbookController"; import { IModLoader } from "../models/spt/mod/IModLoader"; import { ModCompilerService } from "../services/ModCompilerService"; @@ -16,7 +15,7 @@ export declare class DelayedModLoader implements IModLoader { getBundle(key: string, local: boolean): void; getImportedModsNames(): string[]; getModPath(mod: string): string; - load(container: DependencyContainer): void; + load(): void; private executeMods; private addBundles; } diff --git a/TypeScript/7OnLoadHook/types/loaders/InitialModLoader.d.ts b/TypeScript/7OnLoadHook/types/loaders/InitialModLoader.d.ts index 35503c8..d30a3fe 100644 --- a/TypeScript/7OnLoadHook/types/loaders/InitialModLoader.d.ts +++ b/TypeScript/7OnLoadHook/types/loaders/InitialModLoader.d.ts @@ -1,23 +1,22 @@ import { DependencyContainer } from "tsyringe"; -import { JsonUtil } from "../utils/JsonUtil"; -import { VFS } from "../utils/VFS"; +import { IModLoader } from "../models/spt/mod/IModLoader"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { ModCompilerService } from "../services/ModCompilerService"; -import { HashCacheService } from "../services/HashCacheService"; -import { IModLoader } from "../models/spt/mod/IModLoader"; +import { JsonUtil } from "../utils/JsonUtil"; +import { VFS } from "../utils/VFS"; export declare class InitialModLoader implements IModLoader { private logger; private vfs; private jsonUtil; private modCompilerService; - private hashCacheService; private configServer; + private static container; private readonly basepath; private imported; private onLoad; private akiConfig; - constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, hashCacheService: HashCacheService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, configServer: ConfigServer); load(container: DependencyContainer): Promise; getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; @@ -29,10 +28,10 @@ export declare class InitialModLoader implements IModLoader { private executeMods; private sortModsLoadOrder; private addMod; - private compileModIfNeeded; private areModDependenciesFulfilled; private isModCompatible; private validMod; private getLoadOrderRecursive; private getLoadOrder; + getContainer(): DependencyContainer; } diff --git a/TypeScript/7OnLoadHook/types/models/eft/common/ILocationBase.d.ts b/TypeScript/7OnLoadHook/types/models/eft/common/ILocationBase.d.ts index 0d092f6..ad48d32 100644 --- a/TypeScript/7OnLoadHook/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/7OnLoadHook/types/models/eft/common/ILocationBase.d.ts @@ -107,6 +107,15 @@ export interface BossLocationSpawn { BossPlayer: boolean; BossZone: string; Time: number; + TriggerId: string; + TriggerName: string; + Delay?: number; + Supports?: BossSupport[]; +} +export interface BossSupport { + BossEscortAmount: string; + BossEscortDifficult: string[]; + BossEscortType: string; } export interface BotLocationModifier { AccuracySpeed: number; diff --git a/TypeScript/7OnLoadHook/types/models/eft/common/tables/IBotType.d.ts b/TypeScript/7OnLoadHook/types/models/eft/common/tables/IBotType.d.ts index e0f39d9..01be0be 100644 --- a/TypeScript/7OnLoadHook/types/models/eft/common/tables/IBotType.d.ts +++ b/TypeScript/7OnLoadHook/types/models/eft/common/tables/IBotType.d.ts @@ -100,6 +100,8 @@ export interface Generation { export interface ItemMinMax { grenades: MinMax; healing: MinMax; + drugs: MinMax; + stims: MinMax; looseLoot: MinMax; magazines: MinMax; specialItems: MinMax; diff --git a/TypeScript/7OnLoadHook/types/models/eft/common/tables/IQuest.d.ts b/TypeScript/7OnLoadHook/types/models/eft/common/tables/IQuest.d.ts index 1582a2f..0aa7a4e 100644 --- a/TypeScript/7OnLoadHook/types/models/eft/common/tables/IQuest.d.ts +++ b/TypeScript/7OnLoadHook/types/models/eft/common/tables/IQuest.d.ts @@ -44,7 +44,7 @@ export interface AvailableForProps { value?: number; compareMethod?: string; visibilityConditions?: VisibilityCondition[]; - target?: string; + target?: string | string[]; status?: number[]; } export interface VisibilityCondition { diff --git a/TypeScript/7OnLoadHook/types/routers/dynamic/BotDynamicRouter.d.ts b/TypeScript/7OnLoadHook/types/routers/dynamic/BotDynamicRouter.d.ts index 51e52f7..dd2f68a 100644 --- a/TypeScript/7OnLoadHook/types/routers/dynamic/BotDynamicRouter.d.ts +++ b/TypeScript/7OnLoadHook/types/routers/dynamic/BotDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { BotCallbacks } from "../../callbacks/BotCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class BotDynamicRouter extends DynamicRouter { private botCallbacks; constructor(botCallbacks: BotCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/7OnLoadHook/types/routers/dynamic/BundleDynamicRouter.d.ts b/TypeScript/7OnLoadHook/types/routers/dynamic/BundleDynamicRouter.d.ts index 6cec61d..be27008 100644 --- a/TypeScript/7OnLoadHook/types/routers/dynamic/BundleDynamicRouter.d.ts +++ b/TypeScript/7OnLoadHook/types/routers/dynamic/BundleDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { BundleCallbacks } from "../../callbacks/BundleCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class BundleDynamicRouter extends DynamicRouter { private bundleCallbacks; constructor(bundleCallbacks: BundleCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/7OnLoadHook/types/routers/dynamic/CustomizationDynamicRouter.d.ts b/TypeScript/7OnLoadHook/types/routers/dynamic/CustomizationDynamicRouter.d.ts index e8a27ff..03a5967 100644 --- a/TypeScript/7OnLoadHook/types/routers/dynamic/CustomizationDynamicRouter.d.ts +++ b/TypeScript/7OnLoadHook/types/routers/dynamic/CustomizationDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class CustomizationDynamicRouter extends DynamicRouter { private customizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/7OnLoadHook/types/routers/dynamic/DataDynamicRouter.d.ts b/TypeScript/7OnLoadHook/types/routers/dynamic/DataDynamicRouter.d.ts index 9b6f632..c30501a 100644 --- a/TypeScript/7OnLoadHook/types/routers/dynamic/DataDynamicRouter.d.ts +++ b/TypeScript/7OnLoadHook/types/routers/dynamic/DataDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { DataCallbacks } from "../../callbacks/DataCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class DataDynamicRouter extends DynamicRouter { private dataCallbacks; constructor(dataCallbacks: DataCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/7OnLoadHook/types/routers/dynamic/HttpDynamicRouter.d.ts b/TypeScript/7OnLoadHook/types/routers/dynamic/HttpDynamicRouter.d.ts index 17706d5..b2933e9 100644 --- a/TypeScript/7OnLoadHook/types/routers/dynamic/HttpDynamicRouter.d.ts +++ b/TypeScript/7OnLoadHook/types/routers/dynamic/HttpDynamicRouter.d.ts @@ -1,9 +1,6 @@ -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; import { ImageRouter } from "../ImageRouter"; export declare class HttpDynamicRouter extends DynamicRouter { private imageRouter; constructor(imageRouter: ImageRouter); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/7OnLoadHook/types/routers/dynamic/InraidDynamicRouter.d.ts b/TypeScript/7OnLoadHook/types/routers/dynamic/InraidDynamicRouter.d.ts index cb1e8c0..ea4a9ae 100644 --- a/TypeScript/7OnLoadHook/types/routers/dynamic/InraidDynamicRouter.d.ts +++ b/TypeScript/7OnLoadHook/types/routers/dynamic/InraidDynamicRouter.d.ts @@ -1,10 +1,7 @@ import { InraidCallbacks } from "../../callbacks/InraidCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class InraidDynamicRouter extends DynamicRouter { private inraidCallbacks; constructor(inraidCallbacks: InraidCallbacks); - private readonly _routes; getTopLevelRoute(): string; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/7OnLoadHook/types/routers/dynamic/LocationDynamicRouter.d.ts b/TypeScript/7OnLoadHook/types/routers/dynamic/LocationDynamicRouter.d.ts index 9d85230..30741db 100644 --- a/TypeScript/7OnLoadHook/types/routers/dynamic/LocationDynamicRouter.d.ts +++ b/TypeScript/7OnLoadHook/types/routers/dynamic/LocationDynamicRouter.d.ts @@ -1,10 +1,7 @@ import { LocationCallbacks } from "../../callbacks/LocationCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class LocationDynamicRouter extends DynamicRouter { private locationCallbacks; constructor(locationCallbacks: LocationCallbacks); - private readonly _routes; getTopLevelRoute(): string; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/7OnLoadHook/types/routers/dynamic/NotifierDynamicRouter.d.ts b/TypeScript/7OnLoadHook/types/routers/dynamic/NotifierDynamicRouter.d.ts index e087b40..4786817 100644 --- a/TypeScript/7OnLoadHook/types/routers/dynamic/NotifierDynamicRouter.d.ts +++ b/TypeScript/7OnLoadHook/types/routers/dynamic/NotifierDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { NotifierCallbacks } from "../../callbacks/NotifierCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class NotifierDynamicRouter extends DynamicRouter { private notifierCallbacks; constructor(notifierCallbacks: NotifierCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/7OnLoadHook/types/routers/dynamic/TraderDynamicRouter.d.ts b/TypeScript/7OnLoadHook/types/routers/dynamic/TraderDynamicRouter.d.ts index d957e0e..a100b4c 100644 --- a/TypeScript/7OnLoadHook/types/routers/dynamic/TraderDynamicRouter.d.ts +++ b/TypeScript/7OnLoadHook/types/routers/dynamic/TraderDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { TraderCallbacks } from "../../callbacks/TraderCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class TraderDynamicRouter extends DynamicRouter { private traderCallbacks; constructor(traderCallbacks: TraderCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/7OnLoadHook/types/routers/static/BotStaticRouter.d.ts b/TypeScript/7OnLoadHook/types/routers/static/BotStaticRouter.d.ts index 7b23da6..d8b0bf4 100644 --- a/TypeScript/7OnLoadHook/types/routers/static/BotStaticRouter.d.ts +++ b/TypeScript/7OnLoadHook/types/routers/static/BotStaticRouter.d.ts @@ -1,8 +1,6 @@ import { BotCallbacks } from "../../callbacks/BotCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class BotStaticRouter extends StaticRouter { private botCallbacks; constructor(botCallbacks: BotCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/7OnLoadHook/types/routers/static/BundleStaticRouter.d.ts b/TypeScript/7OnLoadHook/types/routers/static/BundleStaticRouter.d.ts index 9283003..3905b82 100644 --- a/TypeScript/7OnLoadHook/types/routers/static/BundleStaticRouter.d.ts +++ b/TypeScript/7OnLoadHook/types/routers/static/BundleStaticRouter.d.ts @@ -1,8 +1,6 @@ import { BundleCallbacks } from "../../callbacks/BundleCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class BundleStaticRouter extends StaticRouter { private bundleCallbacks; constructor(bundleCallbacks: BundleCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/7OnLoadHook/types/routers/static/CustomizationStaticRouter.d.ts b/TypeScript/7OnLoadHook/types/routers/static/CustomizationStaticRouter.d.ts index 0d29578..46c71b8 100644 --- a/TypeScript/7OnLoadHook/types/routers/static/CustomizationStaticRouter.d.ts +++ b/TypeScript/7OnLoadHook/types/routers/static/CustomizationStaticRouter.d.ts @@ -1,8 +1,6 @@ import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class CustomizationStaticRouter extends StaticRouter { private customizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/7OnLoadHook/types/routers/static/DataStaticRouter.d.ts b/TypeScript/7OnLoadHook/types/routers/static/DataStaticRouter.d.ts index b8d2fea..a493d3a 100644 --- a/TypeScript/7OnLoadHook/types/routers/static/DataStaticRouter.d.ts +++ b/TypeScript/7OnLoadHook/types/routers/static/DataStaticRouter.d.ts @@ -1,8 +1,6 @@ import { DataCallbacks } from "../../callbacks/DataCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class DataStaticRouter extends StaticRouter { private dataCallbacks; constructor(dataCallbacks: DataCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/7OnLoadHook/types/routers/static/DialogStaticRouter.d.ts b/TypeScript/7OnLoadHook/types/routers/static/DialogStaticRouter.d.ts index 5e7285e..a59fb14 100644 --- a/TypeScript/7OnLoadHook/types/routers/static/DialogStaticRouter.d.ts +++ b/TypeScript/7OnLoadHook/types/routers/static/DialogStaticRouter.d.ts @@ -1,8 +1,6 @@ import { DialogueCallbacks } from "../../callbacks/DialogueCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class DialogStaticRouter extends StaticRouter { private dialogueCallbacks; constructor(dialogueCallbacks: DialogueCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/7OnLoadHook/types/routers/static/GameStaticRouter.d.ts b/TypeScript/7OnLoadHook/types/routers/static/GameStaticRouter.d.ts index e8eca40..988b673 100644 --- a/TypeScript/7OnLoadHook/types/routers/static/GameStaticRouter.d.ts +++ b/TypeScript/7OnLoadHook/types/routers/static/GameStaticRouter.d.ts @@ -1,8 +1,6 @@ import { GameCallbacks } from "../../callbacks/GameCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class GameStaticRouter extends StaticRouter { private gameCallbacks; constructor(gameCallbacks: GameCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/7OnLoadHook/types/routers/static/HealthStaticRouter.d.ts b/TypeScript/7OnLoadHook/types/routers/static/HealthStaticRouter.d.ts index aa0b8b3..e644861 100644 --- a/TypeScript/7OnLoadHook/types/routers/static/HealthStaticRouter.d.ts +++ b/TypeScript/7OnLoadHook/types/routers/static/HealthStaticRouter.d.ts @@ -1,8 +1,6 @@ import { HealthCallbacks } from "../../callbacks/HealthCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class HealthStaticRouter extends StaticRouter { private healthCallbacks; constructor(healthCallbacks: HealthCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/7OnLoadHook/types/routers/static/InraidStaticRouter.d.ts b/TypeScript/7OnLoadHook/types/routers/static/InraidStaticRouter.d.ts index 417d9d7..66ed860 100644 --- a/TypeScript/7OnLoadHook/types/routers/static/InraidStaticRouter.d.ts +++ b/TypeScript/7OnLoadHook/types/routers/static/InraidStaticRouter.d.ts @@ -1,8 +1,6 @@ import { InraidCallbacks } from "../../callbacks/InraidCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class InraidStaticRouter extends StaticRouter { private inraidCallbacks; constructor(inraidCallbacks: InraidCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/7OnLoadHook/types/routers/static/InsuranceStaticRouter.d.ts b/TypeScript/7OnLoadHook/types/routers/static/InsuranceStaticRouter.d.ts index 6fbffe5..8da26b3 100644 --- a/TypeScript/7OnLoadHook/types/routers/static/InsuranceStaticRouter.d.ts +++ b/TypeScript/7OnLoadHook/types/routers/static/InsuranceStaticRouter.d.ts @@ -1,8 +1,6 @@ import { InsuranceCallbacks } from "../../callbacks/InsuranceCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class InsuranceStaticRouter extends StaticRouter { private insuranceCallbacks; constructor(insuranceCallbacks: InsuranceCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/7OnLoadHook/types/routers/static/ItemEventStaticRouter.d.ts b/TypeScript/7OnLoadHook/types/routers/static/ItemEventStaticRouter.d.ts index 1a869e1..08ba6bb 100644 --- a/TypeScript/7OnLoadHook/types/routers/static/ItemEventStaticRouter.d.ts +++ b/TypeScript/7OnLoadHook/types/routers/static/ItemEventStaticRouter.d.ts @@ -1,8 +1,6 @@ import { ItemEventCallbacks } from "../../callbacks/ItemEventCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class ItemEventStaticRouter extends StaticRouter { private itemEventCallbacks; constructor(itemEventCallbacks: ItemEventCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/7OnLoadHook/types/routers/static/LauncherStaticRouter.d.ts b/TypeScript/7OnLoadHook/types/routers/static/LauncherStaticRouter.d.ts index 0d5e231..9d07f78 100644 --- a/TypeScript/7OnLoadHook/types/routers/static/LauncherStaticRouter.d.ts +++ b/TypeScript/7OnLoadHook/types/routers/static/LauncherStaticRouter.d.ts @@ -1,8 +1,6 @@ import { LauncherCallbacks } from "../../callbacks/LauncherCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class LauncherStaticRouter extends StaticRouter { private launcherCallbacks; constructor(launcherCallbacks: LauncherCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): string; } diff --git a/TypeScript/7OnLoadHook/types/routers/static/LocationStaticRouter.d.ts b/TypeScript/7OnLoadHook/types/routers/static/LocationStaticRouter.d.ts index 0b9b063..9c5c52e 100644 --- a/TypeScript/7OnLoadHook/types/routers/static/LocationStaticRouter.d.ts +++ b/TypeScript/7OnLoadHook/types/routers/static/LocationStaticRouter.d.ts @@ -1,8 +1,6 @@ import { LocationCallbacks } from "../../callbacks/LocationCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class LocationStaticRouter extends StaticRouter { private locationCallbacks; constructor(locationCallbacks: LocationCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/7OnLoadHook/types/routers/static/MatchStaticRouter.d.ts b/TypeScript/7OnLoadHook/types/routers/static/MatchStaticRouter.d.ts index 55c9640..d746381 100644 --- a/TypeScript/7OnLoadHook/types/routers/static/MatchStaticRouter.d.ts +++ b/TypeScript/7OnLoadHook/types/routers/static/MatchStaticRouter.d.ts @@ -1,8 +1,6 @@ import { MatchCallbacks } from "../../callbacks/MatchCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class MatchStaticRouter extends StaticRouter { private matchCallbacks; constructor(matchCallbacks: MatchCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/7OnLoadHook/types/routers/static/NotifierStaticRouter.d.ts b/TypeScript/7OnLoadHook/types/routers/static/NotifierStaticRouter.d.ts index 0d992db..1c8566d 100644 --- a/TypeScript/7OnLoadHook/types/routers/static/NotifierStaticRouter.d.ts +++ b/TypeScript/7OnLoadHook/types/routers/static/NotifierStaticRouter.d.ts @@ -1,8 +1,6 @@ import { NotifierCallbacks } from "../../callbacks/NotifierCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class NotifierStaticRouter extends StaticRouter { private notifierCallbacks; constructor(notifierCallbacks: NotifierCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/7OnLoadHook/types/routers/static/PresetStaticRouter.d.ts b/TypeScript/7OnLoadHook/types/routers/static/PresetStaticRouter.d.ts index a1bda56..2272f82 100644 --- a/TypeScript/7OnLoadHook/types/routers/static/PresetStaticRouter.d.ts +++ b/TypeScript/7OnLoadHook/types/routers/static/PresetStaticRouter.d.ts @@ -1,8 +1,6 @@ import { PresetBuildCallbacks } from "../../callbacks/PresetBuildCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class PresetStaticRouter extends StaticRouter { private presetCallbacks; constructor(presetCallbacks: PresetBuildCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/7OnLoadHook/types/routers/static/ProfileStaticRouter.d.ts b/TypeScript/7OnLoadHook/types/routers/static/ProfileStaticRouter.d.ts index d03b782..fd787f1 100644 --- a/TypeScript/7OnLoadHook/types/routers/static/ProfileStaticRouter.d.ts +++ b/TypeScript/7OnLoadHook/types/routers/static/ProfileStaticRouter.d.ts @@ -1,8 +1,6 @@ import { ProfileCallbacks } from "../../callbacks/ProfileCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class ProfileStaticRouter extends StaticRouter { private profileCallbacks; constructor(profileCallbacks: ProfileCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/7OnLoadHook/types/routers/static/QuestStaticRouter.d.ts b/TypeScript/7OnLoadHook/types/routers/static/QuestStaticRouter.d.ts index d375409..fda3c23 100644 --- a/TypeScript/7OnLoadHook/types/routers/static/QuestStaticRouter.d.ts +++ b/TypeScript/7OnLoadHook/types/routers/static/QuestStaticRouter.d.ts @@ -1,8 +1,6 @@ import { QuestCallbacks } from "../../callbacks/QuestCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class QuestStaticRouter extends StaticRouter { private questCallbacks; constructor(questCallbacks: QuestCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/7OnLoadHook/types/routers/static/RagfairStaticRouter.d.ts b/TypeScript/7OnLoadHook/types/routers/static/RagfairStaticRouter.d.ts index d5ed312..618374f 100644 --- a/TypeScript/7OnLoadHook/types/routers/static/RagfairStaticRouter.d.ts +++ b/TypeScript/7OnLoadHook/types/routers/static/RagfairStaticRouter.d.ts @@ -1,8 +1,6 @@ import { RagfairCallbacks } from "../../callbacks/RagfairCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class RagfairStaticRouter extends StaticRouter { private ragfairCallbacks; constructor(ragfairCallbacks: RagfairCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/7OnLoadHook/types/routers/static/TraderStaticRouter.d.ts b/TypeScript/7OnLoadHook/types/routers/static/TraderStaticRouter.d.ts index e3406fb..18f0629 100644 --- a/TypeScript/7OnLoadHook/types/routers/static/TraderStaticRouter.d.ts +++ b/TypeScript/7OnLoadHook/types/routers/static/TraderStaticRouter.d.ts @@ -1,8 +1,6 @@ import { TraderCallbacks } from "../../callbacks/TraderCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class TraderStaticRouter extends StaticRouter { private traderCallbacks; constructor(traderCallbacks: TraderCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/7OnLoadHook/types/routers/static/WeatherStaticRouter.d.ts b/TypeScript/7OnLoadHook/types/routers/static/WeatherStaticRouter.d.ts index aec3575..61b904d 100644 --- a/TypeScript/7OnLoadHook/types/routers/static/WeatherStaticRouter.d.ts +++ b/TypeScript/7OnLoadHook/types/routers/static/WeatherStaticRouter.d.ts @@ -1,8 +1,6 @@ import { WeatherCallbacks } from "../../callbacks/WeatherCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class WeatherStaticRouter extends StaticRouter { private weatherCallbacks; constructor(weatherCallbacks: WeatherCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/7OnLoadHook/types/servers/HttpServer.d.ts b/TypeScript/7OnLoadHook/types/servers/HttpServer.d.ts index ad33575..d0db7e4 100644 --- a/TypeScript/7OnLoadHook/types/servers/HttpServer.d.ts +++ b/TypeScript/7OnLoadHook/types/servers/HttpServer.d.ts @@ -9,11 +9,13 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { HttpRouter } from "../routers/HttpRouter"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; +import { RandomUtil } from "../utils/RandomUtil"; import { ConfigServer } from "./ConfigServer"; import { DatabaseServer } from "./DatabaseServer"; export declare class HttpServer implements IHttpServer { private httpRouter; private logger; + private randomUtil; private jsonUtil; private httpResponse; private databaseServer; @@ -22,7 +24,7 @@ export declare class HttpServer implements IHttpServer { private serializers; private configServer; constructor(httpRouter: HttpRouter, // TODO: delay required - logger: ILogger, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); + logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); private buffers; private onReceive; private onRespond; @@ -40,5 +42,6 @@ export declare class HttpServer implements IHttpServer { sendResponse(sessionID: string, req: any, resp: any, body: Buffer): void; handleRequest(req: http.IncomingMessage, resp: http.ServerResponse): void; load(): void; + private getRandomisedMessage; wsOnConnection(ws: any, req: any): void; } diff --git a/TypeScript/7OnLoadHook/types/services/ModCompilerService.d.ts b/TypeScript/7OnLoadHook/types/services/ModCompilerService.d.ts index 7e750c3..d316e48 100644 --- a/TypeScript/7OnLoadHook/types/services/ModCompilerService.d.ts +++ b/TypeScript/7OnLoadHook/types/services/ModCompilerService.d.ts @@ -1,10 +1,12 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { VFS } from "../utils/VFS"; +import { HashCacheService } from "./HashCacheService"; export declare class ModCompilerService { private logger; + private hashCacheService; private vfs; - constructor(logger: ILogger, vfs: VFS); - compileMod(path: string, modTypeScriptFiles: string[]): Promise; + constructor(logger: ILogger, hashCacheService: HashCacheService, vfs: VFS); + compileMod(modName: string, path: string, modTypeScriptFiles: string[]): Promise; private compile; private areFilesReady; private delay; diff --git a/TypeScript/7OnLoadHook/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts b/TypeScript/7OnLoadHook/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts new file mode 100644 index 0000000..abfe237 --- /dev/null +++ b/TypeScript/7OnLoadHook/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts @@ -0,0 +1,6 @@ +import { DynamicRouter, RouteAction } from "../../../di/Router"; +export declare class DynamicRouterMod extends DynamicRouter { + private topLevelRoute; + constructor(routes: RouteAction[], topLevelRoute: string); + getTopLevelRoute(): string; +} diff --git a/TypeScript/7OnLoadHook/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/7OnLoadHook/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts new file mode 100644 index 0000000..6742fc6 --- /dev/null +++ b/TypeScript/7OnLoadHook/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -0,0 +1,7 @@ +import { DependencyContainer } from "tsyringe"; +import { RouteAction } from "../../../di/Router"; +export declare class DynamicRouterModService { + private container; + constructor(container: DependencyContainer); + registerDynamicRouter(name: string, routes: RouteAction[], topLevelRoute: string): void; +} diff --git a/TypeScript/7OnLoadHook/types/services/mod/onUpdate/OnUpdateMod.d.ts b/TypeScript/7OnLoadHook/types/services/mod/onUpdate/OnUpdateMod.d.ts new file mode 100644 index 0000000..ee89043 --- /dev/null +++ b/TypeScript/7OnLoadHook/types/services/mod/onUpdate/OnUpdateMod.d.ts @@ -0,0 +1,8 @@ +import { OnUpdate } from "../../../di/OnUpdate"; +export declare class OnUpdateMod extends OnUpdate { + private onUpdateOverride; + private getRouteOverride; + constructor(onUpdateOverride: (timeSinceLastRun: number) => boolean, getRouteOverride: () => string); + onUpdate(timeSinceLastRun: number): boolean; + getRoute(): string; +} diff --git a/TypeScript/7OnLoadHook/types/services/mod/onUpdate/OnUpdateModService.d.ts b/TypeScript/7OnLoadHook/types/services/mod/onUpdate/OnUpdateModService.d.ts new file mode 100644 index 0000000..32419f4 --- /dev/null +++ b/TypeScript/7OnLoadHook/types/services/mod/onUpdate/OnUpdateModService.d.ts @@ -0,0 +1,6 @@ +import { DependencyContainer } from "tsyringe"; +export declare class OnUpdateModService { + private container; + constructor(container: DependencyContainer); + registerOnUpdate(name: string, onUpdate: (timeSinceLastRun: number) => boolean, getRoute: () => string): void; +} diff --git a/TypeScript/7OnLoadHook/types/services/mod/staticRouter/StaticRouterMod.d.ts b/TypeScript/7OnLoadHook/types/services/mod/staticRouter/StaticRouterMod.d.ts new file mode 100644 index 0000000..1e62747 --- /dev/null +++ b/TypeScript/7OnLoadHook/types/services/mod/staticRouter/StaticRouterMod.d.ts @@ -0,0 +1,6 @@ +import { RouteAction, StaticRouter } from "../../../di/Router"; +export declare class StaticRouterMod extends StaticRouter { + private topLevelRoute; + constructor(routes: RouteAction[], topLevelRoute: string); + getTopLevelRoute(): string; +} diff --git a/TypeScript/7OnLoadHook/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/7OnLoadHook/types/services/mod/staticRouter/StaticRouterModService.d.ts new file mode 100644 index 0000000..d4c42aa --- /dev/null +++ b/TypeScript/7OnLoadHook/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -0,0 +1,7 @@ +import { DependencyContainer } from "tsyringe"; +import { RouteAction } from "../../../di/Router"; +export declare class StaticRouterModService { + private container; + constructor(container: DependencyContainer); + registerStaticRouter(name: string, routes: RouteAction[], topLevelRoute: string): void; +} diff --git a/TypeScript/8OnUpdateHook/.eslintignore b/TypeScript/8OnUpdateHook/.eslintignore new file mode 100644 index 0000000..9922d9a --- /dev/null +++ b/TypeScript/8OnUpdateHook/.eslintignore @@ -0,0 +1,9 @@ +# Exclude these folders from linting +node_modules +dist/ +types/ + +# Exclude these filetypes from linting +*.json +*.txt +*.exe \ No newline at end of file diff --git a/TypeScript/8OnUpdateHook/.eslintrc.json b/TypeScript/8OnUpdateHook/.eslintrc.json new file mode 100644 index 0000000..c505160 --- /dev/null +++ b/TypeScript/8OnUpdateHook/.eslintrc.json @@ -0,0 +1,75 @@ +{ + "root": true, + "parser": "@typescript-eslint/parser", + "plugins": [ + "@typescript-eslint" + ], + "extends": [ + "eslint:recommended", + "plugin:@typescript-eslint/eslint-recommended", + "plugin:@typescript-eslint/recommended" + ], + "rules": { + "@typescript-eslint/no-explicit-any": 0, + "@typescript-eslint/no-unused-vars": 1, + "@typescript-eslint/no-empty-interface": 0, + "@typescript-eslint/no-namespace": 0, + "@typescript-eslint/comma-dangle": 1, + "@typescript-eslint/func-call-spacing": 2, + "@typescript-eslint/quotes": 1, + "@typescript-eslint/brace-style": [ + "warn", + "allman" + ], + "@typescript-eslint/naming-convention": [ + "warn", + { + "selector": "default", + "format": ["camelCase"], + "leadingUnderscore": "allow" + }, + { + "selector": "typeLike", + "format": ["PascalCase"] + }, + { + "selector": "objectLiteralProperty", + "format": ["PascalCase", "camelCase"], + "leadingUnderscore": "allow" + }, + { + "selector": "typeProperty", + "format": ["PascalCase", "camelCase"], + "leadingUnderscore": "allow" + }, + { + "selector": "enumMember", + "format": ["UPPER_CASE"] + } + ], + "@typescript-eslint/indent": [ + "warn", + 4 + ], + "@typescript-eslint/no-unused-expressions": [ + "warn", + { + "allowShortCircuit": false, + "allowTernary": false + } + ], + "@typescript-eslint/keyword-spacing": [ + "warn", + { + "before": true, + "after": true + } + ], + "@typescript-eslint/explicit-module-boundary-types": [ + "warn", + { + "allowArgumentsExplicitlyTypedAsAny": true + } + ] + } +} \ No newline at end of file diff --git a/TypeScript/8OnUpdateHook/README.md b/TypeScript/8OnUpdateHook/README.md new file mode 100644 index 0000000..efc31a4 --- /dev/null +++ b/TypeScript/8OnUpdateHook/README.md @@ -0,0 +1,64 @@ + +This project was created to automate most parts of building and setting up an environment. + +## **NodeJS 14.15.3:** + +The first step would be to install nodejs on your pc, the version you NEED is **14.15.3** + +That version is the one that has been used to test the mod templates and build scripts. + +It can be downloaded from here: https://nodejs.org/download/release/v14.15.3/ + +A system reboot may be needed after install. + +## **IDE:** + +The second step is having an IDE ready. For the currect purpose we've setup a VSCodium workspace file. + +You CAN use Visual Studio Code if you so desire, just keep in mind that our dev tests on the mod files was done using VSCodium. + +You can get VSCodium here: https://vscodium.com/#install + +## **Workspace:** + +Once you have NodeJS and VSCodium ready, open the mod.code-workspace file with VSCodium (File->Open Worspace from File...). + +Once the project loads into VSCodium you will be recommended to install the ESLint plugin. This is HIGHLY recommended. + +## **Environment Setup:** + +There is a task that will automatically setup your environment to use typescript. + +To run it, you just need to go to: + +> Terminal->Run Task...->Show All Tasks...->npm: install + +After running this task, your environment will be ready to start coding. + +DO NOT remove the node_modules folder, this is an auto generated directory that has the required dependencies to be able to use typescript and more. + +## **IMPORTANT:** + +Before starting to work on your mod, we suggest you read about Dependency Injection and Inversion of Control as this is the adopted architecture SPT-AKI has adopted. + +It will be difficult to understand some of the problems you may be having if you dont understand the basics of it. + +A guide explaining all the essentials will be available on the hub on release for you to read about. + +## **Coding:** + +All your work should be centered around the mod.ts file as an entry point. +You can ONLY change the following properties from the package.json file: `"name"`, `"version"`, `"license"`: `"MIT"`, `"author"`, `"akiVersion"`. + +If you have never used typescript before, you can read about it here: https://www.typescriptlang.org/docs/ + +## **Distributing your mod:** + +The project has been set up with an automatic task that will copy and zip ALL required files for your mod to work on SPT-AKI. +To run this task you just need to go to: + +> Terminal->Run Task...->Show All Tasks...->npm: build:zip + +The output will be a mod.zip file that will appear on the root of the project. + +Always verify that all files were included into the zip file. \ No newline at end of file diff --git a/TypeScript/8OnUpdateHook/mod.code-workspace b/TypeScript/8OnUpdateHook/mod.code-workspace new file mode 100644 index 0000000..6732c67 --- /dev/null +++ b/TypeScript/8OnUpdateHook/mod.code-workspace @@ -0,0 +1,12 @@ +{ + "folders": [ + { + "path": "." + } + ], + "extensions": { + "recommendations": [ + "dbaeumer.vscode-eslint" + ] + } +} \ No newline at end of file diff --git a/TypeScript/8OnUpdateHook/package.json b/TypeScript/8OnUpdateHook/package.json index 45794a1..36e40ea 100644 --- a/TypeScript/8OnUpdateHook/package.json +++ b/TypeScript/8OnUpdateHook/package.json @@ -1,17 +1,25 @@ { - "name": "OnUpdateHook", - "version": "1.0.0", - "main": "src/mod.js", - "license": "MIT", - "author": "Chomp", - "akiVersion": "3.0.0", - "scripts": { - "install": "npx handpick --target=devDependencies", - "build": "tsc" - }, - "devDependencies": { - "@types/node": "^17.0.31", - "tsyringe": "^4.6.0", - "typescript": "^4.6.4" - } + "name": "OnUpdateHook", + "version": "1.0.0", + "main": "src/mod.js", + "license": "MIT", + "author": "Chomp", + "akiVersion": "3.0.0", + "scripts": { + "setup:environment": "npm i", + "build:unzipped": "copyfiles -e \"./node_modules/**/*.*\" -e \"./dist/**/*.*\" -e \"./package-lock.json\" -e \"./tsconfig.json\" -e \"./README.txt\" -e \"./mod.code-workspace\" ./**/*.* ./dist", + "zip:files": "cd dist/ && bestzip ../mod.zip *", + "build:zip": "npm run clean:environment && npm run build:unzipped && npm run zip:files", + "clean:environment": "node -e \"require('fs').rm('mod.zip', ()=>{})\" && node -e \"require('fs').rmdir('./dist/',{recursive:true},()=>{})\"" + }, + "devDependencies": { + "@types/node": "^14.15.3", + "@typescript-eslint/eslint-plugin": "^4.33.0", + "@typescript-eslint/parser": "^4.33.0", + "copyfiles": "2.4.1", + "eslint": "7.26.0", + "tsyringe": "4.6.0", + "typescript": "4.6.4", + "bestzip": "2.2.1" + } } diff --git a/TypeScript/8OnUpdateHook/types/di/OnSaveLoad.d.ts b/TypeScript/8OnUpdateHook/types/di/OnSaveLoad.d.ts new file mode 100644 index 0000000..1edf37e --- /dev/null +++ b/TypeScript/8OnUpdateHook/types/di/OnSaveLoad.d.ts @@ -0,0 +1,4 @@ +export declare class OnSaveLoad { + onSaveLoad(): void; + getRoute(): string; +} diff --git a/TypeScript/8OnUpdateHook/types/di/Router.d.ts b/TypeScript/8OnUpdateHook/types/di/Router.d.ts index ac48587..2fb98e0 100644 --- a/TypeScript/8OnUpdateHook/types/di/Router.d.ts +++ b/TypeScript/8OnUpdateHook/types/di/Router.d.ts @@ -3,18 +3,22 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; export declare class Router { private handledRoutes; - constructor(); getTopLevelRoute(): string; protected getHandledRoutes(): HandledRoute[]; + private getInternalHandledRoutes; canHandle(url: string, partialMatch?: boolean): boolean; } export declare class StaticRouter extends Router { - constructor(); + private routes; + constructor(routes: RouteAction[]); handleStatic(url: string, info: any, sessionID: string, output: string): any; + getHandledRoutes(): HandledRoute[]; } export declare class DynamicRouter extends Router { - constructor(); + private routes; + constructor(routes: RouteAction[]); handleDynamic(url: string, info: any, sessionID: string, output: string): any; + getHandledRoutes(): HandledRoute[]; } export declare class ItemEventRouterDefinition extends Router { constructor(); @@ -29,3 +33,8 @@ export declare class HandledRoute { dynamic: boolean; constructor(route: string, dynamic: boolean); } +export declare class RouteAction { + url: string; + action: (url: string, info: any, sessionID: string, output: string) => any; + constructor(url: string, action: (url: string, info: any, sessionID: string, output: string) => any); +} diff --git a/TypeScript/8OnUpdateHook/types/loaders/DelayedModLoader.d.ts b/TypeScript/8OnUpdateHook/types/loaders/DelayedModLoader.d.ts index 7e7d8d0..7d0009f 100644 --- a/TypeScript/8OnUpdateHook/types/loaders/DelayedModLoader.d.ts +++ b/TypeScript/8OnUpdateHook/types/loaders/DelayedModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { HandbookController } from "../controllers/HandbookController"; import { IModLoader } from "../models/spt/mod/IModLoader"; import { ModCompilerService } from "../services/ModCompilerService"; @@ -16,7 +15,7 @@ export declare class DelayedModLoader implements IModLoader { getBundle(key: string, local: boolean): void; getImportedModsNames(): string[]; getModPath(mod: string): string; - load(container: DependencyContainer): void; + load(): void; private executeMods; private addBundles; } diff --git a/TypeScript/8OnUpdateHook/types/loaders/InitialModLoader.d.ts b/TypeScript/8OnUpdateHook/types/loaders/InitialModLoader.d.ts index 35503c8..d30a3fe 100644 --- a/TypeScript/8OnUpdateHook/types/loaders/InitialModLoader.d.ts +++ b/TypeScript/8OnUpdateHook/types/loaders/InitialModLoader.d.ts @@ -1,23 +1,22 @@ import { DependencyContainer } from "tsyringe"; -import { JsonUtil } from "../utils/JsonUtil"; -import { VFS } from "../utils/VFS"; +import { IModLoader } from "../models/spt/mod/IModLoader"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { ModCompilerService } from "../services/ModCompilerService"; -import { HashCacheService } from "../services/HashCacheService"; -import { IModLoader } from "../models/spt/mod/IModLoader"; +import { JsonUtil } from "../utils/JsonUtil"; +import { VFS } from "../utils/VFS"; export declare class InitialModLoader implements IModLoader { private logger; private vfs; private jsonUtil; private modCompilerService; - private hashCacheService; private configServer; + private static container; private readonly basepath; private imported; private onLoad; private akiConfig; - constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, hashCacheService: HashCacheService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, configServer: ConfigServer); load(container: DependencyContainer): Promise; getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; @@ -29,10 +28,10 @@ export declare class InitialModLoader implements IModLoader { private executeMods; private sortModsLoadOrder; private addMod; - private compileModIfNeeded; private areModDependenciesFulfilled; private isModCompatible; private validMod; private getLoadOrderRecursive; private getLoadOrder; + getContainer(): DependencyContainer; } diff --git a/TypeScript/8OnUpdateHook/types/models/eft/common/ILocationBase.d.ts b/TypeScript/8OnUpdateHook/types/models/eft/common/ILocationBase.d.ts index 0d092f6..ad48d32 100644 --- a/TypeScript/8OnUpdateHook/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/8OnUpdateHook/types/models/eft/common/ILocationBase.d.ts @@ -107,6 +107,15 @@ export interface BossLocationSpawn { BossPlayer: boolean; BossZone: string; Time: number; + TriggerId: string; + TriggerName: string; + Delay?: number; + Supports?: BossSupport[]; +} +export interface BossSupport { + BossEscortAmount: string; + BossEscortDifficult: string[]; + BossEscortType: string; } export interface BotLocationModifier { AccuracySpeed: number; diff --git a/TypeScript/8OnUpdateHook/types/models/eft/common/tables/IBotType.d.ts b/TypeScript/8OnUpdateHook/types/models/eft/common/tables/IBotType.d.ts index e0f39d9..01be0be 100644 --- a/TypeScript/8OnUpdateHook/types/models/eft/common/tables/IBotType.d.ts +++ b/TypeScript/8OnUpdateHook/types/models/eft/common/tables/IBotType.d.ts @@ -100,6 +100,8 @@ export interface Generation { export interface ItemMinMax { grenades: MinMax; healing: MinMax; + drugs: MinMax; + stims: MinMax; looseLoot: MinMax; magazines: MinMax; specialItems: MinMax; diff --git a/TypeScript/8OnUpdateHook/types/models/eft/common/tables/IQuest.d.ts b/TypeScript/8OnUpdateHook/types/models/eft/common/tables/IQuest.d.ts index 1582a2f..0aa7a4e 100644 --- a/TypeScript/8OnUpdateHook/types/models/eft/common/tables/IQuest.d.ts +++ b/TypeScript/8OnUpdateHook/types/models/eft/common/tables/IQuest.d.ts @@ -44,7 +44,7 @@ export interface AvailableForProps { value?: number; compareMethod?: string; visibilityConditions?: VisibilityCondition[]; - target?: string; + target?: string | string[]; status?: number[]; } export interface VisibilityCondition { diff --git a/TypeScript/8OnUpdateHook/types/routers/dynamic/BotDynamicRouter.d.ts b/TypeScript/8OnUpdateHook/types/routers/dynamic/BotDynamicRouter.d.ts index 51e52f7..dd2f68a 100644 --- a/TypeScript/8OnUpdateHook/types/routers/dynamic/BotDynamicRouter.d.ts +++ b/TypeScript/8OnUpdateHook/types/routers/dynamic/BotDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { BotCallbacks } from "../../callbacks/BotCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class BotDynamicRouter extends DynamicRouter { private botCallbacks; constructor(botCallbacks: BotCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/8OnUpdateHook/types/routers/dynamic/BundleDynamicRouter.d.ts b/TypeScript/8OnUpdateHook/types/routers/dynamic/BundleDynamicRouter.d.ts index 6cec61d..be27008 100644 --- a/TypeScript/8OnUpdateHook/types/routers/dynamic/BundleDynamicRouter.d.ts +++ b/TypeScript/8OnUpdateHook/types/routers/dynamic/BundleDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { BundleCallbacks } from "../../callbacks/BundleCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class BundleDynamicRouter extends DynamicRouter { private bundleCallbacks; constructor(bundleCallbacks: BundleCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/8OnUpdateHook/types/routers/dynamic/CustomizationDynamicRouter.d.ts b/TypeScript/8OnUpdateHook/types/routers/dynamic/CustomizationDynamicRouter.d.ts index e8a27ff..03a5967 100644 --- a/TypeScript/8OnUpdateHook/types/routers/dynamic/CustomizationDynamicRouter.d.ts +++ b/TypeScript/8OnUpdateHook/types/routers/dynamic/CustomizationDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class CustomizationDynamicRouter extends DynamicRouter { private customizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/8OnUpdateHook/types/routers/dynamic/DataDynamicRouter.d.ts b/TypeScript/8OnUpdateHook/types/routers/dynamic/DataDynamicRouter.d.ts index 9b6f632..c30501a 100644 --- a/TypeScript/8OnUpdateHook/types/routers/dynamic/DataDynamicRouter.d.ts +++ b/TypeScript/8OnUpdateHook/types/routers/dynamic/DataDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { DataCallbacks } from "../../callbacks/DataCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class DataDynamicRouter extends DynamicRouter { private dataCallbacks; constructor(dataCallbacks: DataCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/8OnUpdateHook/types/routers/dynamic/HttpDynamicRouter.d.ts b/TypeScript/8OnUpdateHook/types/routers/dynamic/HttpDynamicRouter.d.ts index 17706d5..b2933e9 100644 --- a/TypeScript/8OnUpdateHook/types/routers/dynamic/HttpDynamicRouter.d.ts +++ b/TypeScript/8OnUpdateHook/types/routers/dynamic/HttpDynamicRouter.d.ts @@ -1,9 +1,6 @@ -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; import { ImageRouter } from "../ImageRouter"; export declare class HttpDynamicRouter extends DynamicRouter { private imageRouter; constructor(imageRouter: ImageRouter); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/8OnUpdateHook/types/routers/dynamic/InraidDynamicRouter.d.ts b/TypeScript/8OnUpdateHook/types/routers/dynamic/InraidDynamicRouter.d.ts index cb1e8c0..ea4a9ae 100644 --- a/TypeScript/8OnUpdateHook/types/routers/dynamic/InraidDynamicRouter.d.ts +++ b/TypeScript/8OnUpdateHook/types/routers/dynamic/InraidDynamicRouter.d.ts @@ -1,10 +1,7 @@ import { InraidCallbacks } from "../../callbacks/InraidCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class InraidDynamicRouter extends DynamicRouter { private inraidCallbacks; constructor(inraidCallbacks: InraidCallbacks); - private readonly _routes; getTopLevelRoute(): string; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/8OnUpdateHook/types/routers/dynamic/LocationDynamicRouter.d.ts b/TypeScript/8OnUpdateHook/types/routers/dynamic/LocationDynamicRouter.d.ts index 9d85230..30741db 100644 --- a/TypeScript/8OnUpdateHook/types/routers/dynamic/LocationDynamicRouter.d.ts +++ b/TypeScript/8OnUpdateHook/types/routers/dynamic/LocationDynamicRouter.d.ts @@ -1,10 +1,7 @@ import { LocationCallbacks } from "../../callbacks/LocationCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class LocationDynamicRouter extends DynamicRouter { private locationCallbacks; constructor(locationCallbacks: LocationCallbacks); - private readonly _routes; getTopLevelRoute(): string; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/8OnUpdateHook/types/routers/dynamic/NotifierDynamicRouter.d.ts b/TypeScript/8OnUpdateHook/types/routers/dynamic/NotifierDynamicRouter.d.ts index e087b40..4786817 100644 --- a/TypeScript/8OnUpdateHook/types/routers/dynamic/NotifierDynamicRouter.d.ts +++ b/TypeScript/8OnUpdateHook/types/routers/dynamic/NotifierDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { NotifierCallbacks } from "../../callbacks/NotifierCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class NotifierDynamicRouter extends DynamicRouter { private notifierCallbacks; constructor(notifierCallbacks: NotifierCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/8OnUpdateHook/types/routers/dynamic/TraderDynamicRouter.d.ts b/TypeScript/8OnUpdateHook/types/routers/dynamic/TraderDynamicRouter.d.ts index d957e0e..a100b4c 100644 --- a/TypeScript/8OnUpdateHook/types/routers/dynamic/TraderDynamicRouter.d.ts +++ b/TypeScript/8OnUpdateHook/types/routers/dynamic/TraderDynamicRouter.d.ts @@ -1,9 +1,6 @@ import { TraderCallbacks } from "../../callbacks/TraderCallbacks"; -import { DynamicRouter, HandledRoute } from "../../di/Router"; +import { DynamicRouter } from "../../di/Router"; export declare class TraderDynamicRouter extends DynamicRouter { private traderCallbacks; constructor(traderCallbacks: TraderCallbacks); - private readonly _routes; - getHandledRoutes(): HandledRoute[]; - handleDynamic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/8OnUpdateHook/types/routers/static/BotStaticRouter.d.ts b/TypeScript/8OnUpdateHook/types/routers/static/BotStaticRouter.d.ts index 7b23da6..d8b0bf4 100644 --- a/TypeScript/8OnUpdateHook/types/routers/static/BotStaticRouter.d.ts +++ b/TypeScript/8OnUpdateHook/types/routers/static/BotStaticRouter.d.ts @@ -1,8 +1,6 @@ import { BotCallbacks } from "../../callbacks/BotCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class BotStaticRouter extends StaticRouter { private botCallbacks; constructor(botCallbacks: BotCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/8OnUpdateHook/types/routers/static/BundleStaticRouter.d.ts b/TypeScript/8OnUpdateHook/types/routers/static/BundleStaticRouter.d.ts index 9283003..3905b82 100644 --- a/TypeScript/8OnUpdateHook/types/routers/static/BundleStaticRouter.d.ts +++ b/TypeScript/8OnUpdateHook/types/routers/static/BundleStaticRouter.d.ts @@ -1,8 +1,6 @@ import { BundleCallbacks } from "../../callbacks/BundleCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class BundleStaticRouter extends StaticRouter { private bundleCallbacks; constructor(bundleCallbacks: BundleCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/8OnUpdateHook/types/routers/static/CustomizationStaticRouter.d.ts b/TypeScript/8OnUpdateHook/types/routers/static/CustomizationStaticRouter.d.ts index 0d29578..46c71b8 100644 --- a/TypeScript/8OnUpdateHook/types/routers/static/CustomizationStaticRouter.d.ts +++ b/TypeScript/8OnUpdateHook/types/routers/static/CustomizationStaticRouter.d.ts @@ -1,8 +1,6 @@ import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class CustomizationStaticRouter extends StaticRouter { private customizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/8OnUpdateHook/types/routers/static/DataStaticRouter.d.ts b/TypeScript/8OnUpdateHook/types/routers/static/DataStaticRouter.d.ts index b8d2fea..a493d3a 100644 --- a/TypeScript/8OnUpdateHook/types/routers/static/DataStaticRouter.d.ts +++ b/TypeScript/8OnUpdateHook/types/routers/static/DataStaticRouter.d.ts @@ -1,8 +1,6 @@ import { DataCallbacks } from "../../callbacks/DataCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class DataStaticRouter extends StaticRouter { private dataCallbacks; constructor(dataCallbacks: DataCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/8OnUpdateHook/types/routers/static/DialogStaticRouter.d.ts b/TypeScript/8OnUpdateHook/types/routers/static/DialogStaticRouter.d.ts index 5e7285e..a59fb14 100644 --- a/TypeScript/8OnUpdateHook/types/routers/static/DialogStaticRouter.d.ts +++ b/TypeScript/8OnUpdateHook/types/routers/static/DialogStaticRouter.d.ts @@ -1,8 +1,6 @@ import { DialogueCallbacks } from "../../callbacks/DialogueCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class DialogStaticRouter extends StaticRouter { private dialogueCallbacks; constructor(dialogueCallbacks: DialogueCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/8OnUpdateHook/types/routers/static/GameStaticRouter.d.ts b/TypeScript/8OnUpdateHook/types/routers/static/GameStaticRouter.d.ts index e8eca40..988b673 100644 --- a/TypeScript/8OnUpdateHook/types/routers/static/GameStaticRouter.d.ts +++ b/TypeScript/8OnUpdateHook/types/routers/static/GameStaticRouter.d.ts @@ -1,8 +1,6 @@ import { GameCallbacks } from "../../callbacks/GameCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class GameStaticRouter extends StaticRouter { private gameCallbacks; constructor(gameCallbacks: GameCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/8OnUpdateHook/types/routers/static/HealthStaticRouter.d.ts b/TypeScript/8OnUpdateHook/types/routers/static/HealthStaticRouter.d.ts index aa0b8b3..e644861 100644 --- a/TypeScript/8OnUpdateHook/types/routers/static/HealthStaticRouter.d.ts +++ b/TypeScript/8OnUpdateHook/types/routers/static/HealthStaticRouter.d.ts @@ -1,8 +1,6 @@ import { HealthCallbacks } from "../../callbacks/HealthCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class HealthStaticRouter extends StaticRouter { private healthCallbacks; constructor(healthCallbacks: HealthCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/8OnUpdateHook/types/routers/static/InraidStaticRouter.d.ts b/TypeScript/8OnUpdateHook/types/routers/static/InraidStaticRouter.d.ts index 417d9d7..66ed860 100644 --- a/TypeScript/8OnUpdateHook/types/routers/static/InraidStaticRouter.d.ts +++ b/TypeScript/8OnUpdateHook/types/routers/static/InraidStaticRouter.d.ts @@ -1,8 +1,6 @@ import { InraidCallbacks } from "../../callbacks/InraidCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class InraidStaticRouter extends StaticRouter { private inraidCallbacks; constructor(inraidCallbacks: InraidCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/8OnUpdateHook/types/routers/static/InsuranceStaticRouter.d.ts b/TypeScript/8OnUpdateHook/types/routers/static/InsuranceStaticRouter.d.ts index 6fbffe5..8da26b3 100644 --- a/TypeScript/8OnUpdateHook/types/routers/static/InsuranceStaticRouter.d.ts +++ b/TypeScript/8OnUpdateHook/types/routers/static/InsuranceStaticRouter.d.ts @@ -1,8 +1,6 @@ import { InsuranceCallbacks } from "../../callbacks/InsuranceCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class InsuranceStaticRouter extends StaticRouter { private insuranceCallbacks; constructor(insuranceCallbacks: InsuranceCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/8OnUpdateHook/types/routers/static/ItemEventStaticRouter.d.ts b/TypeScript/8OnUpdateHook/types/routers/static/ItemEventStaticRouter.d.ts index 1a869e1..08ba6bb 100644 --- a/TypeScript/8OnUpdateHook/types/routers/static/ItemEventStaticRouter.d.ts +++ b/TypeScript/8OnUpdateHook/types/routers/static/ItemEventStaticRouter.d.ts @@ -1,8 +1,6 @@ import { ItemEventCallbacks } from "../../callbacks/ItemEventCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class ItemEventStaticRouter extends StaticRouter { private itemEventCallbacks; constructor(itemEventCallbacks: ItemEventCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/8OnUpdateHook/types/routers/static/LauncherStaticRouter.d.ts b/TypeScript/8OnUpdateHook/types/routers/static/LauncherStaticRouter.d.ts index 0d5e231..9d07f78 100644 --- a/TypeScript/8OnUpdateHook/types/routers/static/LauncherStaticRouter.d.ts +++ b/TypeScript/8OnUpdateHook/types/routers/static/LauncherStaticRouter.d.ts @@ -1,8 +1,6 @@ import { LauncherCallbacks } from "../../callbacks/LauncherCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class LauncherStaticRouter extends StaticRouter { private launcherCallbacks; constructor(launcherCallbacks: LauncherCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): string; } diff --git a/TypeScript/8OnUpdateHook/types/routers/static/LocationStaticRouter.d.ts b/TypeScript/8OnUpdateHook/types/routers/static/LocationStaticRouter.d.ts index 0b9b063..9c5c52e 100644 --- a/TypeScript/8OnUpdateHook/types/routers/static/LocationStaticRouter.d.ts +++ b/TypeScript/8OnUpdateHook/types/routers/static/LocationStaticRouter.d.ts @@ -1,8 +1,6 @@ import { LocationCallbacks } from "../../callbacks/LocationCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class LocationStaticRouter extends StaticRouter { private locationCallbacks; constructor(locationCallbacks: LocationCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/8OnUpdateHook/types/routers/static/MatchStaticRouter.d.ts b/TypeScript/8OnUpdateHook/types/routers/static/MatchStaticRouter.d.ts index 55c9640..d746381 100644 --- a/TypeScript/8OnUpdateHook/types/routers/static/MatchStaticRouter.d.ts +++ b/TypeScript/8OnUpdateHook/types/routers/static/MatchStaticRouter.d.ts @@ -1,8 +1,6 @@ import { MatchCallbacks } from "../../callbacks/MatchCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class MatchStaticRouter extends StaticRouter { private matchCallbacks; constructor(matchCallbacks: MatchCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/8OnUpdateHook/types/routers/static/NotifierStaticRouter.d.ts b/TypeScript/8OnUpdateHook/types/routers/static/NotifierStaticRouter.d.ts index 0d992db..1c8566d 100644 --- a/TypeScript/8OnUpdateHook/types/routers/static/NotifierStaticRouter.d.ts +++ b/TypeScript/8OnUpdateHook/types/routers/static/NotifierStaticRouter.d.ts @@ -1,8 +1,6 @@ import { NotifierCallbacks } from "../../callbacks/NotifierCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class NotifierStaticRouter extends StaticRouter { private notifierCallbacks; constructor(notifierCallbacks: NotifierCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/8OnUpdateHook/types/routers/static/PresetStaticRouter.d.ts b/TypeScript/8OnUpdateHook/types/routers/static/PresetStaticRouter.d.ts index a1bda56..2272f82 100644 --- a/TypeScript/8OnUpdateHook/types/routers/static/PresetStaticRouter.d.ts +++ b/TypeScript/8OnUpdateHook/types/routers/static/PresetStaticRouter.d.ts @@ -1,8 +1,6 @@ import { PresetBuildCallbacks } from "../../callbacks/PresetBuildCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class PresetStaticRouter extends StaticRouter { private presetCallbacks; constructor(presetCallbacks: PresetBuildCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/8OnUpdateHook/types/routers/static/ProfileStaticRouter.d.ts b/TypeScript/8OnUpdateHook/types/routers/static/ProfileStaticRouter.d.ts index d03b782..fd787f1 100644 --- a/TypeScript/8OnUpdateHook/types/routers/static/ProfileStaticRouter.d.ts +++ b/TypeScript/8OnUpdateHook/types/routers/static/ProfileStaticRouter.d.ts @@ -1,8 +1,6 @@ import { ProfileCallbacks } from "../../callbacks/ProfileCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class ProfileStaticRouter extends StaticRouter { private profileCallbacks; constructor(profileCallbacks: ProfileCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/8OnUpdateHook/types/routers/static/QuestStaticRouter.d.ts b/TypeScript/8OnUpdateHook/types/routers/static/QuestStaticRouter.d.ts index d375409..fda3c23 100644 --- a/TypeScript/8OnUpdateHook/types/routers/static/QuestStaticRouter.d.ts +++ b/TypeScript/8OnUpdateHook/types/routers/static/QuestStaticRouter.d.ts @@ -1,8 +1,6 @@ import { QuestCallbacks } from "../../callbacks/QuestCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class QuestStaticRouter extends StaticRouter { private questCallbacks; constructor(questCallbacks: QuestCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/8OnUpdateHook/types/routers/static/RagfairStaticRouter.d.ts b/TypeScript/8OnUpdateHook/types/routers/static/RagfairStaticRouter.d.ts index d5ed312..618374f 100644 --- a/TypeScript/8OnUpdateHook/types/routers/static/RagfairStaticRouter.d.ts +++ b/TypeScript/8OnUpdateHook/types/routers/static/RagfairStaticRouter.d.ts @@ -1,8 +1,6 @@ import { RagfairCallbacks } from "../../callbacks/RagfairCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class RagfairStaticRouter extends StaticRouter { private ragfairCallbacks; constructor(ragfairCallbacks: RagfairCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/8OnUpdateHook/types/routers/static/TraderStaticRouter.d.ts b/TypeScript/8OnUpdateHook/types/routers/static/TraderStaticRouter.d.ts index e3406fb..18f0629 100644 --- a/TypeScript/8OnUpdateHook/types/routers/static/TraderStaticRouter.d.ts +++ b/TypeScript/8OnUpdateHook/types/routers/static/TraderStaticRouter.d.ts @@ -1,8 +1,6 @@ import { TraderCallbacks } from "../../callbacks/TraderCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class TraderStaticRouter extends StaticRouter { private traderCallbacks; constructor(traderCallbacks: TraderCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/8OnUpdateHook/types/routers/static/WeatherStaticRouter.d.ts b/TypeScript/8OnUpdateHook/types/routers/static/WeatherStaticRouter.d.ts index aec3575..61b904d 100644 --- a/TypeScript/8OnUpdateHook/types/routers/static/WeatherStaticRouter.d.ts +++ b/TypeScript/8OnUpdateHook/types/routers/static/WeatherStaticRouter.d.ts @@ -1,8 +1,6 @@ import { WeatherCallbacks } from "../../callbacks/WeatherCallbacks"; -import { HandledRoute, StaticRouter } from "../../di/Router"; +import { StaticRouter } from "../../di/Router"; export declare class WeatherStaticRouter extends StaticRouter { private weatherCallbacks; constructor(weatherCallbacks: WeatherCallbacks); - getHandledRoutes(): HandledRoute[]; - handleStatic(url: string, info: any, sessionID: string, output: string): any; } diff --git a/TypeScript/8OnUpdateHook/types/servers/HttpServer.d.ts b/TypeScript/8OnUpdateHook/types/servers/HttpServer.d.ts index ad33575..d0db7e4 100644 --- a/TypeScript/8OnUpdateHook/types/servers/HttpServer.d.ts +++ b/TypeScript/8OnUpdateHook/types/servers/HttpServer.d.ts @@ -9,11 +9,13 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { HttpRouter } from "../routers/HttpRouter"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; +import { RandomUtil } from "../utils/RandomUtil"; import { ConfigServer } from "./ConfigServer"; import { DatabaseServer } from "./DatabaseServer"; export declare class HttpServer implements IHttpServer { private httpRouter; private logger; + private randomUtil; private jsonUtil; private httpResponse; private databaseServer; @@ -22,7 +24,7 @@ export declare class HttpServer implements IHttpServer { private serializers; private configServer; constructor(httpRouter: HttpRouter, // TODO: delay required - logger: ILogger, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); + logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); private buffers; private onReceive; private onRespond; @@ -40,5 +42,6 @@ export declare class HttpServer implements IHttpServer { sendResponse(sessionID: string, req: any, resp: any, body: Buffer): void; handleRequest(req: http.IncomingMessage, resp: http.ServerResponse): void; load(): void; + private getRandomisedMessage; wsOnConnection(ws: any, req: any): void; } diff --git a/TypeScript/8OnUpdateHook/types/services/ModCompilerService.d.ts b/TypeScript/8OnUpdateHook/types/services/ModCompilerService.d.ts index 7e750c3..d316e48 100644 --- a/TypeScript/8OnUpdateHook/types/services/ModCompilerService.d.ts +++ b/TypeScript/8OnUpdateHook/types/services/ModCompilerService.d.ts @@ -1,10 +1,12 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { VFS } from "../utils/VFS"; +import { HashCacheService } from "./HashCacheService"; export declare class ModCompilerService { private logger; + private hashCacheService; private vfs; - constructor(logger: ILogger, vfs: VFS); - compileMod(path: string, modTypeScriptFiles: string[]): Promise; + constructor(logger: ILogger, hashCacheService: HashCacheService, vfs: VFS); + compileMod(modName: string, path: string, modTypeScriptFiles: string[]): Promise; private compile; private areFilesReady; private delay; diff --git a/TypeScript/8OnUpdateHook/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts b/TypeScript/8OnUpdateHook/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts new file mode 100644 index 0000000..abfe237 --- /dev/null +++ b/TypeScript/8OnUpdateHook/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts @@ -0,0 +1,6 @@ +import { DynamicRouter, RouteAction } from "../../../di/Router"; +export declare class DynamicRouterMod extends DynamicRouter { + private topLevelRoute; + constructor(routes: RouteAction[], topLevelRoute: string); + getTopLevelRoute(): string; +} diff --git a/TypeScript/8OnUpdateHook/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/8OnUpdateHook/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts new file mode 100644 index 0000000..6742fc6 --- /dev/null +++ b/TypeScript/8OnUpdateHook/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -0,0 +1,7 @@ +import { DependencyContainer } from "tsyringe"; +import { RouteAction } from "../../../di/Router"; +export declare class DynamicRouterModService { + private container; + constructor(container: DependencyContainer); + registerDynamicRouter(name: string, routes: RouteAction[], topLevelRoute: string): void; +} diff --git a/TypeScript/8OnUpdateHook/types/services/mod/staticRouter/StaticRouterMod.d.ts b/TypeScript/8OnUpdateHook/types/services/mod/staticRouter/StaticRouterMod.d.ts new file mode 100644 index 0000000..1e62747 --- /dev/null +++ b/TypeScript/8OnUpdateHook/types/services/mod/staticRouter/StaticRouterMod.d.ts @@ -0,0 +1,6 @@ +import { RouteAction, StaticRouter } from "../../../di/Router"; +export declare class StaticRouterMod extends StaticRouter { + private topLevelRoute; + constructor(routes: RouteAction[], topLevelRoute: string); + getTopLevelRoute(): string; +} diff --git a/TypeScript/8OnUpdateHook/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/8OnUpdateHook/types/services/mod/staticRouter/StaticRouterModService.d.ts new file mode 100644 index 0000000..d4c42aa --- /dev/null +++ b/TypeScript/8OnUpdateHook/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -0,0 +1,7 @@ +import { DependencyContainer } from "tsyringe"; +import { RouteAction } from "../../../di/Router"; +export declare class StaticRouterModService { + private container; + constructor(container: DependencyContainer); + registerStaticRouter(name: string, routes: RouteAction[], topLevelRoute: string): void; +} diff --git a/TypeScript/9RouterHooks/.eslintignore b/TypeScript/9RouterHooks/.eslintignore new file mode 100644 index 0000000..9922d9a --- /dev/null +++ b/TypeScript/9RouterHooks/.eslintignore @@ -0,0 +1,9 @@ +# Exclude these folders from linting +node_modules +dist/ +types/ + +# Exclude these filetypes from linting +*.json +*.txt +*.exe \ No newline at end of file diff --git a/TypeScript/9RouterHooks/.eslintrc.json b/TypeScript/9RouterHooks/.eslintrc.json new file mode 100644 index 0000000..c505160 --- /dev/null +++ b/TypeScript/9RouterHooks/.eslintrc.json @@ -0,0 +1,75 @@ +{ + "root": true, + "parser": "@typescript-eslint/parser", + "plugins": [ + "@typescript-eslint" + ], + "extends": [ + "eslint:recommended", + "plugin:@typescript-eslint/eslint-recommended", + "plugin:@typescript-eslint/recommended" + ], + "rules": { + "@typescript-eslint/no-explicit-any": 0, + "@typescript-eslint/no-unused-vars": 1, + "@typescript-eslint/no-empty-interface": 0, + "@typescript-eslint/no-namespace": 0, + "@typescript-eslint/comma-dangle": 1, + "@typescript-eslint/func-call-spacing": 2, + "@typescript-eslint/quotes": 1, + "@typescript-eslint/brace-style": [ + "warn", + "allman" + ], + "@typescript-eslint/naming-convention": [ + "warn", + { + "selector": "default", + "format": ["camelCase"], + "leadingUnderscore": "allow" + }, + { + "selector": "typeLike", + "format": ["PascalCase"] + }, + { + "selector": "objectLiteralProperty", + "format": ["PascalCase", "camelCase"], + "leadingUnderscore": "allow" + }, + { + "selector": "typeProperty", + "format": ["PascalCase", "camelCase"], + "leadingUnderscore": "allow" + }, + { + "selector": "enumMember", + "format": ["UPPER_CASE"] + } + ], + "@typescript-eslint/indent": [ + "warn", + 4 + ], + "@typescript-eslint/no-unused-expressions": [ + "warn", + { + "allowShortCircuit": false, + "allowTernary": false + } + ], + "@typescript-eslint/keyword-spacing": [ + "warn", + { + "before": true, + "after": true + } + ], + "@typescript-eslint/explicit-module-boundary-types": [ + "warn", + { + "allowArgumentsExplicitlyTypedAsAny": true + } + ] + } +} \ No newline at end of file diff --git a/TypeScript/9RouterHooks/README.md b/TypeScript/9RouterHooks/README.md new file mode 100644 index 0000000..efc31a4 --- /dev/null +++ b/TypeScript/9RouterHooks/README.md @@ -0,0 +1,64 @@ + +This project was created to automate most parts of building and setting up an environment. + +## **NodeJS 14.15.3:** + +The first step would be to install nodejs on your pc, the version you NEED is **14.15.3** + +That version is the one that has been used to test the mod templates and build scripts. + +It can be downloaded from here: https://nodejs.org/download/release/v14.15.3/ + +A system reboot may be needed after install. + +## **IDE:** + +The second step is having an IDE ready. For the currect purpose we've setup a VSCodium workspace file. + +You CAN use Visual Studio Code if you so desire, just keep in mind that our dev tests on the mod files was done using VSCodium. + +You can get VSCodium here: https://vscodium.com/#install + +## **Workspace:** + +Once you have NodeJS and VSCodium ready, open the mod.code-workspace file with VSCodium (File->Open Worspace from File...). + +Once the project loads into VSCodium you will be recommended to install the ESLint plugin. This is HIGHLY recommended. + +## **Environment Setup:** + +There is a task that will automatically setup your environment to use typescript. + +To run it, you just need to go to: + +> Terminal->Run Task...->Show All Tasks...->npm: install + +After running this task, your environment will be ready to start coding. + +DO NOT remove the node_modules folder, this is an auto generated directory that has the required dependencies to be able to use typescript and more. + +## **IMPORTANT:** + +Before starting to work on your mod, we suggest you read about Dependency Injection and Inversion of Control as this is the adopted architecture SPT-AKI has adopted. + +It will be difficult to understand some of the problems you may be having if you dont understand the basics of it. + +A guide explaining all the essentials will be available on the hub on release for you to read about. + +## **Coding:** + +All your work should be centered around the mod.ts file as an entry point. +You can ONLY change the following properties from the package.json file: `"name"`, `"version"`, `"license"`: `"MIT"`, `"author"`, `"akiVersion"`. + +If you have never used typescript before, you can read about it here: https://www.typescriptlang.org/docs/ + +## **Distributing your mod:** + +The project has been set up with an automatic task that will copy and zip ALL required files for your mod to work on SPT-AKI. +To run this task you just need to go to: + +> Terminal->Run Task...->Show All Tasks...->npm: build:zip + +The output will be a mod.zip file that will appear on the root of the project. + +Always verify that all files were included into the zip file. \ No newline at end of file diff --git a/TypeScript/9RouterHooks/mod.code-workspace b/TypeScript/9RouterHooks/mod.code-workspace new file mode 100644 index 0000000..6732c67 --- /dev/null +++ b/TypeScript/9RouterHooks/mod.code-workspace @@ -0,0 +1,12 @@ +{ + "folders": [ + { + "path": "." + } + ], + "extensions": { + "recommendations": [ + "dbaeumer.vscode-eslint" + ] + } +} \ No newline at end of file diff --git a/TypeScript/9RouterHooks/package.json b/TypeScript/9RouterHooks/package.json index 5d9d821..2075bd3 100644 --- a/TypeScript/9RouterHooks/package.json +++ b/TypeScript/9RouterHooks/package.json @@ -1,17 +1,25 @@ { - "name": "RouterHooks", - "version": "1.0.0", - "main": "src/mod.js", - "license": "MIT", - "author": "Alex", - "akiVersion": "3.0.0", - "scripts": { - "install": "npx handpick --target=devDependencies", - "build": "tsc" - }, - "devDependencies": { - "@types/node": "^17.0.31", - "tsyringe": "^4.6.0", - "typescript": "^4.6.4" - } + "name": "RouterHooks", + "version": "1.0.0", + "main": "src/mod.js", + "license": "MIT", + "author": "Chomp", + "akiVersion": "3.0.0", + "scripts": { + "setup:environment": "npm i", + "build:unzipped": "copyfiles -e \"./node_modules/**/*.*\" -e \"./dist/**/*.*\" -e \"./package-lock.json\" -e \"./tsconfig.json\" -e \"./README.txt\" -e \"./mod.code-workspace\" ./**/*.* ./dist", + "zip:files": "cd dist/ && bestzip ../mod.zip *", + "build:zip": "npm run clean:environment && npm run build:unzipped && npm run zip:files", + "clean:environment": "node -e \"require('fs').rm('mod.zip', ()=>{})\" && node -e \"require('fs').rmdir('./dist/',{recursive:true},()=>{})\"" + }, + "devDependencies": { + "@types/node": "^14.15.3", + "@typescript-eslint/eslint-plugin": "^4.33.0", + "@typescript-eslint/parser": "^4.33.0", + "copyfiles": "2.4.1", + "eslint": "7.26.0", + "tsyringe": "4.6.0", + "typescript": "4.6.4", + "bestzip": "2.2.1" + } } diff --git a/TypeScript/9RouterHooks/types/callbacks/LauncherCallbacks.d.ts b/TypeScript/9RouterHooks/types/callbacks/LauncherCallbacks.d.ts index d3c95ca..4bd5e2c 100644 --- a/TypeScript/9RouterHooks/types/callbacks/LauncherCallbacks.d.ts +++ b/TypeScript/9RouterHooks/types/callbacks/LauncherCallbacks.d.ts @@ -1,5 +1,5 @@ -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { LauncherController } from "../controllers/LauncherController"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IChangeRequestData } from "../models/eft/launcher/IChangeRequestData"; import { ILoginRequestData } from "../models/eft/launcher/ILoginRequestData"; import { IRegisterData } from "../models/eft/launcher/IRegisterData"; diff --git a/TypeScript/9RouterHooks/types/callbacks/LocationCallbacks.d.ts b/TypeScript/9RouterHooks/types/callbacks/LocationCallbacks.d.ts index 5c381a1..5ecab74 100644 --- a/TypeScript/9RouterHooks/types/callbacks/LocationCallbacks.d.ts +++ b/TypeScript/9RouterHooks/types/callbacks/LocationCallbacks.d.ts @@ -1,5 +1,5 @@ -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { LocationController } from "../controllers/LocationController"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { ILocationBase } from "../models/eft/common/ILocationBase"; import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSourceDestinationBase"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; diff --git a/TypeScript/9RouterHooks/types/controllers/InventoryController.d.ts b/TypeScript/9RouterHooks/types/controllers/InventoryController.d.ts index c9ad582..8235082 100644 --- a/TypeScript/9RouterHooks/types/controllers/InventoryController.d.ts +++ b/TypeScript/9RouterHooks/types/controllers/InventoryController.d.ts @@ -3,6 +3,7 @@ import { PaymentHelper } from "../helpers/PaymentHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { IAddItemRequestData } from "../models/eft/inventory/IAddItemRequestData"; import { IInventoryBindRequestData } from "../models/eft/inventory/IInventoryBindRequestData"; import { IInventoryCreateMarkerRequestData } from "../models/eft/inventory/IInventoryCreateMarkerRequestData"; import { IInventoryDeleteMarkerRequestData } from "../models/eft/inventory/IInventoryDeleteMarkerRequestData"; @@ -77,7 +78,7 @@ export declare class InventoryController { * Give Item * its used for "add" item like gifts etc. */ - addItem(pmcData: IPmcData, body: any, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; + addItem(pmcData: IPmcData, body: IAddItemRequestData, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; /** * Handles folding of Weapons */ diff --git a/TypeScript/9RouterHooks/types/di/OnSaveLoad.d.ts b/TypeScript/9RouterHooks/types/di/OnSaveLoad.d.ts new file mode 100644 index 0000000..1edf37e --- /dev/null +++ b/TypeScript/9RouterHooks/types/di/OnSaveLoad.d.ts @@ -0,0 +1,4 @@ +export declare class OnSaveLoad { + onSaveLoad(): void; + getRoute(): string; +} diff --git a/TypeScript/9RouterHooks/types/helpers/InventoryHelper.d.ts b/TypeScript/9RouterHooks/types/helpers/InventoryHelper.d.ts index d91d0a6..00e95d3 100644 --- a/TypeScript/9RouterHooks/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/9RouterHooks/types/helpers/InventoryHelper.d.ts @@ -1,5 +1,6 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; +import { IAddItemRequestData } from "../models/eft/inventory/IAddItemRequestData"; import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; @@ -39,7 +40,7 @@ export declare class InventoryHelper { private configServer; private inventoryConfig; 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, configServer: ConfigServer); - addItem(pmcData: IPmcData, body: any, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; + addItem(pmcData: IPmcData, body: IAddItemRequestData, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; removeItem(pmcData: IPmcData, itemId: string, sessionID: string, output?: IItemEventRouterResponse): IItemEventRouterResponse; getItemSize(itemTpl: string, itemID: string, inventoryItem: Item[]): Record; private getSizeByInventoryItemHash; diff --git a/TypeScript/9RouterHooks/types/loaders/DelayedModLoader.d.ts b/TypeScript/9RouterHooks/types/loaders/DelayedModLoader.d.ts index 7e7d8d0..7d0009f 100644 --- a/TypeScript/9RouterHooks/types/loaders/DelayedModLoader.d.ts +++ b/TypeScript/9RouterHooks/types/loaders/DelayedModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { HandbookController } from "../controllers/HandbookController"; import { IModLoader } from "../models/spt/mod/IModLoader"; import { ModCompilerService } from "../services/ModCompilerService"; @@ -16,7 +15,7 @@ export declare class DelayedModLoader implements IModLoader { getBundle(key: string, local: boolean): void; getImportedModsNames(): string[]; getModPath(mod: string): string; - load(container: DependencyContainer): void; + load(): void; private executeMods; private addBundles; } diff --git a/TypeScript/9RouterHooks/types/loaders/InitialModLoader.d.ts b/TypeScript/9RouterHooks/types/loaders/InitialModLoader.d.ts index 35503c8..d30a3fe 100644 --- a/TypeScript/9RouterHooks/types/loaders/InitialModLoader.d.ts +++ b/TypeScript/9RouterHooks/types/loaders/InitialModLoader.d.ts @@ -1,23 +1,22 @@ import { DependencyContainer } from "tsyringe"; -import { JsonUtil } from "../utils/JsonUtil"; -import { VFS } from "../utils/VFS"; +import { IModLoader } from "../models/spt/mod/IModLoader"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { ModCompilerService } from "../services/ModCompilerService"; -import { HashCacheService } from "../services/HashCacheService"; -import { IModLoader } from "../models/spt/mod/IModLoader"; +import { JsonUtil } from "../utils/JsonUtil"; +import { VFS } from "../utils/VFS"; export declare class InitialModLoader implements IModLoader { private logger; private vfs; private jsonUtil; private modCompilerService; - private hashCacheService; private configServer; + private static container; private readonly basepath; private imported; private onLoad; private akiConfig; - constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, hashCacheService: HashCacheService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, configServer: ConfigServer); load(container: DependencyContainer): Promise; getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; @@ -29,10 +28,10 @@ export declare class InitialModLoader implements IModLoader { private executeMods; private sortModsLoadOrder; private addMod; - private compileModIfNeeded; private areModDependenciesFulfilled; private isModCompatible; private validMod; private getLoadOrderRecursive; private getLoadOrder; + getContainer(): DependencyContainer; } diff --git a/TypeScript/9RouterHooks/types/models/eft/common/ILocationBase.d.ts b/TypeScript/9RouterHooks/types/models/eft/common/ILocationBase.d.ts index 0d092f6..ad48d32 100644 --- a/TypeScript/9RouterHooks/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/9RouterHooks/types/models/eft/common/ILocationBase.d.ts @@ -107,6 +107,15 @@ export interface BossLocationSpawn { BossPlayer: boolean; BossZone: string; Time: number; + TriggerId: string; + TriggerName: string; + Delay?: number; + Supports?: BossSupport[]; +} +export interface BossSupport { + BossEscortAmount: string; + BossEscortDifficult: string[]; + BossEscortType: string; } export interface BotLocationModifier { AccuracySpeed: number; diff --git a/TypeScript/9RouterHooks/types/models/eft/common/tables/IBotType.d.ts b/TypeScript/9RouterHooks/types/models/eft/common/tables/IBotType.d.ts index e0f39d9..01be0be 100644 --- a/TypeScript/9RouterHooks/types/models/eft/common/tables/IBotType.d.ts +++ b/TypeScript/9RouterHooks/types/models/eft/common/tables/IBotType.d.ts @@ -100,6 +100,8 @@ export interface Generation { export interface ItemMinMax { grenades: MinMax; healing: MinMax; + drugs: MinMax; + stims: MinMax; looseLoot: MinMax; magazines: MinMax; specialItems: MinMax; diff --git a/TypeScript/9RouterHooks/types/models/eft/common/tables/IQuest.d.ts b/TypeScript/9RouterHooks/types/models/eft/common/tables/IQuest.d.ts index 1582a2f..0aa7a4e 100644 --- a/TypeScript/9RouterHooks/types/models/eft/common/tables/IQuest.d.ts +++ b/TypeScript/9RouterHooks/types/models/eft/common/tables/IQuest.d.ts @@ -44,7 +44,7 @@ export interface AvailableForProps { value?: number; compareMethod?: string; visibilityConditions?: VisibilityCondition[]; - target?: string; + target?: string | string[]; status?: number[]; } export interface VisibilityCondition { diff --git a/TypeScript/9RouterHooks/types/models/eft/inventory/IAddItemRequestData.d.ts b/TypeScript/9RouterHooks/types/models/eft/inventory/IAddItemRequestData.d.ts new file mode 100644 index 0000000..53db97a --- /dev/null +++ b/TypeScript/9RouterHooks/types/models/eft/inventory/IAddItemRequestData.d.ts @@ -0,0 +1,4 @@ +export interface IAddItemRequestData { + tid: string; + items: any[]; +} diff --git a/TypeScript/9RouterHooks/types/servers/HttpServer.d.ts b/TypeScript/9RouterHooks/types/servers/HttpServer.d.ts index ad33575..d0db7e4 100644 --- a/TypeScript/9RouterHooks/types/servers/HttpServer.d.ts +++ b/TypeScript/9RouterHooks/types/servers/HttpServer.d.ts @@ -9,11 +9,13 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { HttpRouter } from "../routers/HttpRouter"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; +import { RandomUtil } from "../utils/RandomUtil"; import { ConfigServer } from "./ConfigServer"; import { DatabaseServer } from "./DatabaseServer"; export declare class HttpServer implements IHttpServer { private httpRouter; private logger; + private randomUtil; private jsonUtil; private httpResponse; private databaseServer; @@ -22,7 +24,7 @@ export declare class HttpServer implements IHttpServer { private serializers; private configServer; constructor(httpRouter: HttpRouter, // TODO: delay required - logger: ILogger, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); + logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); private buffers; private onReceive; private onRespond; @@ -40,5 +42,6 @@ export declare class HttpServer implements IHttpServer { sendResponse(sessionID: string, req: any, resp: any, body: Buffer): void; handleRequest(req: http.IncomingMessage, resp: http.ServerResponse): void; load(): void; + private getRandomisedMessage; wsOnConnection(ws: any, req: any): void; } diff --git a/TypeScript/9RouterHooks/types/services/ModCompilerService.d.ts b/TypeScript/9RouterHooks/types/services/ModCompilerService.d.ts index 7e750c3..d316e48 100644 --- a/TypeScript/9RouterHooks/types/services/ModCompilerService.d.ts +++ b/TypeScript/9RouterHooks/types/services/ModCompilerService.d.ts @@ -1,10 +1,12 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { VFS } from "../utils/VFS"; +import { HashCacheService } from "./HashCacheService"; export declare class ModCompilerService { private logger; + private hashCacheService; private vfs; - constructor(logger: ILogger, vfs: VFS); - compileMod(path: string, modTypeScriptFiles: string[]): Promise; + constructor(logger: ILogger, hashCacheService: HashCacheService, vfs: VFS); + compileMod(modName: string, path: string, modTypeScriptFiles: string[]): Promise; private compile; private areFilesReady; private delay; diff --git a/TypeScript/9RouterHooks/types/services/mod/onUpdate/OnUpdateMod.d.ts b/TypeScript/9RouterHooks/types/services/mod/onUpdate/OnUpdateMod.d.ts new file mode 100644 index 0000000..ee89043 --- /dev/null +++ b/TypeScript/9RouterHooks/types/services/mod/onUpdate/OnUpdateMod.d.ts @@ -0,0 +1,8 @@ +import { OnUpdate } from "../../../di/OnUpdate"; +export declare class OnUpdateMod extends OnUpdate { + private onUpdateOverride; + private getRouteOverride; + constructor(onUpdateOverride: (timeSinceLastRun: number) => boolean, getRouteOverride: () => string); + onUpdate(timeSinceLastRun: number): boolean; + getRoute(): string; +} diff --git a/TypeScript/9RouterHooks/types/services/mod/onUpdate/OnUpdateModService.d.ts b/TypeScript/9RouterHooks/types/services/mod/onUpdate/OnUpdateModService.d.ts new file mode 100644 index 0000000..32419f4 --- /dev/null +++ b/TypeScript/9RouterHooks/types/services/mod/onUpdate/OnUpdateModService.d.ts @@ -0,0 +1,6 @@ +import { DependencyContainer } from "tsyringe"; +export declare class OnUpdateModService { + private container; + constructor(container: DependencyContainer); + registerOnUpdate(name: string, onUpdate: (timeSinceLastRun: number) => boolean, getRoute: () => string): void; +}