diff --git a/TypeScript/1LogToConsole/package-lock.json b/TypeScript/1LogToConsole/package-lock.json new file mode 100644 index 0000000..0d3d5a3 --- /dev/null +++ b/TypeScript/1LogToConsole/package-lock.json @@ -0,0 +1,5 @@ +{ + "name": "LogToConsole", + "version": "1.0.0", + "lockfileVersion": 1 +} diff --git a/TypeScript/1LogToConsole/package.json b/TypeScript/1LogToConsole/package.json index 26a1b34..e324183 100644 --- a/TypeScript/1LogToConsole/package.json +++ b/TypeScript/1LogToConsole/package.json @@ -4,7 +4,7 @@ "main": "src/mod.js", "license": "MIT", "author": "Chomp", - "akiVersion": "2.4.0", + "akiVersion": "3.0.0", "scripts": { "install": "npx handpick --target=devDependencies", "build": "tsc" diff --git a/TypeScript/1LogToConsole/out/mod.js b/TypeScript/1LogToConsole/src/mod.js similarity index 100% rename from TypeScript/1LogToConsole/out/mod.js rename to TypeScript/1LogToConsole/src/mod.js diff --git a/TypeScript/1LogToConsole/src/mod.ts b/TypeScript/1LogToConsole/src/mod.ts index 269752d..683c318 100644 --- a/TypeScript/1LogToConsole/src/mod.ts +++ b/TypeScript/1LogToConsole/src/mod.ts @@ -1,6 +1,6 @@ import type { DependencyContainer } from "tsyringe"; -import { IMod } from "../types/@types/external/mod"; -import type { ILogger } from "../types/@types/spt/utils/ILogger"; +import { IMod } from "../types/models/external/mod"; +import { ILogger } from "../types/models/spt/utils/ILogger"; class Mod implements IMod { diff --git a/TypeScript/1LogToConsole/tsconfig.json b/TypeScript/1LogToConsole/tsconfig.json index 4204c72..8ba3117 100644 --- a/TypeScript/1LogToConsole/tsconfig.json +++ b/TypeScript/1LogToConsole/tsconfig.json @@ -9,7 +9,6 @@ "experimentalDecorators": true, "emitDecoratorMetadata": true, "resolveJsonModule": true, - "esModuleInterop": true, "outDir": "out" }, "lib": [ diff --git a/TypeScript/1LogToConsole/types/@types/eft/common/IItemEventResponseData.d.ts b/TypeScript/1LogToConsole/types/@types/eft/common/IItemEventResponseData.d.ts deleted file mode 100644 index 08fb8a7..0000000 --- a/TypeScript/1LogToConsole/types/@types/eft/common/IItemEventResponseData.d.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { Skills } from "./IPmcData"; -export interface IItemEventResponseData { - warnings: any[]; - profileChanges: Record; -} -export interface ProfileChange { - _id: string; - experience: number; - quests: any[]; - ragFairOffers: any[]; - builds: any[]; - items: Items; - production: Production; - skills: Skills; - traderRelations: TraderRelations; -} -export interface Items { - new: any[]; - change: any[]; - del: any[]; -} -export interface Production { -} -export interface TraderRelations { -} diff --git a/TypeScript/1LogToConsole/types/@types/eft/common/IPmcDataRepeatableQuest.d.ts b/TypeScript/1LogToConsole/types/@types/eft/common/IPmcDataRepeatableQuest.d.ts deleted file mode 100644 index 15a1c09..0000000 --- a/TypeScript/1LogToConsole/types/@types/eft/common/IPmcDataRepeatableQuest.d.ts +++ /dev/null @@ -1,71 +0,0 @@ -export interface IPmcDataRepeatableQuest { - name: string; - activeQuests: Quest[]; - inactiveQuests: Quest[]; - endTime: number; -} -export interface Quest { - _id: string; - traderId: string; - location: string; - image: string; - type: string; - isKey: boolean; - restartable: boolean; - instantComplete: boolean; - secretQuest: boolean; - canShowNotificationsInGame: boolean; - rewards: Rewards; - conditions: Conditions; - name: string; - note: string; - description: string; - successMessageText: string; - failMessageText: string; - startedMessageText: string; - templateId: string; -} -export interface Rewards { - Started: Reward[]; - Success: Reward[]; - Fail: Reward[]; -} -export interface Reward { - value: number; - type: string; - index: number; - target?: string; - items?: Item[]; -} -export interface Item { - _id: string; - _tpl: string; - upd: Upd; -} -export interface Conditions { - AvailableForStart: any[]; - AvailableForFinish: AvailableForFinish[]; - Fail: any[]; -} -export interface AvailableForFinish { - _props: Props; - _parent: string; - dynamicLocale: boolean; -} -export interface Props { - id: string; - parentId: string; - dynamicLocale: boolean; - index: number; - visibilityConditions: any[]; - target: string[]; - value: number; - minDurability: number; - maxDurability: number; - dogtagLevel: number; - onlyFoundInRaid: boolean; -} -export interface Upd { - StackObjectsCount: number; - SpawnedInSession?: boolean; -} diff --git a/TypeScript/1LogToConsole/types/@types/eft/hideout/IHideoutRequestData.d.ts b/TypeScript/1LogToConsole/types/@types/eft/hideout/IHideoutRequestData.d.ts deleted file mode 100644 index 77c0665..0000000 --- a/TypeScript/1LogToConsole/types/@types/eft/hideout/IHideoutRequestData.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -export interface IHideoutRequestData { - Action: "HideoutUpgrade"; - areaType: number; - items: HideoutItem[]; - timestamp: number; -} -export interface HideoutItem { - count: number; - id: string; -} diff --git a/TypeScript/1LogToConsole/types/@types/eft/itemEvent/IHandleEventRequestData.d.ts b/TypeScript/1LogToConsole/types/@types/eft/itemEvent/IHandleEventRequestData.d.ts deleted file mode 100644 index a7ae306..0000000 --- a/TypeScript/1LogToConsole/types/@types/eft/itemEvent/IHandleEventRequestData.d.ts +++ /dev/null @@ -1,21 +0,0 @@ -export interface IHandleEventRequestData { - data: Daum[]; - tm: number; - reload: number; -} -export interface Daum { - Action: string; - item: string; - to?: To; -} -export interface To { - id: string; - container: string; - location: Location; -} -export interface Location { - x: number; - y: number; - r: string; - isSearched: boolean; -} diff --git a/TypeScript/1LogToConsole/types/@types/eft/notes/INoteData.d.ts b/TypeScript/1LogToConsole/types/@types/eft/notes/INoteData.d.ts deleted file mode 100644 index 4021bb7..0000000 --- a/TypeScript/1LogToConsole/types/@types/eft/notes/INoteData.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface INote { - Time: number; - Text: string; -} diff --git a/TypeScript/1LogToConsole/types/@types/eft/presetBuild/IPresetBuildActionData.d.ts b/TypeScript/1LogToConsole/types/@types/eft/presetBuild/IPresetBuildActionData.d.ts deleted file mode 100644 index 13ec722..0000000 --- a/TypeScript/1LogToConsole/types/@types/eft/presetBuild/IPresetBuildActionData.d.ts +++ /dev/null @@ -1,25 +0,0 @@ -export interface IPresetBuildActionData { - Action: string; - id: string; - name: string; - root: string; - items: Item[]; -} -export interface Item { - _id: string; - _tpl: string; - upd?: Upd; - parentId?: string; - slotId?: string; -} -export interface Upd { - Repairable: Repairable; - FireMode: FireMode; -} -export interface Repairable { - MaxDurability: number; - Durability: number; -} -export interface FireMode { - FireMode: string; -} diff --git a/TypeScript/1LogToConsole/types/@types/eft/ragfair/ISaleChance.d.ts b/TypeScript/1LogToConsole/types/@types/eft/ragfair/ISaleChance.d.ts deleted file mode 100644 index 14b434a..0000000 --- a/TypeScript/1LogToConsole/types/@types/eft/ragfair/ISaleChance.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface ISaleChance { - sellTime: number; - amount: number; -} diff --git a/TypeScript/1LogToConsole/types/@types/eft/repair/IRepairActionData.d.ts b/TypeScript/1LogToConsole/types/@types/eft/repair/IRepairActionData.d.ts deleted file mode 100644 index e6f90c8..0000000 --- a/TypeScript/1LogToConsole/types/@types/eft/repair/IRepairActionData.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -export interface IRepairActionData { - Action: string; - tid: string; - repairItems: RepairItem[]; -} -export interface RepairItem { - _id: string; - count: number; -} diff --git a/TypeScript/1LogToConsole/types/@types/notes/INoteActionData.d.ts b/TypeScript/1LogToConsole/types/@types/notes/INoteActionData.d.ts deleted file mode 100644 index 7d07cdd..0000000 --- a/TypeScript/1LogToConsole/types/@types/notes/INoteActionData.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { INote } from "../eft/notes/INoteData"; -export interface INoteActionData { - Action: string; - index: number; - note: INote; -} diff --git a/TypeScript/1LogToConsole/types/@types/spt/helpers/IGetItemResponse.d.ts b/TypeScript/1LogToConsole/types/@types/spt/helpers/IGetItemResponse.d.ts deleted file mode 100644 index e6f3783..0000000 --- a/TypeScript/1LogToConsole/types/@types/spt/helpers/IGetItemResponse.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export interface IGetItemResponse { -} diff --git a/TypeScript/1LogToConsole/types/Lib.d.ts b/TypeScript/1LogToConsole/types/Lib.d.ts deleted file mode 100644 index 5c77c26..0000000 --- a/TypeScript/1LogToConsole/types/Lib.d.ts +++ /dev/null @@ -1,94 +0,0 @@ -import { BundleLoader } from "./loaders/BundleLoader"; -export { BundleLoader }; -import { ModLoader } from "./loaders/ModLoader"; -export { ModLoader }; -import { ContainerHelper } from "./helpers/ContainerHelper.js"; -export { ContainerHelper }; -import { InventoryHelper } from "./helpers/InventoryHelper.js"; -export { InventoryHelper }; -import { ItemHelper } from "./helpers/ItemHelper.js"; -export { ItemHelper }; -import { GameEventHelper } from "./helpers/GameEventHelper.js"; -export { GameEventHelper }; -import { QuestHelper } from "./helpers/QuestHelper.js"; -export { QuestHelper }; -import { UtilityHelper } from "./helpers/UtilityHelper.js"; -export { UtilityHelper }; -import { TraderHelper } from "./helpers/TraderHelper.js"; -export { TraderHelper }; -import { RagfairServerHelper } from "./helpers/RagfairServerHelper.js"; -export { RagfairServerHelper }; -import { DurabilityLimitsHelper } from "./helpers/DurabilityLimitsHelper.js"; -export { DurabilityLimitsHelper }; -import { WeightedRandomHelper } from "./helpers/WeightedRandomHelper.js"; -export { WeightedRandomHelper }; -import { BotCallbacks } from "./callbacks/BotCallbacks.js"; -export { BotCallbacks }; -import { DataCallbacks } from "./callbacks/DataCallbacks.js"; -export { DataCallbacks }; -import { DialogueCallbacks } from "./callbacks/DialogueCallbacks.js"; -export { DialogueCallbacks }; -import { GameCallbacks } from "./callbacks/GameCallbacks.js"; -export { GameCallbacks }; -import { HideoutCallbacks } from "./callbacks/HideoutCallbacks"; -export { HideoutCallbacks }; -import { HttpCallbacks } from "./callbacks/HttpCallbacks.js"; -export { HttpCallbacks }; -import { InraidCallbacks } from "./callbacks/InraidCallbacks.js"; -export { InraidCallbacks }; -import { InventoryCallbacks } from "./callbacks/InventoryCallbacks.js"; -export { InventoryCallbacks }; -import { NotifierCallbacks } from "./callbacks/NotifierCallbacks.js"; -export { NotifierCallbacks }; -import { ProfileCallbacks } from "./callbacks/ProfileCallbacks.js"; -export { ProfileCallbacks }; -import { QuestCallbacks } from "./callbacks/QuestCallbacks.js"; -export { QuestCallbacks }; -import { RagfairCallbacks } from "./callbacks/RagfairCallbacks.js"; -export { RagfairCallbacks }; -import { TraderCallbacks } from "./callbacks/TraderCallbacks.js"; -export { TraderCallbacks }; -import { BotController } from "./controllers/BotController.js"; -export { BotController }; -import { DialogueController } from "./controllers/DialogueController.js"; -export { DialogueController }; -import { GameController } from "./controllers/GameController.js"; -export { GameController }; -import { HealthController } from "./controllers/HealthController.js"; -export { HealthController }; -import { HideoutController } from "./controllers/HideoutController.js"; -export { HideoutController }; -import { InsuranceController } from "./controllers/InsuranceController.js"; -export { InsuranceController }; -import { InventoryController } from "./controllers/InventoryController.js"; -export { InventoryController }; -import { LocationController } from "./controllers/LocationController.js"; -export { LocationController }; -import { NotifierController } from "./controllers/NotifierController.js"; -export { NotifierController }; -import { PresetController } from "./controllers/PresetController.js"; -export { PresetController }; -import { ProfileController } from "./controllers/ProfileController.js"; -export { ProfileController }; -import { QuestController } from "./controllers/QuestController.js"; -export { QuestController }; -import { RepeatableQuestController } from "./controllers/RepeatableQuestController.js"; -export { RepeatableQuestController }; -import { RagfairController } from "./controllers/RagfairController.js"; -export { RagfairController }; -import { TraderController } from "./controllers/TraderController.js"; -export { TraderController }; -import { PaymentController } from "./controllers/PaymentController"; -export { PaymentController }; -import { PlayerController } from "./controllers/PlayerController.js"; -export { PlayerController }; -import { HandbookController } from "./controllers/HandbookController.js"; -export { HandbookController }; -import { DatabaseServer } from "./servers/DatabaseServer"; -export { DatabaseServer }; -import { HttpServer } from "./servers/HttpServer.js"; -export { HttpServer }; -import { RagfairServer } from "./servers/RagfairServer.js"; -export { RagfairServer }; -import { SaveServer } from "./servers/SaveServer"; -export { SaveServer }; diff --git a/TypeScript/1LogToConsole/types/Program.d.ts b/TypeScript/1LogToConsole/types/Program.d.ts index fe57d08..d4b71b9 100644 --- a/TypeScript/1LogToConsole/types/Program.d.ts +++ b/TypeScript/1LogToConsole/types/Program.d.ts @@ -1,8 +1,4 @@ -import "reflect-metadata"; -import { App } from "./utils/App"; -export interface IProgram { -} -export declare class Program implements IProgram { - private app; - constructor(app: App); +export declare class Program { + constructor(); + start(): void; } diff --git a/TypeScript/1LogToConsole/types/bindings/AppLoad.d.ts b/TypeScript/1LogToConsole/types/bindings/AppLoad.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/1LogToConsole/types/bindings/AppLoad.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/1LogToConsole/types/bindings/AppUpdate.d.ts b/TypeScript/1LogToConsole/types/bindings/AppUpdate.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/1LogToConsole/types/bindings/AppUpdate.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/1LogToConsole/types/bindings/DynamicRoutes.d.ts b/TypeScript/1LogToConsole/types/bindings/DynamicRoutes.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/1LogToConsole/types/bindings/DynamicRoutes.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/1LogToConsole/types/bindings/ItemEvents.d.ts b/TypeScript/1LogToConsole/types/bindings/ItemEvents.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/1LogToConsole/types/bindings/ItemEvents.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/1LogToConsole/types/bindings/SaveLoad.d.ts b/TypeScript/1LogToConsole/types/bindings/SaveLoad.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/1LogToConsole/types/bindings/SaveLoad.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/1LogToConsole/types/bindings/ServerRespond.d.ts b/TypeScript/1LogToConsole/types/bindings/ServerRespond.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/1LogToConsole/types/bindings/ServerRespond.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/1LogToConsole/types/bindings/StaticRoutes.d.ts b/TypeScript/1LogToConsole/types/bindings/StaticRoutes.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/1LogToConsole/types/bindings/StaticRoutes.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/1LogToConsole/types/callbacks/BotCallbacks.d.ts b/TypeScript/1LogToConsole/types/callbacks/BotCallbacks.d.ts index 511c545..358d5e3 100644 --- a/TypeScript/1LogToConsole/types/callbacks/BotCallbacks.d.ts +++ b/TypeScript/1LogToConsole/types/callbacks/BotCallbacks.d.ts @@ -1,13 +1,13 @@ import { BotController } from "../controllers/BotController"; -import { IGenerateBotsRequestData } from "../@types/eft/bot/IGenerateBotsRequestData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IBotBase } from "../@types/eft/common/tables/IBotBase"; -import { HttpResponse } from "../utils/HttpResponse"; +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 { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class BotCallbacks { private botController; private httpResponse; - constructor(botController: BotController, httpResponse: HttpResponse); + constructor(botController: BotController, httpResponse: HttpResponseUtil); 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/1LogToConsole/types/callbacks/BundleCallbacks.d.ts b/TypeScript/1LogToConsole/types/callbacks/BundleCallbacks.d.ts index 1fb6275..08c33c0 100644 --- a/TypeScript/1LogToConsole/types/callbacks/BundleCallbacks.d.ts +++ b/TypeScript/1LogToConsole/types/callbacks/BundleCallbacks.d.ts @@ -1,17 +1,16 @@ import { BundleLoader } from "../loaders/BundleLoader"; import { ConfigServer } from "../servers/ConfigServer"; -import { IHttpConfig } from "../@types/spt/config/IHttpConfig"; -import { HttpResponse } from "../utils/HttpResponse"; -import { ILogger } from "../@types/spt/utils/ILogger"; -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +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; private httpServer; private bundleLoader; private configServer; - httpConfig: IHttpConfig; - constructor(logger: ILogger, httpResponse: HttpResponse, httpServer: IHttpServer, bundleLoader: BundleLoader, configServer: ConfigServer); + private httpConfig; + constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, bundleLoader: BundleLoader, configServer: ConfigServer); 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/1LogToConsole/types/callbacks/CustomizationCallbacks.d.ts b/TypeScript/1LogToConsole/types/callbacks/CustomizationCallbacks.d.ts index 4c27712..0a4265b 100644 --- a/TypeScript/1LogToConsole/types/callbacks/CustomizationCallbacks.d.ts +++ b/TypeScript/1LogToConsole/types/callbacks/CustomizationCallbacks.d.ts @@ -1,17 +1,17 @@ import { SaveServer } from "../servers/SaveServer"; import { CustomizationController } from "../controllers/CustomizationController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IBuyClothingRequestData } from "../@types/eft/customization/IBuyClothingRequestData"; -import { IWearClothingRequestData } from "../@types/eft/customization/IWearClothingRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { ISuit } from "../@types/eft/common/tables/ITrader"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { HttpResponse } from "../utils/HttpResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +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 { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class CustomizationCallbacks { private customizationController; private saveServer; private httpResponse; - constructor(customizationController: CustomizationController, saveServer: SaveServer, httpResponse: HttpResponse); + constructor(customizationController: CustomizationController, saveServer: SaveServer, httpResponse: HttpResponseUtil); getSuits(url: string, info: any, sessionID: string): IGetBodyResponseData<{ _id: string; suites: string[]; diff --git a/TypeScript/1LogToConsole/types/callbacks/DataCallbacks.d.ts b/TypeScript/1LogToConsole/types/callbacks/DataCallbacks.d.ts index add55b5..ac9cab7 100644 --- a/TypeScript/1LogToConsole/types/callbacks/DataCallbacks.d.ts +++ b/TypeScript/1LogToConsole/types/callbacks/DataCallbacks.d.ts @@ -1,20 +1,20 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGlobals } from "../@types/eft/common/IGlobals"; -import { ICustomizationItem } from "../@types/eft/common/tables/ICustomizationItem"; -import { IQuest } from "../@types/eft/common/tables/IQuest"; -import { IHideoutArea } from "../@types/eft/hideout/IHideoutArea"; -import { IHideoutProduction } from "../@types/eft/hideout/IHideoutProduction"; -import { IHideoutScavCase } from "../@types/eft/hideout/IHideoutScavCase"; -import { IHideoutSettingsBase } from "../@types/eft/hideout/IHideoutSettingsBase"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { ILanguageBase } from "../@types/spt/server/ILocaleBase"; -import { ISettingsBase } from "../@types/spt/server/ISettingsBase"; -import { HttpResponse } from "../utils/HttpResponse"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IGlobals } from "../models/eft/common/IGlobals"; +import { ICustomizationItem } from "../models/eft/common/tables/ICustomizationItem"; +import { IQuest } from "../models/eft/common/tables/IQuest"; +import { IHideoutArea } from "../models/eft/hideout/IHideoutArea"; +import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction"; +import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; +import { IHideoutSettingsBase } from "../models/eft/hideout/IHideoutSettingsBase"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { ILanguageBase } from "../models/spt/server/ILocaleBase"; +import { ISettingsBase } from "../models/spt/server/ISettingsBase"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class DataCallbacks { private httpResponse; private databaseServer; - constructor(httpResponse: HttpResponse, databaseServer: DatabaseServer); + constructor(httpResponse: HttpResponseUtil, databaseServer: DatabaseServer); 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/1LogToConsole/types/callbacks/DialogueCallbacks.d.ts b/TypeScript/1LogToConsole/types/callbacks/DialogueCallbacks.d.ts index ccc074b..e81255c 100644 --- a/TypeScript/1LogToConsole/types/callbacks/DialogueCallbacks.d.ts +++ b/TypeScript/1LogToConsole/types/callbacks/DialogueCallbacks.d.ts @@ -1,31 +1,31 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { DialogueController } from "../controllers/DialogueController"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { DialogueInfo } from "../@types/eft/profile/IAkiProfile"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IGetMailDialogViewRequestData } from "../@types/eft/dialog/IGetMailDialogViewRequestData"; -import { IGetMailDialogInfoRequestData } from "../@types/eft/dialog/IGetMailDialogInfoRequestData"; -import { IRemoveDialogRequestData } from "../@types/eft/dialog/IRemoveDialogRequestData"; -import { IGetMailDialogListRequestData } from "../@types/eft/dialog/IGetMailDialogListRequestData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IFriendRequestData } from "../@types/eft/dialog/IFriendRequestData"; -import { IPinDialogRequestData } from "../@types/eft/dialog/IPinDialogRequestData"; -import { ISetDialogReadRequestData } from "../@types/eft/dialog/ISetDialogReadRequestData"; -import { IGetAllAttachmentsRequestData } from "../@types/eft/dialog/IGetAllAttachmentsRequestData"; -import { IGetChatServerListRequestData } from "../@types/eft/dialog/IGetChatServerListRequestData"; -import { IGetFriendListDataResponse } from "../@types/eft/dialog/IGetFriendListDataResponse"; -import { ISendMessageRequest } from "../@types/eft/dialog/ISendMessageRequest"; -import { IGetMailDialogViewResponseData } from "../@types/eft/dialog/IGetMailDialogViewResponseData"; -import { IGetAllAttachmentsResponse } from "../@types/eft/dialog/IGetAllAttachmentsResponse"; +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 { 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 { IGetChatServerListRequestData } from "../models/eft/dialog/IGetChatServerListRequestData"; +import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse"; +import { ISendMessageRequest } from "../models/eft/dialog/ISendMessageRequest"; +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 { private hashUtil; private timeUtil; private httpResponse; private dialogueController; - constructor(hashUtil: HashUtil, timeUtil: TimeUtil, httpResponse: HttpResponse, dialogueController: DialogueController); + constructor(hashUtil: HashUtil, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, dialogueController: DialogueController); 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/1LogToConsole/types/callbacks/GameCallbacks.d.ts b/TypeScript/1LogToConsole/types/callbacks/GameCallbacks.d.ts index 25912c1..9481129 100644 --- a/TypeScript/1LogToConsole/types/callbacks/GameCallbacks.d.ts +++ b/TypeScript/1LogToConsole/types/callbacks/GameCallbacks.d.ts @@ -1,17 +1,17 @@ import { GameController } from "../controllers/GameController"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGameEmptyCrcRequestData } from "../@types/eft/game/IGameEmptyCrcRequestData"; -import { IVersionValidateRequestData } from "../@types/eft/game/IVersionValidateRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IGameConfigResponse } from "../@types/eft/game/IGameConfigResponse"; -import { HttpResponse } from "../utils/HttpResponse"; -import { IWatermark } from "../@types/spt/utils/IWatermark"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +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 { private httpResponse; private watermark; private gameController; - constructor(httpResponse: HttpResponse, watermark: IWatermark, gameController: GameController); + constructor(httpResponse: HttpResponseUtil, watermark: IWatermark, 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/1LogToConsole/types/callbacks/HealthCallbacks.d.ts b/TypeScript/1LogToConsole/types/callbacks/HealthCallbacks.d.ts index 50ec0b6..b223bb3 100644 --- a/TypeScript/1LogToConsole/types/callbacks/HealthCallbacks.d.ts +++ b/TypeScript/1LogToConsole/types/callbacks/HealthCallbacks.d.ts @@ -1,19 +1,20 @@ import { HealthController } from "../controllers/HealthController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { ISyncHealthRequestData } from "../@types/eft/health/ISyncHealthRequestData"; -import { IOffraidEatRequestData } from "../@types/eft/health/IOffraidEatRequestData"; -import { IOffraidHealRequestData } from "../@types/eft/health/IOffraidHealRequestData"; -import { IHealthTreatmentRequestData } from "../@types/eft/health/IHealthTreatmentRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; +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 { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { HttpResponse } from "../utils/HttpResponse"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class HealthCallbacks { private httpResponse; private profileHelper; private healthController; - constructor(httpResponse: HttpResponse, profileHelper: ProfileHelper, healthController: HealthController); + constructor(httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, healthController: HealthController); syncHealth(url: string, info: ISyncHealthRequestData, sessionID: string): IGetBodyResponseData; - offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): any; - offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): any; - healthTreatment(pmcData: IPmcData, info: IHealthTreatmentRequestData, sessionID: string): any; + offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): IItemEventRouterResponse; + offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse; + healthTreatment(pmcData: IPmcData, info: IHealthTreatmentRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/1LogToConsole/types/callbacks/HideoutCallbacks.d.ts b/TypeScript/1LogToConsole/types/callbacks/HideoutCallbacks.d.ts index 3ef61bc..b574232 100644 --- a/TypeScript/1LogToConsole/types/callbacks/HideoutCallbacks.d.ts +++ b/TypeScript/1LogToConsole/types/callbacks/HideoutCallbacks.d.ts @@ -1,15 +1,15 @@ import { HideoutController } from "../controllers/HideoutController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IHideoutUpgradeRequestData } from "../@types/eft/hideout/IHideoutUpgradeRequestData"; -import { IHideoutUpgradeCompleteRequestData } from "../@types/eft/hideout/IHideoutUpgradeCompleteRequestData"; -import { IHideoutScavCaseStartRequestData } from "../@types/eft/hideout/IHideoutScavCaseStartRequestData"; -import { IHideoutPutItemInRequestData } from "../@types/eft/hideout/IHideoutPutItemInRequestData"; -import { IHideoutTakeItemOutRequestData } from "../@types/eft/hideout/IHideoutTakeItemOutRequestData"; -import { IHideoutToggleAreaRequestData } from "../@types/eft/hideout/IHideoutToggleAreaRequestData"; -import { IHideoutSingleProductionStartRequestData } from "../@types/eft/hideout/IHideoutSingleProductionStartRequestData"; -import { IHideoutContinousProductionStartRequestData } from "../@types/eft/hideout/IHideoutContinousProductionStartRequestData"; -import { IHideoutTakeProductionRequestData } from "../@types/eft/hideout/IHideoutTakeProductionRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ConfigServer } from "../servers/ConfigServer"; import { OnUpdate } from "../di/OnUpdate"; export declare class HideoutCallbacks extends OnUpdate { diff --git a/TypeScript/1LogToConsole/types/callbacks/HttpCallbacks.d.ts b/TypeScript/1LogToConsole/types/callbacks/HttpCallbacks.d.ts index 9bb00bf..7072297 100644 --- a/TypeScript/1LogToConsole/types/callbacks/HttpCallbacks.d.ts +++ b/TypeScript/1LogToConsole/types/callbacks/HttpCallbacks.d.ts @@ -1,4 +1,4 @@ -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; import { OnLoad } from "../di/OnLoad"; export declare class HttpCallbacks extends OnLoad { private httpServer; diff --git a/TypeScript/1LogToConsole/types/callbacks/InraidCallbacks.d.ts b/TypeScript/1LogToConsole/types/callbacks/InraidCallbacks.d.ts index 2ccaa0a..1948d01 100644 --- a/TypeScript/1LogToConsole/types/callbacks/InraidCallbacks.d.ts +++ b/TypeScript/1LogToConsole/types/callbacks/InraidCallbacks.d.ts @@ -1,17 +1,17 @@ import { InraidController } from "../controllers/InraidController"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IRegisterPlayerRequestData } from "../@types/eft/inRaid/IRegisterPlayerRequestData"; -import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; +import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ConfigServer } from "../servers/ConfigServer"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class InraidCallbacks { private inraidController; private httpResponse; private configServer; private airdropConfig; private inraidConfig; - constructor(inraidController: InraidController, httpResponse: HttpResponse, configServer: ConfigServer); + constructor(inraidController: InraidController, httpResponse: HttpResponseUtil, configServer: ConfigServer); registerPlayer(url: string, info: IRegisterPlayerRequestData, sessionID: string): INullResponseData; saveProgress(url: string, info: ISaveProgressRequestData, sessionID: string): INullResponseData; getRaidEndState(): string; diff --git a/TypeScript/1LogToConsole/types/callbacks/InsuranceCallbacks.d.ts b/TypeScript/1LogToConsole/types/callbacks/InsuranceCallbacks.d.ts index f3d9832..73b7bd9 100644 --- a/TypeScript/1LogToConsole/types/callbacks/InsuranceCallbacks.d.ts +++ b/TypeScript/1LogToConsole/types/callbacks/InsuranceCallbacks.d.ts @@ -1,22 +1,23 @@ import { InsuranceController } from "../controllers/InsuranceController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IGetInsuranceCostRequestData } from "../@types/eft/insurance/IGetInsuranceCostRequestData"; -import { IInsureRequestData } from "../@types/eft/insurance/IInsureRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +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 { HttpResponse } from "../utils/HttpResponse"; +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 { private insuranceController; private insuranceService; private httpResponse; private configServer; private insuranceConfig; - constructor(insuranceController: InsuranceController, insuranceService: InsuranceService, httpResponse: HttpResponse, configServer: ConfigServer); + constructor(insuranceController: InsuranceController, insuranceService: InsuranceService, httpResponse: HttpResponseUtil, configServer: ConfigServer); onLoad(): void; getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): IGetBodyResponseData; - insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): any; + insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse; onUpdate(secondsSinceLastRun: number): boolean; getRoute(): string; } diff --git a/TypeScript/1LogToConsole/types/callbacks/InventoryCallbacks.d.ts b/TypeScript/1LogToConsole/types/callbacks/InventoryCallbacks.d.ts index 1807e4b..90d6936 100644 --- a/TypeScript/1LogToConsole/types/callbacks/InventoryCallbacks.d.ts +++ b/TypeScript/1LogToConsole/types/callbacks/InventoryCallbacks.d.ts @@ -1,22 +1,22 @@ import { InventoryController } from "../controllers/InventoryController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IInventoryFoldRequestData } from "../@types/eft/inventory/IInventoryFoldRequestData"; -import { IInventorySplitRequestData } from "../@types/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMoveRequestData } from "../@types/eft/inventory/IInventoryMoveRequestData"; -import { IInventoryMergeRequestData } from "../@types/eft/inventory/IInventoryMergeRequestData"; -import { IInventoryRemoveRequestData } from "../@types/eft/inventory/IInventoryRemoveRequestData"; -import { IInventoryTransferRequestData } from "../@types/eft/inventory/IInventoryTransferRequestData"; -import { IInventorySwapRequestData } from "../@types/eft/inventory/IInventorySwapRequestData"; -import { IInventoryToggleRequestData } from "../@types/eft/inventory/IInventoryToggleRequestData"; -import { IInventoryTagRequestData } from "../@types/eft/inventory/IInventoryTagRequestData"; -import { IInventoryBindRequestData } from "../@types/eft/inventory/IInventoryBindRequestData"; -import { IInventoryExamineRequestData } from "../@types/eft/inventory/IInventoryExamineRequestData"; -import { IInventoryReadEncyclopediaRequestData } from "../@types/eft/inventory/IInventoryReadEncyclopediaRequestData"; -import { IInventorySortRequestData } from "../@types/eft/inventory/IInventorySortRequestData"; -import { IInventoryCreateMarkerRequestData } from "../@types/eft/inventory/IInventoryCreateMarkerRequestData"; -import { IInventoryDeleteMarkerRequestData } from "../@types/eft/inventory/IInventoryDeleteMarkerRequestData"; -import { IInventoryEditMarkerRequestData } from "../@types/eft/inventory/IInventoryEditMarkerRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class InventoryCallbacks { private inventoryController; constructor(inventoryController: InventoryController); diff --git a/TypeScript/1LogToConsole/types/callbacks/ItemEventCallbacks.d.ts b/TypeScript/1LogToConsole/types/callbacks/ItemEventCallbacks.d.ts index ca069ad..74e79c4 100644 --- a/TypeScript/1LogToConsole/types/callbacks/ItemEventCallbacks.d.ts +++ b/TypeScript/1LogToConsole/types/callbacks/ItemEventCallbacks.d.ts @@ -1,11 +1,11 @@ -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IItemEventRouterRequest } from "../@types/eft/itemEvent/IItemEventRouterRequest"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterRequest } from "../models/eft/itemEvent/IItemEventRouterRequest"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class ItemEventCallbacks { private httpResponse; private itemEventRouter; - constructor(httpResponse: HttpResponse, itemEventRouter: ItemEventRouter); + constructor(httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter); handleEvents(url: string, info: IItemEventRouterRequest, sessionID: string): IGetBodyResponseData; } diff --git a/TypeScript/1LogToConsole/types/callbacks/LauncherCallbacks.d.ts b/TypeScript/1LogToConsole/types/callbacks/LauncherCallbacks.d.ts index 5e3ec40..addf76b 100644 --- a/TypeScript/1LogToConsole/types/callbacks/LauncherCallbacks.d.ts +++ b/TypeScript/1LogToConsole/types/callbacks/LauncherCallbacks.d.ts @@ -1,17 +1,17 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { SaveServer } from "../servers/SaveServer"; import { LauncherController } from "../controllers/LauncherController"; -import { IRegisterData } from "../@types/eft/launcher/IRegisterData"; -import { IRemoveProfileData } from "../@types/eft/launcher/IRemoveProfileData"; -import { ILoginRequestData } from "../@types/eft/launcher/ILoginRequestData"; -import { IChangeRequestData } from "../@types/eft/launcher/IChangeRequestData"; -import { IWatermark } from "../@types/spt/utils/IWatermark"; +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 { private httpResponse; private launcherController; private saveServer; private watermark; - constructor(httpResponse: HttpResponse, launcherController: LauncherController, saveServer: SaveServer, watermark: IWatermark); + constructor(httpResponse: HttpResponseUtil, launcherController: LauncherController, saveServer: SaveServer, watermark: IWatermark); connect(): string; login(url: string, info: ILoginRequestData, sessionID: string): string; register(url: string, info: IRegisterData, sessionID: string): "FAILED" | "OK"; diff --git a/TypeScript/1LogToConsole/types/callbacks/LocationCallbacks.d.ts b/TypeScript/1LogToConsole/types/callbacks/LocationCallbacks.d.ts index 6142ad5..346893b 100644 --- a/TypeScript/1LogToConsole/types/callbacks/LocationCallbacks.d.ts +++ b/TypeScript/1LogToConsole/types/callbacks/LocationCallbacks.d.ts @@ -1,13 +1,13 @@ import { LocationController } from "../controllers/LocationController"; -import { IGetLocationRequestData } from "../@types/eft/location/IGetLocationRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { ILocationsGenerateAllResponse } from "../@types/eft/common/ILocationsSourceDestinationBase"; -import { ILocationBase } from "../@types/eft/common/ILocationBase"; -import { HttpResponse } from "../utils/HttpResponse"; +import { IGetLocationRequestData } from "../models/eft/location/IGetLocationRequestData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSourceDestinationBase"; +import { ILocationBase } from "../models/eft/common/ILocationBase"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class LocationCallbacks { private httpResponse; private locationController; - constructor(httpResponse: HttpResponse, locationController: LocationController); + constructor(httpResponse: HttpResponseUtil, locationController: LocationController); getLocationData(url: string, info: any, sessionID: string): IGetBodyResponseData; getLocation(url: string, info: IGetLocationRequestData, sessionID: string): IGetBodyResponseData; } diff --git a/TypeScript/1LogToConsole/types/callbacks/MatchCallbacks.d.ts b/TypeScript/1LogToConsole/types/callbacks/MatchCallbacks.d.ts index 373566b..9364a2f 100644 --- a/TypeScript/1LogToConsole/types/callbacks/MatchCallbacks.d.ts +++ b/TypeScript/1LogToConsole/types/callbacks/MatchCallbacks.d.ts @@ -1,18 +1,18 @@ import { MatchController } from "../controllers/MatchController"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { IStartOfflineRaidRequestData } from "../@types/eft/match/IStartOffineRaidRequestData"; -import { IEndOfflineRaidRequestData } from "../@types/eft/match/IEndOfflineRaidRequestData"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { HttpResponse } from "../utils/HttpResponse"; +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 { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class MatchCallbacks { private httpResponse; private jsonUtil; private matchController; private databaseServer; - constructor(httpResponse: HttpResponse, jsonUtil: JsonUtil, matchController: MatchController, databaseServer: DatabaseServer); + constructor(httpResponse: HttpResponseUtil, jsonUtil: JsonUtil, matchController: MatchController, databaseServer: DatabaseServer); updatePing(url: string, info: any, sessionID: string): INullResponseData; exitMatch(url: string, info: any, sessionID: string): INullResponseData; exitToMenu(url: string, info: any, sessionID: string): INullResponseData; diff --git a/TypeScript/1LogToConsole/types/callbacks/ModCallbacks.d.ts b/TypeScript/1LogToConsole/types/callbacks/ModCallbacks.d.ts index 18ebfce..b4c18c2 100644 --- a/TypeScript/1LogToConsole/types/callbacks/ModCallbacks.d.ts +++ b/TypeScript/1LogToConsole/types/callbacks/ModCallbacks.d.ts @@ -1,9 +1,9 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { OnLoad } from "../di/OnLoad"; import { DelayedModLoader } from "../loaders/DelayedModLoader"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from '../@types/spt/utils/ILogger'; -import { IHttpServer } from '../@types/spt/server/IHttpServer'; +import { ILogger } from '../models/spt/utils/ILogger'; +import { IHttpServer } from '../models/spt/server/IHttpServer'; declare class ModCallbacks extends OnLoad { private logger; private httpResponse; @@ -11,7 +11,7 @@ declare class ModCallbacks extends OnLoad { private modLoader; private configServer; private httpConfig; - constructor(logger: ILogger, httpResponse: HttpResponse, httpServer: IHttpServer, modLoader: DelayedModLoader, configServer: ConfigServer); + constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, modLoader: DelayedModLoader, configServer: ConfigServer); onLoad(): void; getRoute(): string; sendBundle(sessionID: string, req: any, resp: any, body: any): void; diff --git a/TypeScript/1LogToConsole/types/callbacks/NoteCallbacks.d.ts b/TypeScript/1LogToConsole/types/callbacks/NoteCallbacks.d.ts index ed30fcd..36cbd44 100644 --- a/TypeScript/1LogToConsole/types/callbacks/NoteCallbacks.d.ts +++ b/TypeScript/1LogToConsole/types/callbacks/NoteCallbacks.d.ts @@ -1,7 +1,7 @@ import { NoteController } from "../controllers/NoteController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { INoteActionData } from "../@types/eft/notes/INoteActionData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { private noteController; constructor(noteController: NoteController); diff --git a/TypeScript/1LogToConsole/types/callbacks/NotifierCallbacks.d.ts b/TypeScript/1LogToConsole/types/callbacks/NotifierCallbacks.d.ts index d982db5..f47dcc9 100644 --- a/TypeScript/1LogToConsole/types/callbacks/NotifierCallbacks.d.ts +++ b/TypeScript/1LogToConsole/types/callbacks/NotifierCallbacks.d.ts @@ -1,15 +1,15 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { INotifierChannel } from "../@types/eft/notifier/INotifier"; -import { ISelectProfileRequestData } from "../@types/eft/notifier/ISelectProfileRequestData"; +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 { private httpServerHelper; private httpResponse; private notifierController; - constructor(httpServerHelper: HttpServerHelper, httpResponse: HttpResponse, notifierController: NotifierController); + constructor(httpServerHelper: HttpServerHelper, httpResponse: HttpResponseUtil, notifierController: NotifierController); /** * If we don't have anything to send, it's ok to not send anything back * because notification requests can be long-polling. In fact, we SHOULD wait diff --git a/TypeScript/1LogToConsole/types/callbacks/PresetBuildCallbacks.d.ts b/TypeScript/1LogToConsole/types/callbacks/PresetBuildCallbacks.d.ts index ee1b592..fd22c8f 100644 --- a/TypeScript/1LogToConsole/types/callbacks/PresetBuildCallbacks.d.ts +++ b/TypeScript/1LogToConsole/types/callbacks/PresetBuildCallbacks.d.ts @@ -1,14 +1,14 @@ import { PresetBuildController } from "../controllers/PresetBuildController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IPresetBuildActionRequestData } from "../@types/eft/presetBuild/IPresetBuildActionRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { WeaponBuild } from "../@types/eft/profile/IAkiProfile"; -import { HttpResponse } from "../utils/HttpResponse"; +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 { WeaponBuild } from "../models/eft/profile/IAkiProfile"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class PresetBuildCallbacks { private httpResponse; private presetBuildController; - constructor(httpResponse: HttpResponse, presetBuildController: PresetBuildController); + constructor(httpResponse: HttpResponseUtil, presetBuildController: PresetBuildController); 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/1LogToConsole/types/callbacks/ProfileCallbacks.d.ts b/TypeScript/1LogToConsole/types/callbacks/ProfileCallbacks.d.ts index 94e05b8..e50c130 100644 --- a/TypeScript/1LogToConsole/types/callbacks/ProfileCallbacks.d.ts +++ b/TypeScript/1LogToConsole/types/callbacks/ProfileCallbacks.d.ts @@ -1,21 +1,21 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { ProfileController } from "../controllers/ProfileController"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IProfileChangeNicknameRequestData } from "../@types/eft/profile/IProfileChangeNicknameRequestData"; -import { IProfileChangeVoiceRequestData } from "../@types/eft/profile/IProfileChangeVoiceRequestData"; -import { IProfileCreateRequestData } from "../@types/eft/profile/IProfileCreateRequestData"; -import { IValidateNicknameRequestData } from "../@types/eft/profile/IValidateNicknameRequestData"; -import { ISearchFriendRequestData } from "../@types/eft/profile/ISearchFriendRequestData"; -import { ISearchFriendResponse } from "../@types/eft/profile/ISearchFriendResponse"; -import { IGetMiniProfileRequestData } from "../@types/eft/launcher/IGetMiniProfileRequestData"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +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 { private httpResponse; private timeUtil; private profileController; - constructor(httpResponse: HttpResponse, timeUtil: TimeUtil, profileController: ProfileController); + constructor(httpResponse: HttpResponseUtil, timeUtil: TimeUtil, profileController: ProfileController); createProfile(url: string, info: IProfileCreateRequestData, sessionID: string): IGetBodyResponseData; getProfileData(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; regenerateScav(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/1LogToConsole/types/callbacks/QuestCallbacks.d.ts b/TypeScript/1LogToConsole/types/callbacks/QuestCallbacks.d.ts index 589682b..1f3964b 100644 --- a/TypeScript/1LogToConsole/types/callbacks/QuestCallbacks.d.ts +++ b/TypeScript/1LogToConsole/types/callbacks/QuestCallbacks.d.ts @@ -1,22 +1,22 @@ import { QuestController } from "../controllers/QuestController"; import { RepeatableQuestController } from "../controllers/RepeatableQuestController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IAcceptQuestRequestData } from "../@types/eft/quests/IAcceptQuestRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IListQuestsRequestData } from "../@types/eft/quests/IListQuestsRequestData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { ICompleteQuestRequestData } from "../@types/eft/quests/ICompleteQuestRequestData"; -import { IHandoverQuestRequestData } from "../@types/eft/quests/IHandoverQuestRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IQuest } from "../@types/eft/common/tables/IQuest"; -import { IPmcDataRepeatableQuest } from "../@types/eft/common/tables/IRepeatableQuests"; -import { IRepeatableQuestChangeRequest } from "../@types/eft/quests/IRepeatableQuestChangeRequest"; -import { HttpResponse } from "../utils/HttpResponse"; +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 { IQuest } from "../models/eft/common/tables/IQuest"; +import { IPmcDataRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; +import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class QuestCallbacks { private httpResponse; private questController; private repeatableQuestController; - constructor(httpResponse: HttpResponse, questController: QuestController, repeatableQuestController: RepeatableQuestController); + constructor(httpResponse: HttpResponseUtil, questController: QuestController, repeatableQuestController: RepeatableQuestController); 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/1LogToConsole/types/callbacks/RagfairCallbacks.d.ts b/TypeScript/1LogToConsole/types/callbacks/RagfairCallbacks.d.ts index 31af479..260fd13 100644 --- a/TypeScript/1LogToConsole/types/callbacks/RagfairCallbacks.d.ts +++ b/TypeScript/1LogToConsole/types/callbacks/RagfairCallbacks.d.ts @@ -1,20 +1,20 @@ import { RagfairServer } from "../servers/RagfairServer"; import { RagfairController } from "../controllers/RagfairController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { ISearchRequestData } from "../@types/eft/ragfair/ISearchRequestData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGetMarketPriceRequestData } from "../@types/eft/ragfair/IGetMarketPriceRequestData"; -import { IAddOfferRequestData } from "../@types/eft/ragfair/IAddOfferRequestData"; -import { IRemoveOfferRequestData } from "../@types/eft/ragfair/IRemoveOfferRequestData"; -import { IExtendOfferRequestData } from "../@types/eft/ragfair/IExtendOfferRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IGetItemPriceResult } from "../@types/eft/ragfair/IGetItemPriceResult"; +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 { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult"; import { ConfigServer } from "../servers/ConfigServer"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairCallbacks extends OnLoadOnUpdate { private httpResponse; private logger; @@ -23,7 +23,7 @@ export declare class RagfairCallbacks extends OnLoadOnUpdate { private ragfairController; private configServer; private ragfairConfig; - constructor(httpResponse: HttpResponse, logger: ILogger, jsonUtil: JsonUtil, ragfairServer: RagfairServer, ragfairController: RagfairController, configServer: ConfigServer); + constructor(httpResponse: HttpResponseUtil, logger: ILogger, jsonUtil: JsonUtil, ragfairServer: RagfairServer, ragfairController: RagfairController, configServer: ConfigServer); onLoad(): void; getRoute(): string; search(url: string, info: ISearchRequestData, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/1LogToConsole/types/callbacks/RepairCallbacks.d.ts b/TypeScript/1LogToConsole/types/callbacks/RepairCallbacks.d.ts index e28e48b..4acd364 100644 --- a/TypeScript/1LogToConsole/types/callbacks/RepairCallbacks.d.ts +++ b/TypeScript/1LogToConsole/types/callbacks/RepairCallbacks.d.ts @@ -1,8 +1,8 @@ import { RepairController } from "../controllers/RepairController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IRepairActionDataRequest } from "../@types/eft/repair/IRepairActionDataRequest"; -import { ITraderRepairActionDataRequest } from "../@types/eft/repair/ITraderRepairActionDataRequest"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +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/1LogToConsole/types/callbacks/TradeCallbacks.d.ts b/TypeScript/1LogToConsole/types/callbacks/TradeCallbacks.d.ts index 5117a82..4cf8497 100644 --- a/TypeScript/1LogToConsole/types/callbacks/TradeCallbacks.d.ts +++ b/TypeScript/1LogToConsole/types/callbacks/TradeCallbacks.d.ts @@ -1,8 +1,8 @@ import { TradeController } from "../controllers/TradeController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IProcessRagfairTradeRequestData } from "../@types/eft/trade/IProcessRagfairTradeRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IProcessBaseTradeRequestData } from "../@types/eft/trade/IProcessBaseTradeRequestData"; +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 { private tradeController; constructor(tradeController: TradeController); diff --git a/TypeScript/1LogToConsole/types/callbacks/TraderCallbacks.d.ts b/TypeScript/1LogToConsole/types/callbacks/TraderCallbacks.d.ts index 3f72e2b..264ef94 100644 --- a/TypeScript/1LogToConsole/types/callbacks/TraderCallbacks.d.ts +++ b/TypeScript/1LogToConsole/types/callbacks/TraderCallbacks.d.ts @@ -1,13 +1,13 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TraderController } from "../controllers/TraderController"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IBarterScheme, ITraderAssort, ITraderBase } from "../@types/eft/common/tables/ITrader"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; +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 { private httpResponse; private traderController; - constructor(httpResponse: HttpResponse, traderController: TraderController); + constructor(httpResponse: HttpResponseUtil, traderController: TraderController); onLoad(): void; getRoute(): string; getTraderSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/1LogToConsole/types/callbacks/WeatherCallbacks.d.ts b/TypeScript/1LogToConsole/types/callbacks/WeatherCallbacks.d.ts index 99d5c1f..2474417 100644 --- a/TypeScript/1LogToConsole/types/callbacks/WeatherCallbacks.d.ts +++ b/TypeScript/1LogToConsole/types/callbacks/WeatherCallbacks.d.ts @@ -1,10 +1,10 @@ import { WeatherController } from "../controllers/WeatherController"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { HttpResponse } from "../utils/HttpResponse"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class WeatherCallbacks { private httpResponse; private weatherController; - constructor(httpResponse: HttpResponse, weatherController: WeatherController); + constructor(httpResponse: HttpResponseUtil, weatherController: WeatherController); getWeather(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; } diff --git a/TypeScript/1LogToConsole/types/callbacks/WishlistCallbacks.d.ts b/TypeScript/1LogToConsole/types/callbacks/WishlistCallbacks.d.ts index 870f049..1816600 100644 --- a/TypeScript/1LogToConsole/types/callbacks/WishlistCallbacks.d.ts +++ b/TypeScript/1LogToConsole/types/callbacks/WishlistCallbacks.d.ts @@ -1,7 +1,7 @@ import { WishlistController } from "../controllers/WishlistController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IWishlistActionData } from "../@types/eft/wishlist/IWishlistActionData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { private wishlistController; constructor(wishlistController: WishlistController); diff --git a/TypeScript/1LogToConsole/types/configs/AkiConfig.d.ts b/TypeScript/1LogToConsole/types/configs/AkiConfig.d.ts deleted file mode 100644 index f9b9e31..0000000 --- a/TypeScript/1LogToConsole/types/configs/AkiConfig.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -export const akiVersion: string; -export const projectName: string; -export const compatibleTarkovVersion: string; diff --git a/TypeScript/1LogToConsole/types/configs/BotConfig.d.ts b/TypeScript/1LogToConsole/types/configs/BotConfig.d.ts deleted file mode 100644 index 6c7ea7b..0000000 --- a/TypeScript/1LogToConsole/types/configs/BotConfig.d.ts +++ /dev/null @@ -1,309 +0,0 @@ -export declare namespace presetBatch { - const assault: number; - const bossBully: number; - const bossGluhar: number; - const bossKilla: number; - const bossKojaniy: number; - const bossSanitar: number; - const bossTagilla: number; - const bossTest: number; - const cursedAssault: number; - const followerBully: number; - const followerGluharAssault: number; - const followerGluharScout: number; - const followerGluharSecurity: number; - const followerGluharSnipe: number; - const followerKojaniy: number; - const followerSanitar: number; - const followerTagilla: number; - const followerTest: number; - const marksman: number; - const pmcBot: number; - const sectantPriest: number; - const sectantWarrior: number; - const gifter: number; - const test: number; - const exUsec: number; -} -export declare const bosses: string[]; -export declare namespace durability { - namespace _default { - namespace armor { - const maxDelta: number; - const minDelta: number; - } - namespace weapon { - export const lowestMax: number; - export const highestMax: number; - const maxDelta_1: number; - export { maxDelta_1 as maxDelta }; - const minDelta_1: number; - export { minDelta_1 as minDelta }; - } - } - export { _default as default }; - export namespace pmc { - export namespace armor_1 { - export const lowestMaxPercent: number; - export const highestMaxPercent: number; - const maxDelta_2: number; - export { maxDelta_2 as maxDelta }; - const minDelta_2: number; - export { minDelta_2 as minDelta }; - } - export { armor_1 as armor }; - export namespace weapon_1 { - const lowestMax_1: number; - export { lowestMax_1 as lowestMax }; - const highestMax_1: number; - export { highestMax_1 as highestMax }; - const maxDelta_3: number; - export { maxDelta_3 as maxDelta }; - const minDelta_3: number; - export { minDelta_3 as minDelta }; - } - export { weapon_1 as weapon }; - } - export namespace boss { - export namespace armor_2 { - const maxDelta_4: number; - export { maxDelta_4 as maxDelta }; - const minDelta_4: number; - export { minDelta_4 as minDelta }; - } - export { armor_2 as armor }; - export namespace weapon_2 { - const lowestMax_2: number; - export { lowestMax_2 as lowestMax }; - const highestMax_2: number; - export { highestMax_2 as highestMax }; - const maxDelta_5: number; - export { maxDelta_5 as maxDelta }; - const minDelta_5: number; - export { minDelta_5 as minDelta }; - } - export { weapon_2 as weapon }; - } - export namespace follower { - export namespace armor_3 { - const maxDelta_6: number; - export { maxDelta_6 as maxDelta }; - const minDelta_6: number; - export { minDelta_6 as minDelta }; - } - export { armor_3 as armor }; - export namespace weapon_3 { - const lowestMax_3: number; - export { lowestMax_3 as lowestMax }; - const highestMax_3: number; - export { highestMax_3 as highestMax }; - const maxDelta_7: number; - export { maxDelta_7 as maxDelta }; - const minDelta_7: number; - export { minDelta_7 as minDelta }; - } - export { weapon_3 as weapon }; - } - export namespace assault_1 { - export namespace armor_4 { - const maxDelta_8: number; - export { maxDelta_8 as maxDelta }; - const minDelta_8: number; - export { minDelta_8 as minDelta }; - } - export { armor_4 as armor }; - export namespace weapon_4 { - const lowestMax_4: number; - export { lowestMax_4 as lowestMax }; - const highestMax_4: number; - export { highestMax_4 as highestMax }; - const maxDelta_9: number; - export { maxDelta_9 as maxDelta }; - const minDelta_9: number; - export { minDelta_9 as minDelta }; - } - export { weapon_4 as weapon }; - } - export { assault_1 as assault }; - export namespace cursedassault { - export namespace armor_5 { - const maxDelta_10: number; - export { maxDelta_10 as maxDelta }; - const minDelta_10: number; - export { minDelta_10 as minDelta }; - } - export { armor_5 as armor }; - export namespace weapon_5 { - const lowestMax_5: number; - export { lowestMax_5 as lowestMax }; - const highestMax_5: number; - export { highestMax_5 as highestMax }; - const maxDelta_11: number; - export { maxDelta_11 as maxDelta }; - const minDelta_11: number; - export { minDelta_11 as minDelta }; - } - export { weapon_5 as weapon }; - } - export namespace marksman_1 { - export namespace armor_6 { - const maxDelta_12: number; - export { maxDelta_12 as maxDelta }; - const minDelta_12: number; - export { minDelta_12 as minDelta }; - } - export { armor_6 as armor }; - export namespace weapon_6 { - const lowestMax_6: number; - export { lowestMax_6 as lowestMax }; - const highestMax_6: number; - export { highestMax_6 as highestMax }; - const maxDelta_13: number; - export { maxDelta_13 as maxDelta }; - const minDelta_13: number; - export { minDelta_13 as minDelta }; - } - export { weapon_6 as weapon }; - } - export { marksman_1 as marksman }; - export namespace pmcbot { - export namespace armor_7 { - const maxDelta_14: number; - export { maxDelta_14 as maxDelta }; - const minDelta_14: number; - export { minDelta_14 as minDelta }; - } - export { armor_7 as armor }; - export namespace weapon_7 { - const lowestMax_7: number; - export { lowestMax_7 as lowestMax }; - const highestMax_7: number; - export { highestMax_7 as highestMax }; - const maxDelta_15: number; - export { maxDelta_15 as maxDelta }; - const minDelta_15: number; - export { minDelta_15 as minDelta }; - } - export { weapon_7 as weapon }; - } - export namespace exusec { - export namespace armor_8 { - const maxDelta_16: number; - export { maxDelta_16 as maxDelta }; - const minDelta_16: number; - export { minDelta_16 as minDelta }; - } - export { armor_8 as armor }; - export namespace weapon_8 { - const lowestMax_8: number; - export { lowestMax_8 as lowestMax }; - const highestMax_8: number; - export { highestMax_8 as highestMax }; - const maxDelta_17: number; - export { maxDelta_17 as maxDelta }; - const minDelta_17: number; - export { minDelta_17 as minDelta }; - } - export { weapon_8 as weapon }; - } - export namespace sectantpriest { - export namespace armor_9 { - const maxDelta_18: number; - export { maxDelta_18 as maxDelta }; - const minDelta_18: number; - export { minDelta_18 as minDelta }; - } - export { armor_9 as armor }; - export namespace weapon_9 { - const lowestMax_9: number; - export { lowestMax_9 as lowestMax }; - const highestMax_9: number; - export { highestMax_9 as highestMax }; - const maxDelta_19: number; - export { maxDelta_19 as maxDelta }; - const minDelta_19: number; - export { minDelta_19 as minDelta }; - } - export { weapon_9 as weapon }; - } - export namespace sectantwarrior { - export namespace armor_10 { - const maxDelta_20: number; - export { maxDelta_20 as maxDelta }; - const minDelta_20: number; - export { minDelta_20 as minDelta }; - } - export { armor_10 as armor }; - export namespace weapon_10 { - const lowestMax_10: number; - export { lowestMax_10 as lowestMax }; - const highestMax_10: number; - export { highestMax_10 as highestMax }; - const maxDelta_21: number; - export { maxDelta_21 as maxDelta }; - const minDelta_21: number; - export { minDelta_21 as minDelta }; - } - export { weapon_10 as weapon }; - } -} -export declare namespace lootNValue { - export const scav: number; - const pmc_1: number; - export { pmc_1 as pmc }; -} -export declare namespace pmc_2 { - namespace dynamicLoot { - const whitelist: any[]; - const blacklist: string[]; - const spawnLimits: { - "5c99f98d86f7745c314214b3": number; - "5c164d2286f774194c5e69fa": number; - "550aa4cd4bdc2dd8348b456c": number; - "55818add4bdc2d5b648b456f": number; - "55818ad54bdc2ddc698b4569": number; - "55818aeb4bdc2ddc698b456a": number; - "55818ae44bdc2dde698b456c": number; - "55818af64bdc2d5b648b4570": number; - "5448e54d4bdc2dcc718b4568": number; - "5448f3a64bdc2d60728b456a": number; - "5447e1d04bdc2dff2f8b4567": number; - "5a341c4686f77469e155819e": number; - "55818b164bdc2ddc698b456c": number; - "5448bc234bdc2d3c308b4569": number; - "543be5dd4bdc2deb348b4569": number; - "543be5cb4bdc2deb348b4568": number; - "5485a8684bdc2da71d8b4567": number; - "5d650c3e815116009f6201d2": number; - "5448f39d4bdc2d0a728b4568": number; - "543be6564bdc2df4348b4568": number; - }; - const moneyStackLimits: { - "5449016a4bdc2d6f028b456f": number; - "5696686a4bdc2da3298b456a": number; - "569668774bdc2da2298b4568": number; - }; - } - const cartridgeBlacklist: string[]; - const difficulty: string; - const isUsec: number; - const chanceSameSideIsHostilePercent: number; - const usecType: string; - const bearType: string; - const maxBackpackLootTotalRub: number; - const maxPocketLootTotalRub: number; - const maxVestLootTotalRub: number; - namespace types { - const assault_2: number; - export { assault_2 as assault }; - const cursedAssault_1: number; - export { cursedAssault_1 as cursedAssault }; - const pmcBot_1: number; - export { pmcBot_1 as pmcBot }; - const exUsec_1: number; - export { exUsec_1 as exUsec }; - } -} -export { pmc_2 as pmc }; -export declare const showTypeInNickname: boolean; -export declare const maxBotCap: number; diff --git a/TypeScript/1LogToConsole/types/configs/HealthConfig.d.ts b/TypeScript/1LogToConsole/types/configs/HealthConfig.d.ts deleted file mode 100644 index 49bef94..0000000 --- a/TypeScript/1LogToConsole/types/configs/HealthConfig.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -export namespace healthMultipliers { - const death: number; - const blacked: number; -} -export namespace save { - const health: boolean; - const effects: boolean; -} diff --git a/TypeScript/1LogToConsole/types/configs/HideoutConfig.d.ts b/TypeScript/1LogToConsole/types/configs/HideoutConfig.d.ts deleted file mode 100644 index 3894576..0000000 --- a/TypeScript/1LogToConsole/types/configs/HideoutConfig.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -export const runIntervalSeconds: number; -export namespace scavCase { - const rewardParentBlacklist: any[]; - const rewardItemBlacklist: any[]; - namespace ammoRewards { - const giveMultipleOfTen: boolean; - const minAmount: number; - } - namespace moneyRewards { - const enabled: boolean; - namespace rub { - const min: number; - const max: number; - } - namespace usd { - const min_1: number; - export { min_1 as min }; - const max_1: number; - export { max_1 as max }; - } - namespace eur { - const min_2: number; - export { min_2 as min }; - const max_2: number; - export { max_2 as max }; - } - } -} diff --git a/TypeScript/1LogToConsole/types/configs/HttpConfig.d.ts b/TypeScript/1LogToConsole/types/configs/HttpConfig.d.ts deleted file mode 100644 index d7572a0..0000000 --- a/TypeScript/1LogToConsole/types/configs/HttpConfig.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export const ip: string; -export const port: number; diff --git a/TypeScript/1LogToConsole/types/configs/InraidConfig.d.ts b/TypeScript/1LogToConsole/types/configs/InraidConfig.d.ts deleted file mode 100644 index 7ac112c..0000000 --- a/TypeScript/1LogToConsole/types/configs/InraidConfig.d.ts +++ /dev/null @@ -1,15 +0,0 @@ -export const MIAOnRaidEnd: boolean; -export namespace raidMenuSettings { - const aiAmount: string; - const aiDifficulty: string; - const bossEnabled: boolean; - const scavWars: boolean; - const taggedAndCursed: boolean; -} -export namespace save { - const loot: boolean; - const durability: boolean; -} -export const carExtracts: string[]; -export const carExtractBaseStandingGain: number; -export const scavExtractGain: number; diff --git a/TypeScript/1LogToConsole/types/configs/InsuranceConfig.d.ts b/TypeScript/1LogToConsole/types/configs/InsuranceConfig.d.ts deleted file mode 100644 index 441319e..0000000 --- a/TypeScript/1LogToConsole/types/configs/InsuranceConfig.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -export const insuranceMultiplier: { - "54cb50c76803fa8b248b4571": number; - "54cb57776803fa99248b456e": number; -}; -export const returnChancePercent: { - "54cb50c76803fa8b248b4571": number; - "54cb57776803fa99248b456e": number; -}; -export const runIntervalSeconds: number; diff --git a/TypeScript/1LogToConsole/types/configs/InventoryConfig.d.ts b/TypeScript/1LogToConsole/types/configs/InventoryConfig.d.ts deleted file mode 100644 index 8d0b82f..0000000 --- a/TypeScript/1LogToConsole/types/configs/InventoryConfig.d.ts +++ /dev/null @@ -1 +0,0 @@ -export const newItemsMarkedFound: boolean; diff --git a/TypeScript/1LogToConsole/types/configs/LocationConfig.d.ts b/TypeScript/1LogToConsole/types/configs/LocationConfig.d.ts deleted file mode 100644 index 848096a..0000000 --- a/TypeScript/1LogToConsole/types/configs/LocationConfig.d.ts +++ /dev/null @@ -1,52 +0,0 @@ -export namespace looseLootMultiplier { - const bigmap: number; - const develop: number; - const factory4_day: number; - const factory4_night: number; - const interchange: number; - const laboratory: number; - const rezervbase: number; - const shoreline: number; - const woods: number; - const hideout: number; - const lighthouse: number; - const privatearea: number; - const suburbs: number; - const tarkovstreets: number; - const terminal: number; - const town: number; -} -export namespace staticLootMultiplier { - const bigmap_1: number; - export { bigmap_1 as bigmap }; - const develop_1: number; - export { develop_1 as develop }; - const factory4_day_1: number; - export { factory4_day_1 as factory4_day }; - const factory4_night_1: number; - export { factory4_night_1 as factory4_night }; - const interchange_1: number; - export { interchange_1 as interchange }; - const laboratory_1: number; - export { laboratory_1 as laboratory }; - const rezervbase_1: number; - export { rezervbase_1 as rezervbase }; - const shoreline_1: number; - export { shoreline_1 as shoreline }; - const woods_1: number; - export { woods_1 as woods }; - const hideout_1: number; - export { hideout_1 as hideout }; - const lighthouse_1: number; - export { lighthouse_1 as lighthouse }; - const privatearea_1: number; - export { privatearea_1 as privatearea }; - const suburbs_1: number; - export { suburbs_1 as suburbs }; - const tarkovstreets_1: number; - export { tarkovstreets_1 as tarkovstreets }; - const terminal_1: number; - export { terminal_1 as terminal }; - const town_1: number; - export { town_1 as town }; -} diff --git a/TypeScript/1LogToConsole/types/configs/MatchConfig.d.ts b/TypeScript/1LogToConsole/types/configs/MatchConfig.d.ts deleted file mode 100644 index 59524e0..0000000 --- a/TypeScript/1LogToConsole/types/configs/MatchConfig.d.ts +++ /dev/null @@ -1 +0,0 @@ -export const enabled: boolean; diff --git a/TypeScript/1LogToConsole/types/configs/QuestConfig.d.ts b/TypeScript/1LogToConsole/types/configs/QuestConfig.d.ts deleted file mode 100644 index 069e0ac..0000000 --- a/TypeScript/1LogToConsole/types/configs/QuestConfig.d.ts +++ /dev/null @@ -1,70 +0,0 @@ -export const redeemTime: number; -export const repeatableQuests: { - name: string; - types: string[]; - resetTime: number; - numQuests: number; - minPlayerLevel: number; - rewardScaling: { - levels: number[]; - experience: number[]; - roubles: number[]; - items: number[]; - reputation: number[]; - rewardSpread: number; - }; - locations: { - any: string[]; - factory4_day: string[]; - bigmap: string[]; - Woods: string[]; - Shoreline: string[]; - Interchange: string[]; - Lighthouse: string[]; - laboratory: string[]; - RezervBase: string[]; - }; - traderWhitelist: { - traderId: any; - questTypes: string[]; - }[]; - questConfig: { - Exploration: { - maxExtracts: number; - specificExits: { - probability: number; - passageRequirementWhitelist: string[]; - }; - }; - Completion: { - minRequestedAmount: number; - maxRequestedAmount: number; - minRequestedBulletAmount: number; - maxRequestedBulletAmount: number; - useWhitelist: boolean; - useBlacklist: boolean; - }; - Elimination: { - targets: { - key: string; - relativeProbability: number; - data: { - isBoss: boolean; - }; - }[]; - bodyPartProb: number; - bodyParts: { - key: string; - relativeProbability: number; - data: string[]; - }[]; - specificLocationProb: number; - distLocationBlacklist: string[]; - distProb: number; - maxDist: number; - minDist: number; - maxKills: number; - minKills: number; - }; - }; -}[]; diff --git a/TypeScript/1LogToConsole/types/configs/RagfairConfig.d.ts b/TypeScript/1LogToConsole/types/configs/RagfairConfig.d.ts deleted file mode 100644 index 4a0f68c..0000000 --- a/TypeScript/1LogToConsole/types/configs/RagfairConfig.d.ts +++ /dev/null @@ -1,87 +0,0 @@ -export const runIntervalSeconds: number; -export namespace sell { - const fees: boolean; - namespace chance { - const base: number; - const overprices: number; - const underpriced: number; - } - namespace time { - const base_1: number; - export { base_1 as base }; - export const min: number; - export const max: number; - } - namespace reputation { - const gain: number; - const loss: number; - } -} -export const traders: { - "54cb50c76803fa8b248b4571": boolean; - "54cb57776803fa99248b456e": boolean; - "579dc571d53a0658a154fbec": boolean; - "58330581ace78e27b8b10cee": boolean; - "5935c25fb3acc3127c3d8cd9": boolean; - "5a7c2eca46aef81a7ca2145d": boolean; - "5ac3b934156ae10c4430e83c": boolean; - "5c0647fdd443bc2504c2d371": boolean; - ragfair: boolean; -}; -export namespace dynamic { - const expiredOfferThreshold: number; - namespace offerItemCount { - const min_1: number; - export { min_1 as min }; - const max_1: number; - export { max_1 as max }; - } - namespace price { - const min_2: number; - export { min_2 as min }; - const max_2: number; - export { max_2 as max }; - } - namespace endTimeSeconds { - const min_3: number; - export { min_3 as min }; - const max_3: number; - export { max_3 as max }; - } - namespace condition { - export const conditionChance: number; - const min_4: number; - export { min_4 as min }; - const max_4: number; - export { max_4 as max }; - } - namespace stackablePercent { - const min_5: number; - export { min_5 as min }; - const max_5: number; - export { max_5 as max }; - } - namespace nonStackableCount { - const min_6: number; - export { min_6 as min }; - const max_6: number; - export { max_6 as max }; - } - namespace rating { - const min_7: number; - export { min_7 as min }; - const max_7: number; - export { max_7 as max }; - } - const currencies: { - "5449016a4bdc2d6f028b456f": number; - "5696686a4bdc2da3298b456a": number; - "569668774bdc2da2298b4568": number; - }; - const showAsSingleStack: any[]; - namespace blacklist { - const custom: string[]; - const enableBsgList: boolean; - const enableQuestList: boolean; - } -} diff --git a/TypeScript/1LogToConsole/types/configs/RepairConfig.d.ts b/TypeScript/1LogToConsole/types/configs/RepairConfig.d.ts deleted file mode 100644 index d2bec52..0000000 --- a/TypeScript/1LogToConsole/types/configs/RepairConfig.d.ts +++ /dev/null @@ -1 +0,0 @@ -export const priceMultiplier: number; diff --git a/TypeScript/1LogToConsole/types/configs/TraderConfig.d.ts b/TypeScript/1LogToConsole/types/configs/TraderConfig.d.ts deleted file mode 100644 index c7fc65d..0000000 --- a/TypeScript/1LogToConsole/types/configs/TraderConfig.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -export const updateTime: { - traderId: any; - seconds: number; -}[]; -export const updateTimeDefault: number; -export const fenceAssortSize: number; -export const fenceMaxPresetsCount: number; -export const fencePresetPriceMult: number; -export const minDurabilityForSale: number; -export const fenceItemIgnoreList: string[]; diff --git a/TypeScript/1LogToConsole/types/configs/WeatherConfig.d.ts b/TypeScript/1LogToConsole/types/configs/WeatherConfig.d.ts deleted file mode 100644 index ca37604..0000000 --- a/TypeScript/1LogToConsole/types/configs/WeatherConfig.d.ts +++ /dev/null @@ -1,55 +0,0 @@ -export const acceleration: number; -export namespace weather { - namespace clouds { - const min: number; - const max: number; - } - namespace windSpeed { - const min_1: number; - export { min_1 as min }; - const max_1: number; - export { max_1 as max }; - } - namespace windDirection { - const min_2: number; - export { min_2 as min }; - const max_2: number; - export { max_2 as max }; - } - namespace windGustiness { - const min_3: number; - export { min_3 as min }; - const max_3: number; - export { max_3 as max }; - } - namespace rain { - const min_4: number; - export { min_4 as min }; - const max_4: number; - export { max_4 as max }; - } - namespace rainIntensity { - const min_5: number; - export { min_5 as min }; - const max_5: number; - export { max_5 as max }; - } - namespace fog { - const min_6: number; - export { min_6 as min }; - const max_6: number; - export { max_6 as max }; - } - namespace temp { - const min_7: number; - export { min_7 as min }; - const max_7: number; - export { max_7 as max }; - } - namespace pressure { - const min_8: number; - export { min_8 as min }; - const max_8: number; - export { max_8 as max }; - } -} diff --git a/TypeScript/1LogToConsole/types/controllers/BotController.d.ts b/TypeScript/1LogToConsole/types/controllers/BotController.d.ts index 1fc8fc4..d7dc36d 100644 --- a/TypeScript/1LogToConsole/types/controllers/BotController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/BotController.d.ts @@ -1,8 +1,8 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { Difficulty } from "../@types/eft/common/tables/IBotType"; -import { IGenerateBotsRequestData } from "../@types/eft/bot/IGenerateBotsRequestData"; -import { IBotBase } from "../@types/eft/common/tables/IBotBase"; -import { IBotCore } from "../@types/eft/common/tables/IBotCore"; +import { Difficulty } from "../models/eft/common/tables/IBotType"; +import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; +import { IBotBase } from "../models/eft/common/tables/IBotBase"; +import { IBotCore } from "../models/eft/common/tables/IBotCore"; import { ConfigServer } from "../servers/ConfigServer"; import { BotHelper } from "../helpers/BotHelper"; import { BotGenerator } from "../generators/BotGenerator"; diff --git a/TypeScript/1LogToConsole/types/controllers/CustomizationController.d.ts b/TypeScript/1LogToConsole/types/controllers/CustomizationController.d.ts index 4255154..6fd3b12 100644 --- a/TypeScript/1LogToConsole/types/controllers/CustomizationController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/CustomizationController.d.ts @@ -1,13 +1,13 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IWearClothingRequestData } from "../@types/eft/customization/IWearClothingRequestData"; -import { IBuyClothingRequestData } from "../@types/eft/customization/IBuyClothingRequestData"; -import { ISuit } from "../@types/eft/common/tables/ITrader"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IWearClothingRequestData } from "../models/eft/customization/IWearClothingRequestData"; +import { IBuyClothingRequestData } from "../models/eft/customization/IBuyClothingRequestData"; +import { ISuit } from "../models/eft/common/tables/ITrader"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class CustomizationController { private logger; private itemEventRouter; diff --git a/TypeScript/1LogToConsole/types/controllers/DialogueController.d.ts b/TypeScript/1LogToConsole/types/controllers/DialogueController.d.ts index a855ad1..8095666 100644 --- a/TypeScript/1LogToConsole/types/controllers/DialogueController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/DialogueController.d.ts @@ -1,16 +1,16 @@ import { SaveServer } from "../servers/SaveServer"; import { DialogueHelper } from "../helpers/DialogueHelper"; -import { DialogueInfo } from "../@types/eft/profile/IAkiProfile"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IGetFriendListDataResponse } from "../@types/eft/dialog/IGetFriendListDataResponse"; -import { IGetMailDialogViewResponseData } from "../@types/eft/dialog/IGetMailDialogViewResponseData"; -import { IGetAllAttachmentsResponse } from "../@types/eft/dialog/IGetAllAttachmentsResponse"; -import { HttpResponse } from "../utils/HttpResponse"; +import { DialogueInfo } from "../models/eft/profile/IAkiProfile"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse"; +import { IGetMailDialogViewResponseData } from "../models/eft/dialog/IGetMailDialogViewResponseData"; +import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachmentsResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class DialogueController { private httpResponse; private saveServer; private dialogueHelper; - constructor(httpResponse: HttpResponse, saveServer: SaveServer, dialogueHelper: DialogueHelper); + constructor(httpResponse: HttpResponseUtil, saveServer: SaveServer, dialogueHelper: DialogueHelper); getFriendList(sessionID: string): IGetFriendListDataResponse; generateDialogueList(sessionID: string): IGetBodyResponseData; getDialogueInfo(dialogueID: string, sessionID: string): DialogueInfo; diff --git a/TypeScript/1LogToConsole/types/controllers/GameController.d.ts b/TypeScript/1LogToConsole/types/controllers/GameController.d.ts index 883bed3..614d270 100644 --- a/TypeScript/1LogToConsole/types/controllers/GameController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/GameController.d.ts @@ -1,9 +1,9 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGameConfigResponse } from "../@types/eft/game/IGameConfigResponse"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from "../@types/spt/utils/ILogger"; -import { IWatermark } from "../@types/spt/utils/IWatermark"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { IWatermark } from "../models/spt/utils/IWatermark"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; export declare class GameController { private logger; diff --git a/TypeScript/1LogToConsole/types/controllers/HealthController.d.ts b/TypeScript/1LogToConsole/types/controllers/HealthController.d.ts index 3d2120b..ca049f6 100644 --- a/TypeScript/1LogToConsole/types/controllers/HealthController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/HealthController.d.ts @@ -2,14 +2,14 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { PaymentService } from "../services/PaymentService"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { HealthHelper } from "../helpers/HealthHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IHealthTreatmentRequestData } from "../@types/eft/health/IHealthTreatmentRequestData"; -import { IOffraidEatRequestData } from "../@types/eft/health/IOffraidEatRequestData"; -import { IOffraidHealRequestData } from "../@types/eft/health/IOffraidHealRequestData"; -import { ISyncHealthRequestData } from "../@types/eft/health/ISyncHealthRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IHealthTreatmentRequestData } from "../models/eft/health/IHealthTreatmentRequestData"; +import { IOffraidEatRequestData } from "../models/eft/health/IOffraidEatRequestData"; +import { IOffraidHealRequestData } from "../models/eft/health/IOffraidHealRequestData"; +import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class HealthController { private logger; private itemEventRouter; diff --git a/TypeScript/1LogToConsole/types/controllers/HideoutController.d.ts b/TypeScript/1LogToConsole/types/controllers/HideoutController.d.ts index 59e05d9..22b7040 100644 --- a/TypeScript/1LogToConsole/types/controllers/HideoutController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/HideoutController.d.ts @@ -10,20 +10,20 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { PaymentHelper } from "../helpers/PaymentHelper"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { HideoutHelper } from "../helpers/HideoutHelper"; -import { IHideoutUpgradeRequestData } from "../@types/eft/hideout/IHideoutUpgradeRequestData"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { HideoutUpgradeCompleteRequestData } from "../@types/eft/hideout/HideoutUpgradeCompleteRequestData"; -import { IHideoutPutItemInRequestData } from "../@types/eft/hideout/IHideoutPutItemInRequestData"; -import { IHideoutTakeItemOutRequestData } from "../@types/eft/hideout/IHideoutTakeItemOutRequestData"; -import { IHideoutToggleAreaRequestData } from "../@types/eft/hideout/IHideoutToggleAreaRequestData"; -import { IHideoutSingleProductionStartRequestData } from "../@types/eft/hideout/IHideoutSingleProductionStartRequestData"; -import { IHideoutScavCaseStartRequestData } from "../@types/eft/hideout/IHideoutScavCaseStartRequestData"; -import { IHideoutTakeProductionRequestData } from "../@types/eft/hideout/IHideoutTakeProductionRequestData"; -import { IHideoutContinousProductionStartRequestData } from "../@types/eft/hideout/IHideoutContinousProductionStartRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { HideoutUpgradeCompleteRequestData } from "../models/eft/hideout/HideoutUpgradeCompleteRequestData"; +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 { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; +import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; +import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HttpResponse } from "../utils/HttpResponse"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class HideoutController { private logger; private hashUtil; @@ -41,7 +41,7 @@ export declare class HideoutController { private hideoutHelper; private configServer; private hideoutConfig; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponse, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, configServer: ConfigServer); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, configServer: ConfigServer); upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; upgradeComplete(pmcData: IPmcData, body: HideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse; putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/TypeScript/1LogToConsole/types/controllers/InraidController.d.ts b/TypeScript/1LogToConsole/types/controllers/InraidController.d.ts index e0be58a..1033e5f 100644 --- a/TypeScript/1LogToConsole/types/controllers/InraidController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/InraidController.d.ts @@ -2,31 +2,29 @@ import { SaveServer } from "../servers/SaveServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "../helpers/ItemHelper"; import { TraderHelper } from "../helpers/TraderHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; import { HealthHelper } from "../helpers/HealthHelper"; -import { IRegisterPlayerRequestData } from "../@types/eft/inRaid/IRegisterPlayerRequestData"; -import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData"; +import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; +import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ConfigServer } from "../servers/ConfigServer"; import { JsonUtil } from "../utils/JsonUtil"; import { QuestHelper } from "../helpers/QuestHelper"; import { InRaidHelper } from "../helpers/InRaidHelper"; import { InsuranceService } from "../services/InsuranceService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; export declare class InraidController { - private logger; private saveServer; private jsonUtil; private databaseServer; private questHelper; private itemHelper; - private profileHelper; + private extendedProfileHelper; private healthHelper; private traderHelper; private insuranceService; private inRaidHelper; private configServer; private inraidConfig; - constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, profileHelper: ProfileHelper, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); + constructor(saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, extendedProfileHelper: ExtendedProfileHelper, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); addPlayer(sessionID: string, info: IRegisterPlayerRequestData): void; saveProgress(offraidData: ISaveProgressRequestData, sessionID: string): void; } diff --git a/TypeScript/1LogToConsole/types/controllers/InsuranceController.d.ts b/TypeScript/1LogToConsole/types/controllers/InsuranceController.d.ts index 5e43c2b..44c61fa 100644 --- a/TypeScript/1LogToConsole/types/controllers/InsuranceController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/InsuranceController.d.ts @@ -8,12 +8,12 @@ import { PaymentService } from "../services/PaymentService"; import { DialogueHelper } from "../helpers/DialogueHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { ItemHelper } from "../helpers/ItemHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IGetInsuranceCostRequestData } from "../@types/eft/insurance/IGetInsuranceCostRequestData"; -import { IInsureRequestData } from "../@types/eft/insurance/IInsureRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData"; +import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { InsuranceService } from "../services/InsuranceService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class InsuranceController { private logger; private randomUtil; diff --git a/TypeScript/1LogToConsole/types/controllers/InventoryController.d.ts b/TypeScript/1LogToConsole/types/controllers/InventoryController.d.ts index a29fd1a..4ff07b8 100644 --- a/TypeScript/1LogToConsole/types/controllers/InventoryController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/InventoryController.d.ts @@ -6,25 +6,25 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { PaymentHelper } from "../helpers/PaymentHelper"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IInventoryMoveRequestData } from "../@types/eft/inventory/IInventoryMoveRequestData"; -import { IInventoryRemoveRequestData } from "../@types/eft/inventory/IInventoryRemoveRequestData"; -import { IInventorySplitRequestData } from "../@types/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMergeRequestData } from "../@types/eft/inventory/IInventoryMergeRequestData"; -import { IInventoryTransferRequestData } from "../@types/eft/inventory/IInventoryTransferRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IInventorySwapRequestData } from "../@types/eft/inventory/IInventorySwapRequestData"; -import { IInventoryFoldRequestData } from "../@types/eft/inventory/IInventoryFoldRequestData"; -import { IInventoryToggleRequestData } from "../@types/eft/inventory/IInventoryToggleRequestData"; -import { IInventoryTagRequestData } from "../@types/eft/inventory/IInventoryTagRequestData"; -import { IInventoryBindRequestData } from "../@types/eft/inventory/IInventoryBindRequestData"; -import { IInventoryExamineRequestData } from "../@types/eft/inventory/IInventoryExamineRequestData"; -import { IInventoryReadEncyclopediaRequestData } from "../@types/eft/inventory/IInventoryReadEncyclopediaRequestData"; -import { IInventorySortRequestData } from "../@types/eft/inventory/IInventorySortRequestData"; -import { IInventoryCreateMarkerRequestData } from "../@types/eft/inventory/IInventoryCreateMarkerRequestData"; -import { IInventoryDeleteMarkerRequestData } from "../@types/eft/inventory/IInventoryDeleteMarkerRequestData"; -import { IInventoryEditMarkerRequestData } from "../@types/eft/inventory/IInventoryEditMarkerRequestData"; -import { ILogger } from "../@types/spt/utils/ILogger"; +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 { 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 { ILogger } from "../models/spt/utils/ILogger"; export declare class InventoryController { private logger; private hashUtil; diff --git a/TypeScript/1LogToConsole/types/controllers/LauncherController.d.ts b/TypeScript/1LogToConsole/types/controllers/LauncherController.d.ts index 687c295..d3d8e6a 100644 --- a/TypeScript/1LogToConsole/types/controllers/LauncherController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/LauncherController.d.ts @@ -2,11 +2,10 @@ import { HashUtil } from "../utils/HashUtil"; import { SaveServer } from "../servers/SaveServer"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { IRegisterData } from "../@types/eft/launcher/IRegisterData"; -import { ILoginRequestData } from "../@types/eft/launcher/ILoginRequestData"; -import { IChangeRequestData } from "../@types/eft/launcher/IChangeRequestData"; -import { Info } from "../@types/eft/profile/IAkiProfile"; -import { ICoreConfig } from "../@types/spt/config/ICoreConfig"; +import { IRegisterData } from "../models/eft/launcher/IRegisterData"; +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 { private hashUtil; @@ -14,7 +13,7 @@ export declare class LauncherController { private httpServerHelper; private databaseServer; private configServer; - coreConfig: ICoreConfig; + private coreConfig; constructor(hashUtil: HashUtil, saveServer: SaveServer, httpServerHelper: HttpServerHelper, databaseServer: DatabaseServer, configServer: ConfigServer); connect(): any; find(sessionIdKey: string): Info; diff --git a/TypeScript/1LogToConsole/types/controllers/LocationController.d.ts b/TypeScript/1LogToConsole/types/controllers/LocationController.d.ts index 64168b4..dde270c 100644 --- a/TypeScript/1LogToConsole/types/controllers/LocationController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/LocationController.d.ts @@ -1,10 +1,10 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { LocationGenerator } from "../generators/LocationGenerator"; -import { ILocationBase } from "../@types/eft/common/ILocationBase"; -import { ILocationsGenerateAllResponse } from "../@types/eft/common/ILocationsSourceDestinationBase"; +import { ILocationBase } from "../models/eft/common/ILocationBase"; +import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSourceDestinationBase"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class LocationController { private jsonUtil; private logger; diff --git a/TypeScript/1LogToConsole/types/controllers/MatchController.d.ts b/TypeScript/1LogToConsole/types/controllers/MatchController.d.ts index 6ab5759..229b884 100644 --- a/TypeScript/1LogToConsole/types/controllers/MatchController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/MatchController.d.ts @@ -1,11 +1,9 @@ import { TraderHelper } from "../helpers/TraderHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IEndOfflineRaidRequestData } from "../@types/eft/match/IEndOfflineRaidRequestData"; -import { IStartOfflineRaidRequestData } from "../@types/eft/match/IStartOffineRaidRequestData"; -import { IPmcData } from "../@types/eft/common/IPmcData"; +import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; +import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { ConfigServer } from "../servers/ConfigServer"; -import { IMatchConfig } from "../@types/spt/config/IMatchConfig"; -import { IInRaidConfig } from "../@types/spt/config/IInRaidConfig"; import { SaveServer } from "../servers/SaveServer"; import { MatchLocationService } from "../services/MatchLocationService"; export declare class MatchController { @@ -14,8 +12,8 @@ export declare class MatchController { private matchLocationService; private traderHelper; private configServer; - matchConfig: IMatchConfig; - inraidConfig: IInRaidConfig; + private matchConfig; + private inraidConfig; constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, configServer: ConfigServer); getEnabled(): boolean; getProfile(info: any): IPmcData[]; diff --git a/TypeScript/1LogToConsole/types/controllers/NoteController.d.ts b/TypeScript/1LogToConsole/types/controllers/NoteController.d.ts index bb02d23..ecd8001 100644 --- a/TypeScript/1LogToConsole/types/controllers/NoteController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/NoteController.d.ts @@ -1,6 +1,6 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { INoteActionData } from "../@types/eft/notes/INoteActionData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { private itemEventRouter; diff --git a/TypeScript/1LogToConsole/types/controllers/NotifierController.d.ts b/TypeScript/1LogToConsole/types/controllers/NotifierController.d.ts index 3366add..36fef66 100644 --- a/TypeScript/1LogToConsole/types/controllers/NotifierController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/NotifierController.d.ts @@ -1,6 +1,6 @@ import { NotifierHelper } from "../helpers/NotifierHelper"; import { NotificationService } from "../services/NotificationService"; -import { INotifierChannel } from "../@types/eft/notifier/INotifier"; +import { INotifierChannel } from "../models/eft/notifier/INotifier"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; export declare class NotifierController { private notifierHelper; diff --git a/TypeScript/1LogToConsole/types/controllers/PaymentController.d.ts b/TypeScript/1LogToConsole/types/controllers/PaymentController.d.ts deleted file mode 100644 index a9a4235..0000000 --- a/TypeScript/1LogToConsole/types/controllers/PaymentController.d.ts +++ /dev/null @@ -1,56 +0,0 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IProcessBuyTradeRequestData } from "../@types/eft/trade/IProcessBuyTradeRequestData"; -import { IProcessSellTradeRequestData } from "../@types/eft/trade/IProcessSellTradeRequestData"; -export declare class PaymentController { - /** - * Check whether tpl is Money - * @param {string} tpl - * @returns void - */ - static isMoneyTpl(tpl: string): boolean; - /** - * Gets currency TPL from TAG - * @param {string} currency - * @returns string - */ - static getCurrency(currency: string): string; - /** - * Gets currency TAG from TPL - * @param {string} currency - * @returns string - */ - static getCurrencyTag(currency: string): string; - /** - * Gets Currency to Ruble conversion Value - * @param {number} value - * @param {string} currencyFrom - * @returns number - */ - static inRUB(value: number, currencyFrom: string): number; - /** - * Gets Ruble to Currency conversion Value - * @param {number} value - * @param {string} currencyTo - * @returns number - */ - static fromRUB(value: number, currencyTo: string): number; - /** - * Take money and insert items into return to server request - * @param {Object} pmcData - * @param {Object} body - * @param {string} sessionID - * @returns Object - */ - static payMoney(pmcData: IPmcData, body: IProcessBuyTradeRequestData, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse; - /** - * Receive money back after selling - * @param {IPmcData} pmcData - * @param {number} amount - * @param {IProcessSellTradeRequestData} body - * @param {IItemEventRouterResponse} output - * @param {string} sessionID - * @returns IItemEventRouterResponse - */ - static getMoney(pmcData: IPmcData, amount: number, body: IProcessSellTradeRequestData, output: IItemEventRouterResponse, sessionID: string): IItemEventRouterResponse; -} diff --git a/TypeScript/1LogToConsole/types/controllers/PlayerController.d.ts b/TypeScript/1LogToConsole/types/controllers/PlayerController.d.ts deleted file mode 100644 index b33606d..0000000 --- a/TypeScript/1LogToConsole/types/controllers/PlayerController.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IPlayerIncrementSkillLevelRequestData } from "../@types/eft/player/IPlayerIncrementSkillLevelRequestData"; -export declare class PlayerController { - /** - * increases the profile skill and updates any output - * @param {Object} pmcData - * @param {Object} output - * @param {String} skillName - * @param {Number} amount - */ - static incrementSkillLevel(pmcData: IPmcData, output: IPlayerIncrementSkillLevelRequestData, skillName: string, amount: number): void; - /** - * @param {Object} pmcData - * @returns number - */ - static calculateLevel(pmcData: IPmcData): number; - /** - * @returns number - */ - static getRandomExperience(): number; - /** - * Made a 2d array table with 0 - free slot and 1 - used slot - * @param {Object} pmcData - * @param {string} sessionID - * @returns Array - */ - static getStashSlotMap(pmcData: IPmcData, sessionID: string): any[][]; -} diff --git a/TypeScript/1LogToConsole/types/controllers/PresetBuildController.d.ts b/TypeScript/1LogToConsole/types/controllers/PresetBuildController.d.ts index e0702f4..a15b181 100644 --- a/TypeScript/1LogToConsole/types/controllers/PresetBuildController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/PresetBuildController.d.ts @@ -1,9 +1,9 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { SaveServer } from "../servers/SaveServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IPresetBuildActionRequestData } from "../@types/eft/presetBuild/IPresetBuildActionRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { WeaponBuild } from "../@types/eft/profile/IAkiProfile"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IPresetBuildActionRequestData } from "../models/eft/presetBuild/IPresetBuildActionRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { WeaponBuild } from "../models/eft/profile/IAkiProfile"; import { HashUtil } from "../utils/HashUtil"; import { ItemEventRouter } from "../routers/ItemEventRouter"; export declare class PresetBuildController { diff --git a/TypeScript/1LogToConsole/types/controllers/ProfileController.d.ts b/TypeScript/1LogToConsole/types/controllers/ProfileController.d.ts index 938a866..46b66d8 100644 --- a/TypeScript/1LogToConsole/types/controllers/ProfileController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/ProfileController.d.ts @@ -1,18 +1,18 @@ import { SaveServer } from "../servers/SaveServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "../helpers/ItemHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; import { TraderHelper } from "../helpers/TraderHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IProfileChangeNicknameRequestData } from "../@types/eft/profile/IProfileChangeNicknameRequestData"; -import { IProfileChangeVoiceRequestData } from "../@types/eft/profile/IProfileChangeVoiceRequestData"; -import { IProfileCreateRequestData } from "../@types/eft/profile/IProfileCreateRequestData"; -import { IValidateNicknameRequestData } from "../@types/eft/profile/IValidateNicknameRequestData"; -import { ISearchFriendRequestData } from "../@types/eft/profile/ISearchFriendRequestData"; -import { ISearchFriendResponse } from "../@types/eft/profile/ISearchFriendResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +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 { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; -import { IMiniProfile } from "../@types/eft/launcher/IMiniProfile"; +import { IMiniProfile } from "../models/eft/launcher/IMiniProfile"; +import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; export declare class ProfileController { private hashUtil; private timeUtil; @@ -20,8 +20,8 @@ export declare class ProfileController { private databaseServer; private itemHelper; private traderHelper; - private profileHelper; - constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, traderHelper: TraderHelper, profileHelper: ProfileHelper); + private extendedProfileHelper; + constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, traderHelper: TraderHelper, extendedProfileHelper: ExtendedProfileHelper); getMiniProfiles(): IMiniProfile[]; getMiniProfile(sessionID: string): any; getCompleteProfile(sessionID: string): IPmcData[]; diff --git a/TypeScript/1LogToConsole/types/controllers/QuestController.d.ts b/TypeScript/1LogToConsole/types/controllers/QuestController.d.ts index bb89a3b..a964c32 100644 --- a/TypeScript/1LogToConsole/types/controllers/QuestController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/QuestController.d.ts @@ -8,13 +8,13 @@ import { QuestConditionHelper } from "../helpers/QuestConditionHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; import { PlayerService } from "../services/PlayerService"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IQuest } from "../@types/eft/common/tables/IQuest"; -import { IAcceptQuestRequestData } from "../@types/eft/quests/IAcceptQuestRequestData"; -import { ICompleteQuestRequestData } from "../@types/eft/quests/ICompleteQuestRequestData"; -import { IHandoverQuestRequestData } from "../@types/eft/quests/IHandoverQuestRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IQuest } from "../models/eft/common/tables/IQuest"; +import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; +import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; +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 { private logger; private timeUtil; diff --git a/TypeScript/1LogToConsole/types/controllers/RagfairController.d.ts b/TypeScript/1LogToConsole/types/controllers/RagfairController.d.ts index 0b6757e..6e71edd 100644 --- a/TypeScript/1LogToConsole/types/controllers/RagfairController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/RagfairController.d.ts @@ -1,5 +1,5 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { RagfairServer } from "../servers/RagfairServer"; import { SaveServer } from "../servers/SaveServer"; @@ -14,24 +14,24 @@ import { PaymentHelper } from "../helpers/PaymentHelper"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { RagfairHelper } from "../helpers/RagfairHelper"; import { RagfairSellHelper } from "../helpers/RagfairSellHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IAddOfferRequestData, Requirement } from "../@types/eft/ragfair/IAddOfferRequestData"; -import { IExtendOfferRequestData } from "../@types/eft/ragfair/IExtendOfferRequestData"; -import { IGetMarketPriceRequestData } from "../@types/eft/ragfair/IGetMarketPriceRequestData"; -import { ISearchRequestData } from "../@types/eft/ragfair/ISearchRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { IGetItemPriceResult } from "../@types/eft/ragfair/IGetItemPriceResult"; -import { IGetOffersResult } from "../@types/eft/ragfair/IGetOffersResult"; +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 "../@types/eft/profile/IAkiProfile"; -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; import { RagfairSortHelper } from "../helpers/RagfairSortHelper"; import { RagfairTaxHelper } from "../helpers/RagfairTaxHelper"; import { RagfairOfferHelper } from "../helpers/RagfairOfferHelper"; import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairController { private logger; private timeUtil; @@ -57,7 +57,7 @@ export declare class RagfairController { private ragfairOfferGenerator; private configServer; private ragfairConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, httpResponse: HttpResponse, itemEventRouter: ItemEventRouter, ragfairServer: RagfairServer, ragfairPriceService: RagfairPriceService, databaseServer: DatabaseServer, itemHelper: ItemHelper, saveServer: SaveServer, ragfairSellHelper: RagfairSellHelper, ragfairTaxHelper: RagfairTaxHelper, ragfairSortHelper: RagfairSortHelper, ragfairOfferHelper: RagfairOfferHelper, profileHelper: ProfileHelper, paymentService: PaymentService, handbookHelper: HandbookHelper, paymentHelper: PaymentHelper, inventoryHelper: InventoryHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, ragfairOfferGenerator: RagfairOfferGenerator, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter, ragfairServer: RagfairServer, ragfairPriceService: RagfairPriceService, databaseServer: DatabaseServer, itemHelper: ItemHelper, saveServer: SaveServer, ragfairSellHelper: RagfairSellHelper, ragfairTaxHelper: RagfairTaxHelper, ragfairSortHelper: RagfairSortHelper, ragfairOfferHelper: RagfairOfferHelper, profileHelper: ProfileHelper, paymentService: PaymentService, handbookHelper: HandbookHelper, paymentHelper: PaymentHelper, inventoryHelper: InventoryHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, ragfairOfferGenerator: RagfairOfferGenerator, configServer: ConfigServer); getOffers(sessionID: string, info: ISearchRequestData): IGetOffersResult; update(): void; getItemPrice(info: IGetMarketPriceRequestData): IGetItemPriceResult; diff --git a/TypeScript/1LogToConsole/types/controllers/RepairController.d.ts b/TypeScript/1LogToConsole/types/controllers/RepairController.d.ts index 86ab1e1..3a9f3a2 100644 --- a/TypeScript/1LogToConsole/types/controllers/RepairController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/RepairController.d.ts @@ -2,15 +2,14 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { QuestHelper } from "../helpers/QuestHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { PaymentService } from "../services/PaymentService"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IRepairActionDataRequest } from "../@types/eft/repair/IRepairActionDataRequest"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { ITraderRepairActionDataRequest } from "../@types/eft/repair/ITraderRepairActionDataRequest"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepairActionDataRequest"; import { ConfigServer } from "../servers/ConfigServer"; -import { IRepairConfig } from "../@types/spt/config/IRepairConfig"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { RepairHelper } from "../helpers/RepairHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RepairController { private logger; private itemEventRouter; @@ -20,7 +19,7 @@ export declare class RepairController { private paymentService; private repairHelper; private configServer; - repairConfig: IRepairConfig; + private repairConfig; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, questHelper: QuestHelper, traderHelper: TraderHelper, paymentService: PaymentService, repairHelper: RepairHelper, configServer: ConfigServer); /** * Repair with trader diff --git a/TypeScript/1LogToConsole/types/controllers/RepeatableQuestController.d.ts b/TypeScript/1LogToConsole/types/controllers/RepeatableQuestController.d.ts index 23d56e5..d2de5df 100644 --- a/TypeScript/1LogToConsole/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/RepeatableQuestController.d.ts @@ -5,20 +5,20 @@ import { JsonUtil } from "../utils/JsonUtil"; import { MathUtil } from "../utils/MathUtil"; import { ItemHelper } from "../helpers/ItemHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IPmcData, TraderInfo } from "../@types/eft/common/IPmcData"; -import { IRepeatableQuestConfig, ELocationName, IQuestConfig } from "../@types/spt/config/IQuestConfig"; -import { IExploration, IRepeatableQuest, IReward, IRewards, IExplorationCondition, ICompletionAvailableFor, IEliminationCondition, ICompletion, IElimination, IPmcDataRepeatableQuest } from "../@types/eft/common/tables/IRepeatableQuests"; -import { Exit } from "../@types/eft/common/ILocationBase"; -import { IRepeatableQuestChangeRequest } from "../@types/eft/quests/IRepeatableQuestChangeRequest"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export interface IQuestTypePool { types: string[]; pool: IQuestPool; @@ -61,7 +61,7 @@ export declare class RepeatableQuestController { private paymentService; private objectId; private configServer; - questConfig: IQuestConfig; + private questConfig; constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, itemEventRouter: ItemEventRouter, paymentService: PaymentService, objectId: ObjectId, configServer: ConfigServer); /** * This is the method reached by the /client/repeatalbeQuests/activityPeriods endpoint diff --git a/TypeScript/1LogToConsole/types/controllers/TradeController.d.ts b/TypeScript/1LogToConsole/types/controllers/TradeController.d.ts index 916ed9c..f0a177b 100644 --- a/TypeScript/1LogToConsole/types/controllers/TradeController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/TradeController.d.ts @@ -1,13 +1,13 @@ import { RagfairServer } from "../servers/RagfairServer"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { TradeHelper } from "../helpers/TradeHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IProcessRagfairTradeRequestData } from "../@types/eft/trade/IProcessRagfairTradeRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { Upd } from "../@types/eft/common/tables/IItem"; -import { IProcessBaseTradeRequestData } from "../@types/eft/trade/IProcessBaseTradeRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { Upd } from "../models/eft/common/tables/IItem"; +import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; declare class TradeController { private logger; private itemEventRouter; diff --git a/TypeScript/1LogToConsole/types/controllers/TraderController.d.ts b/TypeScript/1LogToConsole/types/controllers/TraderController.d.ts index e125cf1..5cd85c9 100644 --- a/TypeScript/1LogToConsole/types/controllers/TraderController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/TraderController.d.ts @@ -2,12 +2,11 @@ import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { DatabaseServer } from "../servers/DatabaseServer"; import { TraderAssortService } from "../services/TraderAssortService"; -import { IBarterScheme, ITraderAssort, ITraderBase } from "../@types/eft/common/tables/ITrader"; +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 { ITraderConfig } from "../@types/spt/config/ITraderConfig"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; import { TraderAssortHelper } from "../helpers/TraderAssortHelper"; export declare class TraderController { private logger; @@ -19,7 +18,7 @@ export declare class TraderController { private traderAssortService; private jsonUtil; private configServer; - traderConfig: ITraderConfig; + private traderConfig; constructor(logger: ILogger, databaseServer: DatabaseServer, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, timeUtil: TimeUtil, traderAssortService: TraderAssortService, jsonUtil: JsonUtil, configServer: ConfigServer); load(): void; getTrader(traderID: string, sessionID: string): ITraderBase; diff --git a/TypeScript/1LogToConsole/types/controllers/WeatherController.d.ts b/TypeScript/1LogToConsole/types/controllers/WeatherController.d.ts index 2d17179..4f8bcf1 100644 --- a/TypeScript/1LogToConsole/types/controllers/WeatherController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/WeatherController.d.ts @@ -1,11 +1,10 @@ import { ConfigServer } from "../servers/ConfigServer"; -import { IWeatherConfig } from "../@types/spt/config/IWeatherConfig"; import { WeatherGenerator } from "../generators/WeatherGenerator"; -import { IWeatherData } from "../@types/eft/weather/IWeatherData"; +import { IWeatherData } from "../models/eft/weather/IWeatherData"; export declare class WeatherController { private weatherGenerator; private configServer; - weatherConfig: IWeatherConfig; + private weatherConfig; constructor(weatherGenerator: WeatherGenerator, configServer: ConfigServer); generate(): IWeatherData; } diff --git a/TypeScript/1LogToConsole/types/controllers/WishlistController.d.ts b/TypeScript/1LogToConsole/types/controllers/WishlistController.d.ts index c935452..5ef8df3 100644 --- a/TypeScript/1LogToConsole/types/controllers/WishlistController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/WishlistController.d.ts @@ -1,7 +1,7 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IWishlistActionData } from "../@types/eft/wishlist/IWishlistActionData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { private itemEvenRouter; constructor(itemEvenRouter: ItemEventRouter); diff --git a/TypeScript/1LogToConsole/types/di/Container.d.ts b/TypeScript/1LogToConsole/types/di/Container.d.ts index bd40dbd..b67523f 100644 --- a/TypeScript/1LogToConsole/types/di/Container.d.ts +++ b/TypeScript/1LogToConsole/types/di/Container.d.ts @@ -1,7 +1,6 @@ import { DependencyContainer } from "tsyringe"; export declare class Container { static registerTypes(depContainer: DependencyContainer): void; - static registerServerSpecificClasses(depContainer: DependencyContainer): void; private static registerUtils; private static registerRouters; private static registerGenerators; diff --git a/TypeScript/1LogToConsole/types/di/Router.d.ts b/TypeScript/1LogToConsole/types/di/Router.d.ts index d27ac97..ac48587 100644 --- a/TypeScript/1LogToConsole/types/di/Router.d.ts +++ b/TypeScript/1LogToConsole/types/di/Router.d.ts @@ -1,5 +1,6 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IAkiProfile } from "../@types/eft/profile/IAkiProfile"; +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 { private handledRoutes; constructor(); @@ -17,7 +18,7 @@ export declare class DynamicRouter extends Router { } export declare class ItemEventRouterDefinition extends Router { constructor(); - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } export declare class SaveLoadRouter extends Router { constructor(); diff --git a/TypeScript/1LogToConsole/types/di/Serializer.d.ts b/TypeScript/1LogToConsole/types/di/Serializer.d.ts index 076407d..70aa7c5 100644 --- a/TypeScript/1LogToConsole/types/di/Serializer.d.ts +++ b/TypeScript/1LogToConsole/types/di/Serializer.d.ts @@ -1,4 +1,4 @@ -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class Serializer { serialize(sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; canHandle(something: string): boolean; diff --git a/TypeScript/1LogToConsole/types/generators/BotEquipmentGenerator.d.ts b/TypeScript/1LogToConsole/types/generators/BotEquipmentGenerator.d.ts deleted file mode 100644 index 2cc98b8..0000000 --- a/TypeScript/1LogToConsole/types/generators/BotEquipmentGenerator.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; -import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData"; -import { Chances, Mods } from "../@types/eft/common/tables/IBotType"; -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { HashUtil } from "../utils/HashUtil"; -import { Logger } from "../utils/Logger"; -import { RandomUtil } from "../utils/RandomUtil"; -import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -export declare class BotEquipmentGenerator { - private logger; - private hashUtil; - private randomUtil; - private databaseServer; - private botGeneratorHelper; - private weightedRandomHelper; - constructor(logger: Logger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, botGeneratorHelper: BotGeneratorHelper, weightedRandomHelper: WeightedRandomHelper); - generateEquipment(equipmentSlot: string, equipmentPool: Record, modPool: Mods, spawnChances: Chances, botRole: string, inventory: PmcInventory): void; -} diff --git a/TypeScript/1LogToConsole/types/generators/BotGenerator.d.ts b/TypeScript/1LogToConsole/types/generators/BotGenerator.d.ts index 4a1b8a3..af7d7d4 100644 --- a/TypeScript/1LogToConsole/types/generators/BotGenerator.d.ts +++ b/TypeScript/1LogToConsole/types/generators/BotGenerator.d.ts @@ -1,20 +1,14 @@ import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; -import { IGenerateBotsRequestData } from "../@types/eft/bot/IGenerateBotsRequestData"; -import { IBotBase } from "../@types/eft/common/tables/IBotBase"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; +import { IBotBase } from "../models/eft/common/tables/IBotBase"; import { DatabaseServer } from "../servers/DatabaseServer"; import { JsonUtil } from "../utils/JsonUtil"; import { ConfigServer } from "../servers/ConfigServer"; import { GameEventHelper } from "../helpers/GameEventHelper"; import { BotInventoryGenerator } from "./BotInventoryGenerator"; import { BotHelper } from "../helpers/BotHelper"; -declare namespace BotGenerator { - interface IRandomisedBotLevelResult { - level: number; - exp: number; - } -} export declare class BotGenerator { private logger; private hashUtil; @@ -28,8 +22,8 @@ export declare class BotGenerator { private botConfig; constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; - generateBot(bot: IBotBase, role: string, isPmc: boolean): IBotBase; - generateRandomLevel(min: number, max: number): BotGenerator.IRandomisedBotLevelResult; + private generateBot; + private generateRandomLevel; /** Converts health object to the required format */ private generateHealth; private generateSkills; @@ -40,4 +34,3 @@ export declare class BotGenerator { private getPMCDifficulty; private generateDogtag; } -export {}; diff --git a/TypeScript/1LogToConsole/types/generators/BotInventoryGenerator.d.ts b/TypeScript/1LogToConsole/types/generators/BotInventoryGenerator.d.ts index c151b83..e9f09de 100644 --- a/TypeScript/1LogToConsole/types/generators/BotInventoryGenerator.d.ts +++ b/TypeScript/1LogToConsole/types/generators/BotInventoryGenerator.d.ts @@ -1,11 +1,11 @@ -import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData"; -import { Inventory, Chances, Generation, Mods } from "../@types/eft/common/tables/IBotType"; +import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { Inventory, Chances, Generation } from "../models/eft/common/tables/IBotType"; import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; import { BotWeaponGenerator } from "./BotWeaponGenerator"; import { BotLootGenerator } from "./BotLootGenerator"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; export declare class BotInventoryGenerator { @@ -20,6 +20,6 @@ export declare class BotInventoryGenerator { 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; - generateEquipment(equipmentSlot: string, equipmentPool: Record, modPool: Mods, spawnChances: Chances, botRole: string, inventory: PmcInventory): void; + private generateEquipment; private generateInventoryBase; } diff --git a/TypeScript/1LogToConsole/types/generators/BotLootGenerator.d.ts b/TypeScript/1LogToConsole/types/generators/BotLootGenerator.d.ts index 0ec991e..3bf1b36 100644 --- a/TypeScript/1LogToConsole/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/1LogToConsole/types/generators/BotLootGenerator.d.ts @@ -1,17 +1,14 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; -import { IBotConfig } from "../@types/spt/config/IBotConfig"; import { HandbookHelper } from "../helpers/HandbookHelper"; import { PMCLootGenerator } from "../generators/PMCLootGenerator"; -import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData"; -import { ItemMinMax, Items } from "../@types/eft/common/tables/IBotType"; +import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { ItemMinMax, Items } from "../models/eft/common/tables/IBotType"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; export declare class BotLootGenerator { - private logger; private jsonUtil; private hashUtil; private randomUtil; @@ -20,8 +17,8 @@ export declare class BotLootGenerator { private botGeneratorHelper; private pmcLootGenerator; private configServer; - botConfig: IBotConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, pmcLootGenerator: PMCLootGenerator, configServer: ConfigServer); + private botConfig; + constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, pmcLootGenerator: PMCLootGenerator, configServer: ConfigServer); generateLoot(lootPool: Items, itemCounts: ItemMinMax, isPmc: boolean, inventory: PmcInventory): void; private getRandomisedCount; private addLootFromPool; diff --git a/TypeScript/1LogToConsole/types/generators/BotWeaponGenerator.d.ts b/TypeScript/1LogToConsole/types/generators/BotWeaponGenerator.d.ts index 8eb643c..3e9d59c 100644 --- a/TypeScript/1LogToConsole/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/1LogToConsole/types/generators/BotWeaponGenerator.d.ts @@ -1,11 +1,12 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "../helpers/ItemHelper"; -import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData"; -import { MinMax, ModsChances, Mods } from "../@types/eft/common/tables/IBotType"; +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 { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { RandomUtil } from "../utils/RandomUtil"; export declare class BotWeaponGenerator { private logger; private hashUtil; @@ -13,7 +14,8 @@ export declare class BotWeaponGenerator { private itemHelper; private weightedRandomHelper; private botGeneratorHelper; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper); + private randomUtil; + constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil); generateWeapon(equipmentSlot: string, weaponPool: Record, modPool: Mods, modChances: ModsChances, magCounts: MinMax, botRole: string, isPmc: boolean, inventory: PmcInventory): void; /** Checks if all required slots are occupied on a weapon and all it's mods */ private isWeaponValid; diff --git a/TypeScript/1LogToConsole/types/generators/LocationGenerator.d.ts b/TypeScript/1LogToConsole/types/generators/LocationGenerator.d.ts index c37814f..b7ba7c5 100644 --- a/TypeScript/1LogToConsole/types/generators/LocationGenerator.d.ts +++ b/TypeScript/1LogToConsole/types/generators/LocationGenerator.d.ts @@ -1,18 +1,17 @@ import { RandomUtil } from "../utils/RandomUtil"; -import { IStaticContainerProps, IStaticLootDetails, IStaticAmmoDetails, IStaticForcedProps } from "../@types/eft/common/tables/ILootBase"; -import { ILooseLoot, SpawnpointTemplate } from "../@types/eft/common/ILooseLoot"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { IStaticContainerProps, IStaticLootDetails, IStaticAmmoDetails, IStaticForcedProps } from "../models/eft/common/tables/ILootBase"; +import { ILooseLoot, SpawnpointTemplate } from "../models/eft/common/ILooseLoot"; +import { Item } from "../models/eft/common/tables/IItem"; import { ItemHelper } from "../helpers/ItemHelper"; import { GameEventHelper } from "../helpers/GameEventHelper"; import { ContainerHelper } from "../helpers/ContainerHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILocationConfig } from "../@types/spt/config/ILocationConfig"; import { JsonUtil } from "../utils/JsonUtil"; import { MathUtil } from "../utils/MathUtil"; import { ObjectId } from "../utils/ObjectId"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export interface IContainerItem { items: Item[]; width: number; @@ -30,7 +29,7 @@ export declare class LocationGenerator { private containerHelper; private presetHelper; private configServer; - locationConfig: ILocationConfig; + private locationConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, objectId: ObjectId, randomUtil: RandomUtil, ragfairServerHelper: RagfairServerHelper, itemHelper: ItemHelper, mathUtil: MathUtil, gameEventHelper: GameEventHelper, containerHelper: ContainerHelper, presetHelper: PresetHelper, configServer: ConfigServer); generateContainerLoot(containerIn: IStaticContainerProps, staticForced: IStaticForcedProps[], staticLootDist: Record, staticAmmoDist: Record, locationName: string): IStaticContainerProps; private getLooseLootMultiplerForLocation; diff --git a/TypeScript/1LogToConsole/types/generators/PMCLootGenerator.d.ts b/TypeScript/1LogToConsole/types/generators/PMCLootGenerator.d.ts index 1ac7ffe..601431b 100644 --- a/TypeScript/1LogToConsole/types/generators/PMCLootGenerator.d.ts +++ b/TypeScript/1LogToConsole/types/generators/PMCLootGenerator.d.ts @@ -1,14 +1,13 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; -import { IBotConfig } from "../@types/spt/config/IBotConfig"; export declare class PMCLootGenerator { private itemHelper; private databaseServer; private configServer; private pocketLootPool; private backpackLootPool; - botConfig: IBotConfig; + private botConfig; constructor(itemHelper: ItemHelper, databaseServer: DatabaseServer, configServer: ConfigServer); generatePMCPocketLootPool(): string[]; generatePMCBackpackLootPool(): string[]; diff --git a/TypeScript/1LogToConsole/types/generators/RagfairAssortGenerator.d.ts b/TypeScript/1LogToConsole/types/generators/RagfairAssortGenerator.d.ts index dcdb057..8b52a90 100644 --- a/TypeScript/1LogToConsole/types/generators/RagfairAssortGenerator.d.ts +++ b/TypeScript/1LogToConsole/types/generators/RagfairAssortGenerator.d.ts @@ -1,4 +1,4 @@ -import { Item } from "../@types/eft/common/tables/IItem"; +import { Item } from "../models/eft/common/tables/IItem"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "../helpers/ItemHelper"; import { HashUtil } from "../utils/HashUtil"; diff --git a/TypeScript/1LogToConsole/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/1LogToConsole/types/generators/RagfairOfferGenerator.d.ts index d28d3af..cb2566c 100644 --- a/TypeScript/1LogToConsole/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/1LogToConsole/types/generators/RagfairOfferGenerator.d.ts @@ -2,9 +2,9 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; import { SaveServer } from "../servers/SaveServer"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; -import { IBarterScheme } from "../@types/eft/common/tables/ITrader"; -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { IBarterScheme } from "../models/eft/common/tables/ITrader"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { Item } from "../models/eft/common/tables/IItem"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; @@ -15,7 +15,7 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { RagfairPriceService } from "../services/RagfairPriceService"; import { FenceService } from "../services/FenceService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairOfferGenerator { private logger; private jsonUtil; diff --git a/TypeScript/1LogToConsole/types/generators/WeatherGenerator.d.ts b/TypeScript/1LogToConsole/types/generators/WeatherGenerator.d.ts index 5c340e2..b9faa3a 100644 --- a/TypeScript/1LogToConsole/types/generators/WeatherGenerator.d.ts +++ b/TypeScript/1LogToConsole/types/generators/WeatherGenerator.d.ts @@ -1,7 +1,6 @@ import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; import { ConfigServer } from "../servers/ConfigServer"; -import { IWeatherData } from "../@types/eft/weather/IWeatherData"; -import { IWeatherConfig } from "../@types/spt/config/IWeatherConfig"; +import { IWeatherData } from "../models/eft/weather/IWeatherData"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class WeatherGenerator { @@ -9,7 +8,7 @@ export declare class WeatherGenerator { private randomUtil; private timeUtil; private configServer; - weatherConfig: IWeatherConfig; + private weatherConfig; constructor(weightedRandomHelper: WeightedRandomHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer); calculateTime(data: IWeatherData): IWeatherData; generateWeather(data: IWeatherData): IWeatherData; diff --git a/TypeScript/1LogToConsole/types/helpers/AssortHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/AssortHelper.d.ts index 95b7bf2..33cb5c6 100644 --- a/TypeScript/1LogToConsole/types/helpers/AssortHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/AssortHelper.d.ts @@ -1,6 +1,6 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "./ItemHelper"; import { QuestHelper } from "./QuestHelper"; diff --git a/TypeScript/1LogToConsole/types/helpers/BotGeneratorHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/BotGeneratorHelper.d.ts index 83f7068..c3cf4d3 100644 --- a/TypeScript/1LogToConsole/types/helpers/BotGeneratorHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/BotGeneratorHelper.d.ts @@ -1,10 +1,9 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; -import { IBotConfig } from "../@types/spt/config/IBotConfig"; -import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData"; -import { ModsChances, Mods } from "../@types/eft/common/tables/IBotType"; -import { Item, Upd } from "../@types/eft/common/tables/IItem"; -import { ITemplateItem } from "../@types/eft/common/tables/ITemplateItem"; +import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { ModsChances, Mods } 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 { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; @@ -12,7 +11,7 @@ import { RandomUtil } from "../utils/RandomUtil"; import { InventoryHelper } from "./InventoryHelper"; import { ContainerHelper } from "./ContainerHelper"; import { ItemHelper } from "./ItemHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; declare class BotGeneratorHelper { private logger; private jsonUtil; @@ -24,7 +23,7 @@ declare class BotGeneratorHelper { private inventoryHelper; private containerHelper; private configServer; - botConfig: IBotConfig; + private botConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer); generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances, isPmc?: boolean): Item[]; /** @@ -44,7 +43,6 @@ declare class BotGeneratorHelper { }; private getModTplFromItemDb; isItemIncompatibleWithCurrentItems(items: Item[], tplToCheck: string, equipmentSlot: string): boolean; - getBiasedRandomNumber(min: number, max: number, shift: number, n: number): number; /** Adds an item with all its childern into specified equipmentSlots, wherever it fits. * Returns a `boolean` indicating success. */ addItemWithChildrenToEquipmentSlot(equipmentSlots: string[], parentId: string, parentTpl: string, itemWithChildren: Item[], inventory: PmcInventory): boolean; diff --git a/TypeScript/1LogToConsole/types/helpers/BotHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/BotHelper.d.ts index 231e114..032218b 100644 --- a/TypeScript/1LogToConsole/types/helpers/BotHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/BotHelper.d.ts @@ -1,9 +1,9 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { Difficulty } from "../@types/eft/common/tables/IBotType"; +import { Difficulty } from "../models/eft/common/tables/IBotType"; import { ConfigServer } from "../servers/ConfigServer"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class BotHelper { private logger; private jsonUtil; diff --git a/TypeScript/1LogToConsole/types/helpers/DialogueHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/DialogueHelper.d.ts index abe13de..d8082e4 100644 --- a/TypeScript/1LogToConsole/types/helpers/DialogueHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/DialogueHelper.d.ts @@ -1,7 +1,7 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { ItemHelper } from "./ItemHelper"; -import { Dialogue, MessageContent, MessagePreview, MessageType } from "../@types/eft/profile/IAkiProfile"; +import { Dialogue, MessageContent, MessagePreview, MessageType } from "../models/eft/profile/IAkiProfile"; import { HashUtil } from "../utils/HashUtil"; import { NotifierHelper } from "./NotifierHelper"; import { NotificationSendHelper } from "./NotificationSendHelper"; diff --git a/TypeScript/1LogToConsole/types/helpers/DurabilityLimitsHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/DurabilityLimitsHelper.d.ts index 70f545b..ee8c887 100644 --- a/TypeScript/1LogToConsole/types/helpers/DurabilityLimitsHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/DurabilityLimitsHelper.d.ts @@ -1,13 +1,12 @@ import { ConfigServer } from "../servers/ConfigServer"; -import { IBotConfig } from "../@types/spt/config/IBotConfig"; -import { ITemplateItem } from "../@types/eft/common/tables/ITemplateItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { RandomUtil } from "../utils/RandomUtil"; import { BotHelper } from "./BotHelper"; export declare class DurabilityLimitsHelper { private randomUtil; private botHelper; private configServer; - botConfig: IBotConfig; + private botConfig; constructor(randomUtil: RandomUtil, botHelper: BotHelper, configServer: ConfigServer); getRandomisedMaxWeaponDurability(itemTemplate: ITemplateItem, botRole: string): number; getRandomisedMaxArmorDurability(itemTemplate: ITemplateItem, botRole: string): number; diff --git a/TypeScript/1LogToConsole/types/helpers/ExtendedProfileHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/ExtendedProfileHelper.d.ts new file mode 100644 index 0000000..22ead31 --- /dev/null +++ b/TypeScript/1LogToConsole/types/helpers/ExtendedProfileHelper.d.ts @@ -0,0 +1,22 @@ +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 { 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); + generatePlayerScav(sessionID: string): IPmcData; + private getScavSkills; + private removeSecureContainer; + private getDefaultScavSkills; + private getScavStats; + private getScavLevel; + private getScavExperience; + private setScavCooldownTimer; +} diff --git a/TypeScript/1LogToConsole/types/helpers/HealthHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/HealthHelper.d.ts index 6cbbe45..fb5bed7 100644 --- a/TypeScript/1LogToConsole/types/helpers/HealthHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/HealthHelper.d.ts @@ -1,19 +1,18 @@ import { SaveServer } from "../servers/SaveServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IAkiProfile } from "../@types/eft/profile/IAkiProfile"; -import { ISyncHealthRequestData } from "../@types/eft/health/ISyncHealthRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; import { ConfigServer } from "../servers/ConfigServer"; -import { IHealthConfig } from "../@types/spt/config/IHealthConfig"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class HealthHelper { private jsonUtil; private logger; private timeUtil; private saveServer; private configServer; - healthConfig: IHealthConfig; + private healthConfig; constructor(jsonUtil: JsonUtil, logger: ILogger, timeUtil: TimeUtil, saveServer: SaveServer, configServer: ConfigServer); resetVitality(sessionID: string): IAkiProfile; saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string): void; diff --git a/TypeScript/1LogToConsole/types/helpers/HideoutHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/HideoutHelper.d.ts index 08f30e6..d60e370 100644 --- a/TypeScript/1LogToConsole/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/HideoutHelper.d.ts @@ -1,21 +1,21 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { IPmcData, Production, Productive } from "../@types/eft/common/IPmcData"; -import { IHideoutSingleProductionStartRequestData } from "../@types/eft/hideout/IHideoutSingleProductionStartRequestData"; -import { StageBonus } from "../@types/eft/hideout/IHideoutArea"; +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 "../@types/eft/hideout/IHideoutContinousProductionStartRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { PlayerService } from "../services/PlayerService"; -import { IHideoutTakeProductionRequestData } from "../@types/eft/hideout/IHideoutTakeProductionRequestData"; +import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; import { InventoryHelper } from "./InventoryHelper"; -import { ITemplateItem } from "../@types/eft/common/tables/ITemplateItem"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class HideoutHelper { private logger; private hashUtil; @@ -29,15 +29,15 @@ export declare class HideoutHelper { private playerService; private configServer; static BITCOIN_FARM: string; - static WATER_COLLECTOR: string; - static BITCOIN: string; - static EXPEDITIONARY_FUEL_TANK: string; + private WATER_COLLECTOR; + private BITCOIN; + private EXPEDITIONARY_FUEL_TANK; static NAME_BACKENDCOUNTERS_CRAFTING: string; static SKILL_NAME_HIDEOUT: string; static HOUR_FOR_SKILL_CRAFTING: number; static SKILL_NAME_CRAFITING: string; private hideoutConfig; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, itemEventRouter: ItemEventRouter, httpResponse: HttpResponse, profileHelper: ProfileHelper, inventoryHelper: InventoryHelper, playerService: PlayerService, configServer: ConfigServer); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, inventoryHelper: InventoryHelper, playerService: PlayerService, configServer: ConfigServer); registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; /** * This convinience function intialies new Production Object diff --git a/TypeScript/1LogToConsole/types/helpers/InRaidHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/InRaidHelper.d.ts index 24e5f54..e79d384 100644 --- a/TypeScript/1LogToConsole/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/InRaidHelper.d.ts @@ -1,7 +1,7 @@ -import { IPmcData, Victim } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { IPmcData, Victim } 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 { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { JsonUtil } from "../utils/JsonUtil"; diff --git a/TypeScript/1LogToConsole/types/helpers/InsuranceHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/InsuranceHelper.d.ts deleted file mode 100644 index 0bfa37b..0000000 --- a/TypeScript/1LogToConsole/types/helpers/InsuranceHelper.d.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData"; -import { IInsuranceConfig } from "../@types/spt/config/IInsuranceConfig"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { InsuranceService } from "../services/InsuranceService"; -import { Logger } from "../utils/Logger"; -import { RandomUtil } from "../utils/RandomUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { DialogueHelper } from "./DialogueHelper"; -import { InventoryHelper } from "./InventoryHelper"; -import { TraderHelper } from "./TraderHelper"; -export declare class InsuranceHelper { - private logger; - private insuranceService; - private inventoryHelper; - private randomUtil; - private timeUtil; - private saveServer; - private databaseServer; - private traderHelper; - private dialogueHelper; - private configServer; - insuranceConfig: IInsuranceConfig; - constructor(logger: Logger, insuranceService: InsuranceService, inventoryHelper: InventoryHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, configServer: ConfigServer); - storeLostGear(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; - addGearToSend(pmcData: IPmcData, insuredItem: any, actualItem: any, sessionID: string): any; - storeInsuredItemsForReturn(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; - sendInsuredItems(pmcData: IPmcData, sessionID: string): void; - getPremium(pmcData: IPmcData, inventoryItem: Item, traderId: string): number; -} diff --git a/TypeScript/1LogToConsole/types/helpers/InventoryHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/InventoryHelper.d.ts index 5d17048..4b3460c 100644 --- a/TypeScript/1LogToConsole/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/InventoryHelper.d.ts @@ -1,6 +1,6 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { FenceService } from "../services/FenceService"; @@ -10,12 +10,12 @@ import { PaymentHelper } from "./PaymentHelper"; import { ProfileHelper } from "./ProfileHelper"; import { DialogueHelper } from "./DialogueHelper"; import { HashUtil } from "../utils/HashUtil"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; -import { IInventoryMoveRequestData } from "../@types/eft/inventory/IInventoryMoveRequestData"; -import { IInventorySplitRequestData } from "../@types/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMergeRequestData } from "../@types/eft/inventory/IInventoryMergeRequestData"; -import { ILogger } from "../@types/spt/utils/ILogger"; +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 { TraderAssortHelper } from "./TraderAssortHelper"; export interface OwnerInventoryItems { from: Item[]; @@ -38,19 +38,12 @@ export declare class InventoryHelper { private profileHelper; private configServer; private inventoryConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, httpResponse: HttpResponse, fenceService: FenceService, databaseServer: DatabaseServer, paymentHelper: PaymentHelper, traderAssortHelper: TraderAssortHelper, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, containerHelper: ContainerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); + 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; removeItem(pmcData: IPmcData, itemId: string, sessionID: string, output?: IItemEventRouterResponse): IItemEventRouterResponse; - getSecureContainerItems(items: Item[]): string[]; getItemSize(itemTpl: string, itemID: string, inventoryItem: Item[]): Record; private getSizeByInventoryItemHash; private getInventoryItemHash; - /** - * Recursively checks if the given item is - * inside the stash, that is it has the stash as - * ancestor with slotId=hideout - */ - isItemInStash(pmcData: IPmcData, item: Item): boolean; getContainerMap(containerW: number, containerH: number, itemList: Item[], containerId: string): number[][]; /** * Based on the item action, determine whose inventories we should be looking at for from and to. diff --git a/TypeScript/1LogToConsole/types/helpers/ItemHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/ItemHelper.d.ts index 2c894e6..8c1175a 100644 --- a/TypeScript/1LogToConsole/types/helpers/ItemHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/ItemHelper.d.ts @@ -1,10 +1,10 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { InsuredItem, IPmcData } from "../@types/eft/common/IPmcData"; -import { ITemplateItem, StackSlot } from "../@types/eft/common/tables/ITemplateItem"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { InsuredItem, IPmcData } from "../models/eft/common/IPmcData"; +import { ITemplateItem, StackSlot } from "../models/eft/common/tables/ITemplateItem"; +import { Item } from "../models/eft/common/tables/IItem"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; declare class ItemHelper { private logger; private hashUtil; diff --git a/TypeScript/1LogToConsole/types/helpers/NotificationSendHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/NotificationSendHelper.d.ts index 40b6dec..b9298da 100644 --- a/TypeScript/1LogToConsole/types/helpers/NotificationSendHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/NotificationSendHelper.d.ts @@ -1,5 +1,5 @@ -import { INotification } from "../@types/eft/notifier/INotifier"; -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +import { INotification } from "../models/eft/notifier/INotifier"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; import { NotificationService } from "../services/NotificationService"; export declare class NotificationSendHelper { private httpServer; diff --git a/TypeScript/1LogToConsole/types/helpers/NotifierHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/NotifierHelper.d.ts index 9998054..0d524e9 100644 --- a/TypeScript/1LogToConsole/types/helpers/NotifierHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/NotifierHelper.d.ts @@ -1,5 +1,5 @@ -import { INotification } from "../@types/eft/notifier/INotifier"; -import { Message, MessageContentRagfair } from "../@types/eft/profile/IAkiProfile"; +import { INotification } from "../models/eft/notifier/INotifier"; +import { Message, MessageContentRagfair } from "../models/eft/profile/IAkiProfile"; import { HttpServerHelper } from "./HttpServerHelper"; export declare class NotifierHelper { private httpServerHelper; diff --git a/TypeScript/1LogToConsole/types/helpers/PresetHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/PresetHelper.d.ts index 7695248..0a24128 100644 --- a/TypeScript/1LogToConsole/types/helpers/PresetHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/PresetHelper.d.ts @@ -1,4 +1,4 @@ -import { Preset } from "../@types/eft/common/IGlobals"; +import { Preset } from "../models/eft/common/IGlobals"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class PresetHelper { private databaseServer; diff --git a/TypeScript/1LogToConsole/types/helpers/ProfileHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/ProfileHelper.d.ts index 1d868b1..515e55e 100644 --- a/TypeScript/1LogToConsole/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/ProfileHelper.d.ts @@ -1,44 +1,33 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { FenceService } from "../services/FenceService"; -import { IPmcData, Skills, Stats } from "../@types/eft/common/IPmcData"; -import { IAkiProfile } from "../@types/eft/profile/IAkiProfile"; -import { IValidateNicknameRequestData } from "../@types/eft/profile/IValidateNicknameRequestData"; +import { IPmcData, Stats } from "../models/eft/common/IPmcData"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { ItemHelper } from "./ItemHelper"; -import { IWatermark } from "../@types/spt/utils/IWatermark"; -import { BotGenerator } from "../generators/BotGenerator"; +import { IWatermark } from "../models/spt/utils/IWatermark"; export declare class ProfileHelper { - private jsonUtil; - private watermark; - private timeUtil; - private saveServer; - private databaseServer; - private botGenerator; - private itemHelper; - private fenceService; - constructor(jsonUtil: JsonUtil, watermark: IWatermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, botGenerator: BotGenerator, itemHelper: ItemHelper, fenceService: FenceService); + protected jsonUtil: JsonUtil; + protected watermark: IWatermark; + 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); resetProfileQuestCondition(sessionID: string, conditionId: string): void; getCompleteProfile(sessionID: string): IPmcData[]; - private isWiped; - getFullProfile(sessionID: string): IAkiProfile; - getPmcProfile(sessionID: string): IPmcData; - getScavProfile(sessionID: string): IPmcData; - setScavProfile(sessionID: string, scavData: IPmcData): void; - getScavSkills(sessionID: string): Skills; - generatePlayerScav(sessionID: string): IPmcData; - private removeSecureContainer; - private getDefaultScavSkills; - getScavStats(sessionID: string): Stats; - getDefaultCounters(): Stats; - getServerVersion(): string; - getScavLevel(sessionID: string): number; - getScavExperience(sessionID: string): number; - setScavCooldownTimer(profile: IPmcData, pmcData: IPmcData): IPmcData; isNicknameTaken(info: IValidateNicknameRequestData, sessionID: string): boolean; getProfileByPmcId(pmcId: string): IPmcData; getExperience(level: number): number; getMaxLevel(): number; getDefaultAkiDataObject(): any; + getFullProfile(sessionID: string): IAkiProfile; + getPmcProfile(sessionID: string): IPmcData; + getScavProfile(sessionID: string): IPmcData; + getDefaultCounters(): Stats; + private isWiped; + private getServerVersion; } diff --git a/TypeScript/1LogToConsole/types/helpers/QuestConditionHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/QuestConditionHelper.d.ts index 8f7b706..2a0ee94 100644 --- a/TypeScript/1LogToConsole/types/helpers/QuestConditionHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/QuestConditionHelper.d.ts @@ -1,4 +1,4 @@ -import { AvailableForConditions } from "../@types/eft/common/tables/IQuest"; +import { AvailableForConditions } from "../models/eft/common/tables/IQuest"; export declare class QuestConditionHelper { getQuestConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; getLevelConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; diff --git a/TypeScript/1LogToConsole/types/helpers/QuestHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/QuestHelper.d.ts index c29158b..3474884 100644 --- a/TypeScript/1LogToConsole/types/helpers/QuestHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/QuestHelper.d.ts @@ -8,15 +8,14 @@ import { ProfileHelper } from "./ProfileHelper"; import { DialogueHelper } from "./DialogueHelper"; import { PaymentHelper } from "./PaymentHelper"; import { TraderHelper } from "./TraderHelper"; -import { IPmcData, Quest } from "../@types/eft/common/IPmcData"; -import { AvailableForConditions, AvailableForProps, IQuest, Reward } from "../@types/eft/common/tables/IQuest"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IAcceptQuestRequestData } from "../@types/eft/quests/IAcceptQuestRequestData"; -import { ICompleteQuestRequestData } from "../@types/eft/quests/ICompleteQuestRequestData"; +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 { IQuestConfig } from "../@types/spt/config/IQuestConfig"; import { RagfairServerHelper } from "./RagfairServerHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class QuestHelper { private logger; private jsonUtil; @@ -31,7 +30,7 @@ export declare class QuestHelper { private paymentHelper; private traderHelper; private configServer; - questConfig: IQuestConfig; + private questConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer); static get STATUS(): Record; questStatus(pmcData: IPmcData, questID: string): string; diff --git a/TypeScript/1LogToConsole/types/helpers/RagfairHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/RagfairHelper.d.ts index 7d867bb..2bce4a6 100644 --- a/TypeScript/1LogToConsole/types/helpers/RagfairHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/RagfairHelper.d.ts @@ -1,15 +1,15 @@ import { JsonUtil } from "../utils/JsonUtil"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; -import { IGetOffersResult } from "../@types/eft/ragfair/IGetOffersResult"; -import { ISearchRequestData } from "../@types/eft/ragfair/ISearchRequestData"; +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 { DatabaseServer } from "../servers/DatabaseServer"; 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 "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; import { TraderAssortHelper } from "./TraderAssortHelper"; export declare class RagfairHelper { private logger; diff --git a/TypeScript/1LogToConsole/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/RagfairOfferHelper.d.ts index 873271f..da3ceb8 100644 --- a/TypeScript/1LogToConsole/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/RagfairOfferHelper.d.ts @@ -1,9 +1,9 @@ import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; -import { ISearchRequestData } from "../@types/eft/ragfair/ISearchRequestData"; +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 { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { RagfairOfferService } from "../services/RagfairOfferService"; @@ -17,7 +17,7 @@ import { ConfigServer } from "../servers/ConfigServer"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { RagfairSortHelper } from "./RagfairSortHelper"; import { RagfairHelper } from "./RagfairHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairOfferHelper { private logger; private timeUtil; diff --git a/TypeScript/1LogToConsole/types/helpers/RagfairSellHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/RagfairSellHelper.d.ts index 2e21589..929d112 100644 --- a/TypeScript/1LogToConsole/types/helpers/RagfairSellHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/RagfairSellHelper.d.ts @@ -1,6 +1,5 @@ -import { SellResult } from "../@types/eft/ragfair/IRagfairOffer"; -import { IRagfairConfig } from "../@types/spt/config/IRagfairConfig"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { SellResult } from "../models/eft/ragfair/IRagfairOffer"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; @@ -9,7 +8,7 @@ export declare class RagfairSellHelper { private randomUtil; private timeUtil; private configServer; - ragfairConfig: IRagfairConfig; + private ragfairConfig; constructor(logger: ILogger, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer); calculateSellChance(baseChance: number, offerPrice: number, requirementsPriceInRub: number): number; rollForSale(sellChance: number, count: number): SellResult[]; diff --git a/TypeScript/1LogToConsole/types/helpers/RagfairServerHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/RagfairServerHelper.d.ts index 51b02cb..9a26261 100644 --- a/TypeScript/1LogToConsole/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/RagfairServerHelper.d.ts @@ -1,13 +1,13 @@ import { SaveServer } from "../servers/SaveServer"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { ITemplateItem } from "../@types/eft/common/tables/ITemplateItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { ItemHelper } from "./ItemHelper"; import { ProfileHelper } from "./ProfileHelper"; -import { MemberCategory } from "../@types/eft/common/MemberCategory"; +import { MemberCategory } from "../models/eft/common/MemberCategory"; import { ConfigServer } from "../servers/ConfigServer"; import { RandomUtil } from "../utils/RandomUtil"; import { DialogueHelper } from "./DialogueHelper"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { Item } from "../models/eft/common/tables/IItem"; import { JsonUtil } from "../utils/JsonUtil"; import { HashUtil } from "../utils/HashUtil"; export declare class RagfairServerHelper { diff --git a/TypeScript/1LogToConsole/types/helpers/RagfairSortHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/RagfairSortHelper.d.ts index fbd4b78..e9d8069 100644 --- a/TypeScript/1LogToConsole/types/helpers/RagfairSortHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/RagfairSortHelper.d.ts @@ -1,4 +1,4 @@ -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class RagfairSortHelper { private databaseServer; diff --git a/TypeScript/1LogToConsole/types/helpers/RagfairTaxHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/RagfairTaxHelper.d.ts index bb78afd..e87334f 100644 --- a/TypeScript/1LogToConsole/types/helpers/RagfairTaxHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/RagfairTaxHelper.d.ts @@ -1,9 +1,9 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; import { DatabaseServer } from "../servers/DatabaseServer"; import { RagfairPriceService } from "../services/RagfairPriceService"; import { ItemHelper } from "./ItemHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairTaxHelper { private logger; private databaseServer; diff --git a/TypeScript/1LogToConsole/types/helpers/RepairHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/RepairHelper.d.ts index f2852d7..d11d0d2 100644 --- a/TypeScript/1LogToConsole/types/helpers/RepairHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/RepairHelper.d.ts @@ -1,18 +1,17 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; import { ConfigServer } from "../servers/ConfigServer"; -import { IRepairConfig } from "../@types/spt/config/IRepairConfig"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RepairHelper { private logger; private jsonUtil; private randomUtil; private databaseServer; private configServer; - repairConfig: IRepairConfig; + private repairConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); updateItemDurability(itemToRepairId: string, amountToRepair: number, pmcData: IPmcData, useRepairKit?: boolean): Item; private getRandomisedArmorRepairDegredationValue; diff --git a/TypeScript/1LogToConsole/types/helpers/SecureContainerHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/SecureContainerHelper.d.ts new file mode 100644 index 0000000..8f246b6 --- /dev/null +++ b/TypeScript/1LogToConsole/types/helpers/SecureContainerHelper.d.ts @@ -0,0 +1,13 @@ +import { Item } from "../models/eft/common/tables/IItem"; +import { ItemHelper } from "./ItemHelper"; +export interface OwnerInventoryItems { + from: Item[]; + to: Item[]; + sameInventory: boolean; + isMail: boolean; +} +export declare class SecureContainerHelper { + private itemHelper; + constructor(itemHelper: ItemHelper); + getSecureContainerItems(items: Item[]): string[]; +} diff --git a/TypeScript/1LogToConsole/types/helpers/TradeHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/TradeHelper.d.ts index f3d9a50..0712ff4 100644 --- a/TypeScript/1LogToConsole/types/helpers/TradeHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/TradeHelper.d.ts @@ -3,14 +3,14 @@ import { InventoryHelper } from "../helpers/InventoryHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { FenceService } from "../services/FenceService"; import { PaymentService } from "../services/PaymentService"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IProcessBuyTradeRequestData } from "../@types/eft/trade/IProcessBuyTradeRequestData"; -import { IProcessSellTradeRequestData } from "../@types/eft/trade/IProcessSellTradeRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { Upd } from "../@types/eft/common/tables/IItem"; +import { IPmcData } from "../models/eft/common/IPmcData"; +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 "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class TradeHelper { private logger; private itemEventRouter; diff --git a/TypeScript/1LogToConsole/types/helpers/TraderAssortHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/TraderAssortHelper.d.ts index 7dfed48..d95879c 100644 --- a/TypeScript/1LogToConsole/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/TraderAssortHelper.d.ts @@ -1,5 +1,5 @@ -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { ILogger } from "../models/spt/utils/ILogger"; import { RagfairAssortGenerator } from "../generators/RagfairAssortGenerator"; import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; import { DatabaseServer } from "../servers/DatabaseServer"; diff --git a/TypeScript/1LogToConsole/types/helpers/TraderHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/TraderHelper.d.ts index d9f37a7..5440afe 100644 --- a/TypeScript/1LogToConsole/types/helpers/TraderHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/TraderHelper.d.ts @@ -6,10 +6,10 @@ import { ItemHelper } from "./ItemHelper"; import { ProfileHelper } from "./ProfileHelper"; import { PaymentHelper } from "./PaymentHelper"; import { FenceService } from "../services/FenceService"; -import { IBarterScheme, ITraderAssort, ITraderBase, LoyaltyLevel } from "../@types/eft/common/tables/ITrader"; -import { IPmcData } from "../@types/eft/common/IPmcData"; +import { IBarterScheme, ITraderAssort, ITraderBase, LoyaltyLevel } from "../models/eft/common/tables/ITrader"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class TraderHelper { private logger; private databaseServer; diff --git a/TypeScript/1LogToConsole/types/ide/CheckVersion.d.ts b/TypeScript/1LogToConsole/types/ide/CheckVersion.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/1LogToConsole/types/ide/CheckVersion.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/1LogToConsole/types/ide/Compiler.d.ts b/TypeScript/1LogToConsole/types/ide/Compiler.d.ts index cb0ff5c..fded23a 100644 --- a/TypeScript/1LogToConsole/types/ide/Compiler.d.ts +++ b/TypeScript/1LogToConsole/types/ide/Compiler.d.ts @@ -1 +1 @@ -export {}; +import "reflect-metadata"; diff --git a/TypeScript/1LogToConsole/types/loaders/DelayedModLoader.d.ts b/TypeScript/1LogToConsole/types/loaders/DelayedModLoader.d.ts index ed6d3f8..db86c75 100644 --- a/TypeScript/1LogToConsole/types/loaders/DelayedModLoader.d.ts +++ b/TypeScript/1LogToConsole/types/loaders/DelayedModLoader.d.ts @@ -3,13 +3,15 @@ import { VFS } from "../utils/VFS"; import { InitialModLoader } from "./InitialModLoader"; import { BundleLoader } from "./BundleLoader"; import { HandbookController } from "../controllers/HandbookController"; -import { IModLoader } from "../@types/spt/mod/IModLoader"; +import { IModLoader } from "../models/spt/mod/IModLoader"; +import { ModCompilerService } from "../services/ModCompilerService"; export declare class DelayedModLoader implements IModLoader { private bundleLoader; private handbookController; private vfs; + private modCompilerService; private initialModLoader; - constructor(bundleLoader: BundleLoader, handbookController: HandbookController, vfs: VFS, initialModLoader: InitialModLoader); + constructor(bundleLoader: BundleLoader, handbookController: HandbookController, vfs: VFS, modCompilerService: ModCompilerService, initialModLoader: InitialModLoader); getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; getImportedModsNames(): string[]; diff --git a/TypeScript/1LogToConsole/types/loaders/IMod.d.ts b/TypeScript/1LogToConsole/types/loaders/IMod.d.ts deleted file mode 100644 index 20813f9..0000000 --- a/TypeScript/1LogToConsole/types/loaders/IMod.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export interface IMod { - onload(): any; -} -export interface IContainerMod extends IMod { - onContainerLoad(): any; -} diff --git a/TypeScript/1LogToConsole/types/loaders/InitialModLoader.d.ts b/TypeScript/1LogToConsole/types/loaders/InitialModLoader.d.ts index 612c821..35503c8 100644 --- a/TypeScript/1LogToConsole/types/loaders/InitialModLoader.d.ts +++ b/TypeScript/1LogToConsole/types/loaders/InitialModLoader.d.ts @@ -1,20 +1,24 @@ -import { DependencyContainer } from 'tsyringe'; +import { DependencyContainer } from "tsyringe"; import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; -import { IModLoader } from "../@types/spt/mod/IModLoader"; -import { ILogger } from '../@types/spt/utils/ILogger'; +import { ModCompilerService } from "../services/ModCompilerService"; +import { HashCacheService } from "../services/HashCacheService"; +import { IModLoader } from "../models/spt/mod/IModLoader"; export declare class InitialModLoader implements IModLoader { private logger; private vfs; private jsonUtil; + private modCompilerService; + private hashCacheService; private configServer; - private basepath; + private readonly basepath; private imported; private onLoad; private akiConfig; - constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, configServer: ConfigServer); - load(container: DependencyContainer): void; + constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, hashCacheService: HashCacheService, configServer: ConfigServer); + load(container: DependencyContainer): Promise; getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; getImportedModsNames(): string[]; @@ -23,7 +27,9 @@ export declare class InitialModLoader implements IModLoader { private importMods; private isModCombatibleWithAki; private executeMods; + private sortModsLoadOrder; private addMod; + private compileModIfNeeded; private areModDependenciesFulfilled; private isModCompatible; private validMod; diff --git a/TypeScript/1LogToConsole/types/loaders/ModLoader.d.ts b/TypeScript/1LogToConsole/types/loaders/ModLoader.d.ts deleted file mode 100644 index eed6d69..0000000 --- a/TypeScript/1LogToConsole/types/loaders/ModLoader.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { IPackageJsonData } from "../@types/spt/mod/IPackageJsonData"; -export declare class ModLoader { - static basepath: string; - static imported: {}; - static onLoad: {}; - static load(): void; - static getBundles(local: any): string; - static getBundle(key: any, arg1: any): void; - static importClass(name: string, filepath: string): void; - static importMods(): void; - static isModCombatibleWithAki(mod: IPackageJsonData): boolean; - static executeMods(): void; - static getModPath(mod: string): string; - static addMod(mod: string): void; - static areModDependenciesFulfilled(mod: IPackageJsonData, loadedMods: any): boolean; - static isModCompatible(mod: any, loadedMods: any): boolean; - static validMod(mod: any): boolean; - static getLoadOrderRecursive(mod: any, result: any, visited: any): void; - static getLoadOrder(mods: any): {}; -} diff --git a/TypeScript/1LogToConsole/types/@types/eft/bot/IGenerateBotsRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/bot/IGenerateBotsRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/bot/IGenerateBotsRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/bot/IGenerateBotsRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/common/IEmptyRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/IEmptyRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/common/IEmptyRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/common/IEmptyRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/common/IGlobals.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/IGlobals.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/common/IGlobals.d.ts rename to TypeScript/1LogToConsole/types/models/eft/common/IGlobals.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/common/ILocation.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/ILocation.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/common/ILocation.d.ts rename to TypeScript/1LogToConsole/types/models/eft/common/ILocation.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/common/ILocationBase.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/ILocationBase.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/common/ILocationBase.d.ts rename to TypeScript/1LogToConsole/types/models/eft/common/ILocationBase.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/common/ILocationsSourceDestinationBase.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/ILocationsSourceDestinationBase.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/common/ILocationsSourceDestinationBase.d.ts rename to TypeScript/1LogToConsole/types/models/eft/common/ILocationsSourceDestinationBase.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/common/ILooseLoot.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/ILooseLoot.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/common/ILooseLoot.d.ts rename to TypeScript/1LogToConsole/types/models/eft/common/ILooseLoot.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/common/IMetricsTableData.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/IMetricsTableData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/common/IMetricsTableData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/common/IMetricsTableData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/common/IPmcData.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/IPmcData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/common/IPmcData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/common/IPmcData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/common/MemberCategory.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/MemberCategory.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/common/MemberCategory.d.ts rename to TypeScript/1LogToConsole/types/models/eft/common/MemberCategory.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/common/request/IBaseInteractionRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/request/IBaseInteractionRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/common/request/IBaseInteractionRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/common/request/IBaseInteractionRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/common/tables/IBotBase.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/tables/IBotBase.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/common/tables/IBotBase.d.ts rename to TypeScript/1LogToConsole/types/models/eft/common/tables/IBotBase.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/common/tables/IBotCore.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/tables/IBotCore.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/common/tables/IBotCore.d.ts rename to TypeScript/1LogToConsole/types/models/eft/common/tables/IBotCore.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/common/tables/IBotType.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/tables/IBotType.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/common/tables/IBotType.d.ts rename to TypeScript/1LogToConsole/types/models/eft/common/tables/IBotType.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/common/tables/ICustomizationItem.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/tables/ICustomizationItem.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/common/tables/ICustomizationItem.d.ts rename to TypeScript/1LogToConsole/types/models/eft/common/tables/ICustomizationItem.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/common/tables/IHandbookBase.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/tables/IHandbookBase.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/common/tables/IHandbookBase.d.ts rename to TypeScript/1LogToConsole/types/models/eft/common/tables/IHandbookBase.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/common/tables/IItem.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/tables/IItem.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/common/tables/IItem.d.ts rename to TypeScript/1LogToConsole/types/models/eft/common/tables/IItem.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/common/tables/ILocationsBase.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/tables/ILocationsBase.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/common/tables/ILocationsBase.d.ts rename to TypeScript/1LogToConsole/types/models/eft/common/tables/ILocationsBase.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/common/tables/ILootBase.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/tables/ILootBase.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/common/tables/ILootBase.d.ts rename to TypeScript/1LogToConsole/types/models/eft/common/tables/ILootBase.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/common/tables/IQuest.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/tables/IQuest.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/common/tables/IQuest.d.ts rename to TypeScript/1LogToConsole/types/models/eft/common/tables/IQuest.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/tables/IRepeatableQuests.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/common/tables/IRepeatableQuests.d.ts rename to TypeScript/1LogToConsole/types/models/eft/common/tables/IRepeatableQuests.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/common/tables/ITemplateItem.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/tables/ITemplateItem.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/common/tables/ITemplateItem.d.ts rename to TypeScript/1LogToConsole/types/models/eft/common/tables/ITemplateItem.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/common/tables/ITrader.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/tables/ITrader.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/common/tables/ITrader.d.ts rename to TypeScript/1LogToConsole/types/models/eft/common/tables/ITrader.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/customization/IBuyClothingRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/customization/IBuyClothingRequestData.d.ts similarity index 71% rename from TypeScript/2EditDatabase/types/@types/eft/customization/IBuyClothingRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/customization/IBuyClothingRequestData.d.ts index be5d930..d19b70d 100644 --- a/TypeScript/2EditDatabase/types/@types/eft/customization/IBuyClothingRequestData.d.ts +++ b/TypeScript/1LogToConsole/types/models/eft/customization/IBuyClothingRequestData.d.ts @@ -1,9 +1,9 @@ export interface IBuyClothingRequestData { Action: "CustomizationBuy"; offer: string; - items: Item[]; + items: ClothingItem[]; } -export interface Item { +export interface ClothingItem { del: boolean; id: string; count: number; diff --git a/TypeScript/1LogToConsole/types/@types/eft/customization/IWearClothingRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/customization/IWearClothingRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/customization/IWearClothingRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/customization/IWearClothingRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/dialog/IFriendRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/dialog/IFriendRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/dialog/IFriendRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/dialog/IFriendRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/dialog/IGetAllAttachmentsRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/dialog/IGetAllAttachmentsRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/dialog/IGetAllAttachmentsResponse.d.ts b/TypeScript/1LogToConsole/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/dialog/IGetAllAttachmentsResponse.d.ts rename to TypeScript/1LogToConsole/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/dialog/IGetChatServerListRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/dialog/IGetChatServerListRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/dialog/IGetChatServerListRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/dialog/IGetChatServerListRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/dialog/IGetFriendListDataResponse.d.ts b/TypeScript/1LogToConsole/types/models/eft/dialog/IGetFriendListDataResponse.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/dialog/IGetFriendListDataResponse.d.ts rename to TypeScript/1LogToConsole/types/models/eft/dialog/IGetFriendListDataResponse.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/dialog/IGetMailDialogInfoRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/dialog/IGetMailDialogInfoRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/dialog/IGetMailDialogListRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/dialog/IGetMailDialogListRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/dialog/IGetMailDialogViewRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/dialog/IGetMailDialogViewRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/dialog/IGetMailDialogViewResponseData.d.ts b/TypeScript/1LogToConsole/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/dialog/IGetMailDialogViewResponseData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/dialog/IPinDialogRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/dialog/IPinDialogRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/dialog/IPinDialogRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/dialog/IPinDialogRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/dialog/IRemoveDialogRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/dialog/IRemoveDialogRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/dialog/IRemoveDialogRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/dialog/IRemoveDialogRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/dialog/ISendMessageRequest.d.ts b/TypeScript/1LogToConsole/types/models/eft/dialog/ISendMessageRequest.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/dialog/ISendMessageRequest.d.ts rename to TypeScript/1LogToConsole/types/models/eft/dialog/ISendMessageRequest.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/dialog/ISetDialogReadRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/dialog/ISetDialogReadRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/dialog/ISetDialogReadRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/dialog/ISetDialogReadRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/game/IGameConfigResponse.d.ts b/TypeScript/1LogToConsole/types/models/eft/game/IGameConfigResponse.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/game/IGameConfigResponse.d.ts rename to TypeScript/1LogToConsole/types/models/eft/game/IGameConfigResponse.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/game/IGameEmptyCrcRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/game/IGameEmptyCrcRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/game/IGameEmptyCrcRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/game/IGameEmptyCrcRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/game/IVersionValidateRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/game/IVersionValidateRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/game/IVersionValidateRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/game/IVersionValidateRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/health/IHealthTreatmentRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/health/IHealthTreatmentRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/health/IHealthTreatmentRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/health/IHealthTreatmentRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/health/IOffraidEatRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/health/IOffraidEatRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/health/IOffraidEatRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/health/IOffraidEatRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/health/IOffraidHealRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/health/IOffraidHealRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/health/IOffraidHealRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/health/IOffraidHealRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/health/ISyncHealthRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/health/ISyncHealthRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/health/ISyncHealthRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/health/ISyncHealthRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/hideout/HideoutAreasEnum.d.ts b/TypeScript/1LogToConsole/types/models/eft/hideout/HideoutAreasEnum.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/hideout/HideoutAreasEnum.d.ts rename to TypeScript/1LogToConsole/types/models/eft/hideout/HideoutAreasEnum.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/hideout/IHideoutArea.d.ts b/TypeScript/1LogToConsole/types/models/eft/hideout/IHideoutArea.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/hideout/IHideoutArea.d.ts rename to TypeScript/1LogToConsole/types/models/eft/hideout/IHideoutArea.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/hideout/IHideoutProduction.d.ts b/TypeScript/1LogToConsole/types/models/eft/hideout/IHideoutProduction.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/hideout/IHideoutProduction.d.ts rename to TypeScript/1LogToConsole/types/models/eft/hideout/IHideoutProduction.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/hideout/IHideoutPutItemInRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/hideout/IHideoutPutItemInRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/hideout/IHideoutScavCase.d.ts b/TypeScript/1LogToConsole/types/models/eft/hideout/IHideoutScavCase.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/hideout/IHideoutScavCase.d.ts rename to TypeScript/1LogToConsole/types/models/eft/hideout/IHideoutScavCase.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/hideout/IHideoutScavCaseStartRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/hideout/IHideoutScavCaseStartRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/hideout/IHideoutSettingsBase.d.ts b/TypeScript/1LogToConsole/types/models/eft/hideout/IHideoutSettingsBase.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/hideout/IHideoutSettingsBase.d.ts rename to TypeScript/1LogToConsole/types/models/eft/hideout/IHideoutSettingsBase.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/hideout/IHideoutTakeItemOutRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/hideout/IHideoutTakeItemOutRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/hideout/IHideoutTakeProductionRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/hideout/IHideoutTakeProductionRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/hideout/IHideoutToggleAreaRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/hideout/IHideoutToggleAreaRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/hideout/IHideoutUpgradeRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/hideout/IHideoutUpgradeRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/httpResponse/IGetBodyResponseData.d.ts b/TypeScript/1LogToConsole/types/models/eft/httpResponse/IGetBodyResponseData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/httpResponse/IGetBodyResponseData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/httpResponse/IGetBodyResponseData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/httpResponse/INullResponseData.d.ts b/TypeScript/1LogToConsole/types/models/eft/httpResponse/INullResponseData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/httpResponse/INullResponseData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/httpResponse/INullResponseData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/inRaid/IRegisterPlayerRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/inRaid/IRegisterPlayerRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/inRaid/ISaveProgressRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/inRaid/ISaveProgressRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/inRaid/ISaveProgressRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/inRaid/ISaveProgressRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/insurance/IGetInsuranceCostRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/insurance/IGetInsuranceCostRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/insurance/IInsureRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/insurance/IInsureRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/insurance/IInsureRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/insurance/IInsureRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/inventory/IInventoryAddRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/inventory/IInventoryAddRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/inventory/IInventoryAddRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/inventory/IInventoryAddRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/inventory/IInventoryBaseActionRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/inventory/IInventoryBaseActionRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/inventory/IInventoryBindRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/inventory/IInventoryBindRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/inventory/IInventoryBindRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/inventory/IInventoryBindRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/inventory/IInventoryCreateMarkerRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/inventory/IInventoryCreateMarkerRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/inventory/IInventoryEditMarkerRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/inventory/IInventoryEditMarkerRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/inventory/IInventoryExamineRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/inventory/IInventoryExamineRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/inventory/IInventoryExamineRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/inventory/IInventoryExamineRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/inventory/IInventoryFoldRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/inventory/IInventoryFoldRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/inventory/IInventoryFoldRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/inventory/IInventoryFoldRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/inventory/IInventoryMergeRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/inventory/IInventoryMergeRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/inventory/IInventoryMergeRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/inventory/IInventoryMergeRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/inventory/IInventoryMoveRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/inventory/IInventoryMoveRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/inventory/IInventoryMoveRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/inventory/IInventoryMoveRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/inventory/IInventoryRemoveRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/inventory/IInventoryRemoveRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/inventory/IInventorySortRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/inventory/IInventorySortRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/inventory/IInventorySortRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/inventory/IInventorySortRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/inventory/IInventorySplitRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/inventory/IInventorySplitRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/inventory/IInventorySplitRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/inventory/IInventorySplitRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/inventory/IInventorySwapRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/inventory/IInventorySwapRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/inventory/IInventorySwapRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/inventory/IInventorySwapRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/inventory/IInventoryTagRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/inventory/IInventoryTagRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/inventory/IInventoryTagRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/inventory/IInventoryTagRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/inventory/IInventoryToggleRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/inventory/IInventoryToggleRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/inventory/IInventoryToggleRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/inventory/IInventoryToggleRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/inventory/IInventoryTransferRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/inventory/IInventoryTransferRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/inventory/IInventoryTransferRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/inventory/IInventoryTransferRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts b/TypeScript/1LogToConsole/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts rename to TypeScript/1LogToConsole/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/itemEvent/IItemEventRouterBase.d.ts b/TypeScript/1LogToConsole/types/models/eft/itemEvent/IItemEventRouterBase.d.ts similarity index 91% rename from TypeScript/1LogToConsole/types/@types/eft/itemEvent/IItemEventRouterBase.d.ts rename to TypeScript/1LogToConsole/types/models/eft/itemEvent/IItemEventRouterBase.d.ts index 0e12850..31e62fe 100644 --- a/TypeScript/1LogToConsole/types/@types/eft/itemEvent/IItemEventRouterBase.d.ts +++ b/TypeScript/1LogToConsole/types/models/eft/itemEvent/IItemEventRouterBase.d.ts @@ -49,9 +49,15 @@ export interface Product { _tpl?: string; parentId?: string; slotId?: string; - location?: any; + location?: ItemChangeLocation; upd?: Upd; } +export interface ItemChangeLocation { + x: number; + y: number; + r: number; + isSearched?: boolean; +} export interface TraderRelations { salesSum?: number; standing?: number; diff --git a/TypeScript/1LogToConsole/types/@types/eft/itemEvent/IItemEventRouterRequest.d.ts b/TypeScript/1LogToConsole/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/itemEvent/IItemEventRouterRequest.d.ts rename to TypeScript/1LogToConsole/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/itemEvent/IItemEventRouterResponse.d.ts b/TypeScript/1LogToConsole/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/itemEvent/IItemEventRouterResponse.d.ts rename to TypeScript/1LogToConsole/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/launcher/IChangeRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/launcher/IChangeRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/launcher/IChangeRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/launcher/IChangeRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/launcher/IGetMiniProfileRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/launcher/IGetMiniProfileRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/launcher/ILoginRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/launcher/ILoginRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/launcher/ILoginRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/launcher/ILoginRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/launcher/IMiniProfile.d.ts b/TypeScript/1LogToConsole/types/models/eft/launcher/IMiniProfile.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/launcher/IMiniProfile.d.ts rename to TypeScript/1LogToConsole/types/models/eft/launcher/IMiniProfile.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/launcher/IRegisterData.d.ts b/TypeScript/1LogToConsole/types/models/eft/launcher/IRegisterData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/launcher/IRegisterData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/launcher/IRegisterData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/launcher/IRemoveProfileData.d.ts b/TypeScript/1LogToConsole/types/models/eft/launcher/IRemoveProfileData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/launcher/IRemoveProfileData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/launcher/IRemoveProfileData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/location/IGetLocationRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/location/IGetLocationRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/location/IGetLocationRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/location/IGetLocationRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/match/IEndOfflineRaidRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/match/IEndOfflineRaidRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/match/IEndOfflineRaidRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/match/IEndOfflineRaidRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/match/IStartOffineRaidRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/match/IStartOffineRaidRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/match/IStartOffineRaidRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/match/IStartOffineRaidRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/notes/INoteActionData.d.ts b/TypeScript/1LogToConsole/types/models/eft/notes/INoteActionData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/notes/INoteActionData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/notes/INoteActionData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/notifier/INotifier.d.ts b/TypeScript/1LogToConsole/types/models/eft/notifier/INotifier.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/notifier/INotifier.d.ts rename to TypeScript/1LogToConsole/types/models/eft/notifier/INotifier.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/notifier/ISelectProfileRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/notifier/ISelectProfileRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/notifier/ISelectProfileRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/notifier/ISelectProfileRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/presetBuild/IPresetBuildActionRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/presetBuild/IPresetBuildActionRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/profile/IAkiProfile.d.ts b/TypeScript/1LogToConsole/types/models/eft/profile/IAkiProfile.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/profile/IAkiProfile.d.ts rename to TypeScript/1LogToConsole/types/models/eft/profile/IAkiProfile.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/profile/IProfileChangeNicknameRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/profile/IProfileChangeNicknameRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/profile/IProfileChangeVoiceRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/profile/IProfileChangeVoiceRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/profile/IProfileCreateRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/profile/IProfileCreateRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/profile/IProfileCreateRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/profile/IProfileCreateRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/profile/ISearchFriendRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/profile/ISearchFriendRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/profile/ISearchFriendRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/profile/ISearchFriendRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/profile/ISearchFriendResponse.d.ts b/TypeScript/1LogToConsole/types/models/eft/profile/ISearchFriendResponse.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/profile/ISearchFriendResponse.d.ts rename to TypeScript/1LogToConsole/types/models/eft/profile/ISearchFriendResponse.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/profile/IValidateNicknameRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/profile/IValidateNicknameRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/profile/IValidateNicknameRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/profile/IValidateNicknameRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/quests/IAcceptQuestRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/quests/IAcceptQuestRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/quests/IAcceptQuestRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/quests/IAcceptQuestRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/quests/ICompleteQuestRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/quests/ICompleteQuestRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/quests/ICompleteQuestRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/quests/ICompleteQuestRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/quests/IHandoverQuestRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/quests/IHandoverQuestRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/quests/IHandoverQuestRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/quests/IHandoverQuestRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/quests/IListQuestsRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/quests/IListQuestsRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/quests/IListQuestsRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/quests/IListQuestsRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/quests/IRepeatableQuestChangeRequest.d.ts b/TypeScript/1LogToConsole/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/quests/IRepeatableQuestChangeRequest.d.ts rename to TypeScript/1LogToConsole/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/ragfair/IAddOfferRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/ragfair/IAddOfferRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/ragfair/IAddOfferRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/ragfair/IAddOfferRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/ragfair/IExtendOfferRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/ragfair/IExtendOfferRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/ragfair/IExtendOfferRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/ragfair/IExtendOfferRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/ragfair/IGetItemPriceResult.d.ts b/TypeScript/1LogToConsole/types/models/eft/ragfair/IGetItemPriceResult.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/ragfair/IGetItemPriceResult.d.ts rename to TypeScript/1LogToConsole/types/models/eft/ragfair/IGetItemPriceResult.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/ragfair/IGetMarketPriceRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/ragfair/IGetMarketPriceRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/ragfair/IGetOffersResult.d.ts b/TypeScript/1LogToConsole/types/models/eft/ragfair/IGetOffersResult.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/ragfair/IGetOffersResult.d.ts rename to TypeScript/1LogToConsole/types/models/eft/ragfair/IGetOffersResult.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/1LogToConsole/types/models/eft/ragfair/IRagfairOffer.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/ragfair/IRagfairOffer.d.ts rename to TypeScript/1LogToConsole/types/models/eft/ragfair/IRagfairOffer.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/ragfair/IRemoveOfferRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/ragfair/IRemoveOfferRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/ragfair/ISearchRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/ragfair/ISearchRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/ragfair/ISearchRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/repair/IBaseRepairActionDataRequest.d.ts b/TypeScript/1LogToConsole/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/repair/IBaseRepairActionDataRequest.d.ts rename to TypeScript/1LogToConsole/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/repair/IRepairActionDataRequest.d.ts b/TypeScript/1LogToConsole/types/models/eft/repair/IRepairActionDataRequest.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/repair/IRepairActionDataRequest.d.ts rename to TypeScript/1LogToConsole/types/models/eft/repair/IRepairActionDataRequest.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/repair/ITraderRepairActionDataRequest.d.ts b/TypeScript/1LogToConsole/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/repair/ITraderRepairActionDataRequest.d.ts rename to TypeScript/1LogToConsole/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/trade/IProcessBaseTradeRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/trade/IProcessBaseTradeRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/trade/IProcessBuyTradeRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/trade/IProcessBuyTradeRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/trade/IProcessRagfairTradeRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/trade/IProcessRagfairTradeRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/trade/IProcessSellTradeRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/trade/IProcessSellTradeRequestData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/trade/IProcessSellTradeRequestData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/trade/IProcessSellTradeRequestData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/weather/IWeatherData.d.ts b/TypeScript/1LogToConsole/types/models/eft/weather/IWeatherData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/weather/IWeatherData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/weather/IWeatherData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/wishlist/IWishlistActionData.d.ts b/TypeScript/1LogToConsole/types/models/eft/wishlist/IWishlistActionData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/eft/wishlist/IWishlistActionData.d.ts rename to TypeScript/1LogToConsole/types/models/eft/wishlist/IWishlistActionData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/external/mod.d.ts b/TypeScript/1LogToConsole/types/models/external/mod.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/external/mod.d.ts rename to TypeScript/1LogToConsole/types/models/external/mod.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/external/tsyringe.d.ts b/TypeScript/1LogToConsole/types/models/external/tsyringe.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/external/tsyringe.d.ts rename to TypeScript/1LogToConsole/types/models/external/tsyringe.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/bindings/Route.d.ts b/TypeScript/1LogToConsole/types/models/spt/bindings/Route.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/bindings/Route.d.ts rename to TypeScript/1LogToConsole/types/models/spt/bindings/Route.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/IBotCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/IBotCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/IBotCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/IBotCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/IBundleCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/IBundleCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/IBundleCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/IBundleCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/ICustomizationCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/ICustomizationCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/ICustomizationCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/ICustomizationCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/IDataCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/IDataCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/IDataCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/IDataCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/IDialogueCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/IDialogueCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/IDialogueCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/IDialogueCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/IGameCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/IGameCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/IGameCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/IGameCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/IHandbookCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/IHandbookCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/IHandbookCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/IHandbookCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/IHealthCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/IHealthCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/IHealthCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/IHealthCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/IHideoutCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/IHideoutCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/IHideoutCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/IHideoutCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/IHttpCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/IHttpCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/IHttpCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/IHttpCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/IInraidCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/IInraidCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/IInraidCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/IInraidCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/IInsuranceCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/IInsuranceCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/IInsuranceCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/IInsuranceCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/IInventoryCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/IInventoryCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/IInventoryCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/IInventoryCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/IItemEventCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/IItemEventCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/IItemEventCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/IItemEventCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/ILauncherCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/ILauncherCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/ILauncherCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/ILauncherCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/ILocationCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/ILocationCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/ILocationCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/ILocationCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/IMatchCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/IMatchCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/IMatchCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/IMatchCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/IModCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/IModCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/IModCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/IModCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/INoteCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/INoteCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/INoteCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/INoteCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/INotifierCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/INotifierCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/INotifierCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/INotifierCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/IPresetBuildCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/IPresetBuildCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/IPresetCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/IPresetCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/IPresetCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/IPresetCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/IProfileCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/IProfileCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/IProfileCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/IProfileCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/IQuestCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/IQuestCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/IQuestCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/IQuestCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/IRagfairCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/IRagfairCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/IRagfairCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/IRagfairCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/IRepairCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/IRepairCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/IRepairCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/IRepairCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/ISaveCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/ISaveCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/ISaveCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/ISaveCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/ITradeCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/ITradeCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/ITradeCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/ITradeCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/ITraderCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/ITraderCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/ITraderCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/ITraderCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/IWeatherCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/IWeatherCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/IWeatherCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/IWeatherCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/callbacks/IWishlistCallbacks.d.ts b/TypeScript/1LogToConsole/types/models/spt/callbacks/IWishlistCallbacks.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/callbacks/IWishlistCallbacks.d.ts rename to TypeScript/1LogToConsole/types/models/spt/callbacks/IWishlistCallbacks.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/config/IAirdropConfig.d.ts b/TypeScript/1LogToConsole/types/models/spt/config/IAirdropConfig.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/config/IAirdropConfig.d.ts rename to TypeScript/1LogToConsole/types/models/spt/config/IAirdropConfig.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/config/IBaseConfig.d.ts b/TypeScript/1LogToConsole/types/models/spt/config/IBaseConfig.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/config/IBaseConfig.d.ts rename to TypeScript/1LogToConsole/types/models/spt/config/IBaseConfig.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/config/IBotConfig.d.ts b/TypeScript/1LogToConsole/types/models/spt/config/IBotConfig.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/config/IBotConfig.d.ts rename to TypeScript/1LogToConsole/types/models/spt/config/IBotConfig.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/config/ICoreConfig.d.ts b/TypeScript/1LogToConsole/types/models/spt/config/ICoreConfig.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/config/ICoreConfig.d.ts rename to TypeScript/1LogToConsole/types/models/spt/config/ICoreConfig.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/config/IHealthConfig.d.ts b/TypeScript/1LogToConsole/types/models/spt/config/IHealthConfig.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/config/IHealthConfig.d.ts rename to TypeScript/1LogToConsole/types/models/spt/config/IHealthConfig.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/config/IHideoutConfig.d.ts b/TypeScript/1LogToConsole/types/models/spt/config/IHideoutConfig.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/config/IHideoutConfig.d.ts rename to TypeScript/1LogToConsole/types/models/spt/config/IHideoutConfig.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/config/IHttpConfig.d.ts b/TypeScript/1LogToConsole/types/models/spt/config/IHttpConfig.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/config/IHttpConfig.d.ts rename to TypeScript/1LogToConsole/types/models/spt/config/IHttpConfig.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/config/IInRaidConfig.d.ts b/TypeScript/1LogToConsole/types/models/spt/config/IInRaidConfig.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/config/IInRaidConfig.d.ts rename to TypeScript/1LogToConsole/types/models/spt/config/IInRaidConfig.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/config/IInsuranceConfig.d.ts b/TypeScript/1LogToConsole/types/models/spt/config/IInsuranceConfig.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/config/IInsuranceConfig.d.ts rename to TypeScript/1LogToConsole/types/models/spt/config/IInsuranceConfig.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/config/IInventoryConfig.d.ts b/TypeScript/1LogToConsole/types/models/spt/config/IInventoryConfig.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/config/IInventoryConfig.d.ts rename to TypeScript/1LogToConsole/types/models/spt/config/IInventoryConfig.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/config/ILocationConfig.d.ts b/TypeScript/1LogToConsole/types/models/spt/config/ILocationConfig.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/config/ILocationConfig.d.ts rename to TypeScript/1LogToConsole/types/models/spt/config/ILocationConfig.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/config/IMatchConfig.d.ts b/TypeScript/1LogToConsole/types/models/spt/config/IMatchConfig.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/config/IMatchConfig.d.ts rename to TypeScript/1LogToConsole/types/models/spt/config/IMatchConfig.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/config/IQuestConfig.d.ts b/TypeScript/1LogToConsole/types/models/spt/config/IQuestConfig.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/config/IQuestConfig.d.ts rename to TypeScript/1LogToConsole/types/models/spt/config/IQuestConfig.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/config/IRagfairConfig.d.ts b/TypeScript/1LogToConsole/types/models/spt/config/IRagfairConfig.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/config/IRagfairConfig.d.ts rename to TypeScript/1LogToConsole/types/models/spt/config/IRagfairConfig.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/config/IRepairConfig.d.ts b/TypeScript/1LogToConsole/types/models/spt/config/IRepairConfig.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/config/IRepairConfig.d.ts rename to TypeScript/1LogToConsole/types/models/spt/config/IRepairConfig.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/config/ITraderConfig.d.ts b/TypeScript/1LogToConsole/types/models/spt/config/ITraderConfig.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/config/ITraderConfig.d.ts rename to TypeScript/1LogToConsole/types/models/spt/config/ITraderConfig.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/config/IWeatherConfig.d.ts b/TypeScript/1LogToConsole/types/models/spt/config/IWeatherConfig.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/config/IWeatherConfig.d.ts rename to TypeScript/1LogToConsole/types/models/spt/config/IWeatherConfig.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/controllers/IBotController.d.ts b/TypeScript/1LogToConsole/types/models/spt/controllers/IBotController.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/controllers/IBotController.d.ts rename to TypeScript/1LogToConsole/types/models/spt/controllers/IBotController.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/generators/IBotGenerator.d.ts b/TypeScript/1LogToConsole/types/models/spt/generators/IBotGenerator.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/generators/IBotGenerator.d.ts rename to TypeScript/1LogToConsole/types/models/spt/generators/IBotGenerator.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/generators/ILocationGenerator.d.ts b/TypeScript/1LogToConsole/types/models/spt/generators/ILocationGenerator.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/generators/ILocationGenerator.d.ts rename to TypeScript/1LogToConsole/types/models/spt/generators/ILocationGenerator.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/generators/IPMCLootGenerator.d.ts b/TypeScript/1LogToConsole/types/models/spt/generators/IPMCLootGenerator.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/generators/IPMCLootGenerator.d.ts rename to TypeScript/1LogToConsole/types/models/spt/generators/IPMCLootGenerator.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/generators/IRagfairAssortGenerator.d.ts b/TypeScript/1LogToConsole/types/models/spt/generators/IRagfairAssortGenerator.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/generators/IRagfairAssortGenerator.d.ts rename to TypeScript/1LogToConsole/types/models/spt/generators/IRagfairAssortGenerator.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/generators/IRagfairOfferGenerator.d.ts b/TypeScript/1LogToConsole/types/models/spt/generators/IRagfairOfferGenerator.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/generators/IRagfairOfferGenerator.d.ts rename to TypeScript/1LogToConsole/types/models/spt/generators/IRagfairOfferGenerator.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/helpers/Traders.d.ts b/TypeScript/1LogToConsole/types/models/spt/helpers/Traders.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/helpers/Traders.d.ts rename to TypeScript/1LogToConsole/types/models/spt/helpers/Traders.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/mod/IMod.d.ts b/TypeScript/1LogToConsole/types/models/spt/mod/IMod.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/mod/IMod.d.ts rename to TypeScript/1LogToConsole/types/models/spt/mod/IMod.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/mod/IModLoader.d.ts b/TypeScript/1LogToConsole/types/models/spt/mod/IModLoader.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/mod/IModLoader.d.ts rename to TypeScript/1LogToConsole/types/models/spt/mod/IModLoader.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/mod/IPackageJsonData.d.ts b/TypeScript/1LogToConsole/types/models/spt/mod/IPackageJsonData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/mod/IPackageJsonData.d.ts rename to TypeScript/1LogToConsole/types/models/spt/mod/IPackageJsonData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/ragfair/IRagfairServerPrices.d.ts b/TypeScript/1LogToConsole/types/models/spt/ragfair/IRagfairServerPrices.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/ragfair/IRagfairServerPrices.d.ts rename to TypeScript/1LogToConsole/types/models/spt/ragfair/IRagfairServerPrices.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/server/IDatabaseTables.d.ts b/TypeScript/1LogToConsole/types/models/spt/server/IDatabaseTables.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/server/IDatabaseTables.d.ts rename to TypeScript/1LogToConsole/types/models/spt/server/IDatabaseTables.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/server/IHttpServer.d.ts b/TypeScript/1LogToConsole/types/models/spt/server/IHttpServer.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/server/IHttpServer.d.ts rename to TypeScript/1LogToConsole/types/models/spt/server/IHttpServer.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/server/ILocaleBase.d.ts b/TypeScript/1LogToConsole/types/models/spt/server/ILocaleBase.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/server/ILocaleBase.d.ts rename to TypeScript/1LogToConsole/types/models/spt/server/ILocaleBase.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/server/ILocations.d.ts b/TypeScript/1LogToConsole/types/models/spt/server/ILocations.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/server/ILocations.d.ts rename to TypeScript/1LogToConsole/types/models/spt/server/ILocations.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/server/IServerBase.d.ts b/TypeScript/1LogToConsole/types/models/spt/server/IServerBase.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/server/IServerBase.d.ts rename to TypeScript/1LogToConsole/types/models/spt/server/IServerBase.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/server/ISettingsBase.d.ts b/TypeScript/1LogToConsole/types/models/spt/server/ISettingsBase.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/server/ISettingsBase.d.ts rename to TypeScript/1LogToConsole/types/models/spt/server/ISettingsBase.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/utils/IAsyncQueue.d.ts b/TypeScript/1LogToConsole/types/models/spt/utils/IAsyncQueue.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/utils/IAsyncQueue.d.ts rename to TypeScript/1LogToConsole/types/models/spt/utils/IAsyncQueue.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/utils/ICommand.d.ts b/TypeScript/1LogToConsole/types/models/spt/utils/ICommand.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/utils/ICommand.d.ts rename to TypeScript/1LogToConsole/types/models/spt/utils/ICommand.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/utils/ILogger.d.ts b/TypeScript/1LogToConsole/types/models/spt/utils/ILogger.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/utils/ILogger.d.ts rename to TypeScript/1LogToConsole/types/models/spt/utils/ILogger.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/utils/IUuidGenerator.d.ts b/TypeScript/1LogToConsole/types/models/spt/utils/IUuidGenerator.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/utils/IUuidGenerator.d.ts rename to TypeScript/1LogToConsole/types/models/spt/utils/IUuidGenerator.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/spt/utils/IWatermark.d.ts b/TypeScript/1LogToConsole/types/models/spt/utils/IWatermark.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/spt/utils/IWatermark.d.ts rename to TypeScript/1LogToConsole/types/models/spt/utils/IWatermark.d.ts diff --git a/TypeScript/1LogToConsole/types/routers/ImageRouter.d.ts b/TypeScript/1LogToConsole/types/routers/ImageRouter.d.ts index 511d5b2..07a0606 100644 --- a/TypeScript/1LogToConsole/types/routers/ImageRouter.d.ts +++ b/TypeScript/1LogToConsole/types/routers/ImageRouter.d.ts @@ -1,7 +1,7 @@ /// import { IncomingMessage, ServerResponse } from "http"; import { VFS } from "../utils/VFS"; -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class ImageRouter { private vfs; constructor(vfs: VFS); diff --git a/TypeScript/1LogToConsole/types/routers/ItemEventRouter.d.ts b/TypeScript/1LogToConsole/types/routers/ItemEventRouter.d.ts index bb5e843..bb20152 100644 --- a/TypeScript/1LogToConsole/types/routers/ItemEventRouter.d.ts +++ b/TypeScript/1LogToConsole/types/routers/ItemEventRouter.d.ts @@ -1,9 +1,9 @@ import { JsonUtil } from "../utils/JsonUtil"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IItemEventRouterRequest } from "../@types/eft/itemEvent/IItemEventRouterRequest"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IItemEventRouterRequest } from "../models/eft/itemEvent/IItemEventRouterRequest"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { ItemEventRouterDefinition } from "../di/Router"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class ItemEventRouter { private logger; private jsonUtil; diff --git a/TypeScript/1LogToConsole/types/routers/item_events/CustomizationItemEventRouter.d.ts b/TypeScript/1LogToConsole/types/routers/item_events/CustomizationItemEventRouter.d.ts index eebc28c..3025e2c 100644 --- a/TypeScript/1LogToConsole/types/routers/item_events/CustomizationItemEventRouter.d.ts +++ b/TypeScript/1LogToConsole/types/routers/item_events/CustomizationItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private customizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/1LogToConsole/types/routers/item_events/HealthItemEventRouter.d.ts b/TypeScript/1LogToConsole/types/routers/item_events/HealthItemEventRouter.d.ts index 333c18a..bad9af2 100644 --- a/TypeScript/1LogToConsole/types/routers/item_events/HealthItemEventRouter.d.ts +++ b/TypeScript/1LogToConsole/types/routers/item_events/HealthItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private healthCallbacks; constructor(healthCallbacks: HealthCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/1LogToConsole/types/routers/item_events/HideoutItemEventRouter.d.ts b/TypeScript/1LogToConsole/types/routers/item_events/HideoutItemEventRouter.d.ts index f68b112..2cec18b 100644 --- a/TypeScript/1LogToConsole/types/routers/item_events/HideoutItemEventRouter.d.ts +++ b/TypeScript/1LogToConsole/types/routers/item_events/HideoutItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private hideoutCallbacks; constructor(hideoutCallbacks: HideoutCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/1LogToConsole/types/routers/item_events/InsuranceItemEventRouter.d.ts b/TypeScript/1LogToConsole/types/routers/item_events/InsuranceItemEventRouter.d.ts index de185db..8efc2c2 100644 --- a/TypeScript/1LogToConsole/types/routers/item_events/InsuranceItemEventRouter.d.ts +++ b/TypeScript/1LogToConsole/types/routers/item_events/InsuranceItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private insuranceCallbacks; constructor(insuranceCallbacks: InsuranceCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/1LogToConsole/types/routers/item_events/InventoryItemEventRouter.d.ts b/TypeScript/1LogToConsole/types/routers/item_events/InventoryItemEventRouter.d.ts index 40496f7..1d93e7b 100644 --- a/TypeScript/1LogToConsole/types/routers/item_events/InventoryItemEventRouter.d.ts +++ b/TypeScript/1LogToConsole/types/routers/item_events/InventoryItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private inventoryCallbacks; constructor(inventoryCallbacks: InventoryCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/1LogToConsole/types/routers/item_events/NoteItemEventRouter.d.ts b/TypeScript/1LogToConsole/types/routers/item_events/NoteItemEventRouter.d.ts index 8b703a3..12af594 100644 --- a/TypeScript/1LogToConsole/types/routers/item_events/NoteItemEventRouter.d.ts +++ b/TypeScript/1LogToConsole/types/routers/item_events/NoteItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private noteCallbacks; constructor(noteCallbacks: NoteCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/1LogToConsole/types/routers/item_events/PresetBuildItemEventRouter.d.ts b/TypeScript/1LogToConsole/types/routers/item_events/PresetBuildItemEventRouter.d.ts index 7a915b1..7298c52 100644 --- a/TypeScript/1LogToConsole/types/routers/item_events/PresetBuildItemEventRouter.d.ts +++ b/TypeScript/1LogToConsole/types/routers/item_events/PresetBuildItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private presetBuildCallbacks; constructor(presetBuildCallbacks: PresetBuildCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/1LogToConsole/types/routers/item_events/QuestItemEventRouter.d.ts b/TypeScript/1LogToConsole/types/routers/item_events/QuestItemEventRouter.d.ts index 6f4d3f6..9944ae9 100644 --- a/TypeScript/1LogToConsole/types/routers/item_events/QuestItemEventRouter.d.ts +++ b/TypeScript/1LogToConsole/types/routers/item_events/QuestItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private questCallbacks; constructor(questCallbacks: QuestCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/1LogToConsole/types/routers/item_events/RagfairItemEventRouter.d.ts b/TypeScript/1LogToConsole/types/routers/item_events/RagfairItemEventRouter.d.ts index 8361e1e..88e52ba 100644 --- a/TypeScript/1LogToConsole/types/routers/item_events/RagfairItemEventRouter.d.ts +++ b/TypeScript/1LogToConsole/types/routers/item_events/RagfairItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private ragfairCallbacks; constructor(ragfairCallbacks: RagfairCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/1LogToConsole/types/routers/item_events/RepairItemEventRouter.d.ts b/TypeScript/1LogToConsole/types/routers/item_events/RepairItemEventRouter.d.ts index 544a656..b292ded 100644 --- a/TypeScript/1LogToConsole/types/routers/item_events/RepairItemEventRouter.d.ts +++ b/TypeScript/1LogToConsole/types/routers/item_events/RepairItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private repairCallbacks; constructor(repairCallbacks: RepairCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/1LogToConsole/types/routers/item_events/TradeItemEventRouter.d.ts b/TypeScript/1LogToConsole/types/routers/item_events/TradeItemEventRouter.d.ts index eb5c294..1bca2b8 100644 --- a/TypeScript/1LogToConsole/types/routers/item_events/TradeItemEventRouter.d.ts +++ b/TypeScript/1LogToConsole/types/routers/item_events/TradeItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private tradeCallbacks; constructor(tradeCallbacks: TradeCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/1LogToConsole/types/routers/item_events/WishlistItemEventRouter.d.ts b/TypeScript/1LogToConsole/types/routers/item_events/WishlistItemEventRouter.d.ts index e7fdc9b..38831f6 100644 --- a/TypeScript/1LogToConsole/types/routers/item_events/WishlistItemEventRouter.d.ts +++ b/TypeScript/1LogToConsole/types/routers/item_events/WishlistItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private wishlistCallbacks; constructor(wishlistCallbacks: WishlistCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/1LogToConsole/types/routers/save_load/HealthSaveLoadRouter.d.ts b/TypeScript/1LogToConsole/types/routers/save_load/HealthSaveLoadRouter.d.ts index c068915..114f5b2 100644 --- a/TypeScript/1LogToConsole/types/routers/save_load/HealthSaveLoadRouter.d.ts +++ b/TypeScript/1LogToConsole/types/routers/save_load/HealthSaveLoadRouter.d.ts @@ -1,4 +1,4 @@ -import { IAkiProfile } from "../../@types/eft/profile/IAkiProfile"; +import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; export declare class HealthSaveLoadRouter extends SaveLoadRouter { constructor(); diff --git a/TypeScript/1LogToConsole/types/routers/save_load/InraidSaveLoadRouter.d.ts b/TypeScript/1LogToConsole/types/routers/save_load/InraidSaveLoadRouter.d.ts index eb5cf5a..4c00b40 100644 --- a/TypeScript/1LogToConsole/types/routers/save_load/InraidSaveLoadRouter.d.ts +++ b/TypeScript/1LogToConsole/types/routers/save_load/InraidSaveLoadRouter.d.ts @@ -1,4 +1,4 @@ -import { IAkiProfile } from "../../@types/eft/profile/IAkiProfile"; +import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; export declare class InraidSaveLoadRouter extends SaveLoadRouter { constructor(); diff --git a/TypeScript/1LogToConsole/types/routers/save_load/InsuranceSaveLoadRouter.d.ts b/TypeScript/1LogToConsole/types/routers/save_load/InsuranceSaveLoadRouter.d.ts index 07df122..30ce98e 100644 --- a/TypeScript/1LogToConsole/types/routers/save_load/InsuranceSaveLoadRouter.d.ts +++ b/TypeScript/1LogToConsole/types/routers/save_load/InsuranceSaveLoadRouter.d.ts @@ -1,4 +1,4 @@ -import { IAkiProfile } from "../../@types/eft/profile/IAkiProfile"; +import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; export declare class InsuranceSaveLoadRouter extends SaveLoadRouter { constructor(); diff --git a/TypeScript/1LogToConsole/types/routers/save_load/ProfileSaveLoadRouter.d.ts b/TypeScript/1LogToConsole/types/routers/save_load/ProfileSaveLoadRouter.d.ts index 51b4cb5..16c7619 100644 --- a/TypeScript/1LogToConsole/types/routers/save_load/ProfileSaveLoadRouter.d.ts +++ b/TypeScript/1LogToConsole/types/routers/save_load/ProfileSaveLoadRouter.d.ts @@ -1,4 +1,4 @@ -import { IAkiProfile } from "../../@types/eft/profile/IAkiProfile"; +import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; export declare class ProfileSaveLoadRouter extends SaveLoadRouter { constructor(); diff --git a/TypeScript/1LogToConsole/types/routers/serializers/BundleSerializer.d.ts b/TypeScript/1LogToConsole/types/routers/serializers/BundleSerializer.d.ts index cf09797..5f275c4 100644 --- a/TypeScript/1LogToConsole/types/routers/serializers/BundleSerializer.d.ts +++ b/TypeScript/1LogToConsole/types/routers/serializers/BundleSerializer.d.ts @@ -1,5 +1,5 @@ -import { IHttpServer } from "../../@types/spt/server/IHttpServer"; -import { ILogger } from "../../@types/spt/utils/ILogger"; +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 { diff --git a/TypeScript/1LogToConsole/types/routers/serializers/ImageSerializer.d.ts b/TypeScript/1LogToConsole/types/routers/serializers/ImageSerializer.d.ts index 1d0b9c4..29340d0 100644 --- a/TypeScript/1LogToConsole/types/routers/serializers/ImageSerializer.d.ts +++ b/TypeScript/1LogToConsole/types/routers/serializers/ImageSerializer.d.ts @@ -1,4 +1,4 @@ -import { IHttpServer } from "../../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { Serializer } from "../../di/Serializer"; import { ImageRouter } from "../ImageRouter"; export declare class ImageSerializer extends Serializer { diff --git a/TypeScript/1LogToConsole/types/routers/serializers/NotifySerializer.d.ts b/TypeScript/1LogToConsole/types/routers/serializers/NotifySerializer.d.ts index d97fc0a..7be87ef 100644 --- a/TypeScript/1LogToConsole/types/routers/serializers/NotifySerializer.d.ts +++ b/TypeScript/1LogToConsole/types/routers/serializers/NotifySerializer.d.ts @@ -1,4 +1,4 @@ -import { IHttpServer } from "../../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { NotifierController } from "../../controllers/NotifierController"; import { Serializer } from "../../di/Serializer"; import { HttpServerHelper } from "../../helpers/HttpServerHelper"; diff --git a/TypeScript/1LogToConsole/types/servers/ConfigServer.d.ts b/TypeScript/1LogToConsole/types/servers/ConfigServer.d.ts index d25d1a8..9c2e114 100644 --- a/TypeScript/1LogToConsole/types/servers/ConfigServer.d.ts +++ b/TypeScript/1LogToConsole/types/servers/ConfigServer.d.ts @@ -1,6 +1,6 @@ import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class ConfigServer { private logger; private vfs; diff --git a/TypeScript/1LogToConsole/types/servers/DatabaseServer.d.ts b/TypeScript/1LogToConsole/types/servers/DatabaseServer.d.ts index b66e847..521bcf9 100644 --- a/TypeScript/1LogToConsole/types/servers/DatabaseServer.d.ts +++ b/TypeScript/1LogToConsole/types/servers/DatabaseServer.d.ts @@ -1,4 +1,4 @@ -import { IDatabaseTables } from "../@types/spt/server/IDatabaseTables"; +import { IDatabaseTables } from "../models/spt/server/IDatabaseTables"; export declare class DatabaseServer { private tableData; getTables(): IDatabaseTables; diff --git a/TypeScript/1LogToConsole/types/servers/HttpServer.d.ts b/TypeScript/1LogToConsole/types/servers/HttpServer.d.ts index e38263d..0ba20c6 100644 --- a/TypeScript/1LogToConsole/types/servers/HttpServer.d.ts +++ b/TypeScript/1LogToConsole/types/servers/HttpServer.d.ts @@ -1,16 +1,16 @@ /// import { HttpRouter } from "../routers/HttpRouter"; import { JsonUtil } from "../utils/JsonUtil"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { DatabaseServer } from "./DatabaseServer"; import { Serializer } from "../di/Serializer"; import http, { ServerResponse } from "http"; -import { INotification } from "../@types/eft/notifier/INotifier"; +import { INotification } from "../models/eft/notifier/INotifier"; import { NotifierHelper } from "../helpers/NotifierHelper"; import { ConfigServer } from "./ConfigServer"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class HttpServer implements IHttpServer { private httpRouter; private logger; @@ -21,7 +21,7 @@ export declare class HttpServer implements IHttpServer { private httpServerHelper; private serializers; private configServer; - constructor(httpRouter: HttpRouter, logger: ILogger, jsonUtil: JsonUtil, httpResponse: HttpResponse, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); + constructor(httpRouter: HttpRouter, logger: ILogger, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); private buffers; private onReceive; private onRespond; diff --git a/TypeScript/1LogToConsole/types/servers/RagfairServer.d.ts b/TypeScript/1LogToConsole/types/servers/RagfairServer.d.ts index ef69106..d103625 100644 --- a/TypeScript/1LogToConsole/types/servers/RagfairServer.d.ts +++ b/TypeScript/1LogToConsole/types/servers/RagfairServer.d.ts @@ -1,4 +1,4 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; @@ -7,12 +7,12 @@ import { RagfairPriceService } from "../services/RagfairPriceService"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { RagfairCategoriesService } from "../services/RagfairCategoriesService"; import { RagfairLinkedItemService } from "../services/RagfairLinkedItemService"; -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ConfigServer } from "./ConfigServer"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairServer { private logger; private ragfairOfferGenerator; @@ -28,7 +28,7 @@ export declare class RagfairServer { private ragfairRequiredItemsService; private configServer; private ragfairConfig; - constructor(logger: ILogger, ragfairOfferGenerator: RagfairOfferGenerator, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponse, saveServer: SaveServer, ragfairPriceService: RagfairPriceService, ragfairOfferService: RagfairOfferService, ragfairLinkedItemService: RagfairLinkedItemService, ragfairCategoriesService: RagfairCategoriesService, ragfairRequiredItemsService: RagfairRequiredItemsService, configServer: ConfigServer); + constructor(logger: ILogger, ragfairOfferGenerator: RagfairOfferGenerator, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, saveServer: SaveServer, ragfairPriceService: RagfairPriceService, ragfairOfferService: RagfairOfferService, ragfairLinkedItemService: RagfairLinkedItemService, ragfairCategoriesService: RagfairCategoriesService, ragfairRequiredItemsService: RagfairRequiredItemsService, configServer: ConfigServer); load(): void; update(): void; private processExpiredOffer; diff --git a/TypeScript/1LogToConsole/types/servers/SaveServer.d.ts b/TypeScript/1LogToConsole/types/servers/SaveServer.d.ts index 23da9ea..fdf92e4 100644 --- a/TypeScript/1LogToConsole/types/servers/SaveServer.d.ts +++ b/TypeScript/1LogToConsole/types/servers/SaveServer.d.ts @@ -1,9 +1,9 @@ -import { IAkiProfile, Info } from "../@types/eft/profile/IAkiProfile"; +import { IAkiProfile, Info } from "../models/eft/profile/IAkiProfile"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; import { SaveLoadRouter } from "../di/Router"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class SaveServer { private vfs; private saveLoadRouters; diff --git a/TypeScript/1LogToConsole/types/services/FenceService.d.ts b/TypeScript/1LogToConsole/types/services/FenceService.d.ts index 4b80d50..eef87b3 100644 --- a/TypeScript/1LogToConsole/types/services/FenceService.d.ts +++ b/TypeScript/1LogToConsole/types/services/FenceService.d.ts @@ -2,14 +2,14 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { HandbookHelper } from "../helpers/HandbookHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { PresetHelper } from "../helpers/PresetHelper"; -import { FenceLevel } from "../@types/eft/common/IGlobals"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; +import { FenceLevel } from "../models/eft/common/IGlobals"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; import { ConfigServer } from "../servers/ConfigServer"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class FenceService { private logger; private hashUtil; diff --git a/TypeScript/1LogToConsole/types/services/HashCacheService.d.ts b/TypeScript/1LogToConsole/types/services/HashCacheService.d.ts new file mode 100644 index 0000000..c9b0170 --- /dev/null +++ b/TypeScript/1LogToConsole/types/services/HashCacheService.d.ts @@ -0,0 +1,19 @@ +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 { + private vfs; + private hashUtil; + private jsonUtil; + private logger; + private jsonHashes; + private modHashes; + private readonly modCachePath; + constructor(vfs: VFS, hashUtil: HashUtil, jsonUtil: JsonUtil, logger: ILogger); + getStoredModHash(modName: string): string; + modContentMatchesStoredHash(modName: string, modContent: string): boolean; + hashMatchesStoredHash(modName: string, modHash: string): boolean; + storeModContent(modName: string, modContent: string): void; + storeModHash(modName: string, modHash: string): void; +} diff --git a/TypeScript/1LogToConsole/types/services/InsuranceService.d.ts b/TypeScript/1LogToConsole/types/services/InsuranceService.d.ts index cd91136..35f0dbc 100644 --- a/TypeScript/1LogToConsole/types/services/InsuranceService.d.ts +++ b/TypeScript/1LogToConsole/types/services/InsuranceService.d.ts @@ -1,10 +1,9 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData"; -import { IInsuranceConfig } from "../@types/spt/config/IInsuranceConfig"; -import { ILogger } from "../@types/spt/utils/ILogger"; +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 { InventoryHelper } from "../helpers/InventoryHelper"; +import { SecureContainerHelper } from "../helpers/SecureContainerHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -14,7 +13,7 @@ import { TimeUtil } from "../utils/TimeUtil"; export declare class InsuranceService { private logger; private databaseServer; - private inventoryHelper; + private secureContainerHelper; private randomUtil; private timeUtil; private saveServer; @@ -23,8 +22,8 @@ export declare class InsuranceService { private configServer; private insured; private templatesById; - insuranceConfig: IInsuranceConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, inventoryHelper: InventoryHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, configServer: ConfigServer); + private insuranceConfig; + constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, configServer: ConfigServer); insuranceExists(sessionId: string): boolean; insuranceTraderArrayExists(sessionId: string, traderId: string): boolean; getInsurance(sessionId: string): Record; diff --git a/TypeScript/1LogToConsole/types/services/ModCompilerService.d.ts b/TypeScript/1LogToConsole/types/services/ModCompilerService.d.ts new file mode 100644 index 0000000..7e750c3 --- /dev/null +++ b/TypeScript/1LogToConsole/types/services/ModCompilerService.d.ts @@ -0,0 +1,11 @@ +import { ILogger } from "../models/spt/utils/ILogger"; +import { VFS } from "../utils/VFS"; +export declare class ModCompilerService { + private logger; + private vfs; + constructor(logger: ILogger, vfs: VFS); + compileMod(path: string, modTypeScriptFiles: string[]): Promise; + private compile; + private areFilesReady; + private delay; +} diff --git a/TypeScript/1LogToConsole/types/services/NotificationService.d.ts b/TypeScript/1LogToConsole/types/services/NotificationService.d.ts index 5c0e0ec..9c6c143 100644 --- a/TypeScript/1LogToConsole/types/services/NotificationService.d.ts +++ b/TypeScript/1LogToConsole/types/services/NotificationService.d.ts @@ -1,4 +1,4 @@ -import { INotification } from "../@types/eft/notifier/INotifier"; +import { INotification } from "../models/eft/notifier/INotifier"; export declare class NotificationService { private messageQueue; getMessageQueue(): {}; diff --git a/TypeScript/1LogToConsole/types/services/PaymentService.d.ts b/TypeScript/1LogToConsole/types/services/PaymentService.d.ts index 245bb34..20cee50 100644 --- a/TypeScript/1LogToConsole/types/services/PaymentService.d.ts +++ b/TypeScript/1LogToConsole/types/services/PaymentService.d.ts @@ -1,15 +1,15 @@ import { InventoryHelper } from "../helpers/InventoryHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IProcessBuyTradeRequestData } from "../@types/eft/trade/IProcessBuyTradeRequestData"; -import { IProcessSellTradeRequestData } from "../@types/eft/trade/IProcessSellTradeRequestData"; +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 { HttpResponse } from "../utils/HttpResponse"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class PaymentService { private logger; private httpResponse; @@ -19,7 +19,7 @@ export declare class PaymentService { private itemHelper; private inventoryHelper; private paymentHelper; - constructor(logger: ILogger, httpResponse: HttpResponse, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); + constructor(logger: ILogger, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request * @param {Object} pmcData @@ -38,5 +38,11 @@ export declare class PaymentService { * @returns IItemEventRouterResponse */ getMoney(pmcData: IPmcData, amount: number, body: IProcessSellTradeRequestData, output: IItemEventRouterResponse, sessionID: string): IItemEventRouterResponse; + /** + * Recursively checks if the given item is + * inside the stash, that is it has the stash as + * ancestor with slotId=hideout + */ + private isItemInStash; addPaymentToOutput(pmcData: IPmcData, currencyTpl: string, amountToPay: number, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse; } diff --git a/TypeScript/1LogToConsole/types/services/PlayerService.d.ts b/TypeScript/1LogToConsole/types/services/PlayerService.d.ts index ec6e32c..4a74b4a 100644 --- a/TypeScript/1LogToConsole/types/services/PlayerService.d.ts +++ b/TypeScript/1LogToConsole/types/services/PlayerService.d.ts @@ -1,7 +1,7 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IPlayerIncrementSkillLevelRequestData } from "../@types/eft/player/IPlayerIncrementSkillLevelRequestData"; -import { ILogger } from "../@types/spt/utils/ILogger"; +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 { private logger; private databaseServer; diff --git a/TypeScript/1LogToConsole/types/services/RagfairCategoriesService.d.ts b/TypeScript/1LogToConsole/types/services/RagfairCategoriesService.d.ts index 370886e..fb9efa2 100644 --- a/TypeScript/1LogToConsole/types/services/RagfairCategoriesService.d.ts +++ b/TypeScript/1LogToConsole/types/services/RagfairCategoriesService.d.ts @@ -1,4 +1,4 @@ -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; export declare class RagfairCategoriesService { updateCategories(offers: IRagfairOffer[]): void; private categories; diff --git a/TypeScript/1LogToConsole/types/services/RagfairOfferService.d.ts b/TypeScript/1LogToConsole/types/services/RagfairOfferService.d.ts index 1b7682d..4e4ae26 100644 --- a/TypeScript/1LogToConsole/types/services/RagfairOfferService.d.ts +++ b/TypeScript/1LogToConsole/types/services/RagfairOfferService.d.ts @@ -2,9 +2,8 @@ import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { TimeUtil } from "../utils/TimeUtil"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; -import { IRagfairConfig } from "../@types/spt/config/IRagfairConfig"; +import { Item } from "../models/eft/common/tables/IItem"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; export declare class RagfairOfferService { private timeUtil; private databaseServer; @@ -14,7 +13,7 @@ export declare class RagfairOfferService { private toUpdate; private expiredOffers; private offers; - ragfairConfig: IRagfairConfig; + private ragfairConfig; constructor(timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, configServer: ConfigServer); getOffers(): IRagfairOffer[]; getOfferByOfferId(offerId: string): IRagfairOffer; diff --git a/TypeScript/1LogToConsole/types/services/RagfairPriceService.d.ts b/TypeScript/1LogToConsole/types/services/RagfairPriceService.d.ts index d91df24..7cc42f9 100644 --- a/TypeScript/1LogToConsole/types/services/RagfairPriceService.d.ts +++ b/TypeScript/1LogToConsole/types/services/RagfairPriceService.d.ts @@ -4,9 +4,9 @@ import { ConfigServer } from "../servers/ConfigServer"; import { HandbookHelper } from "../helpers/HandbookHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { PresetHelper } from "../helpers/PresetHelper"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { IBarterScheme } from "../@types/eft/common/tables/ITrader"; -import { ILogger } from "../@types/spt/utils/ILogger"; +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 { private handbookHelper; private databaseServer; diff --git a/TypeScript/1LogToConsole/types/services/RagfairRequiredItemsService.d.ts b/TypeScript/1LogToConsole/types/services/RagfairRequiredItemsService.d.ts index 3908cb9..e4582d0 100644 --- a/TypeScript/1LogToConsole/types/services/RagfairRequiredItemsService.d.ts +++ b/TypeScript/1LogToConsole/types/services/RagfairRequiredItemsService.d.ts @@ -1,6 +1,6 @@ import { PaymentHelper } from "../helpers/PaymentHelper"; import { RagfairOfferService } from "../services/RagfairOfferService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairRequiredItemsService { private logger; private paymentHelper; diff --git a/TypeScript/1LogToConsole/types/services/TraderAssortService.d.ts b/TypeScript/1LogToConsole/types/services/TraderAssortService.d.ts index 99b23f1..ccb9e45 100644 --- a/TypeScript/1LogToConsole/types/services/TraderAssortService.d.ts +++ b/TypeScript/1LogToConsole/types/services/TraderAssortService.d.ts @@ -1,4 +1,4 @@ -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; export declare class TraderAssortService { private pristineTraderAssorts; getPristineTraderAssort(traderId: string): ITraderAssort; diff --git a/TypeScript/1LogToConsole/types/utils/App.d.ts b/TypeScript/1LogToConsole/types/utils/App.d.ts index 4b082a0..a11f576 100644 --- a/TypeScript/1LogToConsole/types/utils/App.d.ts +++ b/TypeScript/1LogToConsole/types/utils/App.d.ts @@ -1,7 +1,7 @@ import { TimeUtil } from "./TimeUtil"; import { OnLoad } from "../di/OnLoad"; import { OnUpdate } from "../di/OnUpdate"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class App { private logger; private timeUtil; diff --git a/TypeScript/1LogToConsole/types/utils/AyncQueue.d.ts b/TypeScript/1LogToConsole/types/utils/AyncQueue.d.ts index 773a5e4..8f1559b 100644 --- a/TypeScript/1LogToConsole/types/utils/AyncQueue.d.ts +++ b/TypeScript/1LogToConsole/types/utils/AyncQueue.d.ts @@ -1,5 +1,5 @@ -import { IAsyncQueue } from "../@types/spt/utils/IAsyncQueue"; -import { ICommand } from "../@types/spt/utils/ICommand"; +import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; +import { ICommand } from "../models/spt/utils/ICommand"; export declare class AsyncQueue implements IAsyncQueue { commandsQueue: ICommand[]; constructor(); diff --git a/TypeScript/1LogToConsole/types/utils/DatabaseImporter.d.ts b/TypeScript/1LogToConsole/types/utils/DatabaseImporter.d.ts index 41b3e5f..97dda30 100644 --- a/TypeScript/1LogToConsole/types/utils/DatabaseImporter.d.ts +++ b/TypeScript/1LogToConsole/types/utils/DatabaseImporter.d.ts @@ -3,7 +3,7 @@ import { JsonUtil } from "./JsonUtil"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ImageRouter } from "../routers/ImageRouter"; import { OnLoad } from "../di/OnLoad"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class DatabaseImporter extends OnLoad { private logger; private vfs; diff --git a/TypeScript/1LogToConsole/types/utils/HttpResponse.d.ts b/TypeScript/1LogToConsole/types/utils/HttpResponseUtil.d.ts similarity index 73% rename from TypeScript/1LogToConsole/types/utils/HttpResponse.d.ts rename to TypeScript/1LogToConsole/types/utils/HttpResponseUtil.d.ts index d5a90d7..85c28bd 100644 --- a/TypeScript/1LogToConsole/types/utils/HttpResponse.d.ts +++ b/TypeScript/1LogToConsole/types/utils/HttpResponseUtil.d.ts @@ -1,8 +1,8 @@ import { JsonUtil } from "./JsonUtil"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -export declare class HttpResponse { +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 { private jsonUtil; constructor(jsonUtil: JsonUtil); private clearString; diff --git a/TypeScript/1LogToConsole/types/utils/JsonUtil.d.ts b/TypeScript/1LogToConsole/types/utils/JsonUtil.d.ts index 69cf8f1..20b7448 100644 --- a/TypeScript/1LogToConsole/types/utils/JsonUtil.d.ts +++ b/TypeScript/1LogToConsole/types/utils/JsonUtil.d.ts @@ -1,12 +1,12 @@ -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; import { HashUtil } from "./HashUtil"; import { VFS } from "./VFS"; export declare class JsonUtil { private vfs; - private hashutil; + private hashUtil; private logger; private fileHashes; - constructor(vfs: VFS, hashutil: HashUtil, logger: ILogger); + constructor(vfs: VFS, hashUtil: HashUtil, logger: ILogger); /** * From object to string * @param data object to turn into JSON diff --git a/TypeScript/1LogToConsole/types/utils/Logger.d.ts b/TypeScript/1LogToConsole/types/utils/Logger.d.ts index 57da5ae..9d5b32a 100644 --- a/TypeScript/1LogToConsole/types/utils/Logger.d.ts +++ b/TypeScript/1LogToConsole/types/utils/Logger.d.ts @@ -1,14 +1,16 @@ /// -import { Daum } from "../@types/eft/itemEvent/IItemEventRouterRequest"; -import { ILogger } from "../@types/spt/utils/ILogger"; -import { IAsyncQueue } from "../@types/spt/utils/IAsyncQueue"; -import { IUUidGenerator } from "../@types/spt/utils/IUuidGenerator"; +import { Daum } from "../models/eft/itemEvent/IItemEventRouterRequest"; +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 { private asyncQueue; private uuidGenerator; private showDebugInConsole; - private filepath; + private folderPath; + private file; + private filePath; private logLevels; private logger; writeFilePromisify: (path: fs.PathLike, data: string, options?: any) => Promise; diff --git a/TypeScript/1LogToConsole/types/utils/RandomUtil.d.ts b/TypeScript/1LogToConsole/types/utils/RandomUtil.d.ts index a1bac79..3a3ecb6 100644 --- a/TypeScript/1LogToConsole/types/utils/RandomUtil.d.ts +++ b/TypeScript/1LogToConsole/types/utils/RandomUtil.d.ts @@ -1,3 +1,4 @@ +import { ILogger } from "../models/spt/utils/ILogger"; import { JsonUtil } from "./JsonUtil"; import { MathUtil } from "./MathUtil"; /** @@ -103,7 +104,8 @@ export declare class ProbabilityObject { } export declare class RandomUtil { private jsonUtil; - constructor(jsonUtil: JsonUtil); + private logger; + constructor(jsonUtil: JsonUtil, logger: ILogger); getInt(min: number, max: number): number; getIntEx(max: number): number; getFloat(min: number, max: number): number; @@ -147,4 +149,5 @@ export declare class RandomUtil { * @return {array} Array consisting of N random keys of the dictionary */ drawRandomFromDict(dict: any, count?: number, replacement?: boolean): any[]; + getBiasedRandomNumber(min: number, max: number, shift: number, n: number): number; } diff --git a/TypeScript/1LogToConsole/types/utils/UUidGenerator.d.ts b/TypeScript/1LogToConsole/types/utils/UUidGenerator.d.ts index 763424a..000b719 100644 --- a/TypeScript/1LogToConsole/types/utils/UUidGenerator.d.ts +++ b/TypeScript/1LogToConsole/types/utils/UUidGenerator.d.ts @@ -1,4 +1,4 @@ -import { IUUidGenerator } from "../@types/spt/utils/IUuidGenerator"; +import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; export declare class UUidGenerator implements IUUidGenerator { generate: () => string; } diff --git a/TypeScript/1LogToConsole/types/utils/VFS.d.ts b/TypeScript/1LogToConsole/types/utils/VFS.d.ts index c8d32f1..b064cf4 100644 --- a/TypeScript/1LogToConsole/types/utils/VFS.d.ts +++ b/TypeScript/1LogToConsole/types/utils/VFS.d.ts @@ -1,8 +1,8 @@ /// import "reflect-metadata"; import fs from "fs"; -import { IAsyncQueue } from "../@types/spt/utils/IAsyncQueue"; -import { IUUidGenerator } from "../@types/spt/utils/IUuidGenerator"; +import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; +import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; export declare class VFS { private asyncQueue; private uuidGenerator; @@ -50,4 +50,5 @@ export declare class VFS { stripExtension(filepath: string): string; minifyAllJsonInDirRecursive(filepath: string): Promise; minifyAllJsonInDirRecursiveAsync(filepath: string): Promise; + getFilesOfType(directory: string, fileType: string, files?: string[]): string[]; } diff --git a/TypeScript/1LogToConsole/types/utils/Watermark.d.ts b/TypeScript/1LogToConsole/types/utils/Watermark.d.ts index e7765e1..598d5a6 100644 --- a/TypeScript/1LogToConsole/types/utils/Watermark.d.ts +++ b/TypeScript/1LogToConsole/types/utils/Watermark.d.ts @@ -1,6 +1,6 @@ -import { IWatermark, IWatermarkLocale } from "../@types/spt/utils/IWatermark"; +import { IWatermark, IWatermarkLocale } from "../models/spt/utils/IWatermark"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class WatermarkLocale implements IWatermarkLocale { private locales; getLocale(): string; diff --git a/TypeScript/2EditDatabase/package.json b/TypeScript/2EditDatabase/package.json index 87a132f..b003a50 100644 --- a/TypeScript/2EditDatabase/package.json +++ b/TypeScript/2EditDatabase/package.json @@ -4,7 +4,7 @@ "main": "src/mod.js", "license": "MIT", "author": "Chomp", - "akiVersion": "2.4.0", + "akiVersion": "3.0.0", "scripts": { "install": "npx handpick --target=devDependencies", "build": "tsc" diff --git a/TypeScript/2EditDatabase/src/mod.js b/TypeScript/2EditDatabase/src/mod.js new file mode 100644 index 0000000..256adb8 --- /dev/null +++ b/TypeScript/2EditDatabase/src/mod.js @@ -0,0 +1,20 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +class Mod { + // not used for this example + load(container) { return; } + delayedLoad(container) { + // get database from server + const databaseServer = container.resolve("DatabaseServer"); + // Get all the in-memory json found in /assets/database + const tables = databaseServer.getTables(); + // find the ledx item by its Id + const ledx = tables.templates.items["5c0530ee86f774697952d952"]; + // update one of its properties to be true + ledx._props.CanSellOnRagfair = true; + // example #2 + // get globals settings and set flea market min level to be 1 + tables.globals.config.RagFair.minUserLevel = 1; + } +} +module.exports = { mod: new Mod() }; diff --git a/TypeScript/2EditDatabase/src/mod.ts b/TypeScript/2EditDatabase/src/mod.ts index cc7667a..f45b4fe 100644 --- a/TypeScript/2EditDatabase/src/mod.ts +++ b/TypeScript/2EditDatabase/src/mod.ts @@ -1,6 +1,6 @@ import type { DependencyContainer } from "tsyringe"; -import { IMod } from "../types/@types/external/mod"; +import { IMod } from "../types/models/external/mod"; import type { DatabaseServer } from "../types/servers/DatabaseServer"; class Mod implements IMod diff --git a/TypeScript/2EditDatabase/tsconfig.json b/TypeScript/2EditDatabase/tsconfig.json index 4204c72..8ba3117 100644 --- a/TypeScript/2EditDatabase/tsconfig.json +++ b/TypeScript/2EditDatabase/tsconfig.json @@ -9,7 +9,6 @@ "experimentalDecorators": true, "emitDecoratorMetadata": true, "resolveJsonModule": true, - "esModuleInterop": true, "outDir": "out" }, "lib": [ diff --git a/TypeScript/2EditDatabase/types/@types/eft/common/IItemEventResponseData.d.ts b/TypeScript/2EditDatabase/types/@types/eft/common/IItemEventResponseData.d.ts deleted file mode 100644 index 08fb8a7..0000000 --- a/TypeScript/2EditDatabase/types/@types/eft/common/IItemEventResponseData.d.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { Skills } from "./IPmcData"; -export interface IItemEventResponseData { - warnings: any[]; - profileChanges: Record; -} -export interface ProfileChange { - _id: string; - experience: number; - quests: any[]; - ragFairOffers: any[]; - builds: any[]; - items: Items; - production: Production; - skills: Skills; - traderRelations: TraderRelations; -} -export interface Items { - new: any[]; - change: any[]; - del: any[]; -} -export interface Production { -} -export interface TraderRelations { -} diff --git a/TypeScript/2EditDatabase/types/@types/eft/common/IPmcDataRepeatableQuest.d.ts b/TypeScript/2EditDatabase/types/@types/eft/common/IPmcDataRepeatableQuest.d.ts deleted file mode 100644 index 15a1c09..0000000 --- a/TypeScript/2EditDatabase/types/@types/eft/common/IPmcDataRepeatableQuest.d.ts +++ /dev/null @@ -1,71 +0,0 @@ -export interface IPmcDataRepeatableQuest { - name: string; - activeQuests: Quest[]; - inactiveQuests: Quest[]; - endTime: number; -} -export interface Quest { - _id: string; - traderId: string; - location: string; - image: string; - type: string; - isKey: boolean; - restartable: boolean; - instantComplete: boolean; - secretQuest: boolean; - canShowNotificationsInGame: boolean; - rewards: Rewards; - conditions: Conditions; - name: string; - note: string; - description: string; - successMessageText: string; - failMessageText: string; - startedMessageText: string; - templateId: string; -} -export interface Rewards { - Started: Reward[]; - Success: Reward[]; - Fail: Reward[]; -} -export interface Reward { - value: number; - type: string; - index: number; - target?: string; - items?: Item[]; -} -export interface Item { - _id: string; - _tpl: string; - upd: Upd; -} -export interface Conditions { - AvailableForStart: any[]; - AvailableForFinish: AvailableForFinish[]; - Fail: any[]; -} -export interface AvailableForFinish { - _props: Props; - _parent: string; - dynamicLocale: boolean; -} -export interface Props { - id: string; - parentId: string; - dynamicLocale: boolean; - index: number; - visibilityConditions: any[]; - target: string[]; - value: number; - minDurability: number; - maxDurability: number; - dogtagLevel: number; - onlyFoundInRaid: boolean; -} -export interface Upd { - StackObjectsCount: number; - SpawnedInSession?: boolean; -} diff --git a/TypeScript/2EditDatabase/types/@types/eft/hideout/IHideoutRequestData.d.ts b/TypeScript/2EditDatabase/types/@types/eft/hideout/IHideoutRequestData.d.ts deleted file mode 100644 index 77c0665..0000000 --- a/TypeScript/2EditDatabase/types/@types/eft/hideout/IHideoutRequestData.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -export interface IHideoutRequestData { - Action: "HideoutUpgrade"; - areaType: number; - items: HideoutItem[]; - timestamp: number; -} -export interface HideoutItem { - count: number; - id: string; -} diff --git a/TypeScript/2EditDatabase/types/@types/eft/itemEvent/IHandleEventRequestData.d.ts b/TypeScript/2EditDatabase/types/@types/eft/itemEvent/IHandleEventRequestData.d.ts deleted file mode 100644 index a7ae306..0000000 --- a/TypeScript/2EditDatabase/types/@types/eft/itemEvent/IHandleEventRequestData.d.ts +++ /dev/null @@ -1,21 +0,0 @@ -export interface IHandleEventRequestData { - data: Daum[]; - tm: number; - reload: number; -} -export interface Daum { - Action: string; - item: string; - to?: To; -} -export interface To { - id: string; - container: string; - location: Location; -} -export interface Location { - x: number; - y: number; - r: string; - isSearched: boolean; -} diff --git a/TypeScript/2EditDatabase/types/@types/eft/notes/INoteData.d.ts b/TypeScript/2EditDatabase/types/@types/eft/notes/INoteData.d.ts deleted file mode 100644 index 4021bb7..0000000 --- a/TypeScript/2EditDatabase/types/@types/eft/notes/INoteData.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface INote { - Time: number; - Text: string; -} diff --git a/TypeScript/2EditDatabase/types/@types/eft/presetBuild/IPresetBuildActionData.d.ts b/TypeScript/2EditDatabase/types/@types/eft/presetBuild/IPresetBuildActionData.d.ts deleted file mode 100644 index 13ec722..0000000 --- a/TypeScript/2EditDatabase/types/@types/eft/presetBuild/IPresetBuildActionData.d.ts +++ /dev/null @@ -1,25 +0,0 @@ -export interface IPresetBuildActionData { - Action: string; - id: string; - name: string; - root: string; - items: Item[]; -} -export interface Item { - _id: string; - _tpl: string; - upd?: Upd; - parentId?: string; - slotId?: string; -} -export interface Upd { - Repairable: Repairable; - FireMode: FireMode; -} -export interface Repairable { - MaxDurability: number; - Durability: number; -} -export interface FireMode { - FireMode: string; -} diff --git a/TypeScript/2EditDatabase/types/@types/eft/ragfair/ISaleChance.d.ts b/TypeScript/2EditDatabase/types/@types/eft/ragfair/ISaleChance.d.ts deleted file mode 100644 index 14b434a..0000000 --- a/TypeScript/2EditDatabase/types/@types/eft/ragfair/ISaleChance.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface ISaleChance { - sellTime: number; - amount: number; -} diff --git a/TypeScript/2EditDatabase/types/@types/eft/repair/IRepairActionData.d.ts b/TypeScript/2EditDatabase/types/@types/eft/repair/IRepairActionData.d.ts deleted file mode 100644 index e6f90c8..0000000 --- a/TypeScript/2EditDatabase/types/@types/eft/repair/IRepairActionData.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -export interface IRepairActionData { - Action: string; - tid: string; - repairItems: RepairItem[]; -} -export interface RepairItem { - _id: string; - count: number; -} diff --git a/TypeScript/2EditDatabase/types/@types/notes/INoteActionData.d.ts b/TypeScript/2EditDatabase/types/@types/notes/INoteActionData.d.ts deleted file mode 100644 index 7d07cdd..0000000 --- a/TypeScript/2EditDatabase/types/@types/notes/INoteActionData.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { INote } from "../eft/notes/INoteData"; -export interface INoteActionData { - Action: string; - index: number; - note: INote; -} diff --git a/TypeScript/2EditDatabase/types/@types/spt/helpers/IGetItemResponse.d.ts b/TypeScript/2EditDatabase/types/@types/spt/helpers/IGetItemResponse.d.ts deleted file mode 100644 index e6f3783..0000000 --- a/TypeScript/2EditDatabase/types/@types/spt/helpers/IGetItemResponse.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export interface IGetItemResponse { -} diff --git a/TypeScript/2EditDatabase/types/Lib.d.ts b/TypeScript/2EditDatabase/types/Lib.d.ts deleted file mode 100644 index 5c77c26..0000000 --- a/TypeScript/2EditDatabase/types/Lib.d.ts +++ /dev/null @@ -1,94 +0,0 @@ -import { BundleLoader } from "./loaders/BundleLoader"; -export { BundleLoader }; -import { ModLoader } from "./loaders/ModLoader"; -export { ModLoader }; -import { ContainerHelper } from "./helpers/ContainerHelper.js"; -export { ContainerHelper }; -import { InventoryHelper } from "./helpers/InventoryHelper.js"; -export { InventoryHelper }; -import { ItemHelper } from "./helpers/ItemHelper.js"; -export { ItemHelper }; -import { GameEventHelper } from "./helpers/GameEventHelper.js"; -export { GameEventHelper }; -import { QuestHelper } from "./helpers/QuestHelper.js"; -export { QuestHelper }; -import { UtilityHelper } from "./helpers/UtilityHelper.js"; -export { UtilityHelper }; -import { TraderHelper } from "./helpers/TraderHelper.js"; -export { TraderHelper }; -import { RagfairServerHelper } from "./helpers/RagfairServerHelper.js"; -export { RagfairServerHelper }; -import { DurabilityLimitsHelper } from "./helpers/DurabilityLimitsHelper.js"; -export { DurabilityLimitsHelper }; -import { WeightedRandomHelper } from "./helpers/WeightedRandomHelper.js"; -export { WeightedRandomHelper }; -import { BotCallbacks } from "./callbacks/BotCallbacks.js"; -export { BotCallbacks }; -import { DataCallbacks } from "./callbacks/DataCallbacks.js"; -export { DataCallbacks }; -import { DialogueCallbacks } from "./callbacks/DialogueCallbacks.js"; -export { DialogueCallbacks }; -import { GameCallbacks } from "./callbacks/GameCallbacks.js"; -export { GameCallbacks }; -import { HideoutCallbacks } from "./callbacks/HideoutCallbacks"; -export { HideoutCallbacks }; -import { HttpCallbacks } from "./callbacks/HttpCallbacks.js"; -export { HttpCallbacks }; -import { InraidCallbacks } from "./callbacks/InraidCallbacks.js"; -export { InraidCallbacks }; -import { InventoryCallbacks } from "./callbacks/InventoryCallbacks.js"; -export { InventoryCallbacks }; -import { NotifierCallbacks } from "./callbacks/NotifierCallbacks.js"; -export { NotifierCallbacks }; -import { ProfileCallbacks } from "./callbacks/ProfileCallbacks.js"; -export { ProfileCallbacks }; -import { QuestCallbacks } from "./callbacks/QuestCallbacks.js"; -export { QuestCallbacks }; -import { RagfairCallbacks } from "./callbacks/RagfairCallbacks.js"; -export { RagfairCallbacks }; -import { TraderCallbacks } from "./callbacks/TraderCallbacks.js"; -export { TraderCallbacks }; -import { BotController } from "./controllers/BotController.js"; -export { BotController }; -import { DialogueController } from "./controllers/DialogueController.js"; -export { DialogueController }; -import { GameController } from "./controllers/GameController.js"; -export { GameController }; -import { HealthController } from "./controllers/HealthController.js"; -export { HealthController }; -import { HideoutController } from "./controllers/HideoutController.js"; -export { HideoutController }; -import { InsuranceController } from "./controllers/InsuranceController.js"; -export { InsuranceController }; -import { InventoryController } from "./controllers/InventoryController.js"; -export { InventoryController }; -import { LocationController } from "./controllers/LocationController.js"; -export { LocationController }; -import { NotifierController } from "./controllers/NotifierController.js"; -export { NotifierController }; -import { PresetController } from "./controllers/PresetController.js"; -export { PresetController }; -import { ProfileController } from "./controllers/ProfileController.js"; -export { ProfileController }; -import { QuestController } from "./controllers/QuestController.js"; -export { QuestController }; -import { RepeatableQuestController } from "./controllers/RepeatableQuestController.js"; -export { RepeatableQuestController }; -import { RagfairController } from "./controllers/RagfairController.js"; -export { RagfairController }; -import { TraderController } from "./controllers/TraderController.js"; -export { TraderController }; -import { PaymentController } from "./controllers/PaymentController"; -export { PaymentController }; -import { PlayerController } from "./controllers/PlayerController.js"; -export { PlayerController }; -import { HandbookController } from "./controllers/HandbookController.js"; -export { HandbookController }; -import { DatabaseServer } from "./servers/DatabaseServer"; -export { DatabaseServer }; -import { HttpServer } from "./servers/HttpServer.js"; -export { HttpServer }; -import { RagfairServer } from "./servers/RagfairServer.js"; -export { RagfairServer }; -import { SaveServer } from "./servers/SaveServer"; -export { SaveServer }; diff --git a/TypeScript/2EditDatabase/types/Program.d.ts b/TypeScript/2EditDatabase/types/Program.d.ts index fe57d08..d4b71b9 100644 --- a/TypeScript/2EditDatabase/types/Program.d.ts +++ b/TypeScript/2EditDatabase/types/Program.d.ts @@ -1,8 +1,4 @@ -import "reflect-metadata"; -import { App } from "./utils/App"; -export interface IProgram { -} -export declare class Program implements IProgram { - private app; - constructor(app: App); +export declare class Program { + constructor(); + start(): void; } diff --git a/TypeScript/2EditDatabase/types/bindings/AppLoad.d.ts b/TypeScript/2EditDatabase/types/bindings/AppLoad.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/2EditDatabase/types/bindings/AppLoad.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/2EditDatabase/types/bindings/AppUpdate.d.ts b/TypeScript/2EditDatabase/types/bindings/AppUpdate.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/2EditDatabase/types/bindings/AppUpdate.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/2EditDatabase/types/bindings/DynamicRoutes.d.ts b/TypeScript/2EditDatabase/types/bindings/DynamicRoutes.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/2EditDatabase/types/bindings/DynamicRoutes.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/2EditDatabase/types/bindings/ItemEvents.d.ts b/TypeScript/2EditDatabase/types/bindings/ItemEvents.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/2EditDatabase/types/bindings/ItemEvents.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/2EditDatabase/types/bindings/SaveLoad.d.ts b/TypeScript/2EditDatabase/types/bindings/SaveLoad.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/2EditDatabase/types/bindings/SaveLoad.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/2EditDatabase/types/bindings/ServerRespond.d.ts b/TypeScript/2EditDatabase/types/bindings/ServerRespond.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/2EditDatabase/types/bindings/ServerRespond.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/2EditDatabase/types/bindings/StaticRoutes.d.ts b/TypeScript/2EditDatabase/types/bindings/StaticRoutes.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/2EditDatabase/types/bindings/StaticRoutes.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/2EditDatabase/types/callbacks/BotCallbacks.d.ts b/TypeScript/2EditDatabase/types/callbacks/BotCallbacks.d.ts index 511c545..358d5e3 100644 --- a/TypeScript/2EditDatabase/types/callbacks/BotCallbacks.d.ts +++ b/TypeScript/2EditDatabase/types/callbacks/BotCallbacks.d.ts @@ -1,13 +1,13 @@ import { BotController } from "../controllers/BotController"; -import { IGenerateBotsRequestData } from "../@types/eft/bot/IGenerateBotsRequestData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IBotBase } from "../@types/eft/common/tables/IBotBase"; -import { HttpResponse } from "../utils/HttpResponse"; +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 { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class BotCallbacks { private botController; private httpResponse; - constructor(botController: BotController, httpResponse: HttpResponse); + constructor(botController: BotController, httpResponse: HttpResponseUtil); 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/2EditDatabase/types/callbacks/BundleCallbacks.d.ts b/TypeScript/2EditDatabase/types/callbacks/BundleCallbacks.d.ts index 1fb6275..08c33c0 100644 --- a/TypeScript/2EditDatabase/types/callbacks/BundleCallbacks.d.ts +++ b/TypeScript/2EditDatabase/types/callbacks/BundleCallbacks.d.ts @@ -1,17 +1,16 @@ import { BundleLoader } from "../loaders/BundleLoader"; import { ConfigServer } from "../servers/ConfigServer"; -import { IHttpConfig } from "../@types/spt/config/IHttpConfig"; -import { HttpResponse } from "../utils/HttpResponse"; -import { ILogger } from "../@types/spt/utils/ILogger"; -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +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; private httpServer; private bundleLoader; private configServer; - httpConfig: IHttpConfig; - constructor(logger: ILogger, httpResponse: HttpResponse, httpServer: IHttpServer, bundleLoader: BundleLoader, configServer: ConfigServer); + private httpConfig; + constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, bundleLoader: BundleLoader, configServer: ConfigServer); 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/2EditDatabase/types/callbacks/CustomizationCallbacks.d.ts b/TypeScript/2EditDatabase/types/callbacks/CustomizationCallbacks.d.ts index 4c27712..0a4265b 100644 --- a/TypeScript/2EditDatabase/types/callbacks/CustomizationCallbacks.d.ts +++ b/TypeScript/2EditDatabase/types/callbacks/CustomizationCallbacks.d.ts @@ -1,17 +1,17 @@ import { SaveServer } from "../servers/SaveServer"; import { CustomizationController } from "../controllers/CustomizationController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IBuyClothingRequestData } from "../@types/eft/customization/IBuyClothingRequestData"; -import { IWearClothingRequestData } from "../@types/eft/customization/IWearClothingRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { ISuit } from "../@types/eft/common/tables/ITrader"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { HttpResponse } from "../utils/HttpResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +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 { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class CustomizationCallbacks { private customizationController; private saveServer; private httpResponse; - constructor(customizationController: CustomizationController, saveServer: SaveServer, httpResponse: HttpResponse); + constructor(customizationController: CustomizationController, saveServer: SaveServer, httpResponse: HttpResponseUtil); getSuits(url: string, info: any, sessionID: string): IGetBodyResponseData<{ _id: string; suites: string[]; diff --git a/TypeScript/2EditDatabase/types/callbacks/DataCallbacks.d.ts b/TypeScript/2EditDatabase/types/callbacks/DataCallbacks.d.ts index add55b5..ac9cab7 100644 --- a/TypeScript/2EditDatabase/types/callbacks/DataCallbacks.d.ts +++ b/TypeScript/2EditDatabase/types/callbacks/DataCallbacks.d.ts @@ -1,20 +1,20 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGlobals } from "../@types/eft/common/IGlobals"; -import { ICustomizationItem } from "../@types/eft/common/tables/ICustomizationItem"; -import { IQuest } from "../@types/eft/common/tables/IQuest"; -import { IHideoutArea } from "../@types/eft/hideout/IHideoutArea"; -import { IHideoutProduction } from "../@types/eft/hideout/IHideoutProduction"; -import { IHideoutScavCase } from "../@types/eft/hideout/IHideoutScavCase"; -import { IHideoutSettingsBase } from "../@types/eft/hideout/IHideoutSettingsBase"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { ILanguageBase } from "../@types/spt/server/ILocaleBase"; -import { ISettingsBase } from "../@types/spt/server/ISettingsBase"; -import { HttpResponse } from "../utils/HttpResponse"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IGlobals } from "../models/eft/common/IGlobals"; +import { ICustomizationItem } from "../models/eft/common/tables/ICustomizationItem"; +import { IQuest } from "../models/eft/common/tables/IQuest"; +import { IHideoutArea } from "../models/eft/hideout/IHideoutArea"; +import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction"; +import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; +import { IHideoutSettingsBase } from "../models/eft/hideout/IHideoutSettingsBase"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { ILanguageBase } from "../models/spt/server/ILocaleBase"; +import { ISettingsBase } from "../models/spt/server/ISettingsBase"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class DataCallbacks { private httpResponse; private databaseServer; - constructor(httpResponse: HttpResponse, databaseServer: DatabaseServer); + constructor(httpResponse: HttpResponseUtil, databaseServer: DatabaseServer); 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/2EditDatabase/types/callbacks/DialogueCallbacks.d.ts b/TypeScript/2EditDatabase/types/callbacks/DialogueCallbacks.d.ts index ccc074b..e81255c 100644 --- a/TypeScript/2EditDatabase/types/callbacks/DialogueCallbacks.d.ts +++ b/TypeScript/2EditDatabase/types/callbacks/DialogueCallbacks.d.ts @@ -1,31 +1,31 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { DialogueController } from "../controllers/DialogueController"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { DialogueInfo } from "../@types/eft/profile/IAkiProfile"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IGetMailDialogViewRequestData } from "../@types/eft/dialog/IGetMailDialogViewRequestData"; -import { IGetMailDialogInfoRequestData } from "../@types/eft/dialog/IGetMailDialogInfoRequestData"; -import { IRemoveDialogRequestData } from "../@types/eft/dialog/IRemoveDialogRequestData"; -import { IGetMailDialogListRequestData } from "../@types/eft/dialog/IGetMailDialogListRequestData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IFriendRequestData } from "../@types/eft/dialog/IFriendRequestData"; -import { IPinDialogRequestData } from "../@types/eft/dialog/IPinDialogRequestData"; -import { ISetDialogReadRequestData } from "../@types/eft/dialog/ISetDialogReadRequestData"; -import { IGetAllAttachmentsRequestData } from "../@types/eft/dialog/IGetAllAttachmentsRequestData"; -import { IGetChatServerListRequestData } from "../@types/eft/dialog/IGetChatServerListRequestData"; -import { IGetFriendListDataResponse } from "../@types/eft/dialog/IGetFriendListDataResponse"; -import { ISendMessageRequest } from "../@types/eft/dialog/ISendMessageRequest"; -import { IGetMailDialogViewResponseData } from "../@types/eft/dialog/IGetMailDialogViewResponseData"; -import { IGetAllAttachmentsResponse } from "../@types/eft/dialog/IGetAllAttachmentsResponse"; +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 { 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 { IGetChatServerListRequestData } from "../models/eft/dialog/IGetChatServerListRequestData"; +import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse"; +import { ISendMessageRequest } from "../models/eft/dialog/ISendMessageRequest"; +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 { private hashUtil; private timeUtil; private httpResponse; private dialogueController; - constructor(hashUtil: HashUtil, timeUtil: TimeUtil, httpResponse: HttpResponse, dialogueController: DialogueController); + constructor(hashUtil: HashUtil, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, dialogueController: DialogueController); 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/2EditDatabase/types/callbacks/GameCallbacks.d.ts b/TypeScript/2EditDatabase/types/callbacks/GameCallbacks.d.ts index 25912c1..9481129 100644 --- a/TypeScript/2EditDatabase/types/callbacks/GameCallbacks.d.ts +++ b/TypeScript/2EditDatabase/types/callbacks/GameCallbacks.d.ts @@ -1,17 +1,17 @@ import { GameController } from "../controllers/GameController"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGameEmptyCrcRequestData } from "../@types/eft/game/IGameEmptyCrcRequestData"; -import { IVersionValidateRequestData } from "../@types/eft/game/IVersionValidateRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IGameConfigResponse } from "../@types/eft/game/IGameConfigResponse"; -import { HttpResponse } from "../utils/HttpResponse"; -import { IWatermark } from "../@types/spt/utils/IWatermark"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +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 { private httpResponse; private watermark; private gameController; - constructor(httpResponse: HttpResponse, watermark: IWatermark, gameController: GameController); + constructor(httpResponse: HttpResponseUtil, watermark: IWatermark, 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/2EditDatabase/types/callbacks/HealthCallbacks.d.ts b/TypeScript/2EditDatabase/types/callbacks/HealthCallbacks.d.ts index 50ec0b6..b223bb3 100644 --- a/TypeScript/2EditDatabase/types/callbacks/HealthCallbacks.d.ts +++ b/TypeScript/2EditDatabase/types/callbacks/HealthCallbacks.d.ts @@ -1,19 +1,20 @@ import { HealthController } from "../controllers/HealthController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { ISyncHealthRequestData } from "../@types/eft/health/ISyncHealthRequestData"; -import { IOffraidEatRequestData } from "../@types/eft/health/IOffraidEatRequestData"; -import { IOffraidHealRequestData } from "../@types/eft/health/IOffraidHealRequestData"; -import { IHealthTreatmentRequestData } from "../@types/eft/health/IHealthTreatmentRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; +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 { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { HttpResponse } from "../utils/HttpResponse"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class HealthCallbacks { private httpResponse; private profileHelper; private healthController; - constructor(httpResponse: HttpResponse, profileHelper: ProfileHelper, healthController: HealthController); + constructor(httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, healthController: HealthController); syncHealth(url: string, info: ISyncHealthRequestData, sessionID: string): IGetBodyResponseData; - offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): any; - offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): any; - healthTreatment(pmcData: IPmcData, info: IHealthTreatmentRequestData, sessionID: string): any; + offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): IItemEventRouterResponse; + offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse; + healthTreatment(pmcData: IPmcData, info: IHealthTreatmentRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/2EditDatabase/types/callbacks/HideoutCallbacks.d.ts b/TypeScript/2EditDatabase/types/callbacks/HideoutCallbacks.d.ts index 3ef61bc..b574232 100644 --- a/TypeScript/2EditDatabase/types/callbacks/HideoutCallbacks.d.ts +++ b/TypeScript/2EditDatabase/types/callbacks/HideoutCallbacks.d.ts @@ -1,15 +1,15 @@ import { HideoutController } from "../controllers/HideoutController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IHideoutUpgradeRequestData } from "../@types/eft/hideout/IHideoutUpgradeRequestData"; -import { IHideoutUpgradeCompleteRequestData } from "../@types/eft/hideout/IHideoutUpgradeCompleteRequestData"; -import { IHideoutScavCaseStartRequestData } from "../@types/eft/hideout/IHideoutScavCaseStartRequestData"; -import { IHideoutPutItemInRequestData } from "../@types/eft/hideout/IHideoutPutItemInRequestData"; -import { IHideoutTakeItemOutRequestData } from "../@types/eft/hideout/IHideoutTakeItemOutRequestData"; -import { IHideoutToggleAreaRequestData } from "../@types/eft/hideout/IHideoutToggleAreaRequestData"; -import { IHideoutSingleProductionStartRequestData } from "../@types/eft/hideout/IHideoutSingleProductionStartRequestData"; -import { IHideoutContinousProductionStartRequestData } from "../@types/eft/hideout/IHideoutContinousProductionStartRequestData"; -import { IHideoutTakeProductionRequestData } from "../@types/eft/hideout/IHideoutTakeProductionRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ConfigServer } from "../servers/ConfigServer"; import { OnUpdate } from "../di/OnUpdate"; export declare class HideoutCallbacks extends OnUpdate { diff --git a/TypeScript/2EditDatabase/types/callbacks/HttpCallbacks.d.ts b/TypeScript/2EditDatabase/types/callbacks/HttpCallbacks.d.ts index 9bb00bf..7072297 100644 --- a/TypeScript/2EditDatabase/types/callbacks/HttpCallbacks.d.ts +++ b/TypeScript/2EditDatabase/types/callbacks/HttpCallbacks.d.ts @@ -1,4 +1,4 @@ -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; import { OnLoad } from "../di/OnLoad"; export declare class HttpCallbacks extends OnLoad { private httpServer; diff --git a/TypeScript/2EditDatabase/types/callbacks/InraidCallbacks.d.ts b/TypeScript/2EditDatabase/types/callbacks/InraidCallbacks.d.ts index 2ccaa0a..1948d01 100644 --- a/TypeScript/2EditDatabase/types/callbacks/InraidCallbacks.d.ts +++ b/TypeScript/2EditDatabase/types/callbacks/InraidCallbacks.d.ts @@ -1,17 +1,17 @@ import { InraidController } from "../controllers/InraidController"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IRegisterPlayerRequestData } from "../@types/eft/inRaid/IRegisterPlayerRequestData"; -import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; +import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ConfigServer } from "../servers/ConfigServer"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class InraidCallbacks { private inraidController; private httpResponse; private configServer; private airdropConfig; private inraidConfig; - constructor(inraidController: InraidController, httpResponse: HttpResponse, configServer: ConfigServer); + constructor(inraidController: InraidController, httpResponse: HttpResponseUtil, configServer: ConfigServer); registerPlayer(url: string, info: IRegisterPlayerRequestData, sessionID: string): INullResponseData; saveProgress(url: string, info: ISaveProgressRequestData, sessionID: string): INullResponseData; getRaidEndState(): string; diff --git a/TypeScript/2EditDatabase/types/callbacks/InsuranceCallbacks.d.ts b/TypeScript/2EditDatabase/types/callbacks/InsuranceCallbacks.d.ts index f3d9832..73b7bd9 100644 --- a/TypeScript/2EditDatabase/types/callbacks/InsuranceCallbacks.d.ts +++ b/TypeScript/2EditDatabase/types/callbacks/InsuranceCallbacks.d.ts @@ -1,22 +1,23 @@ import { InsuranceController } from "../controllers/InsuranceController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IGetInsuranceCostRequestData } from "../@types/eft/insurance/IGetInsuranceCostRequestData"; -import { IInsureRequestData } from "../@types/eft/insurance/IInsureRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +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 { HttpResponse } from "../utils/HttpResponse"; +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 { private insuranceController; private insuranceService; private httpResponse; private configServer; private insuranceConfig; - constructor(insuranceController: InsuranceController, insuranceService: InsuranceService, httpResponse: HttpResponse, configServer: ConfigServer); + constructor(insuranceController: InsuranceController, insuranceService: InsuranceService, httpResponse: HttpResponseUtil, configServer: ConfigServer); onLoad(): void; getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): IGetBodyResponseData; - insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): any; + insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse; onUpdate(secondsSinceLastRun: number): boolean; getRoute(): string; } diff --git a/TypeScript/2EditDatabase/types/callbacks/InventoryCallbacks.d.ts b/TypeScript/2EditDatabase/types/callbacks/InventoryCallbacks.d.ts index 1807e4b..90d6936 100644 --- a/TypeScript/2EditDatabase/types/callbacks/InventoryCallbacks.d.ts +++ b/TypeScript/2EditDatabase/types/callbacks/InventoryCallbacks.d.ts @@ -1,22 +1,22 @@ import { InventoryController } from "../controllers/InventoryController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IInventoryFoldRequestData } from "../@types/eft/inventory/IInventoryFoldRequestData"; -import { IInventorySplitRequestData } from "../@types/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMoveRequestData } from "../@types/eft/inventory/IInventoryMoveRequestData"; -import { IInventoryMergeRequestData } from "../@types/eft/inventory/IInventoryMergeRequestData"; -import { IInventoryRemoveRequestData } from "../@types/eft/inventory/IInventoryRemoveRequestData"; -import { IInventoryTransferRequestData } from "../@types/eft/inventory/IInventoryTransferRequestData"; -import { IInventorySwapRequestData } from "../@types/eft/inventory/IInventorySwapRequestData"; -import { IInventoryToggleRequestData } from "../@types/eft/inventory/IInventoryToggleRequestData"; -import { IInventoryTagRequestData } from "../@types/eft/inventory/IInventoryTagRequestData"; -import { IInventoryBindRequestData } from "../@types/eft/inventory/IInventoryBindRequestData"; -import { IInventoryExamineRequestData } from "../@types/eft/inventory/IInventoryExamineRequestData"; -import { IInventoryReadEncyclopediaRequestData } from "../@types/eft/inventory/IInventoryReadEncyclopediaRequestData"; -import { IInventorySortRequestData } from "../@types/eft/inventory/IInventorySortRequestData"; -import { IInventoryCreateMarkerRequestData } from "../@types/eft/inventory/IInventoryCreateMarkerRequestData"; -import { IInventoryDeleteMarkerRequestData } from "../@types/eft/inventory/IInventoryDeleteMarkerRequestData"; -import { IInventoryEditMarkerRequestData } from "../@types/eft/inventory/IInventoryEditMarkerRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class InventoryCallbacks { private inventoryController; constructor(inventoryController: InventoryController); diff --git a/TypeScript/2EditDatabase/types/callbacks/ItemEventCallbacks.d.ts b/TypeScript/2EditDatabase/types/callbacks/ItemEventCallbacks.d.ts index ca069ad..74e79c4 100644 --- a/TypeScript/2EditDatabase/types/callbacks/ItemEventCallbacks.d.ts +++ b/TypeScript/2EditDatabase/types/callbacks/ItemEventCallbacks.d.ts @@ -1,11 +1,11 @@ -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IItemEventRouterRequest } from "../@types/eft/itemEvent/IItemEventRouterRequest"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterRequest } from "../models/eft/itemEvent/IItemEventRouterRequest"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class ItemEventCallbacks { private httpResponse; private itemEventRouter; - constructor(httpResponse: HttpResponse, itemEventRouter: ItemEventRouter); + constructor(httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter); handleEvents(url: string, info: IItemEventRouterRequest, sessionID: string): IGetBodyResponseData; } diff --git a/TypeScript/2EditDatabase/types/callbacks/LauncherCallbacks.d.ts b/TypeScript/2EditDatabase/types/callbacks/LauncherCallbacks.d.ts index 5e3ec40..addf76b 100644 --- a/TypeScript/2EditDatabase/types/callbacks/LauncherCallbacks.d.ts +++ b/TypeScript/2EditDatabase/types/callbacks/LauncherCallbacks.d.ts @@ -1,17 +1,17 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { SaveServer } from "../servers/SaveServer"; import { LauncherController } from "../controllers/LauncherController"; -import { IRegisterData } from "../@types/eft/launcher/IRegisterData"; -import { IRemoveProfileData } from "../@types/eft/launcher/IRemoveProfileData"; -import { ILoginRequestData } from "../@types/eft/launcher/ILoginRequestData"; -import { IChangeRequestData } from "../@types/eft/launcher/IChangeRequestData"; -import { IWatermark } from "../@types/spt/utils/IWatermark"; +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 { private httpResponse; private launcherController; private saveServer; private watermark; - constructor(httpResponse: HttpResponse, launcherController: LauncherController, saveServer: SaveServer, watermark: IWatermark); + constructor(httpResponse: HttpResponseUtil, launcherController: LauncherController, saveServer: SaveServer, watermark: IWatermark); connect(): string; login(url: string, info: ILoginRequestData, sessionID: string): string; register(url: string, info: IRegisterData, sessionID: string): "FAILED" | "OK"; diff --git a/TypeScript/2EditDatabase/types/callbacks/LocationCallbacks.d.ts b/TypeScript/2EditDatabase/types/callbacks/LocationCallbacks.d.ts index 6142ad5..346893b 100644 --- a/TypeScript/2EditDatabase/types/callbacks/LocationCallbacks.d.ts +++ b/TypeScript/2EditDatabase/types/callbacks/LocationCallbacks.d.ts @@ -1,13 +1,13 @@ import { LocationController } from "../controllers/LocationController"; -import { IGetLocationRequestData } from "../@types/eft/location/IGetLocationRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { ILocationsGenerateAllResponse } from "../@types/eft/common/ILocationsSourceDestinationBase"; -import { ILocationBase } from "../@types/eft/common/ILocationBase"; -import { HttpResponse } from "../utils/HttpResponse"; +import { IGetLocationRequestData } from "../models/eft/location/IGetLocationRequestData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSourceDestinationBase"; +import { ILocationBase } from "../models/eft/common/ILocationBase"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class LocationCallbacks { private httpResponse; private locationController; - constructor(httpResponse: HttpResponse, locationController: LocationController); + constructor(httpResponse: HttpResponseUtil, locationController: LocationController); getLocationData(url: string, info: any, sessionID: string): IGetBodyResponseData; getLocation(url: string, info: IGetLocationRequestData, sessionID: string): IGetBodyResponseData; } diff --git a/TypeScript/2EditDatabase/types/callbacks/MatchCallbacks.d.ts b/TypeScript/2EditDatabase/types/callbacks/MatchCallbacks.d.ts index 373566b..9364a2f 100644 --- a/TypeScript/2EditDatabase/types/callbacks/MatchCallbacks.d.ts +++ b/TypeScript/2EditDatabase/types/callbacks/MatchCallbacks.d.ts @@ -1,18 +1,18 @@ import { MatchController } from "../controllers/MatchController"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { IStartOfflineRaidRequestData } from "../@types/eft/match/IStartOffineRaidRequestData"; -import { IEndOfflineRaidRequestData } from "../@types/eft/match/IEndOfflineRaidRequestData"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { HttpResponse } from "../utils/HttpResponse"; +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 { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class MatchCallbacks { private httpResponse; private jsonUtil; private matchController; private databaseServer; - constructor(httpResponse: HttpResponse, jsonUtil: JsonUtil, matchController: MatchController, databaseServer: DatabaseServer); + constructor(httpResponse: HttpResponseUtil, jsonUtil: JsonUtil, matchController: MatchController, databaseServer: DatabaseServer); updatePing(url: string, info: any, sessionID: string): INullResponseData; exitMatch(url: string, info: any, sessionID: string): INullResponseData; exitToMenu(url: string, info: any, sessionID: string): INullResponseData; diff --git a/TypeScript/2EditDatabase/types/callbacks/ModCallbacks.d.ts b/TypeScript/2EditDatabase/types/callbacks/ModCallbacks.d.ts index 18ebfce..b4c18c2 100644 --- a/TypeScript/2EditDatabase/types/callbacks/ModCallbacks.d.ts +++ b/TypeScript/2EditDatabase/types/callbacks/ModCallbacks.d.ts @@ -1,9 +1,9 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { OnLoad } from "../di/OnLoad"; import { DelayedModLoader } from "../loaders/DelayedModLoader"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from '../@types/spt/utils/ILogger'; -import { IHttpServer } from '../@types/spt/server/IHttpServer'; +import { ILogger } from '../models/spt/utils/ILogger'; +import { IHttpServer } from '../models/spt/server/IHttpServer'; declare class ModCallbacks extends OnLoad { private logger; private httpResponse; @@ -11,7 +11,7 @@ declare class ModCallbacks extends OnLoad { private modLoader; private configServer; private httpConfig; - constructor(logger: ILogger, httpResponse: HttpResponse, httpServer: IHttpServer, modLoader: DelayedModLoader, configServer: ConfigServer); + constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, modLoader: DelayedModLoader, configServer: ConfigServer); onLoad(): void; getRoute(): string; sendBundle(sessionID: string, req: any, resp: any, body: any): void; diff --git a/TypeScript/2EditDatabase/types/callbacks/NoteCallbacks.d.ts b/TypeScript/2EditDatabase/types/callbacks/NoteCallbacks.d.ts index ed30fcd..36cbd44 100644 --- a/TypeScript/2EditDatabase/types/callbacks/NoteCallbacks.d.ts +++ b/TypeScript/2EditDatabase/types/callbacks/NoteCallbacks.d.ts @@ -1,7 +1,7 @@ import { NoteController } from "../controllers/NoteController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { INoteActionData } from "../@types/eft/notes/INoteActionData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { private noteController; constructor(noteController: NoteController); diff --git a/TypeScript/2EditDatabase/types/callbacks/NotifierCallbacks.d.ts b/TypeScript/2EditDatabase/types/callbacks/NotifierCallbacks.d.ts index d982db5..f47dcc9 100644 --- a/TypeScript/2EditDatabase/types/callbacks/NotifierCallbacks.d.ts +++ b/TypeScript/2EditDatabase/types/callbacks/NotifierCallbacks.d.ts @@ -1,15 +1,15 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { INotifierChannel } from "../@types/eft/notifier/INotifier"; -import { ISelectProfileRequestData } from "../@types/eft/notifier/ISelectProfileRequestData"; +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 { private httpServerHelper; private httpResponse; private notifierController; - constructor(httpServerHelper: HttpServerHelper, httpResponse: HttpResponse, notifierController: NotifierController); + constructor(httpServerHelper: HttpServerHelper, httpResponse: HttpResponseUtil, notifierController: NotifierController); /** * If we don't have anything to send, it's ok to not send anything back * because notification requests can be long-polling. In fact, we SHOULD wait diff --git a/TypeScript/2EditDatabase/types/callbacks/PresetBuildCallbacks.d.ts b/TypeScript/2EditDatabase/types/callbacks/PresetBuildCallbacks.d.ts index ee1b592..fd22c8f 100644 --- a/TypeScript/2EditDatabase/types/callbacks/PresetBuildCallbacks.d.ts +++ b/TypeScript/2EditDatabase/types/callbacks/PresetBuildCallbacks.d.ts @@ -1,14 +1,14 @@ import { PresetBuildController } from "../controllers/PresetBuildController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IPresetBuildActionRequestData } from "../@types/eft/presetBuild/IPresetBuildActionRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { WeaponBuild } from "../@types/eft/profile/IAkiProfile"; -import { HttpResponse } from "../utils/HttpResponse"; +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 { WeaponBuild } from "../models/eft/profile/IAkiProfile"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class PresetBuildCallbacks { private httpResponse; private presetBuildController; - constructor(httpResponse: HttpResponse, presetBuildController: PresetBuildController); + constructor(httpResponse: HttpResponseUtil, presetBuildController: PresetBuildController); 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/2EditDatabase/types/callbacks/ProfileCallbacks.d.ts b/TypeScript/2EditDatabase/types/callbacks/ProfileCallbacks.d.ts index 94e05b8..e50c130 100644 --- a/TypeScript/2EditDatabase/types/callbacks/ProfileCallbacks.d.ts +++ b/TypeScript/2EditDatabase/types/callbacks/ProfileCallbacks.d.ts @@ -1,21 +1,21 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { ProfileController } from "../controllers/ProfileController"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IProfileChangeNicknameRequestData } from "../@types/eft/profile/IProfileChangeNicknameRequestData"; -import { IProfileChangeVoiceRequestData } from "../@types/eft/profile/IProfileChangeVoiceRequestData"; -import { IProfileCreateRequestData } from "../@types/eft/profile/IProfileCreateRequestData"; -import { IValidateNicknameRequestData } from "../@types/eft/profile/IValidateNicknameRequestData"; -import { ISearchFriendRequestData } from "../@types/eft/profile/ISearchFriendRequestData"; -import { ISearchFriendResponse } from "../@types/eft/profile/ISearchFriendResponse"; -import { IGetMiniProfileRequestData } from "../@types/eft/launcher/IGetMiniProfileRequestData"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +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 { private httpResponse; private timeUtil; private profileController; - constructor(httpResponse: HttpResponse, timeUtil: TimeUtil, profileController: ProfileController); + constructor(httpResponse: HttpResponseUtil, timeUtil: TimeUtil, profileController: ProfileController); createProfile(url: string, info: IProfileCreateRequestData, sessionID: string): IGetBodyResponseData; getProfileData(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; regenerateScav(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/2EditDatabase/types/callbacks/QuestCallbacks.d.ts b/TypeScript/2EditDatabase/types/callbacks/QuestCallbacks.d.ts index 589682b..1f3964b 100644 --- a/TypeScript/2EditDatabase/types/callbacks/QuestCallbacks.d.ts +++ b/TypeScript/2EditDatabase/types/callbacks/QuestCallbacks.d.ts @@ -1,22 +1,22 @@ import { QuestController } from "../controllers/QuestController"; import { RepeatableQuestController } from "../controllers/RepeatableQuestController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IAcceptQuestRequestData } from "../@types/eft/quests/IAcceptQuestRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IListQuestsRequestData } from "../@types/eft/quests/IListQuestsRequestData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { ICompleteQuestRequestData } from "../@types/eft/quests/ICompleteQuestRequestData"; -import { IHandoverQuestRequestData } from "../@types/eft/quests/IHandoverQuestRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IQuest } from "../@types/eft/common/tables/IQuest"; -import { IPmcDataRepeatableQuest } from "../@types/eft/common/tables/IRepeatableQuests"; -import { IRepeatableQuestChangeRequest } from "../@types/eft/quests/IRepeatableQuestChangeRequest"; -import { HttpResponse } from "../utils/HttpResponse"; +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 { IQuest } from "../models/eft/common/tables/IQuest"; +import { IPmcDataRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; +import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class QuestCallbacks { private httpResponse; private questController; private repeatableQuestController; - constructor(httpResponse: HttpResponse, questController: QuestController, repeatableQuestController: RepeatableQuestController); + constructor(httpResponse: HttpResponseUtil, questController: QuestController, repeatableQuestController: RepeatableQuestController); 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/2EditDatabase/types/callbacks/RagfairCallbacks.d.ts b/TypeScript/2EditDatabase/types/callbacks/RagfairCallbacks.d.ts index 31af479..260fd13 100644 --- a/TypeScript/2EditDatabase/types/callbacks/RagfairCallbacks.d.ts +++ b/TypeScript/2EditDatabase/types/callbacks/RagfairCallbacks.d.ts @@ -1,20 +1,20 @@ import { RagfairServer } from "../servers/RagfairServer"; import { RagfairController } from "../controllers/RagfairController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { ISearchRequestData } from "../@types/eft/ragfair/ISearchRequestData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGetMarketPriceRequestData } from "../@types/eft/ragfair/IGetMarketPriceRequestData"; -import { IAddOfferRequestData } from "../@types/eft/ragfair/IAddOfferRequestData"; -import { IRemoveOfferRequestData } from "../@types/eft/ragfair/IRemoveOfferRequestData"; -import { IExtendOfferRequestData } from "../@types/eft/ragfair/IExtendOfferRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IGetItemPriceResult } from "../@types/eft/ragfair/IGetItemPriceResult"; +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 { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult"; import { ConfigServer } from "../servers/ConfigServer"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairCallbacks extends OnLoadOnUpdate { private httpResponse; private logger; @@ -23,7 +23,7 @@ export declare class RagfairCallbacks extends OnLoadOnUpdate { private ragfairController; private configServer; private ragfairConfig; - constructor(httpResponse: HttpResponse, logger: ILogger, jsonUtil: JsonUtil, ragfairServer: RagfairServer, ragfairController: RagfairController, configServer: ConfigServer); + constructor(httpResponse: HttpResponseUtil, logger: ILogger, jsonUtil: JsonUtil, ragfairServer: RagfairServer, ragfairController: RagfairController, configServer: ConfigServer); onLoad(): void; getRoute(): string; search(url: string, info: ISearchRequestData, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/2EditDatabase/types/callbacks/RepairCallbacks.d.ts b/TypeScript/2EditDatabase/types/callbacks/RepairCallbacks.d.ts index e28e48b..4acd364 100644 --- a/TypeScript/2EditDatabase/types/callbacks/RepairCallbacks.d.ts +++ b/TypeScript/2EditDatabase/types/callbacks/RepairCallbacks.d.ts @@ -1,8 +1,8 @@ import { RepairController } from "../controllers/RepairController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IRepairActionDataRequest } from "../@types/eft/repair/IRepairActionDataRequest"; -import { ITraderRepairActionDataRequest } from "../@types/eft/repair/ITraderRepairActionDataRequest"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +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/2EditDatabase/types/callbacks/TradeCallbacks.d.ts b/TypeScript/2EditDatabase/types/callbacks/TradeCallbacks.d.ts index 5117a82..4cf8497 100644 --- a/TypeScript/2EditDatabase/types/callbacks/TradeCallbacks.d.ts +++ b/TypeScript/2EditDatabase/types/callbacks/TradeCallbacks.d.ts @@ -1,8 +1,8 @@ import { TradeController } from "../controllers/TradeController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IProcessRagfairTradeRequestData } from "../@types/eft/trade/IProcessRagfairTradeRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IProcessBaseTradeRequestData } from "../@types/eft/trade/IProcessBaseTradeRequestData"; +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 { private tradeController; constructor(tradeController: TradeController); diff --git a/TypeScript/2EditDatabase/types/callbacks/TraderCallbacks.d.ts b/TypeScript/2EditDatabase/types/callbacks/TraderCallbacks.d.ts index 3f72e2b..264ef94 100644 --- a/TypeScript/2EditDatabase/types/callbacks/TraderCallbacks.d.ts +++ b/TypeScript/2EditDatabase/types/callbacks/TraderCallbacks.d.ts @@ -1,13 +1,13 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TraderController } from "../controllers/TraderController"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IBarterScheme, ITraderAssort, ITraderBase } from "../@types/eft/common/tables/ITrader"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; +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 { private httpResponse; private traderController; - constructor(httpResponse: HttpResponse, traderController: TraderController); + constructor(httpResponse: HttpResponseUtil, traderController: TraderController); onLoad(): void; getRoute(): string; getTraderSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/2EditDatabase/types/callbacks/WeatherCallbacks.d.ts b/TypeScript/2EditDatabase/types/callbacks/WeatherCallbacks.d.ts index 99d5c1f..2474417 100644 --- a/TypeScript/2EditDatabase/types/callbacks/WeatherCallbacks.d.ts +++ b/TypeScript/2EditDatabase/types/callbacks/WeatherCallbacks.d.ts @@ -1,10 +1,10 @@ import { WeatherController } from "../controllers/WeatherController"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { HttpResponse } from "../utils/HttpResponse"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class WeatherCallbacks { private httpResponse; private weatherController; - constructor(httpResponse: HttpResponse, weatherController: WeatherController); + constructor(httpResponse: HttpResponseUtil, weatherController: WeatherController); getWeather(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; } diff --git a/TypeScript/2EditDatabase/types/callbacks/WishlistCallbacks.d.ts b/TypeScript/2EditDatabase/types/callbacks/WishlistCallbacks.d.ts index 870f049..1816600 100644 --- a/TypeScript/2EditDatabase/types/callbacks/WishlistCallbacks.d.ts +++ b/TypeScript/2EditDatabase/types/callbacks/WishlistCallbacks.d.ts @@ -1,7 +1,7 @@ import { WishlistController } from "../controllers/WishlistController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IWishlistActionData } from "../@types/eft/wishlist/IWishlistActionData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { private wishlistController; constructor(wishlistController: WishlistController); diff --git a/TypeScript/2EditDatabase/types/configs/AkiConfig.d.ts b/TypeScript/2EditDatabase/types/configs/AkiConfig.d.ts deleted file mode 100644 index f9b9e31..0000000 --- a/TypeScript/2EditDatabase/types/configs/AkiConfig.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -export const akiVersion: string; -export const projectName: string; -export const compatibleTarkovVersion: string; diff --git a/TypeScript/2EditDatabase/types/configs/BotConfig.d.ts b/TypeScript/2EditDatabase/types/configs/BotConfig.d.ts deleted file mode 100644 index 6c7ea7b..0000000 --- a/TypeScript/2EditDatabase/types/configs/BotConfig.d.ts +++ /dev/null @@ -1,309 +0,0 @@ -export declare namespace presetBatch { - const assault: number; - const bossBully: number; - const bossGluhar: number; - const bossKilla: number; - const bossKojaniy: number; - const bossSanitar: number; - const bossTagilla: number; - const bossTest: number; - const cursedAssault: number; - const followerBully: number; - const followerGluharAssault: number; - const followerGluharScout: number; - const followerGluharSecurity: number; - const followerGluharSnipe: number; - const followerKojaniy: number; - const followerSanitar: number; - const followerTagilla: number; - const followerTest: number; - const marksman: number; - const pmcBot: number; - const sectantPriest: number; - const sectantWarrior: number; - const gifter: number; - const test: number; - const exUsec: number; -} -export declare const bosses: string[]; -export declare namespace durability { - namespace _default { - namespace armor { - const maxDelta: number; - const minDelta: number; - } - namespace weapon { - export const lowestMax: number; - export const highestMax: number; - const maxDelta_1: number; - export { maxDelta_1 as maxDelta }; - const minDelta_1: number; - export { minDelta_1 as minDelta }; - } - } - export { _default as default }; - export namespace pmc { - export namespace armor_1 { - export const lowestMaxPercent: number; - export const highestMaxPercent: number; - const maxDelta_2: number; - export { maxDelta_2 as maxDelta }; - const minDelta_2: number; - export { minDelta_2 as minDelta }; - } - export { armor_1 as armor }; - export namespace weapon_1 { - const lowestMax_1: number; - export { lowestMax_1 as lowestMax }; - const highestMax_1: number; - export { highestMax_1 as highestMax }; - const maxDelta_3: number; - export { maxDelta_3 as maxDelta }; - const minDelta_3: number; - export { minDelta_3 as minDelta }; - } - export { weapon_1 as weapon }; - } - export namespace boss { - export namespace armor_2 { - const maxDelta_4: number; - export { maxDelta_4 as maxDelta }; - const minDelta_4: number; - export { minDelta_4 as minDelta }; - } - export { armor_2 as armor }; - export namespace weapon_2 { - const lowestMax_2: number; - export { lowestMax_2 as lowestMax }; - const highestMax_2: number; - export { highestMax_2 as highestMax }; - const maxDelta_5: number; - export { maxDelta_5 as maxDelta }; - const minDelta_5: number; - export { minDelta_5 as minDelta }; - } - export { weapon_2 as weapon }; - } - export namespace follower { - export namespace armor_3 { - const maxDelta_6: number; - export { maxDelta_6 as maxDelta }; - const minDelta_6: number; - export { minDelta_6 as minDelta }; - } - export { armor_3 as armor }; - export namespace weapon_3 { - const lowestMax_3: number; - export { lowestMax_3 as lowestMax }; - const highestMax_3: number; - export { highestMax_3 as highestMax }; - const maxDelta_7: number; - export { maxDelta_7 as maxDelta }; - const minDelta_7: number; - export { minDelta_7 as minDelta }; - } - export { weapon_3 as weapon }; - } - export namespace assault_1 { - export namespace armor_4 { - const maxDelta_8: number; - export { maxDelta_8 as maxDelta }; - const minDelta_8: number; - export { minDelta_8 as minDelta }; - } - export { armor_4 as armor }; - export namespace weapon_4 { - const lowestMax_4: number; - export { lowestMax_4 as lowestMax }; - const highestMax_4: number; - export { highestMax_4 as highestMax }; - const maxDelta_9: number; - export { maxDelta_9 as maxDelta }; - const minDelta_9: number; - export { minDelta_9 as minDelta }; - } - export { weapon_4 as weapon }; - } - export { assault_1 as assault }; - export namespace cursedassault { - export namespace armor_5 { - const maxDelta_10: number; - export { maxDelta_10 as maxDelta }; - const minDelta_10: number; - export { minDelta_10 as minDelta }; - } - export { armor_5 as armor }; - export namespace weapon_5 { - const lowestMax_5: number; - export { lowestMax_5 as lowestMax }; - const highestMax_5: number; - export { highestMax_5 as highestMax }; - const maxDelta_11: number; - export { maxDelta_11 as maxDelta }; - const minDelta_11: number; - export { minDelta_11 as minDelta }; - } - export { weapon_5 as weapon }; - } - export namespace marksman_1 { - export namespace armor_6 { - const maxDelta_12: number; - export { maxDelta_12 as maxDelta }; - const minDelta_12: number; - export { minDelta_12 as minDelta }; - } - export { armor_6 as armor }; - export namespace weapon_6 { - const lowestMax_6: number; - export { lowestMax_6 as lowestMax }; - const highestMax_6: number; - export { highestMax_6 as highestMax }; - const maxDelta_13: number; - export { maxDelta_13 as maxDelta }; - const minDelta_13: number; - export { minDelta_13 as minDelta }; - } - export { weapon_6 as weapon }; - } - export { marksman_1 as marksman }; - export namespace pmcbot { - export namespace armor_7 { - const maxDelta_14: number; - export { maxDelta_14 as maxDelta }; - const minDelta_14: number; - export { minDelta_14 as minDelta }; - } - export { armor_7 as armor }; - export namespace weapon_7 { - const lowestMax_7: number; - export { lowestMax_7 as lowestMax }; - const highestMax_7: number; - export { highestMax_7 as highestMax }; - const maxDelta_15: number; - export { maxDelta_15 as maxDelta }; - const minDelta_15: number; - export { minDelta_15 as minDelta }; - } - export { weapon_7 as weapon }; - } - export namespace exusec { - export namespace armor_8 { - const maxDelta_16: number; - export { maxDelta_16 as maxDelta }; - const minDelta_16: number; - export { minDelta_16 as minDelta }; - } - export { armor_8 as armor }; - export namespace weapon_8 { - const lowestMax_8: number; - export { lowestMax_8 as lowestMax }; - const highestMax_8: number; - export { highestMax_8 as highestMax }; - const maxDelta_17: number; - export { maxDelta_17 as maxDelta }; - const minDelta_17: number; - export { minDelta_17 as minDelta }; - } - export { weapon_8 as weapon }; - } - export namespace sectantpriest { - export namespace armor_9 { - const maxDelta_18: number; - export { maxDelta_18 as maxDelta }; - const minDelta_18: number; - export { minDelta_18 as minDelta }; - } - export { armor_9 as armor }; - export namespace weapon_9 { - const lowestMax_9: number; - export { lowestMax_9 as lowestMax }; - const highestMax_9: number; - export { highestMax_9 as highestMax }; - const maxDelta_19: number; - export { maxDelta_19 as maxDelta }; - const minDelta_19: number; - export { minDelta_19 as minDelta }; - } - export { weapon_9 as weapon }; - } - export namespace sectantwarrior { - export namespace armor_10 { - const maxDelta_20: number; - export { maxDelta_20 as maxDelta }; - const minDelta_20: number; - export { minDelta_20 as minDelta }; - } - export { armor_10 as armor }; - export namespace weapon_10 { - const lowestMax_10: number; - export { lowestMax_10 as lowestMax }; - const highestMax_10: number; - export { highestMax_10 as highestMax }; - const maxDelta_21: number; - export { maxDelta_21 as maxDelta }; - const minDelta_21: number; - export { minDelta_21 as minDelta }; - } - export { weapon_10 as weapon }; - } -} -export declare namespace lootNValue { - export const scav: number; - const pmc_1: number; - export { pmc_1 as pmc }; -} -export declare namespace pmc_2 { - namespace dynamicLoot { - const whitelist: any[]; - const blacklist: string[]; - const spawnLimits: { - "5c99f98d86f7745c314214b3": number; - "5c164d2286f774194c5e69fa": number; - "550aa4cd4bdc2dd8348b456c": number; - "55818add4bdc2d5b648b456f": number; - "55818ad54bdc2ddc698b4569": number; - "55818aeb4bdc2ddc698b456a": number; - "55818ae44bdc2dde698b456c": number; - "55818af64bdc2d5b648b4570": number; - "5448e54d4bdc2dcc718b4568": number; - "5448f3a64bdc2d60728b456a": number; - "5447e1d04bdc2dff2f8b4567": number; - "5a341c4686f77469e155819e": number; - "55818b164bdc2ddc698b456c": number; - "5448bc234bdc2d3c308b4569": number; - "543be5dd4bdc2deb348b4569": number; - "543be5cb4bdc2deb348b4568": number; - "5485a8684bdc2da71d8b4567": number; - "5d650c3e815116009f6201d2": number; - "5448f39d4bdc2d0a728b4568": number; - "543be6564bdc2df4348b4568": number; - }; - const moneyStackLimits: { - "5449016a4bdc2d6f028b456f": number; - "5696686a4bdc2da3298b456a": number; - "569668774bdc2da2298b4568": number; - }; - } - const cartridgeBlacklist: string[]; - const difficulty: string; - const isUsec: number; - const chanceSameSideIsHostilePercent: number; - const usecType: string; - const bearType: string; - const maxBackpackLootTotalRub: number; - const maxPocketLootTotalRub: number; - const maxVestLootTotalRub: number; - namespace types { - const assault_2: number; - export { assault_2 as assault }; - const cursedAssault_1: number; - export { cursedAssault_1 as cursedAssault }; - const pmcBot_1: number; - export { pmcBot_1 as pmcBot }; - const exUsec_1: number; - export { exUsec_1 as exUsec }; - } -} -export { pmc_2 as pmc }; -export declare const showTypeInNickname: boolean; -export declare const maxBotCap: number; diff --git a/TypeScript/2EditDatabase/types/configs/HealthConfig.d.ts b/TypeScript/2EditDatabase/types/configs/HealthConfig.d.ts deleted file mode 100644 index 49bef94..0000000 --- a/TypeScript/2EditDatabase/types/configs/HealthConfig.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -export namespace healthMultipliers { - const death: number; - const blacked: number; -} -export namespace save { - const health: boolean; - const effects: boolean; -} diff --git a/TypeScript/2EditDatabase/types/configs/HideoutConfig.d.ts b/TypeScript/2EditDatabase/types/configs/HideoutConfig.d.ts deleted file mode 100644 index 3894576..0000000 --- a/TypeScript/2EditDatabase/types/configs/HideoutConfig.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -export const runIntervalSeconds: number; -export namespace scavCase { - const rewardParentBlacklist: any[]; - const rewardItemBlacklist: any[]; - namespace ammoRewards { - const giveMultipleOfTen: boolean; - const minAmount: number; - } - namespace moneyRewards { - const enabled: boolean; - namespace rub { - const min: number; - const max: number; - } - namespace usd { - const min_1: number; - export { min_1 as min }; - const max_1: number; - export { max_1 as max }; - } - namespace eur { - const min_2: number; - export { min_2 as min }; - const max_2: number; - export { max_2 as max }; - } - } -} diff --git a/TypeScript/2EditDatabase/types/configs/HttpConfig.d.ts b/TypeScript/2EditDatabase/types/configs/HttpConfig.d.ts deleted file mode 100644 index d7572a0..0000000 --- a/TypeScript/2EditDatabase/types/configs/HttpConfig.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export const ip: string; -export const port: number; diff --git a/TypeScript/2EditDatabase/types/configs/InraidConfig.d.ts b/TypeScript/2EditDatabase/types/configs/InraidConfig.d.ts deleted file mode 100644 index 7ac112c..0000000 --- a/TypeScript/2EditDatabase/types/configs/InraidConfig.d.ts +++ /dev/null @@ -1,15 +0,0 @@ -export const MIAOnRaidEnd: boolean; -export namespace raidMenuSettings { - const aiAmount: string; - const aiDifficulty: string; - const bossEnabled: boolean; - const scavWars: boolean; - const taggedAndCursed: boolean; -} -export namespace save { - const loot: boolean; - const durability: boolean; -} -export const carExtracts: string[]; -export const carExtractBaseStandingGain: number; -export const scavExtractGain: number; diff --git a/TypeScript/2EditDatabase/types/configs/InsuranceConfig.d.ts b/TypeScript/2EditDatabase/types/configs/InsuranceConfig.d.ts deleted file mode 100644 index 441319e..0000000 --- a/TypeScript/2EditDatabase/types/configs/InsuranceConfig.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -export const insuranceMultiplier: { - "54cb50c76803fa8b248b4571": number; - "54cb57776803fa99248b456e": number; -}; -export const returnChancePercent: { - "54cb50c76803fa8b248b4571": number; - "54cb57776803fa99248b456e": number; -}; -export const runIntervalSeconds: number; diff --git a/TypeScript/2EditDatabase/types/configs/InventoryConfig.d.ts b/TypeScript/2EditDatabase/types/configs/InventoryConfig.d.ts deleted file mode 100644 index 8d0b82f..0000000 --- a/TypeScript/2EditDatabase/types/configs/InventoryConfig.d.ts +++ /dev/null @@ -1 +0,0 @@ -export const newItemsMarkedFound: boolean; diff --git a/TypeScript/2EditDatabase/types/configs/LocationConfig.d.ts b/TypeScript/2EditDatabase/types/configs/LocationConfig.d.ts deleted file mode 100644 index 848096a..0000000 --- a/TypeScript/2EditDatabase/types/configs/LocationConfig.d.ts +++ /dev/null @@ -1,52 +0,0 @@ -export namespace looseLootMultiplier { - const bigmap: number; - const develop: number; - const factory4_day: number; - const factory4_night: number; - const interchange: number; - const laboratory: number; - const rezervbase: number; - const shoreline: number; - const woods: number; - const hideout: number; - const lighthouse: number; - const privatearea: number; - const suburbs: number; - const tarkovstreets: number; - const terminal: number; - const town: number; -} -export namespace staticLootMultiplier { - const bigmap_1: number; - export { bigmap_1 as bigmap }; - const develop_1: number; - export { develop_1 as develop }; - const factory4_day_1: number; - export { factory4_day_1 as factory4_day }; - const factory4_night_1: number; - export { factory4_night_1 as factory4_night }; - const interchange_1: number; - export { interchange_1 as interchange }; - const laboratory_1: number; - export { laboratory_1 as laboratory }; - const rezervbase_1: number; - export { rezervbase_1 as rezervbase }; - const shoreline_1: number; - export { shoreline_1 as shoreline }; - const woods_1: number; - export { woods_1 as woods }; - const hideout_1: number; - export { hideout_1 as hideout }; - const lighthouse_1: number; - export { lighthouse_1 as lighthouse }; - const privatearea_1: number; - export { privatearea_1 as privatearea }; - const suburbs_1: number; - export { suburbs_1 as suburbs }; - const tarkovstreets_1: number; - export { tarkovstreets_1 as tarkovstreets }; - const terminal_1: number; - export { terminal_1 as terminal }; - const town_1: number; - export { town_1 as town }; -} diff --git a/TypeScript/2EditDatabase/types/configs/MatchConfig.d.ts b/TypeScript/2EditDatabase/types/configs/MatchConfig.d.ts deleted file mode 100644 index 59524e0..0000000 --- a/TypeScript/2EditDatabase/types/configs/MatchConfig.d.ts +++ /dev/null @@ -1 +0,0 @@ -export const enabled: boolean; diff --git a/TypeScript/2EditDatabase/types/configs/QuestConfig.d.ts b/TypeScript/2EditDatabase/types/configs/QuestConfig.d.ts deleted file mode 100644 index 069e0ac..0000000 --- a/TypeScript/2EditDatabase/types/configs/QuestConfig.d.ts +++ /dev/null @@ -1,70 +0,0 @@ -export const redeemTime: number; -export const repeatableQuests: { - name: string; - types: string[]; - resetTime: number; - numQuests: number; - minPlayerLevel: number; - rewardScaling: { - levels: number[]; - experience: number[]; - roubles: number[]; - items: number[]; - reputation: number[]; - rewardSpread: number; - }; - locations: { - any: string[]; - factory4_day: string[]; - bigmap: string[]; - Woods: string[]; - Shoreline: string[]; - Interchange: string[]; - Lighthouse: string[]; - laboratory: string[]; - RezervBase: string[]; - }; - traderWhitelist: { - traderId: any; - questTypes: string[]; - }[]; - questConfig: { - Exploration: { - maxExtracts: number; - specificExits: { - probability: number; - passageRequirementWhitelist: string[]; - }; - }; - Completion: { - minRequestedAmount: number; - maxRequestedAmount: number; - minRequestedBulletAmount: number; - maxRequestedBulletAmount: number; - useWhitelist: boolean; - useBlacklist: boolean; - }; - Elimination: { - targets: { - key: string; - relativeProbability: number; - data: { - isBoss: boolean; - }; - }[]; - bodyPartProb: number; - bodyParts: { - key: string; - relativeProbability: number; - data: string[]; - }[]; - specificLocationProb: number; - distLocationBlacklist: string[]; - distProb: number; - maxDist: number; - minDist: number; - maxKills: number; - minKills: number; - }; - }; -}[]; diff --git a/TypeScript/2EditDatabase/types/configs/RagfairConfig.d.ts b/TypeScript/2EditDatabase/types/configs/RagfairConfig.d.ts deleted file mode 100644 index 4a0f68c..0000000 --- a/TypeScript/2EditDatabase/types/configs/RagfairConfig.d.ts +++ /dev/null @@ -1,87 +0,0 @@ -export const runIntervalSeconds: number; -export namespace sell { - const fees: boolean; - namespace chance { - const base: number; - const overprices: number; - const underpriced: number; - } - namespace time { - const base_1: number; - export { base_1 as base }; - export const min: number; - export const max: number; - } - namespace reputation { - const gain: number; - const loss: number; - } -} -export const traders: { - "54cb50c76803fa8b248b4571": boolean; - "54cb57776803fa99248b456e": boolean; - "579dc571d53a0658a154fbec": boolean; - "58330581ace78e27b8b10cee": boolean; - "5935c25fb3acc3127c3d8cd9": boolean; - "5a7c2eca46aef81a7ca2145d": boolean; - "5ac3b934156ae10c4430e83c": boolean; - "5c0647fdd443bc2504c2d371": boolean; - ragfair: boolean; -}; -export namespace dynamic { - const expiredOfferThreshold: number; - namespace offerItemCount { - const min_1: number; - export { min_1 as min }; - const max_1: number; - export { max_1 as max }; - } - namespace price { - const min_2: number; - export { min_2 as min }; - const max_2: number; - export { max_2 as max }; - } - namespace endTimeSeconds { - const min_3: number; - export { min_3 as min }; - const max_3: number; - export { max_3 as max }; - } - namespace condition { - export const conditionChance: number; - const min_4: number; - export { min_4 as min }; - const max_4: number; - export { max_4 as max }; - } - namespace stackablePercent { - const min_5: number; - export { min_5 as min }; - const max_5: number; - export { max_5 as max }; - } - namespace nonStackableCount { - const min_6: number; - export { min_6 as min }; - const max_6: number; - export { max_6 as max }; - } - namespace rating { - const min_7: number; - export { min_7 as min }; - const max_7: number; - export { max_7 as max }; - } - const currencies: { - "5449016a4bdc2d6f028b456f": number; - "5696686a4bdc2da3298b456a": number; - "569668774bdc2da2298b4568": number; - }; - const showAsSingleStack: any[]; - namespace blacklist { - const custom: string[]; - const enableBsgList: boolean; - const enableQuestList: boolean; - } -} diff --git a/TypeScript/2EditDatabase/types/configs/RepairConfig.d.ts b/TypeScript/2EditDatabase/types/configs/RepairConfig.d.ts deleted file mode 100644 index d2bec52..0000000 --- a/TypeScript/2EditDatabase/types/configs/RepairConfig.d.ts +++ /dev/null @@ -1 +0,0 @@ -export const priceMultiplier: number; diff --git a/TypeScript/2EditDatabase/types/configs/TraderConfig.d.ts b/TypeScript/2EditDatabase/types/configs/TraderConfig.d.ts deleted file mode 100644 index c7fc65d..0000000 --- a/TypeScript/2EditDatabase/types/configs/TraderConfig.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -export const updateTime: { - traderId: any; - seconds: number; -}[]; -export const updateTimeDefault: number; -export const fenceAssortSize: number; -export const fenceMaxPresetsCount: number; -export const fencePresetPriceMult: number; -export const minDurabilityForSale: number; -export const fenceItemIgnoreList: string[]; diff --git a/TypeScript/2EditDatabase/types/configs/WeatherConfig.d.ts b/TypeScript/2EditDatabase/types/configs/WeatherConfig.d.ts deleted file mode 100644 index ca37604..0000000 --- a/TypeScript/2EditDatabase/types/configs/WeatherConfig.d.ts +++ /dev/null @@ -1,55 +0,0 @@ -export const acceleration: number; -export namespace weather { - namespace clouds { - const min: number; - const max: number; - } - namespace windSpeed { - const min_1: number; - export { min_1 as min }; - const max_1: number; - export { max_1 as max }; - } - namespace windDirection { - const min_2: number; - export { min_2 as min }; - const max_2: number; - export { max_2 as max }; - } - namespace windGustiness { - const min_3: number; - export { min_3 as min }; - const max_3: number; - export { max_3 as max }; - } - namespace rain { - const min_4: number; - export { min_4 as min }; - const max_4: number; - export { max_4 as max }; - } - namespace rainIntensity { - const min_5: number; - export { min_5 as min }; - const max_5: number; - export { max_5 as max }; - } - namespace fog { - const min_6: number; - export { min_6 as min }; - const max_6: number; - export { max_6 as max }; - } - namespace temp { - const min_7: number; - export { min_7 as min }; - const max_7: number; - export { max_7 as max }; - } - namespace pressure { - const min_8: number; - export { min_8 as min }; - const max_8: number; - export { max_8 as max }; - } -} diff --git a/TypeScript/2EditDatabase/types/controllers/BotController.d.ts b/TypeScript/2EditDatabase/types/controllers/BotController.d.ts index 1fc8fc4..d7dc36d 100644 --- a/TypeScript/2EditDatabase/types/controllers/BotController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/BotController.d.ts @@ -1,8 +1,8 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { Difficulty } from "../@types/eft/common/tables/IBotType"; -import { IGenerateBotsRequestData } from "../@types/eft/bot/IGenerateBotsRequestData"; -import { IBotBase } from "../@types/eft/common/tables/IBotBase"; -import { IBotCore } from "../@types/eft/common/tables/IBotCore"; +import { Difficulty } from "../models/eft/common/tables/IBotType"; +import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; +import { IBotBase } from "../models/eft/common/tables/IBotBase"; +import { IBotCore } from "../models/eft/common/tables/IBotCore"; import { ConfigServer } from "../servers/ConfigServer"; import { BotHelper } from "../helpers/BotHelper"; import { BotGenerator } from "../generators/BotGenerator"; diff --git a/TypeScript/2EditDatabase/types/controllers/CustomizationController.d.ts b/TypeScript/2EditDatabase/types/controllers/CustomizationController.d.ts index 4255154..6fd3b12 100644 --- a/TypeScript/2EditDatabase/types/controllers/CustomizationController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/CustomizationController.d.ts @@ -1,13 +1,13 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IWearClothingRequestData } from "../@types/eft/customization/IWearClothingRequestData"; -import { IBuyClothingRequestData } from "../@types/eft/customization/IBuyClothingRequestData"; -import { ISuit } from "../@types/eft/common/tables/ITrader"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IWearClothingRequestData } from "../models/eft/customization/IWearClothingRequestData"; +import { IBuyClothingRequestData } from "../models/eft/customization/IBuyClothingRequestData"; +import { ISuit } from "../models/eft/common/tables/ITrader"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class CustomizationController { private logger; private itemEventRouter; diff --git a/TypeScript/2EditDatabase/types/controllers/DialogueController.d.ts b/TypeScript/2EditDatabase/types/controllers/DialogueController.d.ts index a855ad1..8095666 100644 --- a/TypeScript/2EditDatabase/types/controllers/DialogueController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/DialogueController.d.ts @@ -1,16 +1,16 @@ import { SaveServer } from "../servers/SaveServer"; import { DialogueHelper } from "../helpers/DialogueHelper"; -import { DialogueInfo } from "../@types/eft/profile/IAkiProfile"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IGetFriendListDataResponse } from "../@types/eft/dialog/IGetFriendListDataResponse"; -import { IGetMailDialogViewResponseData } from "../@types/eft/dialog/IGetMailDialogViewResponseData"; -import { IGetAllAttachmentsResponse } from "../@types/eft/dialog/IGetAllAttachmentsResponse"; -import { HttpResponse } from "../utils/HttpResponse"; +import { DialogueInfo } from "../models/eft/profile/IAkiProfile"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse"; +import { IGetMailDialogViewResponseData } from "../models/eft/dialog/IGetMailDialogViewResponseData"; +import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachmentsResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class DialogueController { private httpResponse; private saveServer; private dialogueHelper; - constructor(httpResponse: HttpResponse, saveServer: SaveServer, dialogueHelper: DialogueHelper); + constructor(httpResponse: HttpResponseUtil, saveServer: SaveServer, dialogueHelper: DialogueHelper); getFriendList(sessionID: string): IGetFriendListDataResponse; generateDialogueList(sessionID: string): IGetBodyResponseData; getDialogueInfo(dialogueID: string, sessionID: string): DialogueInfo; diff --git a/TypeScript/2EditDatabase/types/controllers/GameController.d.ts b/TypeScript/2EditDatabase/types/controllers/GameController.d.ts index 883bed3..614d270 100644 --- a/TypeScript/2EditDatabase/types/controllers/GameController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/GameController.d.ts @@ -1,9 +1,9 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGameConfigResponse } from "../@types/eft/game/IGameConfigResponse"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from "../@types/spt/utils/ILogger"; -import { IWatermark } from "../@types/spt/utils/IWatermark"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { IWatermark } from "../models/spt/utils/IWatermark"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; export declare class GameController { private logger; diff --git a/TypeScript/2EditDatabase/types/controllers/HealthController.d.ts b/TypeScript/2EditDatabase/types/controllers/HealthController.d.ts index 3d2120b..ca049f6 100644 --- a/TypeScript/2EditDatabase/types/controllers/HealthController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/HealthController.d.ts @@ -2,14 +2,14 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { PaymentService } from "../services/PaymentService"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { HealthHelper } from "../helpers/HealthHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IHealthTreatmentRequestData } from "../@types/eft/health/IHealthTreatmentRequestData"; -import { IOffraidEatRequestData } from "../@types/eft/health/IOffraidEatRequestData"; -import { IOffraidHealRequestData } from "../@types/eft/health/IOffraidHealRequestData"; -import { ISyncHealthRequestData } from "../@types/eft/health/ISyncHealthRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IHealthTreatmentRequestData } from "../models/eft/health/IHealthTreatmentRequestData"; +import { IOffraidEatRequestData } from "../models/eft/health/IOffraidEatRequestData"; +import { IOffraidHealRequestData } from "../models/eft/health/IOffraidHealRequestData"; +import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class HealthController { private logger; private itemEventRouter; diff --git a/TypeScript/2EditDatabase/types/controllers/HideoutController.d.ts b/TypeScript/2EditDatabase/types/controllers/HideoutController.d.ts index 59e05d9..22b7040 100644 --- a/TypeScript/2EditDatabase/types/controllers/HideoutController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/HideoutController.d.ts @@ -10,20 +10,20 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { PaymentHelper } from "../helpers/PaymentHelper"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { HideoutHelper } from "../helpers/HideoutHelper"; -import { IHideoutUpgradeRequestData } from "../@types/eft/hideout/IHideoutUpgradeRequestData"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { HideoutUpgradeCompleteRequestData } from "../@types/eft/hideout/HideoutUpgradeCompleteRequestData"; -import { IHideoutPutItemInRequestData } from "../@types/eft/hideout/IHideoutPutItemInRequestData"; -import { IHideoutTakeItemOutRequestData } from "../@types/eft/hideout/IHideoutTakeItemOutRequestData"; -import { IHideoutToggleAreaRequestData } from "../@types/eft/hideout/IHideoutToggleAreaRequestData"; -import { IHideoutSingleProductionStartRequestData } from "../@types/eft/hideout/IHideoutSingleProductionStartRequestData"; -import { IHideoutScavCaseStartRequestData } from "../@types/eft/hideout/IHideoutScavCaseStartRequestData"; -import { IHideoutTakeProductionRequestData } from "../@types/eft/hideout/IHideoutTakeProductionRequestData"; -import { IHideoutContinousProductionStartRequestData } from "../@types/eft/hideout/IHideoutContinousProductionStartRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { HideoutUpgradeCompleteRequestData } from "../models/eft/hideout/HideoutUpgradeCompleteRequestData"; +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 { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; +import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; +import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HttpResponse } from "../utils/HttpResponse"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class HideoutController { private logger; private hashUtil; @@ -41,7 +41,7 @@ export declare class HideoutController { private hideoutHelper; private configServer; private hideoutConfig; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponse, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, configServer: ConfigServer); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, configServer: ConfigServer); upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; upgradeComplete(pmcData: IPmcData, body: HideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse; putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/TypeScript/2EditDatabase/types/controllers/InraidController.d.ts b/TypeScript/2EditDatabase/types/controllers/InraidController.d.ts index e0be58a..1033e5f 100644 --- a/TypeScript/2EditDatabase/types/controllers/InraidController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/InraidController.d.ts @@ -2,31 +2,29 @@ import { SaveServer } from "../servers/SaveServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "../helpers/ItemHelper"; import { TraderHelper } from "../helpers/TraderHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; import { HealthHelper } from "../helpers/HealthHelper"; -import { IRegisterPlayerRequestData } from "../@types/eft/inRaid/IRegisterPlayerRequestData"; -import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData"; +import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; +import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ConfigServer } from "../servers/ConfigServer"; import { JsonUtil } from "../utils/JsonUtil"; import { QuestHelper } from "../helpers/QuestHelper"; import { InRaidHelper } from "../helpers/InRaidHelper"; import { InsuranceService } from "../services/InsuranceService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; export declare class InraidController { - private logger; private saveServer; private jsonUtil; private databaseServer; private questHelper; private itemHelper; - private profileHelper; + private extendedProfileHelper; private healthHelper; private traderHelper; private insuranceService; private inRaidHelper; private configServer; private inraidConfig; - constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, profileHelper: ProfileHelper, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); + constructor(saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, extendedProfileHelper: ExtendedProfileHelper, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); addPlayer(sessionID: string, info: IRegisterPlayerRequestData): void; saveProgress(offraidData: ISaveProgressRequestData, sessionID: string): void; } diff --git a/TypeScript/2EditDatabase/types/controllers/InsuranceController.d.ts b/TypeScript/2EditDatabase/types/controllers/InsuranceController.d.ts index 5e43c2b..44c61fa 100644 --- a/TypeScript/2EditDatabase/types/controllers/InsuranceController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/InsuranceController.d.ts @@ -8,12 +8,12 @@ import { PaymentService } from "../services/PaymentService"; import { DialogueHelper } from "../helpers/DialogueHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { ItemHelper } from "../helpers/ItemHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IGetInsuranceCostRequestData } from "../@types/eft/insurance/IGetInsuranceCostRequestData"; -import { IInsureRequestData } from "../@types/eft/insurance/IInsureRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData"; +import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { InsuranceService } from "../services/InsuranceService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class InsuranceController { private logger; private randomUtil; diff --git a/TypeScript/2EditDatabase/types/controllers/InventoryController.d.ts b/TypeScript/2EditDatabase/types/controllers/InventoryController.d.ts index a29fd1a..4ff07b8 100644 --- a/TypeScript/2EditDatabase/types/controllers/InventoryController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/InventoryController.d.ts @@ -6,25 +6,25 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { PaymentHelper } from "../helpers/PaymentHelper"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IInventoryMoveRequestData } from "../@types/eft/inventory/IInventoryMoveRequestData"; -import { IInventoryRemoveRequestData } from "../@types/eft/inventory/IInventoryRemoveRequestData"; -import { IInventorySplitRequestData } from "../@types/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMergeRequestData } from "../@types/eft/inventory/IInventoryMergeRequestData"; -import { IInventoryTransferRequestData } from "../@types/eft/inventory/IInventoryTransferRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IInventorySwapRequestData } from "../@types/eft/inventory/IInventorySwapRequestData"; -import { IInventoryFoldRequestData } from "../@types/eft/inventory/IInventoryFoldRequestData"; -import { IInventoryToggleRequestData } from "../@types/eft/inventory/IInventoryToggleRequestData"; -import { IInventoryTagRequestData } from "../@types/eft/inventory/IInventoryTagRequestData"; -import { IInventoryBindRequestData } from "../@types/eft/inventory/IInventoryBindRequestData"; -import { IInventoryExamineRequestData } from "../@types/eft/inventory/IInventoryExamineRequestData"; -import { IInventoryReadEncyclopediaRequestData } from "../@types/eft/inventory/IInventoryReadEncyclopediaRequestData"; -import { IInventorySortRequestData } from "../@types/eft/inventory/IInventorySortRequestData"; -import { IInventoryCreateMarkerRequestData } from "../@types/eft/inventory/IInventoryCreateMarkerRequestData"; -import { IInventoryDeleteMarkerRequestData } from "../@types/eft/inventory/IInventoryDeleteMarkerRequestData"; -import { IInventoryEditMarkerRequestData } from "../@types/eft/inventory/IInventoryEditMarkerRequestData"; -import { ILogger } from "../@types/spt/utils/ILogger"; +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 { 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 { ILogger } from "../models/spt/utils/ILogger"; export declare class InventoryController { private logger; private hashUtil; diff --git a/TypeScript/2EditDatabase/types/controllers/LauncherController.d.ts b/TypeScript/2EditDatabase/types/controllers/LauncherController.d.ts index 687c295..d3d8e6a 100644 --- a/TypeScript/2EditDatabase/types/controllers/LauncherController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/LauncherController.d.ts @@ -2,11 +2,10 @@ import { HashUtil } from "../utils/HashUtil"; import { SaveServer } from "../servers/SaveServer"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { IRegisterData } from "../@types/eft/launcher/IRegisterData"; -import { ILoginRequestData } from "../@types/eft/launcher/ILoginRequestData"; -import { IChangeRequestData } from "../@types/eft/launcher/IChangeRequestData"; -import { Info } from "../@types/eft/profile/IAkiProfile"; -import { ICoreConfig } from "../@types/spt/config/ICoreConfig"; +import { IRegisterData } from "../models/eft/launcher/IRegisterData"; +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 { private hashUtil; @@ -14,7 +13,7 @@ export declare class LauncherController { private httpServerHelper; private databaseServer; private configServer; - coreConfig: ICoreConfig; + private coreConfig; constructor(hashUtil: HashUtil, saveServer: SaveServer, httpServerHelper: HttpServerHelper, databaseServer: DatabaseServer, configServer: ConfigServer); connect(): any; find(sessionIdKey: string): Info; diff --git a/TypeScript/2EditDatabase/types/controllers/LocationController.d.ts b/TypeScript/2EditDatabase/types/controllers/LocationController.d.ts index 64168b4..dde270c 100644 --- a/TypeScript/2EditDatabase/types/controllers/LocationController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/LocationController.d.ts @@ -1,10 +1,10 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { LocationGenerator } from "../generators/LocationGenerator"; -import { ILocationBase } from "../@types/eft/common/ILocationBase"; -import { ILocationsGenerateAllResponse } from "../@types/eft/common/ILocationsSourceDestinationBase"; +import { ILocationBase } from "../models/eft/common/ILocationBase"; +import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSourceDestinationBase"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class LocationController { private jsonUtil; private logger; diff --git a/TypeScript/2EditDatabase/types/controllers/MatchController.d.ts b/TypeScript/2EditDatabase/types/controllers/MatchController.d.ts index 6ab5759..229b884 100644 --- a/TypeScript/2EditDatabase/types/controllers/MatchController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/MatchController.d.ts @@ -1,11 +1,9 @@ import { TraderHelper } from "../helpers/TraderHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IEndOfflineRaidRequestData } from "../@types/eft/match/IEndOfflineRaidRequestData"; -import { IStartOfflineRaidRequestData } from "../@types/eft/match/IStartOffineRaidRequestData"; -import { IPmcData } from "../@types/eft/common/IPmcData"; +import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; +import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { ConfigServer } from "../servers/ConfigServer"; -import { IMatchConfig } from "../@types/spt/config/IMatchConfig"; -import { IInRaidConfig } from "../@types/spt/config/IInRaidConfig"; import { SaveServer } from "../servers/SaveServer"; import { MatchLocationService } from "../services/MatchLocationService"; export declare class MatchController { @@ -14,8 +12,8 @@ export declare class MatchController { private matchLocationService; private traderHelper; private configServer; - matchConfig: IMatchConfig; - inraidConfig: IInRaidConfig; + private matchConfig; + private inraidConfig; constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, configServer: ConfigServer); getEnabled(): boolean; getProfile(info: any): IPmcData[]; diff --git a/TypeScript/2EditDatabase/types/controllers/NoteController.d.ts b/TypeScript/2EditDatabase/types/controllers/NoteController.d.ts index bb02d23..ecd8001 100644 --- a/TypeScript/2EditDatabase/types/controllers/NoteController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/NoteController.d.ts @@ -1,6 +1,6 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { INoteActionData } from "../@types/eft/notes/INoteActionData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { private itemEventRouter; diff --git a/TypeScript/2EditDatabase/types/controllers/NotifierController.d.ts b/TypeScript/2EditDatabase/types/controllers/NotifierController.d.ts index 3366add..36fef66 100644 --- a/TypeScript/2EditDatabase/types/controllers/NotifierController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/NotifierController.d.ts @@ -1,6 +1,6 @@ import { NotifierHelper } from "../helpers/NotifierHelper"; import { NotificationService } from "../services/NotificationService"; -import { INotifierChannel } from "../@types/eft/notifier/INotifier"; +import { INotifierChannel } from "../models/eft/notifier/INotifier"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; export declare class NotifierController { private notifierHelper; diff --git a/TypeScript/2EditDatabase/types/controllers/PaymentController.d.ts b/TypeScript/2EditDatabase/types/controllers/PaymentController.d.ts deleted file mode 100644 index a9a4235..0000000 --- a/TypeScript/2EditDatabase/types/controllers/PaymentController.d.ts +++ /dev/null @@ -1,56 +0,0 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IProcessBuyTradeRequestData } from "../@types/eft/trade/IProcessBuyTradeRequestData"; -import { IProcessSellTradeRequestData } from "../@types/eft/trade/IProcessSellTradeRequestData"; -export declare class PaymentController { - /** - * Check whether tpl is Money - * @param {string} tpl - * @returns void - */ - static isMoneyTpl(tpl: string): boolean; - /** - * Gets currency TPL from TAG - * @param {string} currency - * @returns string - */ - static getCurrency(currency: string): string; - /** - * Gets currency TAG from TPL - * @param {string} currency - * @returns string - */ - static getCurrencyTag(currency: string): string; - /** - * Gets Currency to Ruble conversion Value - * @param {number} value - * @param {string} currencyFrom - * @returns number - */ - static inRUB(value: number, currencyFrom: string): number; - /** - * Gets Ruble to Currency conversion Value - * @param {number} value - * @param {string} currencyTo - * @returns number - */ - static fromRUB(value: number, currencyTo: string): number; - /** - * Take money and insert items into return to server request - * @param {Object} pmcData - * @param {Object} body - * @param {string} sessionID - * @returns Object - */ - static payMoney(pmcData: IPmcData, body: IProcessBuyTradeRequestData, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse; - /** - * Receive money back after selling - * @param {IPmcData} pmcData - * @param {number} amount - * @param {IProcessSellTradeRequestData} body - * @param {IItemEventRouterResponse} output - * @param {string} sessionID - * @returns IItemEventRouterResponse - */ - static getMoney(pmcData: IPmcData, amount: number, body: IProcessSellTradeRequestData, output: IItemEventRouterResponse, sessionID: string): IItemEventRouterResponse; -} diff --git a/TypeScript/2EditDatabase/types/controllers/PlayerController.d.ts b/TypeScript/2EditDatabase/types/controllers/PlayerController.d.ts deleted file mode 100644 index b33606d..0000000 --- a/TypeScript/2EditDatabase/types/controllers/PlayerController.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IPlayerIncrementSkillLevelRequestData } from "../@types/eft/player/IPlayerIncrementSkillLevelRequestData"; -export declare class PlayerController { - /** - * increases the profile skill and updates any output - * @param {Object} pmcData - * @param {Object} output - * @param {String} skillName - * @param {Number} amount - */ - static incrementSkillLevel(pmcData: IPmcData, output: IPlayerIncrementSkillLevelRequestData, skillName: string, amount: number): void; - /** - * @param {Object} pmcData - * @returns number - */ - static calculateLevel(pmcData: IPmcData): number; - /** - * @returns number - */ - static getRandomExperience(): number; - /** - * Made a 2d array table with 0 - free slot and 1 - used slot - * @param {Object} pmcData - * @param {string} sessionID - * @returns Array - */ - static getStashSlotMap(pmcData: IPmcData, sessionID: string): any[][]; -} diff --git a/TypeScript/2EditDatabase/types/controllers/PresetBuildController.d.ts b/TypeScript/2EditDatabase/types/controllers/PresetBuildController.d.ts index e0702f4..a15b181 100644 --- a/TypeScript/2EditDatabase/types/controllers/PresetBuildController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/PresetBuildController.d.ts @@ -1,9 +1,9 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { SaveServer } from "../servers/SaveServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IPresetBuildActionRequestData } from "../@types/eft/presetBuild/IPresetBuildActionRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { WeaponBuild } from "../@types/eft/profile/IAkiProfile"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IPresetBuildActionRequestData } from "../models/eft/presetBuild/IPresetBuildActionRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { WeaponBuild } from "../models/eft/profile/IAkiProfile"; import { HashUtil } from "../utils/HashUtil"; import { ItemEventRouter } from "../routers/ItemEventRouter"; export declare class PresetBuildController { diff --git a/TypeScript/2EditDatabase/types/controllers/ProfileController.d.ts b/TypeScript/2EditDatabase/types/controllers/ProfileController.d.ts index 938a866..46b66d8 100644 --- a/TypeScript/2EditDatabase/types/controllers/ProfileController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/ProfileController.d.ts @@ -1,18 +1,18 @@ import { SaveServer } from "../servers/SaveServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "../helpers/ItemHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; import { TraderHelper } from "../helpers/TraderHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IProfileChangeNicknameRequestData } from "../@types/eft/profile/IProfileChangeNicknameRequestData"; -import { IProfileChangeVoiceRequestData } from "../@types/eft/profile/IProfileChangeVoiceRequestData"; -import { IProfileCreateRequestData } from "../@types/eft/profile/IProfileCreateRequestData"; -import { IValidateNicknameRequestData } from "../@types/eft/profile/IValidateNicknameRequestData"; -import { ISearchFriendRequestData } from "../@types/eft/profile/ISearchFriendRequestData"; -import { ISearchFriendResponse } from "../@types/eft/profile/ISearchFriendResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +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 { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; -import { IMiniProfile } from "../@types/eft/launcher/IMiniProfile"; +import { IMiniProfile } from "../models/eft/launcher/IMiniProfile"; +import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; export declare class ProfileController { private hashUtil; private timeUtil; @@ -20,8 +20,8 @@ export declare class ProfileController { private databaseServer; private itemHelper; private traderHelper; - private profileHelper; - constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, traderHelper: TraderHelper, profileHelper: ProfileHelper); + private extendedProfileHelper; + constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, traderHelper: TraderHelper, extendedProfileHelper: ExtendedProfileHelper); getMiniProfiles(): IMiniProfile[]; getMiniProfile(sessionID: string): any; getCompleteProfile(sessionID: string): IPmcData[]; diff --git a/TypeScript/2EditDatabase/types/controllers/QuestController.d.ts b/TypeScript/2EditDatabase/types/controllers/QuestController.d.ts index bb89a3b..a964c32 100644 --- a/TypeScript/2EditDatabase/types/controllers/QuestController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/QuestController.d.ts @@ -8,13 +8,13 @@ import { QuestConditionHelper } from "../helpers/QuestConditionHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; import { PlayerService } from "../services/PlayerService"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IQuest } from "../@types/eft/common/tables/IQuest"; -import { IAcceptQuestRequestData } from "../@types/eft/quests/IAcceptQuestRequestData"; -import { ICompleteQuestRequestData } from "../@types/eft/quests/ICompleteQuestRequestData"; -import { IHandoverQuestRequestData } from "../@types/eft/quests/IHandoverQuestRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IQuest } from "../models/eft/common/tables/IQuest"; +import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; +import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; +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 { private logger; private timeUtil; diff --git a/TypeScript/2EditDatabase/types/controllers/RagfairController.d.ts b/TypeScript/2EditDatabase/types/controllers/RagfairController.d.ts index 0b6757e..6e71edd 100644 --- a/TypeScript/2EditDatabase/types/controllers/RagfairController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/RagfairController.d.ts @@ -1,5 +1,5 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { RagfairServer } from "../servers/RagfairServer"; import { SaveServer } from "../servers/SaveServer"; @@ -14,24 +14,24 @@ import { PaymentHelper } from "../helpers/PaymentHelper"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { RagfairHelper } from "../helpers/RagfairHelper"; import { RagfairSellHelper } from "../helpers/RagfairSellHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IAddOfferRequestData, Requirement } from "../@types/eft/ragfair/IAddOfferRequestData"; -import { IExtendOfferRequestData } from "../@types/eft/ragfair/IExtendOfferRequestData"; -import { IGetMarketPriceRequestData } from "../@types/eft/ragfair/IGetMarketPriceRequestData"; -import { ISearchRequestData } from "../@types/eft/ragfair/ISearchRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { IGetItemPriceResult } from "../@types/eft/ragfair/IGetItemPriceResult"; -import { IGetOffersResult } from "../@types/eft/ragfair/IGetOffersResult"; +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 "../@types/eft/profile/IAkiProfile"; -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; import { RagfairSortHelper } from "../helpers/RagfairSortHelper"; import { RagfairTaxHelper } from "../helpers/RagfairTaxHelper"; import { RagfairOfferHelper } from "../helpers/RagfairOfferHelper"; import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairController { private logger; private timeUtil; @@ -57,7 +57,7 @@ export declare class RagfairController { private ragfairOfferGenerator; private configServer; private ragfairConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, httpResponse: HttpResponse, itemEventRouter: ItemEventRouter, ragfairServer: RagfairServer, ragfairPriceService: RagfairPriceService, databaseServer: DatabaseServer, itemHelper: ItemHelper, saveServer: SaveServer, ragfairSellHelper: RagfairSellHelper, ragfairTaxHelper: RagfairTaxHelper, ragfairSortHelper: RagfairSortHelper, ragfairOfferHelper: RagfairOfferHelper, profileHelper: ProfileHelper, paymentService: PaymentService, handbookHelper: HandbookHelper, paymentHelper: PaymentHelper, inventoryHelper: InventoryHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, ragfairOfferGenerator: RagfairOfferGenerator, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter, ragfairServer: RagfairServer, ragfairPriceService: RagfairPriceService, databaseServer: DatabaseServer, itemHelper: ItemHelper, saveServer: SaveServer, ragfairSellHelper: RagfairSellHelper, ragfairTaxHelper: RagfairTaxHelper, ragfairSortHelper: RagfairSortHelper, ragfairOfferHelper: RagfairOfferHelper, profileHelper: ProfileHelper, paymentService: PaymentService, handbookHelper: HandbookHelper, paymentHelper: PaymentHelper, inventoryHelper: InventoryHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, ragfairOfferGenerator: RagfairOfferGenerator, configServer: ConfigServer); getOffers(sessionID: string, info: ISearchRequestData): IGetOffersResult; update(): void; getItemPrice(info: IGetMarketPriceRequestData): IGetItemPriceResult; diff --git a/TypeScript/2EditDatabase/types/controllers/RepairController.d.ts b/TypeScript/2EditDatabase/types/controllers/RepairController.d.ts index 86ab1e1..3a9f3a2 100644 --- a/TypeScript/2EditDatabase/types/controllers/RepairController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/RepairController.d.ts @@ -2,15 +2,14 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { QuestHelper } from "../helpers/QuestHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { PaymentService } from "../services/PaymentService"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IRepairActionDataRequest } from "../@types/eft/repair/IRepairActionDataRequest"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { ITraderRepairActionDataRequest } from "../@types/eft/repair/ITraderRepairActionDataRequest"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepairActionDataRequest"; import { ConfigServer } from "../servers/ConfigServer"; -import { IRepairConfig } from "../@types/spt/config/IRepairConfig"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { RepairHelper } from "../helpers/RepairHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RepairController { private logger; private itemEventRouter; @@ -20,7 +19,7 @@ export declare class RepairController { private paymentService; private repairHelper; private configServer; - repairConfig: IRepairConfig; + private repairConfig; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, questHelper: QuestHelper, traderHelper: TraderHelper, paymentService: PaymentService, repairHelper: RepairHelper, configServer: ConfigServer); /** * Repair with trader diff --git a/TypeScript/2EditDatabase/types/controllers/RepeatableQuestController.d.ts b/TypeScript/2EditDatabase/types/controllers/RepeatableQuestController.d.ts index 23d56e5..d2de5df 100644 --- a/TypeScript/2EditDatabase/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/RepeatableQuestController.d.ts @@ -5,20 +5,20 @@ import { JsonUtil } from "../utils/JsonUtil"; import { MathUtil } from "../utils/MathUtil"; import { ItemHelper } from "../helpers/ItemHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IPmcData, TraderInfo } from "../@types/eft/common/IPmcData"; -import { IRepeatableQuestConfig, ELocationName, IQuestConfig } from "../@types/spt/config/IQuestConfig"; -import { IExploration, IRepeatableQuest, IReward, IRewards, IExplorationCondition, ICompletionAvailableFor, IEliminationCondition, ICompletion, IElimination, IPmcDataRepeatableQuest } from "../@types/eft/common/tables/IRepeatableQuests"; -import { Exit } from "../@types/eft/common/ILocationBase"; -import { IRepeatableQuestChangeRequest } from "../@types/eft/quests/IRepeatableQuestChangeRequest"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export interface IQuestTypePool { types: string[]; pool: IQuestPool; @@ -61,7 +61,7 @@ export declare class RepeatableQuestController { private paymentService; private objectId; private configServer; - questConfig: IQuestConfig; + private questConfig; constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, itemEventRouter: ItemEventRouter, paymentService: PaymentService, objectId: ObjectId, configServer: ConfigServer); /** * This is the method reached by the /client/repeatalbeQuests/activityPeriods endpoint diff --git a/TypeScript/2EditDatabase/types/controllers/TradeController.d.ts b/TypeScript/2EditDatabase/types/controllers/TradeController.d.ts index 916ed9c..f0a177b 100644 --- a/TypeScript/2EditDatabase/types/controllers/TradeController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/TradeController.d.ts @@ -1,13 +1,13 @@ import { RagfairServer } from "../servers/RagfairServer"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { TradeHelper } from "../helpers/TradeHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IProcessRagfairTradeRequestData } from "../@types/eft/trade/IProcessRagfairTradeRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { Upd } from "../@types/eft/common/tables/IItem"; -import { IProcessBaseTradeRequestData } from "../@types/eft/trade/IProcessBaseTradeRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { Upd } from "../models/eft/common/tables/IItem"; +import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; declare class TradeController { private logger; private itemEventRouter; diff --git a/TypeScript/2EditDatabase/types/controllers/TraderController.d.ts b/TypeScript/2EditDatabase/types/controllers/TraderController.d.ts index e125cf1..5cd85c9 100644 --- a/TypeScript/2EditDatabase/types/controllers/TraderController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/TraderController.d.ts @@ -2,12 +2,11 @@ import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { DatabaseServer } from "../servers/DatabaseServer"; import { TraderAssortService } from "../services/TraderAssortService"; -import { IBarterScheme, ITraderAssort, ITraderBase } from "../@types/eft/common/tables/ITrader"; +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 { ITraderConfig } from "../@types/spt/config/ITraderConfig"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; import { TraderAssortHelper } from "../helpers/TraderAssortHelper"; export declare class TraderController { private logger; @@ -19,7 +18,7 @@ export declare class TraderController { private traderAssortService; private jsonUtil; private configServer; - traderConfig: ITraderConfig; + private traderConfig; constructor(logger: ILogger, databaseServer: DatabaseServer, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, timeUtil: TimeUtil, traderAssortService: TraderAssortService, jsonUtil: JsonUtil, configServer: ConfigServer); load(): void; getTrader(traderID: string, sessionID: string): ITraderBase; diff --git a/TypeScript/2EditDatabase/types/controllers/WeatherController.d.ts b/TypeScript/2EditDatabase/types/controllers/WeatherController.d.ts index 2d17179..4f8bcf1 100644 --- a/TypeScript/2EditDatabase/types/controllers/WeatherController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/WeatherController.d.ts @@ -1,11 +1,10 @@ import { ConfigServer } from "../servers/ConfigServer"; -import { IWeatherConfig } from "../@types/spt/config/IWeatherConfig"; import { WeatherGenerator } from "../generators/WeatherGenerator"; -import { IWeatherData } from "../@types/eft/weather/IWeatherData"; +import { IWeatherData } from "../models/eft/weather/IWeatherData"; export declare class WeatherController { private weatherGenerator; private configServer; - weatherConfig: IWeatherConfig; + private weatherConfig; constructor(weatherGenerator: WeatherGenerator, configServer: ConfigServer); generate(): IWeatherData; } diff --git a/TypeScript/2EditDatabase/types/controllers/WishlistController.d.ts b/TypeScript/2EditDatabase/types/controllers/WishlistController.d.ts index c935452..5ef8df3 100644 --- a/TypeScript/2EditDatabase/types/controllers/WishlistController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/WishlistController.d.ts @@ -1,7 +1,7 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IWishlistActionData } from "../@types/eft/wishlist/IWishlistActionData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { private itemEvenRouter; constructor(itemEvenRouter: ItemEventRouter); diff --git a/TypeScript/2EditDatabase/types/di/Container.d.ts b/TypeScript/2EditDatabase/types/di/Container.d.ts index bd40dbd..b67523f 100644 --- a/TypeScript/2EditDatabase/types/di/Container.d.ts +++ b/TypeScript/2EditDatabase/types/di/Container.d.ts @@ -1,7 +1,6 @@ import { DependencyContainer } from "tsyringe"; export declare class Container { static registerTypes(depContainer: DependencyContainer): void; - static registerServerSpecificClasses(depContainer: DependencyContainer): void; private static registerUtils; private static registerRouters; private static registerGenerators; diff --git a/TypeScript/2EditDatabase/types/di/Router.d.ts b/TypeScript/2EditDatabase/types/di/Router.d.ts index d27ac97..ac48587 100644 --- a/TypeScript/2EditDatabase/types/di/Router.d.ts +++ b/TypeScript/2EditDatabase/types/di/Router.d.ts @@ -1,5 +1,6 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IAkiProfile } from "../@types/eft/profile/IAkiProfile"; +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 { private handledRoutes; constructor(); @@ -17,7 +18,7 @@ export declare class DynamicRouter extends Router { } export declare class ItemEventRouterDefinition extends Router { constructor(); - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } export declare class SaveLoadRouter extends Router { constructor(); diff --git a/TypeScript/2EditDatabase/types/di/Serializer.d.ts b/TypeScript/2EditDatabase/types/di/Serializer.d.ts index 076407d..70aa7c5 100644 --- a/TypeScript/2EditDatabase/types/di/Serializer.d.ts +++ b/TypeScript/2EditDatabase/types/di/Serializer.d.ts @@ -1,4 +1,4 @@ -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class Serializer { serialize(sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; canHandle(something: string): boolean; diff --git a/TypeScript/2EditDatabase/types/generators/BotEquipmentGenerator.d.ts b/TypeScript/2EditDatabase/types/generators/BotEquipmentGenerator.d.ts deleted file mode 100644 index 2cc98b8..0000000 --- a/TypeScript/2EditDatabase/types/generators/BotEquipmentGenerator.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; -import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData"; -import { Chances, Mods } from "../@types/eft/common/tables/IBotType"; -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { HashUtil } from "../utils/HashUtil"; -import { Logger } from "../utils/Logger"; -import { RandomUtil } from "../utils/RandomUtil"; -import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -export declare class BotEquipmentGenerator { - private logger; - private hashUtil; - private randomUtil; - private databaseServer; - private botGeneratorHelper; - private weightedRandomHelper; - constructor(logger: Logger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, botGeneratorHelper: BotGeneratorHelper, weightedRandomHelper: WeightedRandomHelper); - generateEquipment(equipmentSlot: string, equipmentPool: Record, modPool: Mods, spawnChances: Chances, botRole: string, inventory: PmcInventory): void; -} diff --git a/TypeScript/2EditDatabase/types/generators/BotGenerator.d.ts b/TypeScript/2EditDatabase/types/generators/BotGenerator.d.ts index 4a1b8a3..af7d7d4 100644 --- a/TypeScript/2EditDatabase/types/generators/BotGenerator.d.ts +++ b/TypeScript/2EditDatabase/types/generators/BotGenerator.d.ts @@ -1,20 +1,14 @@ import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; -import { IGenerateBotsRequestData } from "../@types/eft/bot/IGenerateBotsRequestData"; -import { IBotBase } from "../@types/eft/common/tables/IBotBase"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; +import { IBotBase } from "../models/eft/common/tables/IBotBase"; import { DatabaseServer } from "../servers/DatabaseServer"; import { JsonUtil } from "../utils/JsonUtil"; import { ConfigServer } from "../servers/ConfigServer"; import { GameEventHelper } from "../helpers/GameEventHelper"; import { BotInventoryGenerator } from "./BotInventoryGenerator"; import { BotHelper } from "../helpers/BotHelper"; -declare namespace BotGenerator { - interface IRandomisedBotLevelResult { - level: number; - exp: number; - } -} export declare class BotGenerator { private logger; private hashUtil; @@ -28,8 +22,8 @@ export declare class BotGenerator { private botConfig; constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; - generateBot(bot: IBotBase, role: string, isPmc: boolean): IBotBase; - generateRandomLevel(min: number, max: number): BotGenerator.IRandomisedBotLevelResult; + private generateBot; + private generateRandomLevel; /** Converts health object to the required format */ private generateHealth; private generateSkills; @@ -40,4 +34,3 @@ export declare class BotGenerator { private getPMCDifficulty; private generateDogtag; } -export {}; diff --git a/TypeScript/2EditDatabase/types/generators/BotInventoryGenerator.d.ts b/TypeScript/2EditDatabase/types/generators/BotInventoryGenerator.d.ts index c151b83..e9f09de 100644 --- a/TypeScript/2EditDatabase/types/generators/BotInventoryGenerator.d.ts +++ b/TypeScript/2EditDatabase/types/generators/BotInventoryGenerator.d.ts @@ -1,11 +1,11 @@ -import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData"; -import { Inventory, Chances, Generation, Mods } from "../@types/eft/common/tables/IBotType"; +import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { Inventory, Chances, Generation } from "../models/eft/common/tables/IBotType"; import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; import { BotWeaponGenerator } from "./BotWeaponGenerator"; import { BotLootGenerator } from "./BotLootGenerator"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; export declare class BotInventoryGenerator { @@ -20,6 +20,6 @@ export declare class BotInventoryGenerator { 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; - generateEquipment(equipmentSlot: string, equipmentPool: Record, modPool: Mods, spawnChances: Chances, botRole: string, inventory: PmcInventory): void; + private generateEquipment; private generateInventoryBase; } diff --git a/TypeScript/2EditDatabase/types/generators/BotLootGenerator.d.ts b/TypeScript/2EditDatabase/types/generators/BotLootGenerator.d.ts index 0ec991e..3bf1b36 100644 --- a/TypeScript/2EditDatabase/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/2EditDatabase/types/generators/BotLootGenerator.d.ts @@ -1,17 +1,14 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; -import { IBotConfig } from "../@types/spt/config/IBotConfig"; import { HandbookHelper } from "../helpers/HandbookHelper"; import { PMCLootGenerator } from "../generators/PMCLootGenerator"; -import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData"; -import { ItemMinMax, Items } from "../@types/eft/common/tables/IBotType"; +import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { ItemMinMax, Items } from "../models/eft/common/tables/IBotType"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; export declare class BotLootGenerator { - private logger; private jsonUtil; private hashUtil; private randomUtil; @@ -20,8 +17,8 @@ export declare class BotLootGenerator { private botGeneratorHelper; private pmcLootGenerator; private configServer; - botConfig: IBotConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, pmcLootGenerator: PMCLootGenerator, configServer: ConfigServer); + private botConfig; + constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, pmcLootGenerator: PMCLootGenerator, configServer: ConfigServer); generateLoot(lootPool: Items, itemCounts: ItemMinMax, isPmc: boolean, inventory: PmcInventory): void; private getRandomisedCount; private addLootFromPool; diff --git a/TypeScript/2EditDatabase/types/generators/BotWeaponGenerator.d.ts b/TypeScript/2EditDatabase/types/generators/BotWeaponGenerator.d.ts index 8eb643c..3e9d59c 100644 --- a/TypeScript/2EditDatabase/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/2EditDatabase/types/generators/BotWeaponGenerator.d.ts @@ -1,11 +1,12 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "../helpers/ItemHelper"; -import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData"; -import { MinMax, ModsChances, Mods } from "../@types/eft/common/tables/IBotType"; +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 { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { RandomUtil } from "../utils/RandomUtil"; export declare class BotWeaponGenerator { private logger; private hashUtil; @@ -13,7 +14,8 @@ export declare class BotWeaponGenerator { private itemHelper; private weightedRandomHelper; private botGeneratorHelper; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper); + private randomUtil; + constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil); generateWeapon(equipmentSlot: string, weaponPool: Record, modPool: Mods, modChances: ModsChances, magCounts: MinMax, botRole: string, isPmc: boolean, inventory: PmcInventory): void; /** Checks if all required slots are occupied on a weapon and all it's mods */ private isWeaponValid; diff --git a/TypeScript/2EditDatabase/types/generators/LocationGenerator.d.ts b/TypeScript/2EditDatabase/types/generators/LocationGenerator.d.ts index c37814f..b7ba7c5 100644 --- a/TypeScript/2EditDatabase/types/generators/LocationGenerator.d.ts +++ b/TypeScript/2EditDatabase/types/generators/LocationGenerator.d.ts @@ -1,18 +1,17 @@ import { RandomUtil } from "../utils/RandomUtil"; -import { IStaticContainerProps, IStaticLootDetails, IStaticAmmoDetails, IStaticForcedProps } from "../@types/eft/common/tables/ILootBase"; -import { ILooseLoot, SpawnpointTemplate } from "../@types/eft/common/ILooseLoot"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { IStaticContainerProps, IStaticLootDetails, IStaticAmmoDetails, IStaticForcedProps } from "../models/eft/common/tables/ILootBase"; +import { ILooseLoot, SpawnpointTemplate } from "../models/eft/common/ILooseLoot"; +import { Item } from "../models/eft/common/tables/IItem"; import { ItemHelper } from "../helpers/ItemHelper"; import { GameEventHelper } from "../helpers/GameEventHelper"; import { ContainerHelper } from "../helpers/ContainerHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILocationConfig } from "../@types/spt/config/ILocationConfig"; import { JsonUtil } from "../utils/JsonUtil"; import { MathUtil } from "../utils/MathUtil"; import { ObjectId } from "../utils/ObjectId"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export interface IContainerItem { items: Item[]; width: number; @@ -30,7 +29,7 @@ export declare class LocationGenerator { private containerHelper; private presetHelper; private configServer; - locationConfig: ILocationConfig; + private locationConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, objectId: ObjectId, randomUtil: RandomUtil, ragfairServerHelper: RagfairServerHelper, itemHelper: ItemHelper, mathUtil: MathUtil, gameEventHelper: GameEventHelper, containerHelper: ContainerHelper, presetHelper: PresetHelper, configServer: ConfigServer); generateContainerLoot(containerIn: IStaticContainerProps, staticForced: IStaticForcedProps[], staticLootDist: Record, staticAmmoDist: Record, locationName: string): IStaticContainerProps; private getLooseLootMultiplerForLocation; diff --git a/TypeScript/2EditDatabase/types/generators/PMCLootGenerator.d.ts b/TypeScript/2EditDatabase/types/generators/PMCLootGenerator.d.ts index 1ac7ffe..601431b 100644 --- a/TypeScript/2EditDatabase/types/generators/PMCLootGenerator.d.ts +++ b/TypeScript/2EditDatabase/types/generators/PMCLootGenerator.d.ts @@ -1,14 +1,13 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; -import { IBotConfig } from "../@types/spt/config/IBotConfig"; export declare class PMCLootGenerator { private itemHelper; private databaseServer; private configServer; private pocketLootPool; private backpackLootPool; - botConfig: IBotConfig; + private botConfig; constructor(itemHelper: ItemHelper, databaseServer: DatabaseServer, configServer: ConfigServer); generatePMCPocketLootPool(): string[]; generatePMCBackpackLootPool(): string[]; diff --git a/TypeScript/2EditDatabase/types/generators/RagfairAssortGenerator.d.ts b/TypeScript/2EditDatabase/types/generators/RagfairAssortGenerator.d.ts index dcdb057..8b52a90 100644 --- a/TypeScript/2EditDatabase/types/generators/RagfairAssortGenerator.d.ts +++ b/TypeScript/2EditDatabase/types/generators/RagfairAssortGenerator.d.ts @@ -1,4 +1,4 @@ -import { Item } from "../@types/eft/common/tables/IItem"; +import { Item } from "../models/eft/common/tables/IItem"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "../helpers/ItemHelper"; import { HashUtil } from "../utils/HashUtil"; diff --git a/TypeScript/2EditDatabase/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/2EditDatabase/types/generators/RagfairOfferGenerator.d.ts index d28d3af..cb2566c 100644 --- a/TypeScript/2EditDatabase/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/2EditDatabase/types/generators/RagfairOfferGenerator.d.ts @@ -2,9 +2,9 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; import { SaveServer } from "../servers/SaveServer"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; -import { IBarterScheme } from "../@types/eft/common/tables/ITrader"; -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { IBarterScheme } from "../models/eft/common/tables/ITrader"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { Item } from "../models/eft/common/tables/IItem"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; @@ -15,7 +15,7 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { RagfairPriceService } from "../services/RagfairPriceService"; import { FenceService } from "../services/FenceService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairOfferGenerator { private logger; private jsonUtil; diff --git a/TypeScript/2EditDatabase/types/generators/WeatherGenerator.d.ts b/TypeScript/2EditDatabase/types/generators/WeatherGenerator.d.ts index 5c340e2..b9faa3a 100644 --- a/TypeScript/2EditDatabase/types/generators/WeatherGenerator.d.ts +++ b/TypeScript/2EditDatabase/types/generators/WeatherGenerator.d.ts @@ -1,7 +1,6 @@ import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; import { ConfigServer } from "../servers/ConfigServer"; -import { IWeatherData } from "../@types/eft/weather/IWeatherData"; -import { IWeatherConfig } from "../@types/spt/config/IWeatherConfig"; +import { IWeatherData } from "../models/eft/weather/IWeatherData"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class WeatherGenerator { @@ -9,7 +8,7 @@ export declare class WeatherGenerator { private randomUtil; private timeUtil; private configServer; - weatherConfig: IWeatherConfig; + private weatherConfig; constructor(weightedRandomHelper: WeightedRandomHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer); calculateTime(data: IWeatherData): IWeatherData; generateWeather(data: IWeatherData): IWeatherData; diff --git a/TypeScript/2EditDatabase/types/helpers/AssortHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/AssortHelper.d.ts index 95b7bf2..33cb5c6 100644 --- a/TypeScript/2EditDatabase/types/helpers/AssortHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/AssortHelper.d.ts @@ -1,6 +1,6 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "./ItemHelper"; import { QuestHelper } from "./QuestHelper"; diff --git a/TypeScript/2EditDatabase/types/helpers/BotGeneratorHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/BotGeneratorHelper.d.ts index 83f7068..c3cf4d3 100644 --- a/TypeScript/2EditDatabase/types/helpers/BotGeneratorHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/BotGeneratorHelper.d.ts @@ -1,10 +1,9 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; -import { IBotConfig } from "../@types/spt/config/IBotConfig"; -import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData"; -import { ModsChances, Mods } from "../@types/eft/common/tables/IBotType"; -import { Item, Upd } from "../@types/eft/common/tables/IItem"; -import { ITemplateItem } from "../@types/eft/common/tables/ITemplateItem"; +import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { ModsChances, Mods } 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 { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; @@ -12,7 +11,7 @@ import { RandomUtil } from "../utils/RandomUtil"; import { InventoryHelper } from "./InventoryHelper"; import { ContainerHelper } from "./ContainerHelper"; import { ItemHelper } from "./ItemHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; declare class BotGeneratorHelper { private logger; private jsonUtil; @@ -24,7 +23,7 @@ declare class BotGeneratorHelper { private inventoryHelper; private containerHelper; private configServer; - botConfig: IBotConfig; + private botConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer); generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances, isPmc?: boolean): Item[]; /** @@ -44,7 +43,6 @@ declare class BotGeneratorHelper { }; private getModTplFromItemDb; isItemIncompatibleWithCurrentItems(items: Item[], tplToCheck: string, equipmentSlot: string): boolean; - getBiasedRandomNumber(min: number, max: number, shift: number, n: number): number; /** Adds an item with all its childern into specified equipmentSlots, wherever it fits. * Returns a `boolean` indicating success. */ addItemWithChildrenToEquipmentSlot(equipmentSlots: string[], parentId: string, parentTpl: string, itemWithChildren: Item[], inventory: PmcInventory): boolean; diff --git a/TypeScript/2EditDatabase/types/helpers/BotHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/BotHelper.d.ts index 231e114..032218b 100644 --- a/TypeScript/2EditDatabase/types/helpers/BotHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/BotHelper.d.ts @@ -1,9 +1,9 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { Difficulty } from "../@types/eft/common/tables/IBotType"; +import { Difficulty } from "../models/eft/common/tables/IBotType"; import { ConfigServer } from "../servers/ConfigServer"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class BotHelper { private logger; private jsonUtil; diff --git a/TypeScript/2EditDatabase/types/helpers/DialogueHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/DialogueHelper.d.ts index abe13de..d8082e4 100644 --- a/TypeScript/2EditDatabase/types/helpers/DialogueHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/DialogueHelper.d.ts @@ -1,7 +1,7 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { ItemHelper } from "./ItemHelper"; -import { Dialogue, MessageContent, MessagePreview, MessageType } from "../@types/eft/profile/IAkiProfile"; +import { Dialogue, MessageContent, MessagePreview, MessageType } from "../models/eft/profile/IAkiProfile"; import { HashUtil } from "../utils/HashUtil"; import { NotifierHelper } from "./NotifierHelper"; import { NotificationSendHelper } from "./NotificationSendHelper"; diff --git a/TypeScript/2EditDatabase/types/helpers/DurabilityLimitsHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/DurabilityLimitsHelper.d.ts index 70f545b..ee8c887 100644 --- a/TypeScript/2EditDatabase/types/helpers/DurabilityLimitsHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/DurabilityLimitsHelper.d.ts @@ -1,13 +1,12 @@ import { ConfigServer } from "../servers/ConfigServer"; -import { IBotConfig } from "../@types/spt/config/IBotConfig"; -import { ITemplateItem } from "../@types/eft/common/tables/ITemplateItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { RandomUtil } from "../utils/RandomUtil"; import { BotHelper } from "./BotHelper"; export declare class DurabilityLimitsHelper { private randomUtil; private botHelper; private configServer; - botConfig: IBotConfig; + private botConfig; constructor(randomUtil: RandomUtil, botHelper: BotHelper, configServer: ConfigServer); getRandomisedMaxWeaponDurability(itemTemplate: ITemplateItem, botRole: string): number; getRandomisedMaxArmorDurability(itemTemplate: ITemplateItem, botRole: string): number; diff --git a/TypeScript/2EditDatabase/types/helpers/ExtendedProfileHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/ExtendedProfileHelper.d.ts new file mode 100644 index 0000000..22ead31 --- /dev/null +++ b/TypeScript/2EditDatabase/types/helpers/ExtendedProfileHelper.d.ts @@ -0,0 +1,22 @@ +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 { 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); + generatePlayerScav(sessionID: string): IPmcData; + private getScavSkills; + private removeSecureContainer; + private getDefaultScavSkills; + private getScavStats; + private getScavLevel; + private getScavExperience; + private setScavCooldownTimer; +} diff --git a/TypeScript/2EditDatabase/types/helpers/HealthHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/HealthHelper.d.ts index 6cbbe45..fb5bed7 100644 --- a/TypeScript/2EditDatabase/types/helpers/HealthHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/HealthHelper.d.ts @@ -1,19 +1,18 @@ import { SaveServer } from "../servers/SaveServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IAkiProfile } from "../@types/eft/profile/IAkiProfile"; -import { ISyncHealthRequestData } from "../@types/eft/health/ISyncHealthRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; import { ConfigServer } from "../servers/ConfigServer"; -import { IHealthConfig } from "../@types/spt/config/IHealthConfig"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class HealthHelper { private jsonUtil; private logger; private timeUtil; private saveServer; private configServer; - healthConfig: IHealthConfig; + private healthConfig; constructor(jsonUtil: JsonUtil, logger: ILogger, timeUtil: TimeUtil, saveServer: SaveServer, configServer: ConfigServer); resetVitality(sessionID: string): IAkiProfile; saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string): void; diff --git a/TypeScript/2EditDatabase/types/helpers/HideoutHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/HideoutHelper.d.ts index 08f30e6..d60e370 100644 --- a/TypeScript/2EditDatabase/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/HideoutHelper.d.ts @@ -1,21 +1,21 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { IPmcData, Production, Productive } from "../@types/eft/common/IPmcData"; -import { IHideoutSingleProductionStartRequestData } from "../@types/eft/hideout/IHideoutSingleProductionStartRequestData"; -import { StageBonus } from "../@types/eft/hideout/IHideoutArea"; +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 "../@types/eft/hideout/IHideoutContinousProductionStartRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { PlayerService } from "../services/PlayerService"; -import { IHideoutTakeProductionRequestData } from "../@types/eft/hideout/IHideoutTakeProductionRequestData"; +import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; import { InventoryHelper } from "./InventoryHelper"; -import { ITemplateItem } from "../@types/eft/common/tables/ITemplateItem"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class HideoutHelper { private logger; private hashUtil; @@ -29,15 +29,15 @@ export declare class HideoutHelper { private playerService; private configServer; static BITCOIN_FARM: string; - static WATER_COLLECTOR: string; - static BITCOIN: string; - static EXPEDITIONARY_FUEL_TANK: string; + private WATER_COLLECTOR; + private BITCOIN; + private EXPEDITIONARY_FUEL_TANK; static NAME_BACKENDCOUNTERS_CRAFTING: string; static SKILL_NAME_HIDEOUT: string; static HOUR_FOR_SKILL_CRAFTING: number; static SKILL_NAME_CRAFITING: string; private hideoutConfig; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, itemEventRouter: ItemEventRouter, httpResponse: HttpResponse, profileHelper: ProfileHelper, inventoryHelper: InventoryHelper, playerService: PlayerService, configServer: ConfigServer); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, inventoryHelper: InventoryHelper, playerService: PlayerService, configServer: ConfigServer); registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; /** * This convinience function intialies new Production Object diff --git a/TypeScript/2EditDatabase/types/helpers/InRaidHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/InRaidHelper.d.ts index 24e5f54..e79d384 100644 --- a/TypeScript/2EditDatabase/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/InRaidHelper.d.ts @@ -1,7 +1,7 @@ -import { IPmcData, Victim } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { IPmcData, Victim } 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 { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { JsonUtil } from "../utils/JsonUtil"; diff --git a/TypeScript/2EditDatabase/types/helpers/InsuranceHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/InsuranceHelper.d.ts deleted file mode 100644 index 0bfa37b..0000000 --- a/TypeScript/2EditDatabase/types/helpers/InsuranceHelper.d.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData"; -import { IInsuranceConfig } from "../@types/spt/config/IInsuranceConfig"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { InsuranceService } from "../services/InsuranceService"; -import { Logger } from "../utils/Logger"; -import { RandomUtil } from "../utils/RandomUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { DialogueHelper } from "./DialogueHelper"; -import { InventoryHelper } from "./InventoryHelper"; -import { TraderHelper } from "./TraderHelper"; -export declare class InsuranceHelper { - private logger; - private insuranceService; - private inventoryHelper; - private randomUtil; - private timeUtil; - private saveServer; - private databaseServer; - private traderHelper; - private dialogueHelper; - private configServer; - insuranceConfig: IInsuranceConfig; - constructor(logger: Logger, insuranceService: InsuranceService, inventoryHelper: InventoryHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, configServer: ConfigServer); - storeLostGear(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; - addGearToSend(pmcData: IPmcData, insuredItem: any, actualItem: any, sessionID: string): any; - storeInsuredItemsForReturn(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; - sendInsuredItems(pmcData: IPmcData, sessionID: string): void; - getPremium(pmcData: IPmcData, inventoryItem: Item, traderId: string): number; -} diff --git a/TypeScript/2EditDatabase/types/helpers/InventoryHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/InventoryHelper.d.ts index 5d17048..4b3460c 100644 --- a/TypeScript/2EditDatabase/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/InventoryHelper.d.ts @@ -1,6 +1,6 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { FenceService } from "../services/FenceService"; @@ -10,12 +10,12 @@ import { PaymentHelper } from "./PaymentHelper"; import { ProfileHelper } from "./ProfileHelper"; import { DialogueHelper } from "./DialogueHelper"; import { HashUtil } from "../utils/HashUtil"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; -import { IInventoryMoveRequestData } from "../@types/eft/inventory/IInventoryMoveRequestData"; -import { IInventorySplitRequestData } from "../@types/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMergeRequestData } from "../@types/eft/inventory/IInventoryMergeRequestData"; -import { ILogger } from "../@types/spt/utils/ILogger"; +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 { TraderAssortHelper } from "./TraderAssortHelper"; export interface OwnerInventoryItems { from: Item[]; @@ -38,19 +38,12 @@ export declare class InventoryHelper { private profileHelper; private configServer; private inventoryConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, httpResponse: HttpResponse, fenceService: FenceService, databaseServer: DatabaseServer, paymentHelper: PaymentHelper, traderAssortHelper: TraderAssortHelper, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, containerHelper: ContainerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); + 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; removeItem(pmcData: IPmcData, itemId: string, sessionID: string, output?: IItemEventRouterResponse): IItemEventRouterResponse; - getSecureContainerItems(items: Item[]): string[]; getItemSize(itemTpl: string, itemID: string, inventoryItem: Item[]): Record; private getSizeByInventoryItemHash; private getInventoryItemHash; - /** - * Recursively checks if the given item is - * inside the stash, that is it has the stash as - * ancestor with slotId=hideout - */ - isItemInStash(pmcData: IPmcData, item: Item): boolean; getContainerMap(containerW: number, containerH: number, itemList: Item[], containerId: string): number[][]; /** * Based on the item action, determine whose inventories we should be looking at for from and to. diff --git a/TypeScript/2EditDatabase/types/helpers/ItemHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/ItemHelper.d.ts index 2c894e6..8c1175a 100644 --- a/TypeScript/2EditDatabase/types/helpers/ItemHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/ItemHelper.d.ts @@ -1,10 +1,10 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { InsuredItem, IPmcData } from "../@types/eft/common/IPmcData"; -import { ITemplateItem, StackSlot } from "../@types/eft/common/tables/ITemplateItem"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { InsuredItem, IPmcData } from "../models/eft/common/IPmcData"; +import { ITemplateItem, StackSlot } from "../models/eft/common/tables/ITemplateItem"; +import { Item } from "../models/eft/common/tables/IItem"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; declare class ItemHelper { private logger; private hashUtil; diff --git a/TypeScript/2EditDatabase/types/helpers/NotificationSendHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/NotificationSendHelper.d.ts index 40b6dec..b9298da 100644 --- a/TypeScript/2EditDatabase/types/helpers/NotificationSendHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/NotificationSendHelper.d.ts @@ -1,5 +1,5 @@ -import { INotification } from "../@types/eft/notifier/INotifier"; -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +import { INotification } from "../models/eft/notifier/INotifier"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; import { NotificationService } from "../services/NotificationService"; export declare class NotificationSendHelper { private httpServer; diff --git a/TypeScript/2EditDatabase/types/helpers/NotifierHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/NotifierHelper.d.ts index 9998054..0d524e9 100644 --- a/TypeScript/2EditDatabase/types/helpers/NotifierHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/NotifierHelper.d.ts @@ -1,5 +1,5 @@ -import { INotification } from "../@types/eft/notifier/INotifier"; -import { Message, MessageContentRagfair } from "../@types/eft/profile/IAkiProfile"; +import { INotification } from "../models/eft/notifier/INotifier"; +import { Message, MessageContentRagfair } from "../models/eft/profile/IAkiProfile"; import { HttpServerHelper } from "./HttpServerHelper"; export declare class NotifierHelper { private httpServerHelper; diff --git a/TypeScript/2EditDatabase/types/helpers/PresetHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/PresetHelper.d.ts index 7695248..0a24128 100644 --- a/TypeScript/2EditDatabase/types/helpers/PresetHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/PresetHelper.d.ts @@ -1,4 +1,4 @@ -import { Preset } from "../@types/eft/common/IGlobals"; +import { Preset } from "../models/eft/common/IGlobals"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class PresetHelper { private databaseServer; diff --git a/TypeScript/2EditDatabase/types/helpers/ProfileHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/ProfileHelper.d.ts index 1d868b1..515e55e 100644 --- a/TypeScript/2EditDatabase/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/ProfileHelper.d.ts @@ -1,44 +1,33 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { FenceService } from "../services/FenceService"; -import { IPmcData, Skills, Stats } from "../@types/eft/common/IPmcData"; -import { IAkiProfile } from "../@types/eft/profile/IAkiProfile"; -import { IValidateNicknameRequestData } from "../@types/eft/profile/IValidateNicknameRequestData"; +import { IPmcData, Stats } from "../models/eft/common/IPmcData"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { ItemHelper } from "./ItemHelper"; -import { IWatermark } from "../@types/spt/utils/IWatermark"; -import { BotGenerator } from "../generators/BotGenerator"; +import { IWatermark } from "../models/spt/utils/IWatermark"; export declare class ProfileHelper { - private jsonUtil; - private watermark; - private timeUtil; - private saveServer; - private databaseServer; - private botGenerator; - private itemHelper; - private fenceService; - constructor(jsonUtil: JsonUtil, watermark: IWatermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, botGenerator: BotGenerator, itemHelper: ItemHelper, fenceService: FenceService); + protected jsonUtil: JsonUtil; + protected watermark: IWatermark; + 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); resetProfileQuestCondition(sessionID: string, conditionId: string): void; getCompleteProfile(sessionID: string): IPmcData[]; - private isWiped; - getFullProfile(sessionID: string): IAkiProfile; - getPmcProfile(sessionID: string): IPmcData; - getScavProfile(sessionID: string): IPmcData; - setScavProfile(sessionID: string, scavData: IPmcData): void; - getScavSkills(sessionID: string): Skills; - generatePlayerScav(sessionID: string): IPmcData; - private removeSecureContainer; - private getDefaultScavSkills; - getScavStats(sessionID: string): Stats; - getDefaultCounters(): Stats; - getServerVersion(): string; - getScavLevel(sessionID: string): number; - getScavExperience(sessionID: string): number; - setScavCooldownTimer(profile: IPmcData, pmcData: IPmcData): IPmcData; isNicknameTaken(info: IValidateNicknameRequestData, sessionID: string): boolean; getProfileByPmcId(pmcId: string): IPmcData; getExperience(level: number): number; getMaxLevel(): number; getDefaultAkiDataObject(): any; + getFullProfile(sessionID: string): IAkiProfile; + getPmcProfile(sessionID: string): IPmcData; + getScavProfile(sessionID: string): IPmcData; + getDefaultCounters(): Stats; + private isWiped; + private getServerVersion; } diff --git a/TypeScript/2EditDatabase/types/helpers/QuestConditionHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/QuestConditionHelper.d.ts index 8f7b706..2a0ee94 100644 --- a/TypeScript/2EditDatabase/types/helpers/QuestConditionHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/QuestConditionHelper.d.ts @@ -1,4 +1,4 @@ -import { AvailableForConditions } from "../@types/eft/common/tables/IQuest"; +import { AvailableForConditions } from "../models/eft/common/tables/IQuest"; export declare class QuestConditionHelper { getQuestConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; getLevelConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; diff --git a/TypeScript/2EditDatabase/types/helpers/QuestHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/QuestHelper.d.ts index c29158b..3474884 100644 --- a/TypeScript/2EditDatabase/types/helpers/QuestHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/QuestHelper.d.ts @@ -8,15 +8,14 @@ import { ProfileHelper } from "./ProfileHelper"; import { DialogueHelper } from "./DialogueHelper"; import { PaymentHelper } from "./PaymentHelper"; import { TraderHelper } from "./TraderHelper"; -import { IPmcData, Quest } from "../@types/eft/common/IPmcData"; -import { AvailableForConditions, AvailableForProps, IQuest, Reward } from "../@types/eft/common/tables/IQuest"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IAcceptQuestRequestData } from "../@types/eft/quests/IAcceptQuestRequestData"; -import { ICompleteQuestRequestData } from "../@types/eft/quests/ICompleteQuestRequestData"; +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 { IQuestConfig } from "../@types/spt/config/IQuestConfig"; import { RagfairServerHelper } from "./RagfairServerHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class QuestHelper { private logger; private jsonUtil; @@ -31,7 +30,7 @@ export declare class QuestHelper { private paymentHelper; private traderHelper; private configServer; - questConfig: IQuestConfig; + private questConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer); static get STATUS(): Record; questStatus(pmcData: IPmcData, questID: string): string; diff --git a/TypeScript/2EditDatabase/types/helpers/RagfairHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/RagfairHelper.d.ts index 7d867bb..2bce4a6 100644 --- a/TypeScript/2EditDatabase/types/helpers/RagfairHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/RagfairHelper.d.ts @@ -1,15 +1,15 @@ import { JsonUtil } from "../utils/JsonUtil"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; -import { IGetOffersResult } from "../@types/eft/ragfair/IGetOffersResult"; -import { ISearchRequestData } from "../@types/eft/ragfair/ISearchRequestData"; +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 { DatabaseServer } from "../servers/DatabaseServer"; 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 "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; import { TraderAssortHelper } from "./TraderAssortHelper"; export declare class RagfairHelper { private logger; diff --git a/TypeScript/2EditDatabase/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/RagfairOfferHelper.d.ts index 873271f..da3ceb8 100644 --- a/TypeScript/2EditDatabase/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/RagfairOfferHelper.d.ts @@ -1,9 +1,9 @@ import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; -import { ISearchRequestData } from "../@types/eft/ragfair/ISearchRequestData"; +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 { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { RagfairOfferService } from "../services/RagfairOfferService"; @@ -17,7 +17,7 @@ import { ConfigServer } from "../servers/ConfigServer"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { RagfairSortHelper } from "./RagfairSortHelper"; import { RagfairHelper } from "./RagfairHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairOfferHelper { private logger; private timeUtil; diff --git a/TypeScript/2EditDatabase/types/helpers/RagfairSellHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/RagfairSellHelper.d.ts index 2e21589..929d112 100644 --- a/TypeScript/2EditDatabase/types/helpers/RagfairSellHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/RagfairSellHelper.d.ts @@ -1,6 +1,5 @@ -import { SellResult } from "../@types/eft/ragfair/IRagfairOffer"; -import { IRagfairConfig } from "../@types/spt/config/IRagfairConfig"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { SellResult } from "../models/eft/ragfair/IRagfairOffer"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; @@ -9,7 +8,7 @@ export declare class RagfairSellHelper { private randomUtil; private timeUtil; private configServer; - ragfairConfig: IRagfairConfig; + private ragfairConfig; constructor(logger: ILogger, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer); calculateSellChance(baseChance: number, offerPrice: number, requirementsPriceInRub: number): number; rollForSale(sellChance: number, count: number): SellResult[]; diff --git a/TypeScript/2EditDatabase/types/helpers/RagfairServerHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/RagfairServerHelper.d.ts index 51b02cb..9a26261 100644 --- a/TypeScript/2EditDatabase/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/RagfairServerHelper.d.ts @@ -1,13 +1,13 @@ import { SaveServer } from "../servers/SaveServer"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { ITemplateItem } from "../@types/eft/common/tables/ITemplateItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { ItemHelper } from "./ItemHelper"; import { ProfileHelper } from "./ProfileHelper"; -import { MemberCategory } from "../@types/eft/common/MemberCategory"; +import { MemberCategory } from "../models/eft/common/MemberCategory"; import { ConfigServer } from "../servers/ConfigServer"; import { RandomUtil } from "../utils/RandomUtil"; import { DialogueHelper } from "./DialogueHelper"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { Item } from "../models/eft/common/tables/IItem"; import { JsonUtil } from "../utils/JsonUtil"; import { HashUtil } from "../utils/HashUtil"; export declare class RagfairServerHelper { diff --git a/TypeScript/2EditDatabase/types/helpers/RagfairSortHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/RagfairSortHelper.d.ts index fbd4b78..e9d8069 100644 --- a/TypeScript/2EditDatabase/types/helpers/RagfairSortHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/RagfairSortHelper.d.ts @@ -1,4 +1,4 @@ -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class RagfairSortHelper { private databaseServer; diff --git a/TypeScript/2EditDatabase/types/helpers/RagfairTaxHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/RagfairTaxHelper.d.ts index bb78afd..e87334f 100644 --- a/TypeScript/2EditDatabase/types/helpers/RagfairTaxHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/RagfairTaxHelper.d.ts @@ -1,9 +1,9 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; import { DatabaseServer } from "../servers/DatabaseServer"; import { RagfairPriceService } from "../services/RagfairPriceService"; import { ItemHelper } from "./ItemHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairTaxHelper { private logger; private databaseServer; diff --git a/TypeScript/2EditDatabase/types/helpers/RepairHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/RepairHelper.d.ts index f2852d7..d11d0d2 100644 --- a/TypeScript/2EditDatabase/types/helpers/RepairHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/RepairHelper.d.ts @@ -1,18 +1,17 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; import { ConfigServer } from "../servers/ConfigServer"; -import { IRepairConfig } from "../@types/spt/config/IRepairConfig"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RepairHelper { private logger; private jsonUtil; private randomUtil; private databaseServer; private configServer; - repairConfig: IRepairConfig; + private repairConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); updateItemDurability(itemToRepairId: string, amountToRepair: number, pmcData: IPmcData, useRepairKit?: boolean): Item; private getRandomisedArmorRepairDegredationValue; diff --git a/TypeScript/2EditDatabase/types/helpers/SecureContainerHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/SecureContainerHelper.d.ts new file mode 100644 index 0000000..8f246b6 --- /dev/null +++ b/TypeScript/2EditDatabase/types/helpers/SecureContainerHelper.d.ts @@ -0,0 +1,13 @@ +import { Item } from "../models/eft/common/tables/IItem"; +import { ItemHelper } from "./ItemHelper"; +export interface OwnerInventoryItems { + from: Item[]; + to: Item[]; + sameInventory: boolean; + isMail: boolean; +} +export declare class SecureContainerHelper { + private itemHelper; + constructor(itemHelper: ItemHelper); + getSecureContainerItems(items: Item[]): string[]; +} diff --git a/TypeScript/2EditDatabase/types/helpers/TradeHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/TradeHelper.d.ts index f3d9a50..0712ff4 100644 --- a/TypeScript/2EditDatabase/types/helpers/TradeHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/TradeHelper.d.ts @@ -3,14 +3,14 @@ import { InventoryHelper } from "../helpers/InventoryHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { FenceService } from "../services/FenceService"; import { PaymentService } from "../services/PaymentService"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IProcessBuyTradeRequestData } from "../@types/eft/trade/IProcessBuyTradeRequestData"; -import { IProcessSellTradeRequestData } from "../@types/eft/trade/IProcessSellTradeRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { Upd } from "../@types/eft/common/tables/IItem"; +import { IPmcData } from "../models/eft/common/IPmcData"; +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 "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class TradeHelper { private logger; private itemEventRouter; diff --git a/TypeScript/2EditDatabase/types/helpers/TraderAssortHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/TraderAssortHelper.d.ts index 7dfed48..d95879c 100644 --- a/TypeScript/2EditDatabase/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/TraderAssortHelper.d.ts @@ -1,5 +1,5 @@ -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { ILogger } from "../models/spt/utils/ILogger"; import { RagfairAssortGenerator } from "../generators/RagfairAssortGenerator"; import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; import { DatabaseServer } from "../servers/DatabaseServer"; diff --git a/TypeScript/2EditDatabase/types/helpers/TraderHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/TraderHelper.d.ts index d9f37a7..5440afe 100644 --- a/TypeScript/2EditDatabase/types/helpers/TraderHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/TraderHelper.d.ts @@ -6,10 +6,10 @@ import { ItemHelper } from "./ItemHelper"; import { ProfileHelper } from "./ProfileHelper"; import { PaymentHelper } from "./PaymentHelper"; import { FenceService } from "../services/FenceService"; -import { IBarterScheme, ITraderAssort, ITraderBase, LoyaltyLevel } from "../@types/eft/common/tables/ITrader"; -import { IPmcData } from "../@types/eft/common/IPmcData"; +import { IBarterScheme, ITraderAssort, ITraderBase, LoyaltyLevel } from "../models/eft/common/tables/ITrader"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class TraderHelper { private logger; private databaseServer; diff --git a/TypeScript/2EditDatabase/types/ide/CheckVersion.d.ts b/TypeScript/2EditDatabase/types/ide/CheckVersion.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/2EditDatabase/types/ide/CheckVersion.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/2EditDatabase/types/ide/Compiler.d.ts b/TypeScript/2EditDatabase/types/ide/Compiler.d.ts index cb0ff5c..fded23a 100644 --- a/TypeScript/2EditDatabase/types/ide/Compiler.d.ts +++ b/TypeScript/2EditDatabase/types/ide/Compiler.d.ts @@ -1 +1 @@ -export {}; +import "reflect-metadata"; diff --git a/TypeScript/2EditDatabase/types/loaders/DelayedModLoader.d.ts b/TypeScript/2EditDatabase/types/loaders/DelayedModLoader.d.ts index ed6d3f8..db86c75 100644 --- a/TypeScript/2EditDatabase/types/loaders/DelayedModLoader.d.ts +++ b/TypeScript/2EditDatabase/types/loaders/DelayedModLoader.d.ts @@ -3,13 +3,15 @@ import { VFS } from "../utils/VFS"; import { InitialModLoader } from "./InitialModLoader"; import { BundleLoader } from "./BundleLoader"; import { HandbookController } from "../controllers/HandbookController"; -import { IModLoader } from "../@types/spt/mod/IModLoader"; +import { IModLoader } from "../models/spt/mod/IModLoader"; +import { ModCompilerService } from "../services/ModCompilerService"; export declare class DelayedModLoader implements IModLoader { private bundleLoader; private handbookController; private vfs; + private modCompilerService; private initialModLoader; - constructor(bundleLoader: BundleLoader, handbookController: HandbookController, vfs: VFS, initialModLoader: InitialModLoader); + constructor(bundleLoader: BundleLoader, handbookController: HandbookController, vfs: VFS, modCompilerService: ModCompilerService, initialModLoader: InitialModLoader); getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; getImportedModsNames(): string[]; diff --git a/TypeScript/2EditDatabase/types/loaders/IMod.d.ts b/TypeScript/2EditDatabase/types/loaders/IMod.d.ts deleted file mode 100644 index 20813f9..0000000 --- a/TypeScript/2EditDatabase/types/loaders/IMod.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export interface IMod { - onload(): any; -} -export interface IContainerMod extends IMod { - onContainerLoad(): any; -} diff --git a/TypeScript/2EditDatabase/types/loaders/InitialModLoader.d.ts b/TypeScript/2EditDatabase/types/loaders/InitialModLoader.d.ts index 612c821..35503c8 100644 --- a/TypeScript/2EditDatabase/types/loaders/InitialModLoader.d.ts +++ b/TypeScript/2EditDatabase/types/loaders/InitialModLoader.d.ts @@ -1,20 +1,24 @@ -import { DependencyContainer } from 'tsyringe'; +import { DependencyContainer } from "tsyringe"; import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; -import { IModLoader } from "../@types/spt/mod/IModLoader"; -import { ILogger } from '../@types/spt/utils/ILogger'; +import { ModCompilerService } from "../services/ModCompilerService"; +import { HashCacheService } from "../services/HashCacheService"; +import { IModLoader } from "../models/spt/mod/IModLoader"; export declare class InitialModLoader implements IModLoader { private logger; private vfs; private jsonUtil; + private modCompilerService; + private hashCacheService; private configServer; - private basepath; + private readonly basepath; private imported; private onLoad; private akiConfig; - constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, configServer: ConfigServer); - load(container: DependencyContainer): void; + constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, hashCacheService: HashCacheService, configServer: ConfigServer); + load(container: DependencyContainer): Promise; getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; getImportedModsNames(): string[]; @@ -23,7 +27,9 @@ export declare class InitialModLoader implements IModLoader { private importMods; private isModCombatibleWithAki; private executeMods; + private sortModsLoadOrder; private addMod; + private compileModIfNeeded; private areModDependenciesFulfilled; private isModCompatible; private validMod; diff --git a/TypeScript/2EditDatabase/types/loaders/ModLoader.d.ts b/TypeScript/2EditDatabase/types/loaders/ModLoader.d.ts deleted file mode 100644 index eed6d69..0000000 --- a/TypeScript/2EditDatabase/types/loaders/ModLoader.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { IPackageJsonData } from "../@types/spt/mod/IPackageJsonData"; -export declare class ModLoader { - static basepath: string; - static imported: {}; - static onLoad: {}; - static load(): void; - static getBundles(local: any): string; - static getBundle(key: any, arg1: any): void; - static importClass(name: string, filepath: string): void; - static importMods(): void; - static isModCombatibleWithAki(mod: IPackageJsonData): boolean; - static executeMods(): void; - static getModPath(mod: string): string; - static addMod(mod: string): void; - static areModDependenciesFulfilled(mod: IPackageJsonData, loadedMods: any): boolean; - static isModCompatible(mod: any, loadedMods: any): boolean; - static validMod(mod: any): boolean; - static getLoadOrderRecursive(mod: any, result: any, visited: any): void; - static getLoadOrder(mods: any): {}; -} diff --git a/TypeScript/2EditDatabase/types/@types/eft/bot/IGenerateBotsRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/bot/IGenerateBotsRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/bot/IGenerateBotsRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/bot/IGenerateBotsRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/common/IEmptyRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/IEmptyRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/common/IEmptyRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/common/IEmptyRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/common/IGlobals.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/IGlobals.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/common/IGlobals.d.ts rename to TypeScript/2EditDatabase/types/models/eft/common/IGlobals.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/common/ILocation.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/ILocation.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/common/ILocation.d.ts rename to TypeScript/2EditDatabase/types/models/eft/common/ILocation.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/common/ILocationBase.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/ILocationBase.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/common/ILocationBase.d.ts rename to TypeScript/2EditDatabase/types/models/eft/common/ILocationBase.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/common/ILocationsSourceDestinationBase.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/ILocationsSourceDestinationBase.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/common/ILocationsSourceDestinationBase.d.ts rename to TypeScript/2EditDatabase/types/models/eft/common/ILocationsSourceDestinationBase.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/common/ILooseLoot.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/ILooseLoot.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/common/ILooseLoot.d.ts rename to TypeScript/2EditDatabase/types/models/eft/common/ILooseLoot.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/common/IMetricsTableData.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/IMetricsTableData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/common/IMetricsTableData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/common/IMetricsTableData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/common/IPmcData.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/IPmcData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/common/IPmcData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/common/IPmcData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/common/MemberCategory.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/MemberCategory.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/common/MemberCategory.d.ts rename to TypeScript/2EditDatabase/types/models/eft/common/MemberCategory.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/common/request/IBaseInteractionRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/request/IBaseInteractionRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/common/request/IBaseInteractionRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/common/request/IBaseInteractionRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/common/tables/IBotBase.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/tables/IBotBase.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/common/tables/IBotBase.d.ts rename to TypeScript/2EditDatabase/types/models/eft/common/tables/IBotBase.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/common/tables/IBotCore.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/tables/IBotCore.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/common/tables/IBotCore.d.ts rename to TypeScript/2EditDatabase/types/models/eft/common/tables/IBotCore.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/common/tables/IBotType.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/tables/IBotType.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/common/tables/IBotType.d.ts rename to TypeScript/2EditDatabase/types/models/eft/common/tables/IBotType.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/common/tables/ICustomizationItem.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/tables/ICustomizationItem.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/common/tables/ICustomizationItem.d.ts rename to TypeScript/2EditDatabase/types/models/eft/common/tables/ICustomizationItem.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/common/tables/IHandbookBase.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/tables/IHandbookBase.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/common/tables/IHandbookBase.d.ts rename to TypeScript/2EditDatabase/types/models/eft/common/tables/IHandbookBase.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/common/tables/IItem.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/tables/IItem.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/common/tables/IItem.d.ts rename to TypeScript/2EditDatabase/types/models/eft/common/tables/IItem.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/common/tables/ILocationsBase.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/tables/ILocationsBase.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/common/tables/ILocationsBase.d.ts rename to TypeScript/2EditDatabase/types/models/eft/common/tables/ILocationsBase.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/common/tables/ILootBase.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/tables/ILootBase.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/common/tables/ILootBase.d.ts rename to TypeScript/2EditDatabase/types/models/eft/common/tables/ILootBase.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/common/tables/IQuest.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/tables/IQuest.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/common/tables/IQuest.d.ts rename to TypeScript/2EditDatabase/types/models/eft/common/tables/IQuest.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/tables/IRepeatableQuests.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/common/tables/IRepeatableQuests.d.ts rename to TypeScript/2EditDatabase/types/models/eft/common/tables/IRepeatableQuests.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/common/tables/ITemplateItem.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/tables/ITemplateItem.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/common/tables/ITemplateItem.d.ts rename to TypeScript/2EditDatabase/types/models/eft/common/tables/ITemplateItem.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/common/tables/ITrader.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/tables/ITrader.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/common/tables/ITrader.d.ts rename to TypeScript/2EditDatabase/types/models/eft/common/tables/ITrader.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/customization/IBuyClothingRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/customization/IBuyClothingRequestData.d.ts similarity index 71% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/customization/IBuyClothingRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/customization/IBuyClothingRequestData.d.ts index be5d930..d19b70d 100644 --- a/TypeScript/3.0GetSptConfigFile/types/@types/eft/customization/IBuyClothingRequestData.d.ts +++ b/TypeScript/2EditDatabase/types/models/eft/customization/IBuyClothingRequestData.d.ts @@ -1,9 +1,9 @@ export interface IBuyClothingRequestData { Action: "CustomizationBuy"; offer: string; - items: Item[]; + items: ClothingItem[]; } -export interface Item { +export interface ClothingItem { del: boolean; id: string; count: number; diff --git a/TypeScript/2EditDatabase/types/@types/eft/customization/IWearClothingRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/customization/IWearClothingRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/customization/IWearClothingRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/customization/IWearClothingRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/dialog/IFriendRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/dialog/IFriendRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/dialog/IFriendRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/dialog/IFriendRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/dialog/IGetAllAttachmentsRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/dialog/IGetAllAttachmentsRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/dialog/IGetAllAttachmentsResponse.d.ts b/TypeScript/2EditDatabase/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/dialog/IGetAllAttachmentsResponse.d.ts rename to TypeScript/2EditDatabase/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/dialog/IGetChatServerListRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/dialog/IGetChatServerListRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/dialog/IGetChatServerListRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/dialog/IGetChatServerListRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/dialog/IGetFriendListDataResponse.d.ts b/TypeScript/2EditDatabase/types/models/eft/dialog/IGetFriendListDataResponse.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/dialog/IGetFriendListDataResponse.d.ts rename to TypeScript/2EditDatabase/types/models/eft/dialog/IGetFriendListDataResponse.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/dialog/IGetMailDialogInfoRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/dialog/IGetMailDialogInfoRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/dialog/IGetMailDialogListRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/dialog/IGetMailDialogListRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/dialog/IGetMailDialogViewRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/dialog/IGetMailDialogViewRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/dialog/IGetMailDialogViewResponseData.d.ts b/TypeScript/2EditDatabase/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/dialog/IGetMailDialogViewResponseData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/dialog/IPinDialogRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/dialog/IPinDialogRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/dialog/IPinDialogRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/dialog/IPinDialogRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/dialog/IRemoveDialogRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/dialog/IRemoveDialogRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/dialog/IRemoveDialogRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/dialog/IRemoveDialogRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/dialog/ISendMessageRequest.d.ts b/TypeScript/2EditDatabase/types/models/eft/dialog/ISendMessageRequest.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/dialog/ISendMessageRequest.d.ts rename to TypeScript/2EditDatabase/types/models/eft/dialog/ISendMessageRequest.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/dialog/ISetDialogReadRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/dialog/ISetDialogReadRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/dialog/ISetDialogReadRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/dialog/ISetDialogReadRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/game/IGameConfigResponse.d.ts b/TypeScript/2EditDatabase/types/models/eft/game/IGameConfigResponse.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/game/IGameConfigResponse.d.ts rename to TypeScript/2EditDatabase/types/models/eft/game/IGameConfigResponse.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/game/IGameEmptyCrcRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/game/IGameEmptyCrcRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/game/IGameEmptyCrcRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/game/IGameEmptyCrcRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/game/IVersionValidateRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/game/IVersionValidateRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/game/IVersionValidateRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/game/IVersionValidateRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/health/IHealthTreatmentRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/health/IHealthTreatmentRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/health/IHealthTreatmentRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/health/IHealthTreatmentRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/health/IOffraidEatRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/health/IOffraidEatRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/health/IOffraidEatRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/health/IOffraidEatRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/health/IOffraidHealRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/health/IOffraidHealRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/health/IOffraidHealRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/health/IOffraidHealRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/health/ISyncHealthRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/health/ISyncHealthRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/health/ISyncHealthRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/health/ISyncHealthRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/hideout/HideoutAreasEnum.d.ts b/TypeScript/2EditDatabase/types/models/eft/hideout/HideoutAreasEnum.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/hideout/HideoutAreasEnum.d.ts rename to TypeScript/2EditDatabase/types/models/eft/hideout/HideoutAreasEnum.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/hideout/IHideoutArea.d.ts b/TypeScript/2EditDatabase/types/models/eft/hideout/IHideoutArea.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/hideout/IHideoutArea.d.ts rename to TypeScript/2EditDatabase/types/models/eft/hideout/IHideoutArea.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/hideout/IHideoutProduction.d.ts b/TypeScript/2EditDatabase/types/models/eft/hideout/IHideoutProduction.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/hideout/IHideoutProduction.d.ts rename to TypeScript/2EditDatabase/types/models/eft/hideout/IHideoutProduction.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/hideout/IHideoutPutItemInRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/hideout/IHideoutPutItemInRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/hideout/IHideoutScavCase.d.ts b/TypeScript/2EditDatabase/types/models/eft/hideout/IHideoutScavCase.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/hideout/IHideoutScavCase.d.ts rename to TypeScript/2EditDatabase/types/models/eft/hideout/IHideoutScavCase.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/hideout/IHideoutScavCaseStartRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/hideout/IHideoutScavCaseStartRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/hideout/IHideoutSettingsBase.d.ts b/TypeScript/2EditDatabase/types/models/eft/hideout/IHideoutSettingsBase.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/hideout/IHideoutSettingsBase.d.ts rename to TypeScript/2EditDatabase/types/models/eft/hideout/IHideoutSettingsBase.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/hideout/IHideoutTakeItemOutRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/hideout/IHideoutTakeItemOutRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/hideout/IHideoutTakeProductionRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/hideout/IHideoutTakeProductionRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/hideout/IHideoutToggleAreaRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/hideout/IHideoutToggleAreaRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/hideout/IHideoutUpgradeRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/hideout/IHideoutUpgradeRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/httpResponse/IGetBodyResponseData.d.ts b/TypeScript/2EditDatabase/types/models/eft/httpResponse/IGetBodyResponseData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/httpResponse/IGetBodyResponseData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/httpResponse/IGetBodyResponseData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/httpResponse/INullResponseData.d.ts b/TypeScript/2EditDatabase/types/models/eft/httpResponse/INullResponseData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/httpResponse/INullResponseData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/httpResponse/INullResponseData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/inRaid/IRegisterPlayerRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/inRaid/IRegisterPlayerRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/inRaid/ISaveProgressRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/inRaid/ISaveProgressRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/inRaid/ISaveProgressRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/inRaid/ISaveProgressRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/insurance/IGetInsuranceCostRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/insurance/IGetInsuranceCostRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/insurance/IInsureRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/insurance/IInsureRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/insurance/IInsureRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/insurance/IInsureRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/inventory/IInventoryAddRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/inventory/IInventoryAddRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/inventory/IInventoryAddRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/inventory/IInventoryAddRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/inventory/IInventoryBaseActionRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/inventory/IInventoryBaseActionRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/inventory/IInventoryBindRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/inventory/IInventoryBindRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/inventory/IInventoryBindRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/inventory/IInventoryBindRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/inventory/IInventoryCreateMarkerRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/inventory/IInventoryCreateMarkerRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/inventory/IInventoryEditMarkerRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/inventory/IInventoryEditMarkerRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/inventory/IInventoryExamineRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/inventory/IInventoryExamineRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/inventory/IInventoryExamineRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/inventory/IInventoryExamineRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/inventory/IInventoryFoldRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/inventory/IInventoryFoldRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/inventory/IInventoryFoldRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/inventory/IInventoryFoldRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/inventory/IInventoryMergeRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/inventory/IInventoryMergeRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/inventory/IInventoryMergeRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/inventory/IInventoryMergeRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/inventory/IInventoryMoveRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/inventory/IInventoryMoveRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/inventory/IInventoryMoveRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/inventory/IInventoryMoveRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/inventory/IInventoryRemoveRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/inventory/IInventoryRemoveRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/inventory/IInventorySortRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/inventory/IInventorySortRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/inventory/IInventorySortRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/inventory/IInventorySortRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/inventory/IInventorySplitRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/inventory/IInventorySplitRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/inventory/IInventorySplitRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/inventory/IInventorySplitRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/inventory/IInventorySwapRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/inventory/IInventorySwapRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/inventory/IInventorySwapRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/inventory/IInventorySwapRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/inventory/IInventoryTagRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/inventory/IInventoryTagRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/inventory/IInventoryTagRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/inventory/IInventoryTagRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/inventory/IInventoryToggleRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/inventory/IInventoryToggleRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/inventory/IInventoryToggleRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/inventory/IInventoryToggleRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/inventory/IInventoryTransferRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/inventory/IInventoryTransferRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/inventory/IInventoryTransferRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/inventory/IInventoryTransferRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts b/TypeScript/2EditDatabase/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts rename to TypeScript/2EditDatabase/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/itemEvent/IItemEventRouterBase.d.ts b/TypeScript/2EditDatabase/types/models/eft/itemEvent/IItemEventRouterBase.d.ts similarity index 91% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/itemEvent/IItemEventRouterBase.d.ts rename to TypeScript/2EditDatabase/types/models/eft/itemEvent/IItemEventRouterBase.d.ts index 0e12850..31e62fe 100644 --- a/TypeScript/3.0GetSptConfigFile/types/@types/eft/itemEvent/IItemEventRouterBase.d.ts +++ b/TypeScript/2EditDatabase/types/models/eft/itemEvent/IItemEventRouterBase.d.ts @@ -49,9 +49,15 @@ export interface Product { _tpl?: string; parentId?: string; slotId?: string; - location?: any; + location?: ItemChangeLocation; upd?: Upd; } +export interface ItemChangeLocation { + x: number; + y: number; + r: number; + isSearched?: boolean; +} export interface TraderRelations { salesSum?: number; standing?: number; diff --git a/TypeScript/2EditDatabase/types/@types/eft/itemEvent/IItemEventRouterRequest.d.ts b/TypeScript/2EditDatabase/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/itemEvent/IItemEventRouterRequest.d.ts rename to TypeScript/2EditDatabase/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/itemEvent/IItemEventRouterResponse.d.ts b/TypeScript/2EditDatabase/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/itemEvent/IItemEventRouterResponse.d.ts rename to TypeScript/2EditDatabase/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/launcher/IChangeRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/launcher/IChangeRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/launcher/IChangeRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/launcher/IChangeRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/launcher/IGetMiniProfileRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/launcher/IGetMiniProfileRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/launcher/ILoginRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/launcher/ILoginRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/launcher/ILoginRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/launcher/ILoginRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/launcher/IMiniProfile.d.ts b/TypeScript/2EditDatabase/types/models/eft/launcher/IMiniProfile.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/launcher/IMiniProfile.d.ts rename to TypeScript/2EditDatabase/types/models/eft/launcher/IMiniProfile.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/launcher/IRegisterData.d.ts b/TypeScript/2EditDatabase/types/models/eft/launcher/IRegisterData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/launcher/IRegisterData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/launcher/IRegisterData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/launcher/IRemoveProfileData.d.ts b/TypeScript/2EditDatabase/types/models/eft/launcher/IRemoveProfileData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/launcher/IRemoveProfileData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/launcher/IRemoveProfileData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/location/IGetLocationRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/location/IGetLocationRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/location/IGetLocationRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/location/IGetLocationRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/match/IEndOfflineRaidRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/match/IEndOfflineRaidRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/match/IEndOfflineRaidRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/match/IEndOfflineRaidRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/match/IStartOffineRaidRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/match/IStartOffineRaidRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/match/IStartOffineRaidRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/match/IStartOffineRaidRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/notes/INoteActionData.d.ts b/TypeScript/2EditDatabase/types/models/eft/notes/INoteActionData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/notes/INoteActionData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/notes/INoteActionData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/notifier/INotifier.d.ts b/TypeScript/2EditDatabase/types/models/eft/notifier/INotifier.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/notifier/INotifier.d.ts rename to TypeScript/2EditDatabase/types/models/eft/notifier/INotifier.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/notifier/ISelectProfileRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/notifier/ISelectProfileRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/notifier/ISelectProfileRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/notifier/ISelectProfileRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/presetBuild/IPresetBuildActionRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/presetBuild/IPresetBuildActionRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/profile/IAkiProfile.d.ts b/TypeScript/2EditDatabase/types/models/eft/profile/IAkiProfile.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/profile/IAkiProfile.d.ts rename to TypeScript/2EditDatabase/types/models/eft/profile/IAkiProfile.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/profile/IProfileChangeNicknameRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/profile/IProfileChangeNicknameRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/profile/IProfileChangeVoiceRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/profile/IProfileChangeVoiceRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/profile/IProfileCreateRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/profile/IProfileCreateRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/profile/IProfileCreateRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/profile/IProfileCreateRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/profile/ISearchFriendRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/profile/ISearchFriendRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/profile/ISearchFriendRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/profile/ISearchFriendRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/profile/ISearchFriendResponse.d.ts b/TypeScript/2EditDatabase/types/models/eft/profile/ISearchFriendResponse.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/profile/ISearchFriendResponse.d.ts rename to TypeScript/2EditDatabase/types/models/eft/profile/ISearchFriendResponse.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/profile/IValidateNicknameRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/profile/IValidateNicknameRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/profile/IValidateNicknameRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/profile/IValidateNicknameRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/quests/IAcceptQuestRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/quests/IAcceptQuestRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/quests/IAcceptQuestRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/quests/IAcceptQuestRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/quests/ICompleteQuestRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/quests/ICompleteQuestRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/quests/ICompleteQuestRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/quests/ICompleteQuestRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/quests/IHandoverQuestRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/quests/IHandoverQuestRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/quests/IHandoverQuestRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/quests/IHandoverQuestRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/quests/IListQuestsRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/quests/IListQuestsRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/quests/IListQuestsRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/quests/IListQuestsRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/quests/IRepeatableQuestChangeRequest.d.ts b/TypeScript/2EditDatabase/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/quests/IRepeatableQuestChangeRequest.d.ts rename to TypeScript/2EditDatabase/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/ragfair/IAddOfferRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/ragfair/IAddOfferRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/ragfair/IAddOfferRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/ragfair/IAddOfferRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/ragfair/IExtendOfferRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/ragfair/IExtendOfferRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/ragfair/IExtendOfferRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/ragfair/IExtendOfferRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/ragfair/IGetItemPriceResult.d.ts b/TypeScript/2EditDatabase/types/models/eft/ragfair/IGetItemPriceResult.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/ragfair/IGetItemPriceResult.d.ts rename to TypeScript/2EditDatabase/types/models/eft/ragfair/IGetItemPriceResult.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/ragfair/IGetMarketPriceRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/ragfair/IGetMarketPriceRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/ragfair/IGetOffersResult.d.ts b/TypeScript/2EditDatabase/types/models/eft/ragfair/IGetOffersResult.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/ragfair/IGetOffersResult.d.ts rename to TypeScript/2EditDatabase/types/models/eft/ragfair/IGetOffersResult.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/2EditDatabase/types/models/eft/ragfair/IRagfairOffer.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/ragfair/IRagfairOffer.d.ts rename to TypeScript/2EditDatabase/types/models/eft/ragfair/IRagfairOffer.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/ragfair/IRemoveOfferRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/ragfair/IRemoveOfferRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/ragfair/ISearchRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/ragfair/ISearchRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/ragfair/ISearchRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/repair/IBaseRepairActionDataRequest.d.ts b/TypeScript/2EditDatabase/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/repair/IBaseRepairActionDataRequest.d.ts rename to TypeScript/2EditDatabase/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/repair/IRepairActionDataRequest.d.ts b/TypeScript/2EditDatabase/types/models/eft/repair/IRepairActionDataRequest.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/repair/IRepairActionDataRequest.d.ts rename to TypeScript/2EditDatabase/types/models/eft/repair/IRepairActionDataRequest.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/repair/ITraderRepairActionDataRequest.d.ts b/TypeScript/2EditDatabase/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/repair/ITraderRepairActionDataRequest.d.ts rename to TypeScript/2EditDatabase/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/trade/IProcessBaseTradeRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/trade/IProcessBaseTradeRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/trade/IProcessBuyTradeRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/trade/IProcessBuyTradeRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/trade/IProcessRagfairTradeRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/trade/IProcessRagfairTradeRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/trade/IProcessSellTradeRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/trade/IProcessSellTradeRequestData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/trade/IProcessSellTradeRequestData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/trade/IProcessSellTradeRequestData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/weather/IWeatherData.d.ts b/TypeScript/2EditDatabase/types/models/eft/weather/IWeatherData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/weather/IWeatherData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/weather/IWeatherData.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/wishlist/IWishlistActionData.d.ts b/TypeScript/2EditDatabase/types/models/eft/wishlist/IWishlistActionData.d.ts similarity index 100% rename from TypeScript/1LogToConsole/types/@types/wishlist/IWishlistActionData.d.ts rename to TypeScript/2EditDatabase/types/models/eft/wishlist/IWishlistActionData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/external/mod.d.ts b/TypeScript/2EditDatabase/types/models/external/mod.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/external/mod.d.ts rename to TypeScript/2EditDatabase/types/models/external/mod.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/external/tsyringe.d.ts b/TypeScript/2EditDatabase/types/models/external/tsyringe.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/external/tsyringe.d.ts rename to TypeScript/2EditDatabase/types/models/external/tsyringe.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/bindings/Route.d.ts b/TypeScript/2EditDatabase/types/models/spt/bindings/Route.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/bindings/Route.d.ts rename to TypeScript/2EditDatabase/types/models/spt/bindings/Route.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/IBotCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/IBotCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/IBotCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/IBotCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/IBundleCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/IBundleCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/IBundleCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/IBundleCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/ICustomizationCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/ICustomizationCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/ICustomizationCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/ICustomizationCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/IDataCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/IDataCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/IDataCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/IDataCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/IDialogueCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/IDialogueCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/IDialogueCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/IDialogueCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/IGameCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/IGameCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/IGameCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/IGameCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/IHandbookCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/IHandbookCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/IHandbookCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/IHandbookCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/IHealthCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/IHealthCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/IHealthCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/IHealthCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/IHideoutCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/IHideoutCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/IHideoutCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/IHideoutCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/IHttpCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/IHttpCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/IHttpCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/IHttpCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/IInraidCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/IInraidCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/IInraidCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/IInraidCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/IInsuranceCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/IInsuranceCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/IInsuranceCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/IInsuranceCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/IInventoryCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/IInventoryCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/IInventoryCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/IInventoryCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/IItemEventCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/IItemEventCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/IItemEventCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/IItemEventCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/ILauncherCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/ILauncherCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/ILauncherCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/ILauncherCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/ILocationCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/ILocationCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/ILocationCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/ILocationCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/IMatchCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/IMatchCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/IMatchCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/IMatchCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/IModCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/IModCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/IModCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/IModCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/INoteCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/INoteCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/INoteCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/INoteCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/INotifierCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/INotifierCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/INotifierCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/INotifierCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/IPresetBuildCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/IPresetBuildCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/IPresetCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/IPresetCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/IPresetCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/IPresetCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/IProfileCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/IProfileCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/IProfileCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/IProfileCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/IQuestCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/IQuestCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/IQuestCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/IQuestCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/IRagfairCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/IRagfairCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/IRagfairCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/IRagfairCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/IRepairCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/IRepairCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/IRepairCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/IRepairCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/ISaveCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/ISaveCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/ISaveCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/ISaveCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/ITradeCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/ITradeCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/ITradeCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/ITradeCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/ITraderCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/ITraderCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/ITraderCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/ITraderCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/IWeatherCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/IWeatherCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/IWeatherCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/IWeatherCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/callbacks/IWishlistCallbacks.d.ts b/TypeScript/2EditDatabase/types/models/spt/callbacks/IWishlistCallbacks.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/callbacks/IWishlistCallbacks.d.ts rename to TypeScript/2EditDatabase/types/models/spt/callbacks/IWishlistCallbacks.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/config/IAirdropConfig.d.ts b/TypeScript/2EditDatabase/types/models/spt/config/IAirdropConfig.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/config/IAirdropConfig.d.ts rename to TypeScript/2EditDatabase/types/models/spt/config/IAirdropConfig.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/config/IBaseConfig.d.ts b/TypeScript/2EditDatabase/types/models/spt/config/IBaseConfig.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/config/IBaseConfig.d.ts rename to TypeScript/2EditDatabase/types/models/spt/config/IBaseConfig.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/config/IBotConfig.d.ts b/TypeScript/2EditDatabase/types/models/spt/config/IBotConfig.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/config/IBotConfig.d.ts rename to TypeScript/2EditDatabase/types/models/spt/config/IBotConfig.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/config/ICoreConfig.d.ts b/TypeScript/2EditDatabase/types/models/spt/config/ICoreConfig.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/config/ICoreConfig.d.ts rename to TypeScript/2EditDatabase/types/models/spt/config/ICoreConfig.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/config/IHealthConfig.d.ts b/TypeScript/2EditDatabase/types/models/spt/config/IHealthConfig.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/config/IHealthConfig.d.ts rename to TypeScript/2EditDatabase/types/models/spt/config/IHealthConfig.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/config/IHideoutConfig.d.ts b/TypeScript/2EditDatabase/types/models/spt/config/IHideoutConfig.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/config/IHideoutConfig.d.ts rename to TypeScript/2EditDatabase/types/models/spt/config/IHideoutConfig.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/config/IHttpConfig.d.ts b/TypeScript/2EditDatabase/types/models/spt/config/IHttpConfig.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/config/IHttpConfig.d.ts rename to TypeScript/2EditDatabase/types/models/spt/config/IHttpConfig.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/config/IInRaidConfig.d.ts b/TypeScript/2EditDatabase/types/models/spt/config/IInRaidConfig.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/config/IInRaidConfig.d.ts rename to TypeScript/2EditDatabase/types/models/spt/config/IInRaidConfig.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/config/IInsuranceConfig.d.ts b/TypeScript/2EditDatabase/types/models/spt/config/IInsuranceConfig.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/config/IInsuranceConfig.d.ts rename to TypeScript/2EditDatabase/types/models/spt/config/IInsuranceConfig.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/config/IInventoryConfig.d.ts b/TypeScript/2EditDatabase/types/models/spt/config/IInventoryConfig.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/config/IInventoryConfig.d.ts rename to TypeScript/2EditDatabase/types/models/spt/config/IInventoryConfig.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/config/ILocationConfig.d.ts b/TypeScript/2EditDatabase/types/models/spt/config/ILocationConfig.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/config/ILocationConfig.d.ts rename to TypeScript/2EditDatabase/types/models/spt/config/ILocationConfig.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/config/IMatchConfig.d.ts b/TypeScript/2EditDatabase/types/models/spt/config/IMatchConfig.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/config/IMatchConfig.d.ts rename to TypeScript/2EditDatabase/types/models/spt/config/IMatchConfig.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/config/IQuestConfig.d.ts b/TypeScript/2EditDatabase/types/models/spt/config/IQuestConfig.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/config/IQuestConfig.d.ts rename to TypeScript/2EditDatabase/types/models/spt/config/IQuestConfig.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/config/IRagfairConfig.d.ts b/TypeScript/2EditDatabase/types/models/spt/config/IRagfairConfig.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/config/IRagfairConfig.d.ts rename to TypeScript/2EditDatabase/types/models/spt/config/IRagfairConfig.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/config/IRepairConfig.d.ts b/TypeScript/2EditDatabase/types/models/spt/config/IRepairConfig.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/config/IRepairConfig.d.ts rename to TypeScript/2EditDatabase/types/models/spt/config/IRepairConfig.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/config/ITraderConfig.d.ts b/TypeScript/2EditDatabase/types/models/spt/config/ITraderConfig.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/config/ITraderConfig.d.ts rename to TypeScript/2EditDatabase/types/models/spt/config/ITraderConfig.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/config/IWeatherConfig.d.ts b/TypeScript/2EditDatabase/types/models/spt/config/IWeatherConfig.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/config/IWeatherConfig.d.ts rename to TypeScript/2EditDatabase/types/models/spt/config/IWeatherConfig.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/controllers/IBotController.d.ts b/TypeScript/2EditDatabase/types/models/spt/controllers/IBotController.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/controllers/IBotController.d.ts rename to TypeScript/2EditDatabase/types/models/spt/controllers/IBotController.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/generators/IBotGenerator.d.ts b/TypeScript/2EditDatabase/types/models/spt/generators/IBotGenerator.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/generators/IBotGenerator.d.ts rename to TypeScript/2EditDatabase/types/models/spt/generators/IBotGenerator.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/generators/ILocationGenerator.d.ts b/TypeScript/2EditDatabase/types/models/spt/generators/ILocationGenerator.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/generators/ILocationGenerator.d.ts rename to TypeScript/2EditDatabase/types/models/spt/generators/ILocationGenerator.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/generators/IPMCLootGenerator.d.ts b/TypeScript/2EditDatabase/types/models/spt/generators/IPMCLootGenerator.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/generators/IPMCLootGenerator.d.ts rename to TypeScript/2EditDatabase/types/models/spt/generators/IPMCLootGenerator.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/generators/IRagfairAssortGenerator.d.ts b/TypeScript/2EditDatabase/types/models/spt/generators/IRagfairAssortGenerator.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/generators/IRagfairAssortGenerator.d.ts rename to TypeScript/2EditDatabase/types/models/spt/generators/IRagfairAssortGenerator.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/generators/IRagfairOfferGenerator.d.ts b/TypeScript/2EditDatabase/types/models/spt/generators/IRagfairOfferGenerator.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/generators/IRagfairOfferGenerator.d.ts rename to TypeScript/2EditDatabase/types/models/spt/generators/IRagfairOfferGenerator.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/helpers/Traders.d.ts b/TypeScript/2EditDatabase/types/models/spt/helpers/Traders.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/helpers/Traders.d.ts rename to TypeScript/2EditDatabase/types/models/spt/helpers/Traders.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/mod/IMod.d.ts b/TypeScript/2EditDatabase/types/models/spt/mod/IMod.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/mod/IMod.d.ts rename to TypeScript/2EditDatabase/types/models/spt/mod/IMod.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/mod/IModLoader.d.ts b/TypeScript/2EditDatabase/types/models/spt/mod/IModLoader.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/mod/IModLoader.d.ts rename to TypeScript/2EditDatabase/types/models/spt/mod/IModLoader.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/mod/IPackageJsonData.d.ts b/TypeScript/2EditDatabase/types/models/spt/mod/IPackageJsonData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/mod/IPackageJsonData.d.ts rename to TypeScript/2EditDatabase/types/models/spt/mod/IPackageJsonData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/ragfair/IRagfairServerPrices.d.ts b/TypeScript/2EditDatabase/types/models/spt/ragfair/IRagfairServerPrices.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/ragfair/IRagfairServerPrices.d.ts rename to TypeScript/2EditDatabase/types/models/spt/ragfair/IRagfairServerPrices.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/server/IDatabaseTables.d.ts b/TypeScript/2EditDatabase/types/models/spt/server/IDatabaseTables.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/server/IDatabaseTables.d.ts rename to TypeScript/2EditDatabase/types/models/spt/server/IDatabaseTables.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/server/IHttpServer.d.ts b/TypeScript/2EditDatabase/types/models/spt/server/IHttpServer.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/server/IHttpServer.d.ts rename to TypeScript/2EditDatabase/types/models/spt/server/IHttpServer.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/server/ILocaleBase.d.ts b/TypeScript/2EditDatabase/types/models/spt/server/ILocaleBase.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/server/ILocaleBase.d.ts rename to TypeScript/2EditDatabase/types/models/spt/server/ILocaleBase.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/server/ILocations.d.ts b/TypeScript/2EditDatabase/types/models/spt/server/ILocations.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/server/ILocations.d.ts rename to TypeScript/2EditDatabase/types/models/spt/server/ILocations.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/server/IServerBase.d.ts b/TypeScript/2EditDatabase/types/models/spt/server/IServerBase.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/server/IServerBase.d.ts rename to TypeScript/2EditDatabase/types/models/spt/server/IServerBase.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/server/ISettingsBase.d.ts b/TypeScript/2EditDatabase/types/models/spt/server/ISettingsBase.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/server/ISettingsBase.d.ts rename to TypeScript/2EditDatabase/types/models/spt/server/ISettingsBase.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/utils/IAsyncQueue.d.ts b/TypeScript/2EditDatabase/types/models/spt/utils/IAsyncQueue.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/utils/IAsyncQueue.d.ts rename to TypeScript/2EditDatabase/types/models/spt/utils/IAsyncQueue.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/utils/ICommand.d.ts b/TypeScript/2EditDatabase/types/models/spt/utils/ICommand.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/utils/ICommand.d.ts rename to TypeScript/2EditDatabase/types/models/spt/utils/ICommand.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/utils/ILogger.d.ts b/TypeScript/2EditDatabase/types/models/spt/utils/ILogger.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/utils/ILogger.d.ts rename to TypeScript/2EditDatabase/types/models/spt/utils/ILogger.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/utils/IUuidGenerator.d.ts b/TypeScript/2EditDatabase/types/models/spt/utils/IUuidGenerator.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/utils/IUuidGenerator.d.ts rename to TypeScript/2EditDatabase/types/models/spt/utils/IUuidGenerator.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/spt/utils/IWatermark.d.ts b/TypeScript/2EditDatabase/types/models/spt/utils/IWatermark.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/spt/utils/IWatermark.d.ts rename to TypeScript/2EditDatabase/types/models/spt/utils/IWatermark.d.ts diff --git a/TypeScript/2EditDatabase/types/routers/ImageRouter.d.ts b/TypeScript/2EditDatabase/types/routers/ImageRouter.d.ts index 511d5b2..07a0606 100644 --- a/TypeScript/2EditDatabase/types/routers/ImageRouter.d.ts +++ b/TypeScript/2EditDatabase/types/routers/ImageRouter.d.ts @@ -1,7 +1,7 @@ /// import { IncomingMessage, ServerResponse } from "http"; import { VFS } from "../utils/VFS"; -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class ImageRouter { private vfs; constructor(vfs: VFS); diff --git a/TypeScript/2EditDatabase/types/routers/ItemEventRouter.d.ts b/TypeScript/2EditDatabase/types/routers/ItemEventRouter.d.ts index bb5e843..bb20152 100644 --- a/TypeScript/2EditDatabase/types/routers/ItemEventRouter.d.ts +++ b/TypeScript/2EditDatabase/types/routers/ItemEventRouter.d.ts @@ -1,9 +1,9 @@ import { JsonUtil } from "../utils/JsonUtil"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IItemEventRouterRequest } from "../@types/eft/itemEvent/IItemEventRouterRequest"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IItemEventRouterRequest } from "../models/eft/itemEvent/IItemEventRouterRequest"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { ItemEventRouterDefinition } from "../di/Router"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class ItemEventRouter { private logger; private jsonUtil; diff --git a/TypeScript/2EditDatabase/types/routers/item_events/CustomizationItemEventRouter.d.ts b/TypeScript/2EditDatabase/types/routers/item_events/CustomizationItemEventRouter.d.ts index eebc28c..3025e2c 100644 --- a/TypeScript/2EditDatabase/types/routers/item_events/CustomizationItemEventRouter.d.ts +++ b/TypeScript/2EditDatabase/types/routers/item_events/CustomizationItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private customizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/2EditDatabase/types/routers/item_events/HealthItemEventRouter.d.ts b/TypeScript/2EditDatabase/types/routers/item_events/HealthItemEventRouter.d.ts index 333c18a..bad9af2 100644 --- a/TypeScript/2EditDatabase/types/routers/item_events/HealthItemEventRouter.d.ts +++ b/TypeScript/2EditDatabase/types/routers/item_events/HealthItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private healthCallbacks; constructor(healthCallbacks: HealthCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/2EditDatabase/types/routers/item_events/HideoutItemEventRouter.d.ts b/TypeScript/2EditDatabase/types/routers/item_events/HideoutItemEventRouter.d.ts index f68b112..2cec18b 100644 --- a/TypeScript/2EditDatabase/types/routers/item_events/HideoutItemEventRouter.d.ts +++ b/TypeScript/2EditDatabase/types/routers/item_events/HideoutItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private hideoutCallbacks; constructor(hideoutCallbacks: HideoutCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/2EditDatabase/types/routers/item_events/InsuranceItemEventRouter.d.ts b/TypeScript/2EditDatabase/types/routers/item_events/InsuranceItemEventRouter.d.ts index de185db..8efc2c2 100644 --- a/TypeScript/2EditDatabase/types/routers/item_events/InsuranceItemEventRouter.d.ts +++ b/TypeScript/2EditDatabase/types/routers/item_events/InsuranceItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private insuranceCallbacks; constructor(insuranceCallbacks: InsuranceCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/2EditDatabase/types/routers/item_events/InventoryItemEventRouter.d.ts b/TypeScript/2EditDatabase/types/routers/item_events/InventoryItemEventRouter.d.ts index 40496f7..1d93e7b 100644 --- a/TypeScript/2EditDatabase/types/routers/item_events/InventoryItemEventRouter.d.ts +++ b/TypeScript/2EditDatabase/types/routers/item_events/InventoryItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private inventoryCallbacks; constructor(inventoryCallbacks: InventoryCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/2EditDatabase/types/routers/item_events/NoteItemEventRouter.d.ts b/TypeScript/2EditDatabase/types/routers/item_events/NoteItemEventRouter.d.ts index 8b703a3..12af594 100644 --- a/TypeScript/2EditDatabase/types/routers/item_events/NoteItemEventRouter.d.ts +++ b/TypeScript/2EditDatabase/types/routers/item_events/NoteItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private noteCallbacks; constructor(noteCallbacks: NoteCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/2EditDatabase/types/routers/item_events/PresetBuildItemEventRouter.d.ts b/TypeScript/2EditDatabase/types/routers/item_events/PresetBuildItemEventRouter.d.ts index 7a915b1..7298c52 100644 --- a/TypeScript/2EditDatabase/types/routers/item_events/PresetBuildItemEventRouter.d.ts +++ b/TypeScript/2EditDatabase/types/routers/item_events/PresetBuildItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private presetBuildCallbacks; constructor(presetBuildCallbacks: PresetBuildCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/2EditDatabase/types/routers/item_events/QuestItemEventRouter.d.ts b/TypeScript/2EditDatabase/types/routers/item_events/QuestItemEventRouter.d.ts index 6f4d3f6..9944ae9 100644 --- a/TypeScript/2EditDatabase/types/routers/item_events/QuestItemEventRouter.d.ts +++ b/TypeScript/2EditDatabase/types/routers/item_events/QuestItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private questCallbacks; constructor(questCallbacks: QuestCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/2EditDatabase/types/routers/item_events/RagfairItemEventRouter.d.ts b/TypeScript/2EditDatabase/types/routers/item_events/RagfairItemEventRouter.d.ts index 8361e1e..88e52ba 100644 --- a/TypeScript/2EditDatabase/types/routers/item_events/RagfairItemEventRouter.d.ts +++ b/TypeScript/2EditDatabase/types/routers/item_events/RagfairItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private ragfairCallbacks; constructor(ragfairCallbacks: RagfairCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/2EditDatabase/types/routers/item_events/RepairItemEventRouter.d.ts b/TypeScript/2EditDatabase/types/routers/item_events/RepairItemEventRouter.d.ts index 544a656..b292ded 100644 --- a/TypeScript/2EditDatabase/types/routers/item_events/RepairItemEventRouter.d.ts +++ b/TypeScript/2EditDatabase/types/routers/item_events/RepairItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private repairCallbacks; constructor(repairCallbacks: RepairCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/2EditDatabase/types/routers/item_events/TradeItemEventRouter.d.ts b/TypeScript/2EditDatabase/types/routers/item_events/TradeItemEventRouter.d.ts index eb5c294..1bca2b8 100644 --- a/TypeScript/2EditDatabase/types/routers/item_events/TradeItemEventRouter.d.ts +++ b/TypeScript/2EditDatabase/types/routers/item_events/TradeItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private tradeCallbacks; constructor(tradeCallbacks: TradeCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/2EditDatabase/types/routers/item_events/WishlistItemEventRouter.d.ts b/TypeScript/2EditDatabase/types/routers/item_events/WishlistItemEventRouter.d.ts index e7fdc9b..38831f6 100644 --- a/TypeScript/2EditDatabase/types/routers/item_events/WishlistItemEventRouter.d.ts +++ b/TypeScript/2EditDatabase/types/routers/item_events/WishlistItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private wishlistCallbacks; constructor(wishlistCallbacks: WishlistCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/2EditDatabase/types/routers/save_load/HealthSaveLoadRouter.d.ts b/TypeScript/2EditDatabase/types/routers/save_load/HealthSaveLoadRouter.d.ts index c068915..114f5b2 100644 --- a/TypeScript/2EditDatabase/types/routers/save_load/HealthSaveLoadRouter.d.ts +++ b/TypeScript/2EditDatabase/types/routers/save_load/HealthSaveLoadRouter.d.ts @@ -1,4 +1,4 @@ -import { IAkiProfile } from "../../@types/eft/profile/IAkiProfile"; +import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; export declare class HealthSaveLoadRouter extends SaveLoadRouter { constructor(); diff --git a/TypeScript/2EditDatabase/types/routers/save_load/InraidSaveLoadRouter.d.ts b/TypeScript/2EditDatabase/types/routers/save_load/InraidSaveLoadRouter.d.ts index eb5cf5a..4c00b40 100644 --- a/TypeScript/2EditDatabase/types/routers/save_load/InraidSaveLoadRouter.d.ts +++ b/TypeScript/2EditDatabase/types/routers/save_load/InraidSaveLoadRouter.d.ts @@ -1,4 +1,4 @@ -import { IAkiProfile } from "../../@types/eft/profile/IAkiProfile"; +import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; export declare class InraidSaveLoadRouter extends SaveLoadRouter { constructor(); diff --git a/TypeScript/2EditDatabase/types/routers/save_load/InsuranceSaveLoadRouter.d.ts b/TypeScript/2EditDatabase/types/routers/save_load/InsuranceSaveLoadRouter.d.ts index 07df122..30ce98e 100644 --- a/TypeScript/2EditDatabase/types/routers/save_load/InsuranceSaveLoadRouter.d.ts +++ b/TypeScript/2EditDatabase/types/routers/save_load/InsuranceSaveLoadRouter.d.ts @@ -1,4 +1,4 @@ -import { IAkiProfile } from "../../@types/eft/profile/IAkiProfile"; +import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; export declare class InsuranceSaveLoadRouter extends SaveLoadRouter { constructor(); diff --git a/TypeScript/2EditDatabase/types/routers/save_load/ProfileSaveLoadRouter.d.ts b/TypeScript/2EditDatabase/types/routers/save_load/ProfileSaveLoadRouter.d.ts index 51b4cb5..16c7619 100644 --- a/TypeScript/2EditDatabase/types/routers/save_load/ProfileSaveLoadRouter.d.ts +++ b/TypeScript/2EditDatabase/types/routers/save_load/ProfileSaveLoadRouter.d.ts @@ -1,4 +1,4 @@ -import { IAkiProfile } from "../../@types/eft/profile/IAkiProfile"; +import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; export declare class ProfileSaveLoadRouter extends SaveLoadRouter { constructor(); diff --git a/TypeScript/2EditDatabase/types/routers/serializers/BundleSerializer.d.ts b/TypeScript/2EditDatabase/types/routers/serializers/BundleSerializer.d.ts index cf09797..5f275c4 100644 --- a/TypeScript/2EditDatabase/types/routers/serializers/BundleSerializer.d.ts +++ b/TypeScript/2EditDatabase/types/routers/serializers/BundleSerializer.d.ts @@ -1,5 +1,5 @@ -import { IHttpServer } from "../../@types/spt/server/IHttpServer"; -import { ILogger } from "../../@types/spt/utils/ILogger"; +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 { diff --git a/TypeScript/2EditDatabase/types/routers/serializers/ImageSerializer.d.ts b/TypeScript/2EditDatabase/types/routers/serializers/ImageSerializer.d.ts index 1d0b9c4..29340d0 100644 --- a/TypeScript/2EditDatabase/types/routers/serializers/ImageSerializer.d.ts +++ b/TypeScript/2EditDatabase/types/routers/serializers/ImageSerializer.d.ts @@ -1,4 +1,4 @@ -import { IHttpServer } from "../../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { Serializer } from "../../di/Serializer"; import { ImageRouter } from "../ImageRouter"; export declare class ImageSerializer extends Serializer { diff --git a/TypeScript/2EditDatabase/types/routers/serializers/NotifySerializer.d.ts b/TypeScript/2EditDatabase/types/routers/serializers/NotifySerializer.d.ts index d97fc0a..7be87ef 100644 --- a/TypeScript/2EditDatabase/types/routers/serializers/NotifySerializer.d.ts +++ b/TypeScript/2EditDatabase/types/routers/serializers/NotifySerializer.d.ts @@ -1,4 +1,4 @@ -import { IHttpServer } from "../../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { NotifierController } from "../../controllers/NotifierController"; import { Serializer } from "../../di/Serializer"; import { HttpServerHelper } from "../../helpers/HttpServerHelper"; diff --git a/TypeScript/2EditDatabase/types/servers/ConfigServer.d.ts b/TypeScript/2EditDatabase/types/servers/ConfigServer.d.ts index d25d1a8..9c2e114 100644 --- a/TypeScript/2EditDatabase/types/servers/ConfigServer.d.ts +++ b/TypeScript/2EditDatabase/types/servers/ConfigServer.d.ts @@ -1,6 +1,6 @@ import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class ConfigServer { private logger; private vfs; diff --git a/TypeScript/2EditDatabase/types/servers/DatabaseServer.d.ts b/TypeScript/2EditDatabase/types/servers/DatabaseServer.d.ts index b66e847..521bcf9 100644 --- a/TypeScript/2EditDatabase/types/servers/DatabaseServer.d.ts +++ b/TypeScript/2EditDatabase/types/servers/DatabaseServer.d.ts @@ -1,4 +1,4 @@ -import { IDatabaseTables } from "../@types/spt/server/IDatabaseTables"; +import { IDatabaseTables } from "../models/spt/server/IDatabaseTables"; export declare class DatabaseServer { private tableData; getTables(): IDatabaseTables; diff --git a/TypeScript/2EditDatabase/types/servers/HttpServer.d.ts b/TypeScript/2EditDatabase/types/servers/HttpServer.d.ts index e38263d..0ba20c6 100644 --- a/TypeScript/2EditDatabase/types/servers/HttpServer.d.ts +++ b/TypeScript/2EditDatabase/types/servers/HttpServer.d.ts @@ -1,16 +1,16 @@ /// import { HttpRouter } from "../routers/HttpRouter"; import { JsonUtil } from "../utils/JsonUtil"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { DatabaseServer } from "./DatabaseServer"; import { Serializer } from "../di/Serializer"; import http, { ServerResponse } from "http"; -import { INotification } from "../@types/eft/notifier/INotifier"; +import { INotification } from "../models/eft/notifier/INotifier"; import { NotifierHelper } from "../helpers/NotifierHelper"; import { ConfigServer } from "./ConfigServer"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class HttpServer implements IHttpServer { private httpRouter; private logger; @@ -21,7 +21,7 @@ export declare class HttpServer implements IHttpServer { private httpServerHelper; private serializers; private configServer; - constructor(httpRouter: HttpRouter, logger: ILogger, jsonUtil: JsonUtil, httpResponse: HttpResponse, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); + constructor(httpRouter: HttpRouter, logger: ILogger, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); private buffers; private onReceive; private onRespond; diff --git a/TypeScript/2EditDatabase/types/servers/RagfairServer.d.ts b/TypeScript/2EditDatabase/types/servers/RagfairServer.d.ts index ef69106..d103625 100644 --- a/TypeScript/2EditDatabase/types/servers/RagfairServer.d.ts +++ b/TypeScript/2EditDatabase/types/servers/RagfairServer.d.ts @@ -1,4 +1,4 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; @@ -7,12 +7,12 @@ import { RagfairPriceService } from "../services/RagfairPriceService"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { RagfairCategoriesService } from "../services/RagfairCategoriesService"; import { RagfairLinkedItemService } from "../services/RagfairLinkedItemService"; -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ConfigServer } from "./ConfigServer"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairServer { private logger; private ragfairOfferGenerator; @@ -28,7 +28,7 @@ export declare class RagfairServer { private ragfairRequiredItemsService; private configServer; private ragfairConfig; - constructor(logger: ILogger, ragfairOfferGenerator: RagfairOfferGenerator, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponse, saveServer: SaveServer, ragfairPriceService: RagfairPriceService, ragfairOfferService: RagfairOfferService, ragfairLinkedItemService: RagfairLinkedItemService, ragfairCategoriesService: RagfairCategoriesService, ragfairRequiredItemsService: RagfairRequiredItemsService, configServer: ConfigServer); + constructor(logger: ILogger, ragfairOfferGenerator: RagfairOfferGenerator, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, saveServer: SaveServer, ragfairPriceService: RagfairPriceService, ragfairOfferService: RagfairOfferService, ragfairLinkedItemService: RagfairLinkedItemService, ragfairCategoriesService: RagfairCategoriesService, ragfairRequiredItemsService: RagfairRequiredItemsService, configServer: ConfigServer); load(): void; update(): void; private processExpiredOffer; diff --git a/TypeScript/2EditDatabase/types/servers/SaveServer.d.ts b/TypeScript/2EditDatabase/types/servers/SaveServer.d.ts index 23da9ea..fdf92e4 100644 --- a/TypeScript/2EditDatabase/types/servers/SaveServer.d.ts +++ b/TypeScript/2EditDatabase/types/servers/SaveServer.d.ts @@ -1,9 +1,9 @@ -import { IAkiProfile, Info } from "../@types/eft/profile/IAkiProfile"; +import { IAkiProfile, Info } from "../models/eft/profile/IAkiProfile"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; import { SaveLoadRouter } from "../di/Router"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class SaveServer { private vfs; private saveLoadRouters; diff --git a/TypeScript/2EditDatabase/types/services/FenceService.d.ts b/TypeScript/2EditDatabase/types/services/FenceService.d.ts index 4b80d50..eef87b3 100644 --- a/TypeScript/2EditDatabase/types/services/FenceService.d.ts +++ b/TypeScript/2EditDatabase/types/services/FenceService.d.ts @@ -2,14 +2,14 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { HandbookHelper } from "../helpers/HandbookHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { PresetHelper } from "../helpers/PresetHelper"; -import { FenceLevel } from "../@types/eft/common/IGlobals"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; +import { FenceLevel } from "../models/eft/common/IGlobals"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; import { ConfigServer } from "../servers/ConfigServer"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class FenceService { private logger; private hashUtil; diff --git a/TypeScript/2EditDatabase/types/services/HashCacheService.d.ts b/TypeScript/2EditDatabase/types/services/HashCacheService.d.ts new file mode 100644 index 0000000..c9b0170 --- /dev/null +++ b/TypeScript/2EditDatabase/types/services/HashCacheService.d.ts @@ -0,0 +1,19 @@ +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 { + private vfs; + private hashUtil; + private jsonUtil; + private logger; + private jsonHashes; + private modHashes; + private readonly modCachePath; + constructor(vfs: VFS, hashUtil: HashUtil, jsonUtil: JsonUtil, logger: ILogger); + getStoredModHash(modName: string): string; + modContentMatchesStoredHash(modName: string, modContent: string): boolean; + hashMatchesStoredHash(modName: string, modHash: string): boolean; + storeModContent(modName: string, modContent: string): void; + storeModHash(modName: string, modHash: string): void; +} diff --git a/TypeScript/2EditDatabase/types/services/InsuranceService.d.ts b/TypeScript/2EditDatabase/types/services/InsuranceService.d.ts index cd91136..35f0dbc 100644 --- a/TypeScript/2EditDatabase/types/services/InsuranceService.d.ts +++ b/TypeScript/2EditDatabase/types/services/InsuranceService.d.ts @@ -1,10 +1,9 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData"; -import { IInsuranceConfig } from "../@types/spt/config/IInsuranceConfig"; -import { ILogger } from "../@types/spt/utils/ILogger"; +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 { InventoryHelper } from "../helpers/InventoryHelper"; +import { SecureContainerHelper } from "../helpers/SecureContainerHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -14,7 +13,7 @@ import { TimeUtil } from "../utils/TimeUtil"; export declare class InsuranceService { private logger; private databaseServer; - private inventoryHelper; + private secureContainerHelper; private randomUtil; private timeUtil; private saveServer; @@ -23,8 +22,8 @@ export declare class InsuranceService { private configServer; private insured; private templatesById; - insuranceConfig: IInsuranceConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, inventoryHelper: InventoryHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, configServer: ConfigServer); + private insuranceConfig; + constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, configServer: ConfigServer); insuranceExists(sessionId: string): boolean; insuranceTraderArrayExists(sessionId: string, traderId: string): boolean; getInsurance(sessionId: string): Record; diff --git a/TypeScript/2EditDatabase/types/services/ModCompilerService.d.ts b/TypeScript/2EditDatabase/types/services/ModCompilerService.d.ts new file mode 100644 index 0000000..7e750c3 --- /dev/null +++ b/TypeScript/2EditDatabase/types/services/ModCompilerService.d.ts @@ -0,0 +1,11 @@ +import { ILogger } from "../models/spt/utils/ILogger"; +import { VFS } from "../utils/VFS"; +export declare class ModCompilerService { + private logger; + private vfs; + constructor(logger: ILogger, vfs: VFS); + compileMod(path: string, modTypeScriptFiles: string[]): Promise; + private compile; + private areFilesReady; + private delay; +} diff --git a/TypeScript/2EditDatabase/types/services/NotificationService.d.ts b/TypeScript/2EditDatabase/types/services/NotificationService.d.ts index 5c0e0ec..9c6c143 100644 --- a/TypeScript/2EditDatabase/types/services/NotificationService.d.ts +++ b/TypeScript/2EditDatabase/types/services/NotificationService.d.ts @@ -1,4 +1,4 @@ -import { INotification } from "../@types/eft/notifier/INotifier"; +import { INotification } from "../models/eft/notifier/INotifier"; export declare class NotificationService { private messageQueue; getMessageQueue(): {}; diff --git a/TypeScript/2EditDatabase/types/services/PaymentService.d.ts b/TypeScript/2EditDatabase/types/services/PaymentService.d.ts index 245bb34..20cee50 100644 --- a/TypeScript/2EditDatabase/types/services/PaymentService.d.ts +++ b/TypeScript/2EditDatabase/types/services/PaymentService.d.ts @@ -1,15 +1,15 @@ import { InventoryHelper } from "../helpers/InventoryHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IProcessBuyTradeRequestData } from "../@types/eft/trade/IProcessBuyTradeRequestData"; -import { IProcessSellTradeRequestData } from "../@types/eft/trade/IProcessSellTradeRequestData"; +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 { HttpResponse } from "../utils/HttpResponse"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class PaymentService { private logger; private httpResponse; @@ -19,7 +19,7 @@ export declare class PaymentService { private itemHelper; private inventoryHelper; private paymentHelper; - constructor(logger: ILogger, httpResponse: HttpResponse, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); + constructor(logger: ILogger, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request * @param {Object} pmcData @@ -38,5 +38,11 @@ export declare class PaymentService { * @returns IItemEventRouterResponse */ getMoney(pmcData: IPmcData, amount: number, body: IProcessSellTradeRequestData, output: IItemEventRouterResponse, sessionID: string): IItemEventRouterResponse; + /** + * Recursively checks if the given item is + * inside the stash, that is it has the stash as + * ancestor with slotId=hideout + */ + private isItemInStash; addPaymentToOutput(pmcData: IPmcData, currencyTpl: string, amountToPay: number, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse; } diff --git a/TypeScript/2EditDatabase/types/services/PlayerService.d.ts b/TypeScript/2EditDatabase/types/services/PlayerService.d.ts index ec6e32c..4a74b4a 100644 --- a/TypeScript/2EditDatabase/types/services/PlayerService.d.ts +++ b/TypeScript/2EditDatabase/types/services/PlayerService.d.ts @@ -1,7 +1,7 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IPlayerIncrementSkillLevelRequestData } from "../@types/eft/player/IPlayerIncrementSkillLevelRequestData"; -import { ILogger } from "../@types/spt/utils/ILogger"; +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 { private logger; private databaseServer; diff --git a/TypeScript/2EditDatabase/types/services/RagfairCategoriesService.d.ts b/TypeScript/2EditDatabase/types/services/RagfairCategoriesService.d.ts index 370886e..fb9efa2 100644 --- a/TypeScript/2EditDatabase/types/services/RagfairCategoriesService.d.ts +++ b/TypeScript/2EditDatabase/types/services/RagfairCategoriesService.d.ts @@ -1,4 +1,4 @@ -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; export declare class RagfairCategoriesService { updateCategories(offers: IRagfairOffer[]): void; private categories; diff --git a/TypeScript/2EditDatabase/types/services/RagfairOfferService.d.ts b/TypeScript/2EditDatabase/types/services/RagfairOfferService.d.ts index 1b7682d..4e4ae26 100644 --- a/TypeScript/2EditDatabase/types/services/RagfairOfferService.d.ts +++ b/TypeScript/2EditDatabase/types/services/RagfairOfferService.d.ts @@ -2,9 +2,8 @@ import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { TimeUtil } from "../utils/TimeUtil"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; -import { IRagfairConfig } from "../@types/spt/config/IRagfairConfig"; +import { Item } from "../models/eft/common/tables/IItem"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; export declare class RagfairOfferService { private timeUtil; private databaseServer; @@ -14,7 +13,7 @@ export declare class RagfairOfferService { private toUpdate; private expiredOffers; private offers; - ragfairConfig: IRagfairConfig; + private ragfairConfig; constructor(timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, configServer: ConfigServer); getOffers(): IRagfairOffer[]; getOfferByOfferId(offerId: string): IRagfairOffer; diff --git a/TypeScript/2EditDatabase/types/services/RagfairPriceService.d.ts b/TypeScript/2EditDatabase/types/services/RagfairPriceService.d.ts index d91df24..7cc42f9 100644 --- a/TypeScript/2EditDatabase/types/services/RagfairPriceService.d.ts +++ b/TypeScript/2EditDatabase/types/services/RagfairPriceService.d.ts @@ -4,9 +4,9 @@ import { ConfigServer } from "../servers/ConfigServer"; import { HandbookHelper } from "../helpers/HandbookHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { PresetHelper } from "../helpers/PresetHelper"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { IBarterScheme } from "../@types/eft/common/tables/ITrader"; -import { ILogger } from "../@types/spt/utils/ILogger"; +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 { private handbookHelper; private databaseServer; diff --git a/TypeScript/2EditDatabase/types/services/RagfairRequiredItemsService.d.ts b/TypeScript/2EditDatabase/types/services/RagfairRequiredItemsService.d.ts index 3908cb9..e4582d0 100644 --- a/TypeScript/2EditDatabase/types/services/RagfairRequiredItemsService.d.ts +++ b/TypeScript/2EditDatabase/types/services/RagfairRequiredItemsService.d.ts @@ -1,6 +1,6 @@ import { PaymentHelper } from "../helpers/PaymentHelper"; import { RagfairOfferService } from "../services/RagfairOfferService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairRequiredItemsService { private logger; private paymentHelper; diff --git a/TypeScript/2EditDatabase/types/services/TraderAssortService.d.ts b/TypeScript/2EditDatabase/types/services/TraderAssortService.d.ts index 99b23f1..ccb9e45 100644 --- a/TypeScript/2EditDatabase/types/services/TraderAssortService.d.ts +++ b/TypeScript/2EditDatabase/types/services/TraderAssortService.d.ts @@ -1,4 +1,4 @@ -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; export declare class TraderAssortService { private pristineTraderAssorts; getPristineTraderAssort(traderId: string): ITraderAssort; diff --git a/TypeScript/2EditDatabase/types/utils/App.d.ts b/TypeScript/2EditDatabase/types/utils/App.d.ts index 4b082a0..a11f576 100644 --- a/TypeScript/2EditDatabase/types/utils/App.d.ts +++ b/TypeScript/2EditDatabase/types/utils/App.d.ts @@ -1,7 +1,7 @@ import { TimeUtil } from "./TimeUtil"; import { OnLoad } from "../di/OnLoad"; import { OnUpdate } from "../di/OnUpdate"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class App { private logger; private timeUtil; diff --git a/TypeScript/2EditDatabase/types/utils/AyncQueue.d.ts b/TypeScript/2EditDatabase/types/utils/AyncQueue.d.ts index 773a5e4..8f1559b 100644 --- a/TypeScript/2EditDatabase/types/utils/AyncQueue.d.ts +++ b/TypeScript/2EditDatabase/types/utils/AyncQueue.d.ts @@ -1,5 +1,5 @@ -import { IAsyncQueue } from "../@types/spt/utils/IAsyncQueue"; -import { ICommand } from "../@types/spt/utils/ICommand"; +import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; +import { ICommand } from "../models/spt/utils/ICommand"; export declare class AsyncQueue implements IAsyncQueue { commandsQueue: ICommand[]; constructor(); diff --git a/TypeScript/2EditDatabase/types/utils/DatabaseImporter.d.ts b/TypeScript/2EditDatabase/types/utils/DatabaseImporter.d.ts index 41b3e5f..97dda30 100644 --- a/TypeScript/2EditDatabase/types/utils/DatabaseImporter.d.ts +++ b/TypeScript/2EditDatabase/types/utils/DatabaseImporter.d.ts @@ -3,7 +3,7 @@ import { JsonUtil } from "./JsonUtil"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ImageRouter } from "../routers/ImageRouter"; import { OnLoad } from "../di/OnLoad"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class DatabaseImporter extends OnLoad { private logger; private vfs; diff --git a/TypeScript/2EditDatabase/types/utils/HttpResponse.d.ts b/TypeScript/2EditDatabase/types/utils/HttpResponseUtil.d.ts similarity index 73% rename from TypeScript/2EditDatabase/types/utils/HttpResponse.d.ts rename to TypeScript/2EditDatabase/types/utils/HttpResponseUtil.d.ts index d5a90d7..85c28bd 100644 --- a/TypeScript/2EditDatabase/types/utils/HttpResponse.d.ts +++ b/TypeScript/2EditDatabase/types/utils/HttpResponseUtil.d.ts @@ -1,8 +1,8 @@ import { JsonUtil } from "./JsonUtil"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -export declare class HttpResponse { +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 { private jsonUtil; constructor(jsonUtil: JsonUtil); private clearString; diff --git a/TypeScript/2EditDatabase/types/utils/JsonUtil.d.ts b/TypeScript/2EditDatabase/types/utils/JsonUtil.d.ts index 69cf8f1..20b7448 100644 --- a/TypeScript/2EditDatabase/types/utils/JsonUtil.d.ts +++ b/TypeScript/2EditDatabase/types/utils/JsonUtil.d.ts @@ -1,12 +1,12 @@ -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; import { HashUtil } from "./HashUtil"; import { VFS } from "./VFS"; export declare class JsonUtil { private vfs; - private hashutil; + private hashUtil; private logger; private fileHashes; - constructor(vfs: VFS, hashutil: HashUtil, logger: ILogger); + constructor(vfs: VFS, hashUtil: HashUtil, logger: ILogger); /** * From object to string * @param data object to turn into JSON diff --git a/TypeScript/2EditDatabase/types/utils/Logger.d.ts b/TypeScript/2EditDatabase/types/utils/Logger.d.ts index 57da5ae..9d5b32a 100644 --- a/TypeScript/2EditDatabase/types/utils/Logger.d.ts +++ b/TypeScript/2EditDatabase/types/utils/Logger.d.ts @@ -1,14 +1,16 @@ /// -import { Daum } from "../@types/eft/itemEvent/IItemEventRouterRequest"; -import { ILogger } from "../@types/spt/utils/ILogger"; -import { IAsyncQueue } from "../@types/spt/utils/IAsyncQueue"; -import { IUUidGenerator } from "../@types/spt/utils/IUuidGenerator"; +import { Daum } from "../models/eft/itemEvent/IItemEventRouterRequest"; +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 { private asyncQueue; private uuidGenerator; private showDebugInConsole; - private filepath; + private folderPath; + private file; + private filePath; private logLevels; private logger; writeFilePromisify: (path: fs.PathLike, data: string, options?: any) => Promise; diff --git a/TypeScript/2EditDatabase/types/utils/RandomUtil.d.ts b/TypeScript/2EditDatabase/types/utils/RandomUtil.d.ts index a1bac79..3a3ecb6 100644 --- a/TypeScript/2EditDatabase/types/utils/RandomUtil.d.ts +++ b/TypeScript/2EditDatabase/types/utils/RandomUtil.d.ts @@ -1,3 +1,4 @@ +import { ILogger } from "../models/spt/utils/ILogger"; import { JsonUtil } from "./JsonUtil"; import { MathUtil } from "./MathUtil"; /** @@ -103,7 +104,8 @@ export declare class ProbabilityObject { } export declare class RandomUtil { private jsonUtil; - constructor(jsonUtil: JsonUtil); + private logger; + constructor(jsonUtil: JsonUtil, logger: ILogger); getInt(min: number, max: number): number; getIntEx(max: number): number; getFloat(min: number, max: number): number; @@ -147,4 +149,5 @@ export declare class RandomUtil { * @return {array} Array consisting of N random keys of the dictionary */ drawRandomFromDict(dict: any, count?: number, replacement?: boolean): any[]; + getBiasedRandomNumber(min: number, max: number, shift: number, n: number): number; } diff --git a/TypeScript/2EditDatabase/types/utils/UUidGenerator.d.ts b/TypeScript/2EditDatabase/types/utils/UUidGenerator.d.ts index 763424a..000b719 100644 --- a/TypeScript/2EditDatabase/types/utils/UUidGenerator.d.ts +++ b/TypeScript/2EditDatabase/types/utils/UUidGenerator.d.ts @@ -1,4 +1,4 @@ -import { IUUidGenerator } from "../@types/spt/utils/IUuidGenerator"; +import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; export declare class UUidGenerator implements IUUidGenerator { generate: () => string; } diff --git a/TypeScript/2EditDatabase/types/utils/VFS.d.ts b/TypeScript/2EditDatabase/types/utils/VFS.d.ts index c8d32f1..b064cf4 100644 --- a/TypeScript/2EditDatabase/types/utils/VFS.d.ts +++ b/TypeScript/2EditDatabase/types/utils/VFS.d.ts @@ -1,8 +1,8 @@ /// import "reflect-metadata"; import fs from "fs"; -import { IAsyncQueue } from "../@types/spt/utils/IAsyncQueue"; -import { IUUidGenerator } from "../@types/spt/utils/IUuidGenerator"; +import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; +import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; export declare class VFS { private asyncQueue; private uuidGenerator; @@ -50,4 +50,5 @@ export declare class VFS { stripExtension(filepath: string): string; minifyAllJsonInDirRecursive(filepath: string): Promise; minifyAllJsonInDirRecursiveAsync(filepath: string): Promise; + getFilesOfType(directory: string, fileType: string, files?: string[]): string[]; } diff --git a/TypeScript/2EditDatabase/types/utils/Watermark.d.ts b/TypeScript/2EditDatabase/types/utils/Watermark.d.ts index e7765e1..598d5a6 100644 --- a/TypeScript/2EditDatabase/types/utils/Watermark.d.ts +++ b/TypeScript/2EditDatabase/types/utils/Watermark.d.ts @@ -1,6 +1,6 @@ -import { IWatermark, IWatermarkLocale } from "../@types/spt/utils/IWatermark"; +import { IWatermark, IWatermarkLocale } from "../models/spt/utils/IWatermark"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class WatermarkLocale implements IWatermarkLocale { private locales; getLocale(): string; diff --git a/TypeScript/3.0GetSptConfigFile/package.json b/TypeScript/3.0GetSptConfigFile/package.json index 8866781..3dee4a9 100644 --- a/TypeScript/3.0GetSptConfigFile/package.json +++ b/TypeScript/3.0GetSptConfigFile/package.json @@ -4,7 +4,7 @@ "main": "src/mod.js", "license": "MIT", "author": "Chomp", - "akiVersion": "2.4.0", + "akiVersion": "3.0.0", "scripts": { "install": "npx handpick --target=devDependencies", "build": "tsc" diff --git a/TypeScript/3.0GetSptConfigFile/src/mod.js b/TypeScript/3.0GetSptConfigFile/src/mod.js new file mode 100644 index 0000000..e8d1398 --- /dev/null +++ b/TypeScript/3.0GetSptConfigFile/src/mod.js @@ -0,0 +1,22 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +class Mod { + // not used for this example + load(container) { return; } + delayedLoad(container) { + // get logger + const logger = container.resolve("WinstonLogger"); + // get the config server + const configServer = container.resolve("ConfigServer"); + // Request bot config + // Required - ConfigTypes.BOT is the enum of the config we want, others include ConfigTypes.Airdrop + const botConfig = configServer.getConfig("aki-bot" /* BOT */); + // log the original pmc difficulty + logger.info(`here is the original bot pmc difficulty: ${botConfig.pmc.difficulty}`); + // adjust the difficulty + botConfig.pmc.difficulty = "easy"; + // log the new pmc difficulty + logger.info(`here is the altered bot pmc difficulty: ${botConfig.pmc.difficulty}`); + } +} +module.exports = { mod: new Mod() }; diff --git a/TypeScript/3.0GetSptConfigFile/src/mod.ts b/TypeScript/3.0GetSptConfigFile/src/mod.ts index 3b72036..125594a 100644 --- a/TypeScript/3.0GetSptConfigFile/src/mod.ts +++ b/TypeScript/3.0GetSptConfigFile/src/mod.ts @@ -1,9 +1,9 @@ import type { DependencyContainer } from "tsyringe"; -import { IMod } from "../types/@types/external/mod"; +import { IMod } from "../types/models/external/mod"; -import type { ILogger } from "../types/@types/spt/utils/ILogger"; +import type { ILogger } from "../types/models/spt/utils/ILogger"; import { ConfigServer, ConfigTypes } from "../types/servers/ConfigServer"; -import { IBotConfig } from "../types/@types/spt/config/IBotConfig"; +import { IBotConfig } from "../types/models/spt/config/IBotConfig"; class Mod implements IMod { diff --git a/TypeScript/3.0GetSptConfigFile/tsconfig.json b/TypeScript/3.0GetSptConfigFile/tsconfig.json index 4204c72..8ba3117 100644 --- a/TypeScript/3.0GetSptConfigFile/tsconfig.json +++ b/TypeScript/3.0GetSptConfigFile/tsconfig.json @@ -9,7 +9,6 @@ "experimentalDecorators": true, "emitDecoratorMetadata": true, "resolveJsonModule": true, - "esModuleInterop": true, "outDir": "out" }, "lib": [ diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/common/IItemEventResponseData.d.ts b/TypeScript/3.0GetSptConfigFile/types/@types/eft/common/IItemEventResponseData.d.ts deleted file mode 100644 index 08fb8a7..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/@types/eft/common/IItemEventResponseData.d.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { Skills } from "./IPmcData"; -export interface IItemEventResponseData { - warnings: any[]; - profileChanges: Record; -} -export interface ProfileChange { - _id: string; - experience: number; - quests: any[]; - ragFairOffers: any[]; - builds: any[]; - items: Items; - production: Production; - skills: Skills; - traderRelations: TraderRelations; -} -export interface Items { - new: any[]; - change: any[]; - del: any[]; -} -export interface Production { -} -export interface TraderRelations { -} diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/common/IPmcDataRepeatableQuest.d.ts b/TypeScript/3.0GetSptConfigFile/types/@types/eft/common/IPmcDataRepeatableQuest.d.ts deleted file mode 100644 index 15a1c09..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/@types/eft/common/IPmcDataRepeatableQuest.d.ts +++ /dev/null @@ -1,71 +0,0 @@ -export interface IPmcDataRepeatableQuest { - name: string; - activeQuests: Quest[]; - inactiveQuests: Quest[]; - endTime: number; -} -export interface Quest { - _id: string; - traderId: string; - location: string; - image: string; - type: string; - isKey: boolean; - restartable: boolean; - instantComplete: boolean; - secretQuest: boolean; - canShowNotificationsInGame: boolean; - rewards: Rewards; - conditions: Conditions; - name: string; - note: string; - description: string; - successMessageText: string; - failMessageText: string; - startedMessageText: string; - templateId: string; -} -export interface Rewards { - Started: Reward[]; - Success: Reward[]; - Fail: Reward[]; -} -export interface Reward { - value: number; - type: string; - index: number; - target?: string; - items?: Item[]; -} -export interface Item { - _id: string; - _tpl: string; - upd: Upd; -} -export interface Conditions { - AvailableForStart: any[]; - AvailableForFinish: AvailableForFinish[]; - Fail: any[]; -} -export interface AvailableForFinish { - _props: Props; - _parent: string; - dynamicLocale: boolean; -} -export interface Props { - id: string; - parentId: string; - dynamicLocale: boolean; - index: number; - visibilityConditions: any[]; - target: string[]; - value: number; - minDurability: number; - maxDurability: number; - dogtagLevel: number; - onlyFoundInRaid: boolean; -} -export interface Upd { - StackObjectsCount: number; - SpawnedInSession?: boolean; -} diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/IHideoutRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/IHideoutRequestData.d.ts deleted file mode 100644 index 77c0665..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/IHideoutRequestData.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -export interface IHideoutRequestData { - Action: "HideoutUpgrade"; - areaType: number; - items: HideoutItem[]; - timestamp: number; -} -export interface HideoutItem { - count: number; - id: string; -} diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/itemEvent/IHandleEventRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/@types/eft/itemEvent/IHandleEventRequestData.d.ts deleted file mode 100644 index a7ae306..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/@types/eft/itemEvent/IHandleEventRequestData.d.ts +++ /dev/null @@ -1,21 +0,0 @@ -export interface IHandleEventRequestData { - data: Daum[]; - tm: number; - reload: number; -} -export interface Daum { - Action: string; - item: string; - to?: To; -} -export interface To { - id: string; - container: string; - location: Location; -} -export interface Location { - x: number; - y: number; - r: string; - isSearched: boolean; -} diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/notes/INoteData.d.ts b/TypeScript/3.0GetSptConfigFile/types/@types/eft/notes/INoteData.d.ts deleted file mode 100644 index 4021bb7..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/@types/eft/notes/INoteData.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface INote { - Time: number; - Text: string; -} diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/presetBuild/IPresetBuildActionData.d.ts b/TypeScript/3.0GetSptConfigFile/types/@types/eft/presetBuild/IPresetBuildActionData.d.ts deleted file mode 100644 index 13ec722..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/@types/eft/presetBuild/IPresetBuildActionData.d.ts +++ /dev/null @@ -1,25 +0,0 @@ -export interface IPresetBuildActionData { - Action: string; - id: string; - name: string; - root: string; - items: Item[]; -} -export interface Item { - _id: string; - _tpl: string; - upd?: Upd; - parentId?: string; - slotId?: string; -} -export interface Upd { - Repairable: Repairable; - FireMode: FireMode; -} -export interface Repairable { - MaxDurability: number; - Durability: number; -} -export interface FireMode { - FireMode: string; -} diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/ragfair/ISaleChance.d.ts b/TypeScript/3.0GetSptConfigFile/types/@types/eft/ragfair/ISaleChance.d.ts deleted file mode 100644 index 14b434a..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/@types/eft/ragfair/ISaleChance.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface ISaleChance { - sellTime: number; - amount: number; -} diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/repair/IRepairActionData.d.ts b/TypeScript/3.0GetSptConfigFile/types/@types/eft/repair/IRepairActionData.d.ts deleted file mode 100644 index e6f90c8..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/@types/eft/repair/IRepairActionData.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -export interface IRepairActionData { - Action: string; - tid: string; - repairItems: RepairItem[]; -} -export interface RepairItem { - _id: string; - count: number; -} diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/notes/INoteActionData.d.ts b/TypeScript/3.0GetSptConfigFile/types/@types/notes/INoteActionData.d.ts deleted file mode 100644 index 7d07cdd..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/@types/notes/INoteActionData.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { INote } from "../eft/notes/INoteData"; -export interface INoteActionData { - Action: string; - index: number; - note: INote; -} diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/helpers/IGetItemResponse.d.ts b/TypeScript/3.0GetSptConfigFile/types/@types/spt/helpers/IGetItemResponse.d.ts deleted file mode 100644 index e6f3783..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/@types/spt/helpers/IGetItemResponse.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export interface IGetItemResponse { -} diff --git a/TypeScript/3.0GetSptConfigFile/types/Lib.d.ts b/TypeScript/3.0GetSptConfigFile/types/Lib.d.ts deleted file mode 100644 index 5c77c26..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/Lib.d.ts +++ /dev/null @@ -1,94 +0,0 @@ -import { BundleLoader } from "./loaders/BundleLoader"; -export { BundleLoader }; -import { ModLoader } from "./loaders/ModLoader"; -export { ModLoader }; -import { ContainerHelper } from "./helpers/ContainerHelper.js"; -export { ContainerHelper }; -import { InventoryHelper } from "./helpers/InventoryHelper.js"; -export { InventoryHelper }; -import { ItemHelper } from "./helpers/ItemHelper.js"; -export { ItemHelper }; -import { GameEventHelper } from "./helpers/GameEventHelper.js"; -export { GameEventHelper }; -import { QuestHelper } from "./helpers/QuestHelper.js"; -export { QuestHelper }; -import { UtilityHelper } from "./helpers/UtilityHelper.js"; -export { UtilityHelper }; -import { TraderHelper } from "./helpers/TraderHelper.js"; -export { TraderHelper }; -import { RagfairServerHelper } from "./helpers/RagfairServerHelper.js"; -export { RagfairServerHelper }; -import { DurabilityLimitsHelper } from "./helpers/DurabilityLimitsHelper.js"; -export { DurabilityLimitsHelper }; -import { WeightedRandomHelper } from "./helpers/WeightedRandomHelper.js"; -export { WeightedRandomHelper }; -import { BotCallbacks } from "./callbacks/BotCallbacks.js"; -export { BotCallbacks }; -import { DataCallbacks } from "./callbacks/DataCallbacks.js"; -export { DataCallbacks }; -import { DialogueCallbacks } from "./callbacks/DialogueCallbacks.js"; -export { DialogueCallbacks }; -import { GameCallbacks } from "./callbacks/GameCallbacks.js"; -export { GameCallbacks }; -import { HideoutCallbacks } from "./callbacks/HideoutCallbacks"; -export { HideoutCallbacks }; -import { HttpCallbacks } from "./callbacks/HttpCallbacks.js"; -export { HttpCallbacks }; -import { InraidCallbacks } from "./callbacks/InraidCallbacks.js"; -export { InraidCallbacks }; -import { InventoryCallbacks } from "./callbacks/InventoryCallbacks.js"; -export { InventoryCallbacks }; -import { NotifierCallbacks } from "./callbacks/NotifierCallbacks.js"; -export { NotifierCallbacks }; -import { ProfileCallbacks } from "./callbacks/ProfileCallbacks.js"; -export { ProfileCallbacks }; -import { QuestCallbacks } from "./callbacks/QuestCallbacks.js"; -export { QuestCallbacks }; -import { RagfairCallbacks } from "./callbacks/RagfairCallbacks.js"; -export { RagfairCallbacks }; -import { TraderCallbacks } from "./callbacks/TraderCallbacks.js"; -export { TraderCallbacks }; -import { BotController } from "./controllers/BotController.js"; -export { BotController }; -import { DialogueController } from "./controllers/DialogueController.js"; -export { DialogueController }; -import { GameController } from "./controllers/GameController.js"; -export { GameController }; -import { HealthController } from "./controllers/HealthController.js"; -export { HealthController }; -import { HideoutController } from "./controllers/HideoutController.js"; -export { HideoutController }; -import { InsuranceController } from "./controllers/InsuranceController.js"; -export { InsuranceController }; -import { InventoryController } from "./controllers/InventoryController.js"; -export { InventoryController }; -import { LocationController } from "./controllers/LocationController.js"; -export { LocationController }; -import { NotifierController } from "./controllers/NotifierController.js"; -export { NotifierController }; -import { PresetController } from "./controllers/PresetController.js"; -export { PresetController }; -import { ProfileController } from "./controllers/ProfileController.js"; -export { ProfileController }; -import { QuestController } from "./controllers/QuestController.js"; -export { QuestController }; -import { RepeatableQuestController } from "./controllers/RepeatableQuestController.js"; -export { RepeatableQuestController }; -import { RagfairController } from "./controllers/RagfairController.js"; -export { RagfairController }; -import { TraderController } from "./controllers/TraderController.js"; -export { TraderController }; -import { PaymentController } from "./controllers/PaymentController"; -export { PaymentController }; -import { PlayerController } from "./controllers/PlayerController.js"; -export { PlayerController }; -import { HandbookController } from "./controllers/HandbookController.js"; -export { HandbookController }; -import { DatabaseServer } from "./servers/DatabaseServer"; -export { DatabaseServer }; -import { HttpServer } from "./servers/HttpServer.js"; -export { HttpServer }; -import { RagfairServer } from "./servers/RagfairServer.js"; -export { RagfairServer }; -import { SaveServer } from "./servers/SaveServer"; -export { SaveServer }; diff --git a/TypeScript/3.0GetSptConfigFile/types/Program.d.ts b/TypeScript/3.0GetSptConfigFile/types/Program.d.ts index fe57d08..d4b71b9 100644 --- a/TypeScript/3.0GetSptConfigFile/types/Program.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/Program.d.ts @@ -1,8 +1,4 @@ -import "reflect-metadata"; -import { App } from "./utils/App"; -export interface IProgram { -} -export declare class Program implements IProgram { - private app; - constructor(app: App); +export declare class Program { + constructor(); + start(): void; } diff --git a/TypeScript/3.0GetSptConfigFile/types/bindings/AppLoad.d.ts b/TypeScript/3.0GetSptConfigFile/types/bindings/AppLoad.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/bindings/AppLoad.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/3.0GetSptConfigFile/types/bindings/AppUpdate.d.ts b/TypeScript/3.0GetSptConfigFile/types/bindings/AppUpdate.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/bindings/AppUpdate.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/3.0GetSptConfigFile/types/bindings/DynamicRoutes.d.ts b/TypeScript/3.0GetSptConfigFile/types/bindings/DynamicRoutes.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/bindings/DynamicRoutes.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/3.0GetSptConfigFile/types/bindings/ItemEvents.d.ts b/TypeScript/3.0GetSptConfigFile/types/bindings/ItemEvents.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/bindings/ItemEvents.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/3.0GetSptConfigFile/types/bindings/SaveLoad.d.ts b/TypeScript/3.0GetSptConfigFile/types/bindings/SaveLoad.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/bindings/SaveLoad.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/3.0GetSptConfigFile/types/bindings/ServerRespond.d.ts b/TypeScript/3.0GetSptConfigFile/types/bindings/ServerRespond.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/bindings/ServerRespond.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/3.0GetSptConfigFile/types/bindings/StaticRoutes.d.ts b/TypeScript/3.0GetSptConfigFile/types/bindings/StaticRoutes.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/bindings/StaticRoutes.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 511c545..358d5e3 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/BotCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/BotCallbacks.d.ts @@ -1,13 +1,13 @@ import { BotController } from "../controllers/BotController"; -import { IGenerateBotsRequestData } from "../@types/eft/bot/IGenerateBotsRequestData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IBotBase } from "../@types/eft/common/tables/IBotBase"; -import { HttpResponse } from "../utils/HttpResponse"; +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 { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class BotCallbacks { private botController; private httpResponse; - constructor(botController: BotController, httpResponse: HttpResponse); + constructor(botController: BotController, httpResponse: HttpResponseUtil); 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/3.0GetSptConfigFile/types/callbacks/BundleCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/BundleCallbacks.d.ts index 1fb6275..08c33c0 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/BundleCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/BundleCallbacks.d.ts @@ -1,17 +1,16 @@ import { BundleLoader } from "../loaders/BundleLoader"; import { ConfigServer } from "../servers/ConfigServer"; -import { IHttpConfig } from "../@types/spt/config/IHttpConfig"; -import { HttpResponse } from "../utils/HttpResponse"; -import { ILogger } from "../@types/spt/utils/ILogger"; -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +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; private httpServer; private bundleLoader; private configServer; - httpConfig: IHttpConfig; - constructor(logger: ILogger, httpResponse: HttpResponse, httpServer: IHttpServer, bundleLoader: BundleLoader, configServer: ConfigServer); + private httpConfig; + constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, bundleLoader: BundleLoader, configServer: ConfigServer); 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/3.0GetSptConfigFile/types/callbacks/CustomizationCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/CustomizationCallbacks.d.ts index 4c27712..0a4265b 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/CustomizationCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/CustomizationCallbacks.d.ts @@ -1,17 +1,17 @@ import { SaveServer } from "../servers/SaveServer"; import { CustomizationController } from "../controllers/CustomizationController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IBuyClothingRequestData } from "../@types/eft/customization/IBuyClothingRequestData"; -import { IWearClothingRequestData } from "../@types/eft/customization/IWearClothingRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { ISuit } from "../@types/eft/common/tables/ITrader"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { HttpResponse } from "../utils/HttpResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +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 { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class CustomizationCallbacks { private customizationController; private saveServer; private httpResponse; - constructor(customizationController: CustomizationController, saveServer: SaveServer, httpResponse: HttpResponse); + constructor(customizationController: CustomizationController, saveServer: SaveServer, httpResponse: HttpResponseUtil); getSuits(url: string, info: any, sessionID: string): IGetBodyResponseData<{ _id: string; suites: string[]; diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/DataCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/DataCallbacks.d.ts index add55b5..ac9cab7 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/DataCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/DataCallbacks.d.ts @@ -1,20 +1,20 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGlobals } from "../@types/eft/common/IGlobals"; -import { ICustomizationItem } from "../@types/eft/common/tables/ICustomizationItem"; -import { IQuest } from "../@types/eft/common/tables/IQuest"; -import { IHideoutArea } from "../@types/eft/hideout/IHideoutArea"; -import { IHideoutProduction } from "../@types/eft/hideout/IHideoutProduction"; -import { IHideoutScavCase } from "../@types/eft/hideout/IHideoutScavCase"; -import { IHideoutSettingsBase } from "../@types/eft/hideout/IHideoutSettingsBase"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { ILanguageBase } from "../@types/spt/server/ILocaleBase"; -import { ISettingsBase } from "../@types/spt/server/ISettingsBase"; -import { HttpResponse } from "../utils/HttpResponse"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IGlobals } from "../models/eft/common/IGlobals"; +import { ICustomizationItem } from "../models/eft/common/tables/ICustomizationItem"; +import { IQuest } from "../models/eft/common/tables/IQuest"; +import { IHideoutArea } from "../models/eft/hideout/IHideoutArea"; +import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction"; +import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; +import { IHideoutSettingsBase } from "../models/eft/hideout/IHideoutSettingsBase"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { ILanguageBase } from "../models/spt/server/ILocaleBase"; +import { ISettingsBase } from "../models/spt/server/ISettingsBase"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class DataCallbacks { private httpResponse; private databaseServer; - constructor(httpResponse: HttpResponse, databaseServer: DatabaseServer); + constructor(httpResponse: HttpResponseUtil, databaseServer: DatabaseServer); 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/3.0GetSptConfigFile/types/callbacks/DialogueCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/DialogueCallbacks.d.ts index ccc074b..e81255c 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/DialogueCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/DialogueCallbacks.d.ts @@ -1,31 +1,31 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { DialogueController } from "../controllers/DialogueController"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { DialogueInfo } from "../@types/eft/profile/IAkiProfile"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IGetMailDialogViewRequestData } from "../@types/eft/dialog/IGetMailDialogViewRequestData"; -import { IGetMailDialogInfoRequestData } from "../@types/eft/dialog/IGetMailDialogInfoRequestData"; -import { IRemoveDialogRequestData } from "../@types/eft/dialog/IRemoveDialogRequestData"; -import { IGetMailDialogListRequestData } from "../@types/eft/dialog/IGetMailDialogListRequestData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IFriendRequestData } from "../@types/eft/dialog/IFriendRequestData"; -import { IPinDialogRequestData } from "../@types/eft/dialog/IPinDialogRequestData"; -import { ISetDialogReadRequestData } from "../@types/eft/dialog/ISetDialogReadRequestData"; -import { IGetAllAttachmentsRequestData } from "../@types/eft/dialog/IGetAllAttachmentsRequestData"; -import { IGetChatServerListRequestData } from "../@types/eft/dialog/IGetChatServerListRequestData"; -import { IGetFriendListDataResponse } from "../@types/eft/dialog/IGetFriendListDataResponse"; -import { ISendMessageRequest } from "../@types/eft/dialog/ISendMessageRequest"; -import { IGetMailDialogViewResponseData } from "../@types/eft/dialog/IGetMailDialogViewResponseData"; -import { IGetAllAttachmentsResponse } from "../@types/eft/dialog/IGetAllAttachmentsResponse"; +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 { 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 { IGetChatServerListRequestData } from "../models/eft/dialog/IGetChatServerListRequestData"; +import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse"; +import { ISendMessageRequest } from "../models/eft/dialog/ISendMessageRequest"; +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 { private hashUtil; private timeUtil; private httpResponse; private dialogueController; - constructor(hashUtil: HashUtil, timeUtil: TimeUtil, httpResponse: HttpResponse, dialogueController: DialogueController); + constructor(hashUtil: HashUtil, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, dialogueController: DialogueController); 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/3.0GetSptConfigFile/types/callbacks/GameCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/GameCallbacks.d.ts index 25912c1..9481129 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 "../@types/eft/common/IEmptyRequestData"; -import { IGameEmptyCrcRequestData } from "../@types/eft/game/IGameEmptyCrcRequestData"; -import { IVersionValidateRequestData } from "../@types/eft/game/IVersionValidateRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IGameConfigResponse } from "../@types/eft/game/IGameConfigResponse"; -import { HttpResponse } from "../utils/HttpResponse"; -import { IWatermark } from "../@types/spt/utils/IWatermark"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +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 { private httpResponse; private watermark; private gameController; - constructor(httpResponse: HttpResponse, watermark: IWatermark, gameController: GameController); + constructor(httpResponse: HttpResponseUtil, watermark: IWatermark, 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 50ec0b6..b223bb3 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/HealthCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/HealthCallbacks.d.ts @@ -1,19 +1,20 @@ import { HealthController } from "../controllers/HealthController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { ISyncHealthRequestData } from "../@types/eft/health/ISyncHealthRequestData"; -import { IOffraidEatRequestData } from "../@types/eft/health/IOffraidEatRequestData"; -import { IOffraidHealRequestData } from "../@types/eft/health/IOffraidHealRequestData"; -import { IHealthTreatmentRequestData } from "../@types/eft/health/IHealthTreatmentRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; +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 { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { HttpResponse } from "../utils/HttpResponse"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class HealthCallbacks { private httpResponse; private profileHelper; private healthController; - constructor(httpResponse: HttpResponse, profileHelper: ProfileHelper, healthController: HealthController); + constructor(httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, healthController: HealthController); syncHealth(url: string, info: ISyncHealthRequestData, sessionID: string): IGetBodyResponseData; - offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): any; - offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): any; - healthTreatment(pmcData: IPmcData, info: IHealthTreatmentRequestData, sessionID: string): any; + offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): IItemEventRouterResponse; + offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse; + healthTreatment(pmcData: IPmcData, info: IHealthTreatmentRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/HideoutCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/HideoutCallbacks.d.ts index 3ef61bc..b574232 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/HideoutCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/HideoutCallbacks.d.ts @@ -1,15 +1,15 @@ import { HideoutController } from "../controllers/HideoutController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IHideoutUpgradeRequestData } from "../@types/eft/hideout/IHideoutUpgradeRequestData"; -import { IHideoutUpgradeCompleteRequestData } from "../@types/eft/hideout/IHideoutUpgradeCompleteRequestData"; -import { IHideoutScavCaseStartRequestData } from "../@types/eft/hideout/IHideoutScavCaseStartRequestData"; -import { IHideoutPutItemInRequestData } from "../@types/eft/hideout/IHideoutPutItemInRequestData"; -import { IHideoutTakeItemOutRequestData } from "../@types/eft/hideout/IHideoutTakeItemOutRequestData"; -import { IHideoutToggleAreaRequestData } from "../@types/eft/hideout/IHideoutToggleAreaRequestData"; -import { IHideoutSingleProductionStartRequestData } from "../@types/eft/hideout/IHideoutSingleProductionStartRequestData"; -import { IHideoutContinousProductionStartRequestData } from "../@types/eft/hideout/IHideoutContinousProductionStartRequestData"; -import { IHideoutTakeProductionRequestData } from "../@types/eft/hideout/IHideoutTakeProductionRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ConfigServer } from "../servers/ConfigServer"; import { OnUpdate } from "../di/OnUpdate"; export declare class HideoutCallbacks extends OnUpdate { diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/HttpCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/HttpCallbacks.d.ts index 9bb00bf..7072297 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/HttpCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/HttpCallbacks.d.ts @@ -1,4 +1,4 @@ -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; import { OnLoad } from "../di/OnLoad"; export declare class HttpCallbacks extends OnLoad { private httpServer; diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/InraidCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/InraidCallbacks.d.ts index 2ccaa0a..1948d01 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/InraidCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/InraidCallbacks.d.ts @@ -1,17 +1,17 @@ import { InraidController } from "../controllers/InraidController"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IRegisterPlayerRequestData } from "../@types/eft/inRaid/IRegisterPlayerRequestData"; -import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; +import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ConfigServer } from "../servers/ConfigServer"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class InraidCallbacks { private inraidController; private httpResponse; private configServer; private airdropConfig; private inraidConfig; - constructor(inraidController: InraidController, httpResponse: HttpResponse, configServer: ConfigServer); + constructor(inraidController: InraidController, httpResponse: HttpResponseUtil, configServer: ConfigServer); registerPlayer(url: string, info: IRegisterPlayerRequestData, sessionID: string): INullResponseData; saveProgress(url: string, info: ISaveProgressRequestData, sessionID: string): INullResponseData; getRaidEndState(): string; diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/InsuranceCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/InsuranceCallbacks.d.ts index f3d9832..73b7bd9 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/InsuranceCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/InsuranceCallbacks.d.ts @@ -1,22 +1,23 @@ import { InsuranceController } from "../controllers/InsuranceController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IGetInsuranceCostRequestData } from "../@types/eft/insurance/IGetInsuranceCostRequestData"; -import { IInsureRequestData } from "../@types/eft/insurance/IInsureRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +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 { HttpResponse } from "../utils/HttpResponse"; +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 { private insuranceController; private insuranceService; private httpResponse; private configServer; private insuranceConfig; - constructor(insuranceController: InsuranceController, insuranceService: InsuranceService, httpResponse: HttpResponse, configServer: ConfigServer); + constructor(insuranceController: InsuranceController, insuranceService: InsuranceService, httpResponse: HttpResponseUtil, configServer: ConfigServer); onLoad(): void; getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): IGetBodyResponseData; - insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): any; + insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse; onUpdate(secondsSinceLastRun: number): boolean; getRoute(): string; } diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/InventoryCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/InventoryCallbacks.d.ts index 1807e4b..90d6936 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/InventoryCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/InventoryCallbacks.d.ts @@ -1,22 +1,22 @@ import { InventoryController } from "../controllers/InventoryController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IInventoryFoldRequestData } from "../@types/eft/inventory/IInventoryFoldRequestData"; -import { IInventorySplitRequestData } from "../@types/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMoveRequestData } from "../@types/eft/inventory/IInventoryMoveRequestData"; -import { IInventoryMergeRequestData } from "../@types/eft/inventory/IInventoryMergeRequestData"; -import { IInventoryRemoveRequestData } from "../@types/eft/inventory/IInventoryRemoveRequestData"; -import { IInventoryTransferRequestData } from "../@types/eft/inventory/IInventoryTransferRequestData"; -import { IInventorySwapRequestData } from "../@types/eft/inventory/IInventorySwapRequestData"; -import { IInventoryToggleRequestData } from "../@types/eft/inventory/IInventoryToggleRequestData"; -import { IInventoryTagRequestData } from "../@types/eft/inventory/IInventoryTagRequestData"; -import { IInventoryBindRequestData } from "../@types/eft/inventory/IInventoryBindRequestData"; -import { IInventoryExamineRequestData } from "../@types/eft/inventory/IInventoryExamineRequestData"; -import { IInventoryReadEncyclopediaRequestData } from "../@types/eft/inventory/IInventoryReadEncyclopediaRequestData"; -import { IInventorySortRequestData } from "../@types/eft/inventory/IInventorySortRequestData"; -import { IInventoryCreateMarkerRequestData } from "../@types/eft/inventory/IInventoryCreateMarkerRequestData"; -import { IInventoryDeleteMarkerRequestData } from "../@types/eft/inventory/IInventoryDeleteMarkerRequestData"; -import { IInventoryEditMarkerRequestData } from "../@types/eft/inventory/IInventoryEditMarkerRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class InventoryCallbacks { private inventoryController; constructor(inventoryController: InventoryController); diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/ItemEventCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/ItemEventCallbacks.d.ts index ca069ad..74e79c4 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/ItemEventCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/ItemEventCallbacks.d.ts @@ -1,11 +1,11 @@ -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IItemEventRouterRequest } from "../@types/eft/itemEvent/IItemEventRouterRequest"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterRequest } from "../models/eft/itemEvent/IItemEventRouterRequest"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class ItemEventCallbacks { private httpResponse; private itemEventRouter; - constructor(httpResponse: HttpResponse, itemEventRouter: ItemEventRouter); + constructor(httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter); handleEvents(url: string, info: IItemEventRouterRequest, sessionID: string): IGetBodyResponseData; } diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/LauncherCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/LauncherCallbacks.d.ts index 5e3ec40..addf76b 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/LauncherCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/LauncherCallbacks.d.ts @@ -1,17 +1,17 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { SaveServer } from "../servers/SaveServer"; import { LauncherController } from "../controllers/LauncherController"; -import { IRegisterData } from "../@types/eft/launcher/IRegisterData"; -import { IRemoveProfileData } from "../@types/eft/launcher/IRemoveProfileData"; -import { ILoginRequestData } from "../@types/eft/launcher/ILoginRequestData"; -import { IChangeRequestData } from "../@types/eft/launcher/IChangeRequestData"; -import { IWatermark } from "../@types/spt/utils/IWatermark"; +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 { private httpResponse; private launcherController; private saveServer; private watermark; - constructor(httpResponse: HttpResponse, launcherController: LauncherController, saveServer: SaveServer, watermark: IWatermark); + constructor(httpResponse: HttpResponseUtil, launcherController: LauncherController, saveServer: SaveServer, watermark: IWatermark); connect(): string; login(url: string, info: ILoginRequestData, sessionID: string): string; register(url: string, info: IRegisterData, sessionID: string): "FAILED" | "OK"; diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/LocationCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/LocationCallbacks.d.ts index 6142ad5..346893b 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/LocationCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/LocationCallbacks.d.ts @@ -1,13 +1,13 @@ import { LocationController } from "../controllers/LocationController"; -import { IGetLocationRequestData } from "../@types/eft/location/IGetLocationRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { ILocationsGenerateAllResponse } from "../@types/eft/common/ILocationsSourceDestinationBase"; -import { ILocationBase } from "../@types/eft/common/ILocationBase"; -import { HttpResponse } from "../utils/HttpResponse"; +import { IGetLocationRequestData } from "../models/eft/location/IGetLocationRequestData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSourceDestinationBase"; +import { ILocationBase } from "../models/eft/common/ILocationBase"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class LocationCallbacks { private httpResponse; private locationController; - constructor(httpResponse: HttpResponse, locationController: LocationController); + constructor(httpResponse: HttpResponseUtil, locationController: LocationController); getLocationData(url: string, info: any, 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 373566b..9364a2f 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/MatchCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/MatchCallbacks.d.ts @@ -1,18 +1,18 @@ import { MatchController } from "../controllers/MatchController"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { IStartOfflineRaidRequestData } from "../@types/eft/match/IStartOffineRaidRequestData"; -import { IEndOfflineRaidRequestData } from "../@types/eft/match/IEndOfflineRaidRequestData"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { HttpResponse } from "../utils/HttpResponse"; +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 { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class MatchCallbacks { private httpResponse; private jsonUtil; private matchController; private databaseServer; - constructor(httpResponse: HttpResponse, jsonUtil: JsonUtil, matchController: MatchController, databaseServer: DatabaseServer); + constructor(httpResponse: HttpResponseUtil, jsonUtil: JsonUtil, matchController: MatchController, databaseServer: DatabaseServer); updatePing(url: string, info: any, sessionID: string): INullResponseData; exitMatch(url: string, info: any, sessionID: string): INullResponseData; exitToMenu(url: string, info: any, sessionID: string): INullResponseData; diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/ModCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/ModCallbacks.d.ts index 18ebfce..b4c18c2 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/ModCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/ModCallbacks.d.ts @@ -1,9 +1,9 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { OnLoad } from "../di/OnLoad"; import { DelayedModLoader } from "../loaders/DelayedModLoader"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from '../@types/spt/utils/ILogger'; -import { IHttpServer } from '../@types/spt/server/IHttpServer'; +import { ILogger } from '../models/spt/utils/ILogger'; +import { IHttpServer } from '../models/spt/server/IHttpServer'; declare class ModCallbacks extends OnLoad { private logger; private httpResponse; @@ -11,7 +11,7 @@ declare class ModCallbacks extends OnLoad { private modLoader; private configServer; private httpConfig; - constructor(logger: ILogger, httpResponse: HttpResponse, httpServer: IHttpServer, modLoader: DelayedModLoader, configServer: ConfigServer); + constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, modLoader: DelayedModLoader, configServer: ConfigServer); onLoad(): void; getRoute(): string; sendBundle(sessionID: string, req: any, resp: any, body: any): void; diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/NoteCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/NoteCallbacks.d.ts index ed30fcd..36cbd44 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 "../@types/eft/common/IPmcData"; -import { INoteActionData } from "../@types/eft/notes/INoteActionData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { 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 d982db5..f47dcc9 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/NotifierCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/NotifierCallbacks.d.ts @@ -1,15 +1,15 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { INotifierChannel } from "../@types/eft/notifier/INotifier"; -import { ISelectProfileRequestData } from "../@types/eft/notifier/ISelectProfileRequestData"; +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 { private httpServerHelper; private httpResponse; private notifierController; - constructor(httpServerHelper: HttpServerHelper, httpResponse: HttpResponse, notifierController: NotifierController); + constructor(httpServerHelper: HttpServerHelper, httpResponse: HttpResponseUtil, notifierController: NotifierController); /** * If we don't have anything to send, it's ok to not send anything back * because notification requests can be long-polling. In fact, we SHOULD wait diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/PresetBuildCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/PresetBuildCallbacks.d.ts index ee1b592..fd22c8f 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/PresetBuildCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/PresetBuildCallbacks.d.ts @@ -1,14 +1,14 @@ import { PresetBuildController } from "../controllers/PresetBuildController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IPresetBuildActionRequestData } from "../@types/eft/presetBuild/IPresetBuildActionRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { WeaponBuild } from "../@types/eft/profile/IAkiProfile"; -import { HttpResponse } from "../utils/HttpResponse"; +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 { WeaponBuild } from "../models/eft/profile/IAkiProfile"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class PresetBuildCallbacks { private httpResponse; private presetBuildController; - constructor(httpResponse: HttpResponse, presetBuildController: PresetBuildController); + constructor(httpResponse: HttpResponseUtil, presetBuildController: PresetBuildController); 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/3.0GetSptConfigFile/types/callbacks/ProfileCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/ProfileCallbacks.d.ts index 94e05b8..e50c130 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/ProfileCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/ProfileCallbacks.d.ts @@ -1,21 +1,21 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { ProfileController } from "../controllers/ProfileController"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IProfileChangeNicknameRequestData } from "../@types/eft/profile/IProfileChangeNicknameRequestData"; -import { IProfileChangeVoiceRequestData } from "../@types/eft/profile/IProfileChangeVoiceRequestData"; -import { IProfileCreateRequestData } from "../@types/eft/profile/IProfileCreateRequestData"; -import { IValidateNicknameRequestData } from "../@types/eft/profile/IValidateNicknameRequestData"; -import { ISearchFriendRequestData } from "../@types/eft/profile/ISearchFriendRequestData"; -import { ISearchFriendResponse } from "../@types/eft/profile/ISearchFriendResponse"; -import { IGetMiniProfileRequestData } from "../@types/eft/launcher/IGetMiniProfileRequestData"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +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 { private httpResponse; private timeUtil; private profileController; - constructor(httpResponse: HttpResponse, timeUtil: TimeUtil, profileController: ProfileController); + constructor(httpResponse: HttpResponseUtil, timeUtil: TimeUtil, profileController: ProfileController); createProfile(url: string, info: IProfileCreateRequestData, sessionID: string): IGetBodyResponseData; getProfileData(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; regenerateScav(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/QuestCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/QuestCallbacks.d.ts index 589682b..1f3964b 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/QuestCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/QuestCallbacks.d.ts @@ -1,22 +1,22 @@ import { QuestController } from "../controllers/QuestController"; import { RepeatableQuestController } from "../controllers/RepeatableQuestController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IAcceptQuestRequestData } from "../@types/eft/quests/IAcceptQuestRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IListQuestsRequestData } from "../@types/eft/quests/IListQuestsRequestData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { ICompleteQuestRequestData } from "../@types/eft/quests/ICompleteQuestRequestData"; -import { IHandoverQuestRequestData } from "../@types/eft/quests/IHandoverQuestRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IQuest } from "../@types/eft/common/tables/IQuest"; -import { IPmcDataRepeatableQuest } from "../@types/eft/common/tables/IRepeatableQuests"; -import { IRepeatableQuestChangeRequest } from "../@types/eft/quests/IRepeatableQuestChangeRequest"; -import { HttpResponse } from "../utils/HttpResponse"; +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 { IQuest } from "../models/eft/common/tables/IQuest"; +import { IPmcDataRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; +import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class QuestCallbacks { private httpResponse; private questController; private repeatableQuestController; - constructor(httpResponse: HttpResponse, questController: QuestController, repeatableQuestController: RepeatableQuestController); + constructor(httpResponse: HttpResponseUtil, questController: QuestController, repeatableQuestController: RepeatableQuestController); 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/3.0GetSptConfigFile/types/callbacks/RagfairCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/RagfairCallbacks.d.ts index 31af479..260fd13 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 { IPmcData } from "../@types/eft/common/IPmcData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { ISearchRequestData } from "../@types/eft/ragfair/ISearchRequestData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGetMarketPriceRequestData } from "../@types/eft/ragfair/IGetMarketPriceRequestData"; -import { IAddOfferRequestData } from "../@types/eft/ragfair/IAddOfferRequestData"; -import { IRemoveOfferRequestData } from "../@types/eft/ragfair/IRemoveOfferRequestData"; -import { IExtendOfferRequestData } from "../@types/eft/ragfair/IExtendOfferRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IGetItemPriceResult } from "../@types/eft/ragfair/IGetItemPriceResult"; +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 { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult"; import { ConfigServer } from "../servers/ConfigServer"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairCallbacks extends OnLoadOnUpdate { private httpResponse; private logger; @@ -23,7 +23,7 @@ export declare class RagfairCallbacks extends OnLoadOnUpdate { private ragfairController; private configServer; private ragfairConfig; - constructor(httpResponse: HttpResponse, logger: ILogger, jsonUtil: JsonUtil, ragfairServer: RagfairServer, ragfairController: RagfairController, configServer: ConfigServer); + constructor(httpResponse: HttpResponseUtil, logger: ILogger, jsonUtil: JsonUtil, ragfairServer: RagfairServer, ragfairController: RagfairController, configServer: ConfigServer); onLoad(): void; getRoute(): string; search(url: string, info: ISearchRequestData, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/RepairCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/RepairCallbacks.d.ts index e28e48b..4acd364 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 "../@types/eft/common/IPmcData"; -import { IRepairActionDataRequest } from "../@types/eft/repair/IRepairActionDataRequest"; -import { ITraderRepairActionDataRequest } from "../@types/eft/repair/ITraderRepairActionDataRequest"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +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/TradeCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/TradeCallbacks.d.ts index 5117a82..4cf8497 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 "../@types/eft/common/IPmcData"; -import { IProcessRagfairTradeRequestData } from "../@types/eft/trade/IProcessRagfairTradeRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IProcessBaseTradeRequestData } from "../@types/eft/trade/IProcessBaseTradeRequestData"; +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 { 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 3f72e2b..264ef94 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/TraderCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/TraderCallbacks.d.ts @@ -1,13 +1,13 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TraderController } from "../controllers/TraderController"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IBarterScheme, ITraderAssort, ITraderBase } from "../@types/eft/common/tables/ITrader"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; +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 { private httpResponse; private traderController; - constructor(httpResponse: HttpResponse, traderController: TraderController); + constructor(httpResponse: HttpResponseUtil, traderController: TraderController); onLoad(): void; getRoute(): string; getTraderSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/WeatherCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/WeatherCallbacks.d.ts index 99d5c1f..2474417 100644 --- a/TypeScript/3.0GetSptConfigFile/types/callbacks/WeatherCallbacks.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/callbacks/WeatherCallbacks.d.ts @@ -1,10 +1,10 @@ import { WeatherController } from "../controllers/WeatherController"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { HttpResponse } from "../utils/HttpResponse"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class WeatherCallbacks { private httpResponse; private weatherController; - constructor(httpResponse: HttpResponse, weatherController: WeatherController); + constructor(httpResponse: HttpResponseUtil, weatherController: WeatherController); getWeather(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; } diff --git a/TypeScript/3.0GetSptConfigFile/types/callbacks/WishlistCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/callbacks/WishlistCallbacks.d.ts index 870f049..1816600 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 "../@types/eft/common/IPmcData"; -import { IWishlistActionData } from "../@types/eft/wishlist/IWishlistActionData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { private wishlistController; constructor(wishlistController: WishlistController); diff --git a/TypeScript/3.0GetSptConfigFile/types/configs/AkiConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/configs/AkiConfig.d.ts deleted file mode 100644 index f9b9e31..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/configs/AkiConfig.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -export const akiVersion: string; -export const projectName: string; -export const compatibleTarkovVersion: string; diff --git a/TypeScript/3.0GetSptConfigFile/types/configs/BotConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/configs/BotConfig.d.ts deleted file mode 100644 index 6c7ea7b..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/configs/BotConfig.d.ts +++ /dev/null @@ -1,309 +0,0 @@ -export declare namespace presetBatch { - const assault: number; - const bossBully: number; - const bossGluhar: number; - const bossKilla: number; - const bossKojaniy: number; - const bossSanitar: number; - const bossTagilla: number; - const bossTest: number; - const cursedAssault: number; - const followerBully: number; - const followerGluharAssault: number; - const followerGluharScout: number; - const followerGluharSecurity: number; - const followerGluharSnipe: number; - const followerKojaniy: number; - const followerSanitar: number; - const followerTagilla: number; - const followerTest: number; - const marksman: number; - const pmcBot: number; - const sectantPriest: number; - const sectantWarrior: number; - const gifter: number; - const test: number; - const exUsec: number; -} -export declare const bosses: string[]; -export declare namespace durability { - namespace _default { - namespace armor { - const maxDelta: number; - const minDelta: number; - } - namespace weapon { - export const lowestMax: number; - export const highestMax: number; - const maxDelta_1: number; - export { maxDelta_1 as maxDelta }; - const minDelta_1: number; - export { minDelta_1 as minDelta }; - } - } - export { _default as default }; - export namespace pmc { - export namespace armor_1 { - export const lowestMaxPercent: number; - export const highestMaxPercent: number; - const maxDelta_2: number; - export { maxDelta_2 as maxDelta }; - const minDelta_2: number; - export { minDelta_2 as minDelta }; - } - export { armor_1 as armor }; - export namespace weapon_1 { - const lowestMax_1: number; - export { lowestMax_1 as lowestMax }; - const highestMax_1: number; - export { highestMax_1 as highestMax }; - const maxDelta_3: number; - export { maxDelta_3 as maxDelta }; - const minDelta_3: number; - export { minDelta_3 as minDelta }; - } - export { weapon_1 as weapon }; - } - export namespace boss { - export namespace armor_2 { - const maxDelta_4: number; - export { maxDelta_4 as maxDelta }; - const minDelta_4: number; - export { minDelta_4 as minDelta }; - } - export { armor_2 as armor }; - export namespace weapon_2 { - const lowestMax_2: number; - export { lowestMax_2 as lowestMax }; - const highestMax_2: number; - export { highestMax_2 as highestMax }; - const maxDelta_5: number; - export { maxDelta_5 as maxDelta }; - const minDelta_5: number; - export { minDelta_5 as minDelta }; - } - export { weapon_2 as weapon }; - } - export namespace follower { - export namespace armor_3 { - const maxDelta_6: number; - export { maxDelta_6 as maxDelta }; - const minDelta_6: number; - export { minDelta_6 as minDelta }; - } - export { armor_3 as armor }; - export namespace weapon_3 { - const lowestMax_3: number; - export { lowestMax_3 as lowestMax }; - const highestMax_3: number; - export { highestMax_3 as highestMax }; - const maxDelta_7: number; - export { maxDelta_7 as maxDelta }; - const minDelta_7: number; - export { minDelta_7 as minDelta }; - } - export { weapon_3 as weapon }; - } - export namespace assault_1 { - export namespace armor_4 { - const maxDelta_8: number; - export { maxDelta_8 as maxDelta }; - const minDelta_8: number; - export { minDelta_8 as minDelta }; - } - export { armor_4 as armor }; - export namespace weapon_4 { - const lowestMax_4: number; - export { lowestMax_4 as lowestMax }; - const highestMax_4: number; - export { highestMax_4 as highestMax }; - const maxDelta_9: number; - export { maxDelta_9 as maxDelta }; - const minDelta_9: number; - export { minDelta_9 as minDelta }; - } - export { weapon_4 as weapon }; - } - export { assault_1 as assault }; - export namespace cursedassault { - export namespace armor_5 { - const maxDelta_10: number; - export { maxDelta_10 as maxDelta }; - const minDelta_10: number; - export { minDelta_10 as minDelta }; - } - export { armor_5 as armor }; - export namespace weapon_5 { - const lowestMax_5: number; - export { lowestMax_5 as lowestMax }; - const highestMax_5: number; - export { highestMax_5 as highestMax }; - const maxDelta_11: number; - export { maxDelta_11 as maxDelta }; - const minDelta_11: number; - export { minDelta_11 as minDelta }; - } - export { weapon_5 as weapon }; - } - export namespace marksman_1 { - export namespace armor_6 { - const maxDelta_12: number; - export { maxDelta_12 as maxDelta }; - const minDelta_12: number; - export { minDelta_12 as minDelta }; - } - export { armor_6 as armor }; - export namespace weapon_6 { - const lowestMax_6: number; - export { lowestMax_6 as lowestMax }; - const highestMax_6: number; - export { highestMax_6 as highestMax }; - const maxDelta_13: number; - export { maxDelta_13 as maxDelta }; - const minDelta_13: number; - export { minDelta_13 as minDelta }; - } - export { weapon_6 as weapon }; - } - export { marksman_1 as marksman }; - export namespace pmcbot { - export namespace armor_7 { - const maxDelta_14: number; - export { maxDelta_14 as maxDelta }; - const minDelta_14: number; - export { minDelta_14 as minDelta }; - } - export { armor_7 as armor }; - export namespace weapon_7 { - const lowestMax_7: number; - export { lowestMax_7 as lowestMax }; - const highestMax_7: number; - export { highestMax_7 as highestMax }; - const maxDelta_15: number; - export { maxDelta_15 as maxDelta }; - const minDelta_15: number; - export { minDelta_15 as minDelta }; - } - export { weapon_7 as weapon }; - } - export namespace exusec { - export namespace armor_8 { - const maxDelta_16: number; - export { maxDelta_16 as maxDelta }; - const minDelta_16: number; - export { minDelta_16 as minDelta }; - } - export { armor_8 as armor }; - export namespace weapon_8 { - const lowestMax_8: number; - export { lowestMax_8 as lowestMax }; - const highestMax_8: number; - export { highestMax_8 as highestMax }; - const maxDelta_17: number; - export { maxDelta_17 as maxDelta }; - const minDelta_17: number; - export { minDelta_17 as minDelta }; - } - export { weapon_8 as weapon }; - } - export namespace sectantpriest { - export namespace armor_9 { - const maxDelta_18: number; - export { maxDelta_18 as maxDelta }; - const minDelta_18: number; - export { minDelta_18 as minDelta }; - } - export { armor_9 as armor }; - export namespace weapon_9 { - const lowestMax_9: number; - export { lowestMax_9 as lowestMax }; - const highestMax_9: number; - export { highestMax_9 as highestMax }; - const maxDelta_19: number; - export { maxDelta_19 as maxDelta }; - const minDelta_19: number; - export { minDelta_19 as minDelta }; - } - export { weapon_9 as weapon }; - } - export namespace sectantwarrior { - export namespace armor_10 { - const maxDelta_20: number; - export { maxDelta_20 as maxDelta }; - const minDelta_20: number; - export { minDelta_20 as minDelta }; - } - export { armor_10 as armor }; - export namespace weapon_10 { - const lowestMax_10: number; - export { lowestMax_10 as lowestMax }; - const highestMax_10: number; - export { highestMax_10 as highestMax }; - const maxDelta_21: number; - export { maxDelta_21 as maxDelta }; - const minDelta_21: number; - export { minDelta_21 as minDelta }; - } - export { weapon_10 as weapon }; - } -} -export declare namespace lootNValue { - export const scav: number; - const pmc_1: number; - export { pmc_1 as pmc }; -} -export declare namespace pmc_2 { - namespace dynamicLoot { - const whitelist: any[]; - const blacklist: string[]; - const spawnLimits: { - "5c99f98d86f7745c314214b3": number; - "5c164d2286f774194c5e69fa": number; - "550aa4cd4bdc2dd8348b456c": number; - "55818add4bdc2d5b648b456f": number; - "55818ad54bdc2ddc698b4569": number; - "55818aeb4bdc2ddc698b456a": number; - "55818ae44bdc2dde698b456c": number; - "55818af64bdc2d5b648b4570": number; - "5448e54d4bdc2dcc718b4568": number; - "5448f3a64bdc2d60728b456a": number; - "5447e1d04bdc2dff2f8b4567": number; - "5a341c4686f77469e155819e": number; - "55818b164bdc2ddc698b456c": number; - "5448bc234bdc2d3c308b4569": number; - "543be5dd4bdc2deb348b4569": number; - "543be5cb4bdc2deb348b4568": number; - "5485a8684bdc2da71d8b4567": number; - "5d650c3e815116009f6201d2": number; - "5448f39d4bdc2d0a728b4568": number; - "543be6564bdc2df4348b4568": number; - }; - const moneyStackLimits: { - "5449016a4bdc2d6f028b456f": number; - "5696686a4bdc2da3298b456a": number; - "569668774bdc2da2298b4568": number; - }; - } - const cartridgeBlacklist: string[]; - const difficulty: string; - const isUsec: number; - const chanceSameSideIsHostilePercent: number; - const usecType: string; - const bearType: string; - const maxBackpackLootTotalRub: number; - const maxPocketLootTotalRub: number; - const maxVestLootTotalRub: number; - namespace types { - const assault_2: number; - export { assault_2 as assault }; - const cursedAssault_1: number; - export { cursedAssault_1 as cursedAssault }; - const pmcBot_1: number; - export { pmcBot_1 as pmcBot }; - const exUsec_1: number; - export { exUsec_1 as exUsec }; - } -} -export { pmc_2 as pmc }; -export declare const showTypeInNickname: boolean; -export declare const maxBotCap: number; diff --git a/TypeScript/3.0GetSptConfigFile/types/configs/HealthConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/configs/HealthConfig.d.ts deleted file mode 100644 index 49bef94..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/configs/HealthConfig.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -export namespace healthMultipliers { - const death: number; - const blacked: number; -} -export namespace save { - const health: boolean; - const effects: boolean; -} diff --git a/TypeScript/3.0GetSptConfigFile/types/configs/HideoutConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/configs/HideoutConfig.d.ts deleted file mode 100644 index 3894576..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/configs/HideoutConfig.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -export const runIntervalSeconds: number; -export namespace scavCase { - const rewardParentBlacklist: any[]; - const rewardItemBlacklist: any[]; - namespace ammoRewards { - const giveMultipleOfTen: boolean; - const minAmount: number; - } - namespace moneyRewards { - const enabled: boolean; - namespace rub { - const min: number; - const max: number; - } - namespace usd { - const min_1: number; - export { min_1 as min }; - const max_1: number; - export { max_1 as max }; - } - namespace eur { - const min_2: number; - export { min_2 as min }; - const max_2: number; - export { max_2 as max }; - } - } -} diff --git a/TypeScript/3.0GetSptConfigFile/types/configs/HttpConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/configs/HttpConfig.d.ts deleted file mode 100644 index d7572a0..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/configs/HttpConfig.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export const ip: string; -export const port: number; diff --git a/TypeScript/3.0GetSptConfigFile/types/configs/InraidConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/configs/InraidConfig.d.ts deleted file mode 100644 index 7ac112c..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/configs/InraidConfig.d.ts +++ /dev/null @@ -1,15 +0,0 @@ -export const MIAOnRaidEnd: boolean; -export namespace raidMenuSettings { - const aiAmount: string; - const aiDifficulty: string; - const bossEnabled: boolean; - const scavWars: boolean; - const taggedAndCursed: boolean; -} -export namespace save { - const loot: boolean; - const durability: boolean; -} -export const carExtracts: string[]; -export const carExtractBaseStandingGain: number; -export const scavExtractGain: number; diff --git a/TypeScript/3.0GetSptConfigFile/types/configs/InsuranceConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/configs/InsuranceConfig.d.ts deleted file mode 100644 index 441319e..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/configs/InsuranceConfig.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -export const insuranceMultiplier: { - "54cb50c76803fa8b248b4571": number; - "54cb57776803fa99248b456e": number; -}; -export const returnChancePercent: { - "54cb50c76803fa8b248b4571": number; - "54cb57776803fa99248b456e": number; -}; -export const runIntervalSeconds: number; diff --git a/TypeScript/3.0GetSptConfigFile/types/configs/InventoryConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/configs/InventoryConfig.d.ts deleted file mode 100644 index 8d0b82f..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/configs/InventoryConfig.d.ts +++ /dev/null @@ -1 +0,0 @@ -export const newItemsMarkedFound: boolean; diff --git a/TypeScript/3.0GetSptConfigFile/types/configs/LocationConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/configs/LocationConfig.d.ts deleted file mode 100644 index 848096a..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/configs/LocationConfig.d.ts +++ /dev/null @@ -1,52 +0,0 @@ -export namespace looseLootMultiplier { - const bigmap: number; - const develop: number; - const factory4_day: number; - const factory4_night: number; - const interchange: number; - const laboratory: number; - const rezervbase: number; - const shoreline: number; - const woods: number; - const hideout: number; - const lighthouse: number; - const privatearea: number; - const suburbs: number; - const tarkovstreets: number; - const terminal: number; - const town: number; -} -export namespace staticLootMultiplier { - const bigmap_1: number; - export { bigmap_1 as bigmap }; - const develop_1: number; - export { develop_1 as develop }; - const factory4_day_1: number; - export { factory4_day_1 as factory4_day }; - const factory4_night_1: number; - export { factory4_night_1 as factory4_night }; - const interchange_1: number; - export { interchange_1 as interchange }; - const laboratory_1: number; - export { laboratory_1 as laboratory }; - const rezervbase_1: number; - export { rezervbase_1 as rezervbase }; - const shoreline_1: number; - export { shoreline_1 as shoreline }; - const woods_1: number; - export { woods_1 as woods }; - const hideout_1: number; - export { hideout_1 as hideout }; - const lighthouse_1: number; - export { lighthouse_1 as lighthouse }; - const privatearea_1: number; - export { privatearea_1 as privatearea }; - const suburbs_1: number; - export { suburbs_1 as suburbs }; - const tarkovstreets_1: number; - export { tarkovstreets_1 as tarkovstreets }; - const terminal_1: number; - export { terminal_1 as terminal }; - const town_1: number; - export { town_1 as town }; -} diff --git a/TypeScript/3.0GetSptConfigFile/types/configs/MatchConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/configs/MatchConfig.d.ts deleted file mode 100644 index 59524e0..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/configs/MatchConfig.d.ts +++ /dev/null @@ -1 +0,0 @@ -export const enabled: boolean; diff --git a/TypeScript/3.0GetSptConfigFile/types/configs/QuestConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/configs/QuestConfig.d.ts deleted file mode 100644 index 069e0ac..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/configs/QuestConfig.d.ts +++ /dev/null @@ -1,70 +0,0 @@ -export const redeemTime: number; -export const repeatableQuests: { - name: string; - types: string[]; - resetTime: number; - numQuests: number; - minPlayerLevel: number; - rewardScaling: { - levels: number[]; - experience: number[]; - roubles: number[]; - items: number[]; - reputation: number[]; - rewardSpread: number; - }; - locations: { - any: string[]; - factory4_day: string[]; - bigmap: string[]; - Woods: string[]; - Shoreline: string[]; - Interchange: string[]; - Lighthouse: string[]; - laboratory: string[]; - RezervBase: string[]; - }; - traderWhitelist: { - traderId: any; - questTypes: string[]; - }[]; - questConfig: { - Exploration: { - maxExtracts: number; - specificExits: { - probability: number; - passageRequirementWhitelist: string[]; - }; - }; - Completion: { - minRequestedAmount: number; - maxRequestedAmount: number; - minRequestedBulletAmount: number; - maxRequestedBulletAmount: number; - useWhitelist: boolean; - useBlacklist: boolean; - }; - Elimination: { - targets: { - key: string; - relativeProbability: number; - data: { - isBoss: boolean; - }; - }[]; - bodyPartProb: number; - bodyParts: { - key: string; - relativeProbability: number; - data: string[]; - }[]; - specificLocationProb: number; - distLocationBlacklist: string[]; - distProb: number; - maxDist: number; - minDist: number; - maxKills: number; - minKills: number; - }; - }; -}[]; diff --git a/TypeScript/3.0GetSptConfigFile/types/configs/RagfairConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/configs/RagfairConfig.d.ts deleted file mode 100644 index 4a0f68c..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/configs/RagfairConfig.d.ts +++ /dev/null @@ -1,87 +0,0 @@ -export const runIntervalSeconds: number; -export namespace sell { - const fees: boolean; - namespace chance { - const base: number; - const overprices: number; - const underpriced: number; - } - namespace time { - const base_1: number; - export { base_1 as base }; - export const min: number; - export const max: number; - } - namespace reputation { - const gain: number; - const loss: number; - } -} -export const traders: { - "54cb50c76803fa8b248b4571": boolean; - "54cb57776803fa99248b456e": boolean; - "579dc571d53a0658a154fbec": boolean; - "58330581ace78e27b8b10cee": boolean; - "5935c25fb3acc3127c3d8cd9": boolean; - "5a7c2eca46aef81a7ca2145d": boolean; - "5ac3b934156ae10c4430e83c": boolean; - "5c0647fdd443bc2504c2d371": boolean; - ragfair: boolean; -}; -export namespace dynamic { - const expiredOfferThreshold: number; - namespace offerItemCount { - const min_1: number; - export { min_1 as min }; - const max_1: number; - export { max_1 as max }; - } - namespace price { - const min_2: number; - export { min_2 as min }; - const max_2: number; - export { max_2 as max }; - } - namespace endTimeSeconds { - const min_3: number; - export { min_3 as min }; - const max_3: number; - export { max_3 as max }; - } - namespace condition { - export const conditionChance: number; - const min_4: number; - export { min_4 as min }; - const max_4: number; - export { max_4 as max }; - } - namespace stackablePercent { - const min_5: number; - export { min_5 as min }; - const max_5: number; - export { max_5 as max }; - } - namespace nonStackableCount { - const min_6: number; - export { min_6 as min }; - const max_6: number; - export { max_6 as max }; - } - namespace rating { - const min_7: number; - export { min_7 as min }; - const max_7: number; - export { max_7 as max }; - } - const currencies: { - "5449016a4bdc2d6f028b456f": number; - "5696686a4bdc2da3298b456a": number; - "569668774bdc2da2298b4568": number; - }; - const showAsSingleStack: any[]; - namespace blacklist { - const custom: string[]; - const enableBsgList: boolean; - const enableQuestList: boolean; - } -} diff --git a/TypeScript/3.0GetSptConfigFile/types/configs/RepairConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/configs/RepairConfig.d.ts deleted file mode 100644 index d2bec52..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/configs/RepairConfig.d.ts +++ /dev/null @@ -1 +0,0 @@ -export const priceMultiplier: number; diff --git a/TypeScript/3.0GetSptConfigFile/types/configs/TraderConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/configs/TraderConfig.d.ts deleted file mode 100644 index c7fc65d..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/configs/TraderConfig.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -export const updateTime: { - traderId: any; - seconds: number; -}[]; -export const updateTimeDefault: number; -export const fenceAssortSize: number; -export const fenceMaxPresetsCount: number; -export const fencePresetPriceMult: number; -export const minDurabilityForSale: number; -export const fenceItemIgnoreList: string[]; diff --git a/TypeScript/3.0GetSptConfigFile/types/configs/WeatherConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/configs/WeatherConfig.d.ts deleted file mode 100644 index ca37604..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/configs/WeatherConfig.d.ts +++ /dev/null @@ -1,55 +0,0 @@ -export const acceleration: number; -export namespace weather { - namespace clouds { - const min: number; - const max: number; - } - namespace windSpeed { - const min_1: number; - export { min_1 as min }; - const max_1: number; - export { max_1 as max }; - } - namespace windDirection { - const min_2: number; - export { min_2 as min }; - const max_2: number; - export { max_2 as max }; - } - namespace windGustiness { - const min_3: number; - export { min_3 as min }; - const max_3: number; - export { max_3 as max }; - } - namespace rain { - const min_4: number; - export { min_4 as min }; - const max_4: number; - export { max_4 as max }; - } - namespace rainIntensity { - const min_5: number; - export { min_5 as min }; - const max_5: number; - export { max_5 as max }; - } - namespace fog { - const min_6: number; - export { min_6 as min }; - const max_6: number; - export { max_6 as max }; - } - namespace temp { - const min_7: number; - export { min_7 as min }; - const max_7: number; - export { max_7 as max }; - } - namespace pressure { - const min_8: number; - export { min_8 as min }; - const max_8: number; - export { max_8 as max }; - } -} diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/BotController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/BotController.d.ts index 1fc8fc4..d7dc36d 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/BotController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/BotController.d.ts @@ -1,8 +1,8 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { Difficulty } from "../@types/eft/common/tables/IBotType"; -import { IGenerateBotsRequestData } from "../@types/eft/bot/IGenerateBotsRequestData"; -import { IBotBase } from "../@types/eft/common/tables/IBotBase"; -import { IBotCore } from "../@types/eft/common/tables/IBotCore"; +import { Difficulty } from "../models/eft/common/tables/IBotType"; +import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; +import { IBotBase } from "../models/eft/common/tables/IBotBase"; +import { IBotCore } from "../models/eft/common/tables/IBotCore"; import { ConfigServer } from "../servers/ConfigServer"; import { BotHelper } from "../helpers/BotHelper"; import { BotGenerator } from "../generators/BotGenerator"; diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/CustomizationController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/CustomizationController.d.ts index 4255154..6fd3b12 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/CustomizationController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/CustomizationController.d.ts @@ -1,13 +1,13 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IWearClothingRequestData } from "../@types/eft/customization/IWearClothingRequestData"; -import { IBuyClothingRequestData } from "../@types/eft/customization/IBuyClothingRequestData"; -import { ISuit } from "../@types/eft/common/tables/ITrader"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IWearClothingRequestData } from "../models/eft/customization/IWearClothingRequestData"; +import { IBuyClothingRequestData } from "../models/eft/customization/IBuyClothingRequestData"; +import { ISuit } from "../models/eft/common/tables/ITrader"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class CustomizationController { private logger; private itemEventRouter; diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/DialogueController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/DialogueController.d.ts index a855ad1..8095666 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/DialogueController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/DialogueController.d.ts @@ -1,16 +1,16 @@ import { SaveServer } from "../servers/SaveServer"; import { DialogueHelper } from "../helpers/DialogueHelper"; -import { DialogueInfo } from "../@types/eft/profile/IAkiProfile"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IGetFriendListDataResponse } from "../@types/eft/dialog/IGetFriendListDataResponse"; -import { IGetMailDialogViewResponseData } from "../@types/eft/dialog/IGetMailDialogViewResponseData"; -import { IGetAllAttachmentsResponse } from "../@types/eft/dialog/IGetAllAttachmentsResponse"; -import { HttpResponse } from "../utils/HttpResponse"; +import { DialogueInfo } from "../models/eft/profile/IAkiProfile"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse"; +import { IGetMailDialogViewResponseData } from "../models/eft/dialog/IGetMailDialogViewResponseData"; +import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachmentsResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class DialogueController { private httpResponse; private saveServer; private dialogueHelper; - constructor(httpResponse: HttpResponse, saveServer: SaveServer, dialogueHelper: DialogueHelper); + constructor(httpResponse: HttpResponseUtil, saveServer: SaveServer, dialogueHelper: DialogueHelper); getFriendList(sessionID: string): IGetFriendListDataResponse; generateDialogueList(sessionID: string): IGetBodyResponseData; getDialogueInfo(dialogueID: string, sessionID: string): DialogueInfo; diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/GameController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/GameController.d.ts index 883bed3..614d270 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/GameController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/GameController.d.ts @@ -1,9 +1,9 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGameConfigResponse } from "../@types/eft/game/IGameConfigResponse"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from "../@types/spt/utils/ILogger"; -import { IWatermark } from "../@types/spt/utils/IWatermark"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { IWatermark } from "../models/spt/utils/IWatermark"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; export declare class GameController { private logger; diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/HealthController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/HealthController.d.ts index 3d2120b..ca049f6 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/HealthController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/HealthController.d.ts @@ -2,14 +2,14 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { PaymentService } from "../services/PaymentService"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { HealthHelper } from "../helpers/HealthHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IHealthTreatmentRequestData } from "../@types/eft/health/IHealthTreatmentRequestData"; -import { IOffraidEatRequestData } from "../@types/eft/health/IOffraidEatRequestData"; -import { IOffraidHealRequestData } from "../@types/eft/health/IOffraidHealRequestData"; -import { ISyncHealthRequestData } from "../@types/eft/health/ISyncHealthRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IHealthTreatmentRequestData } from "../models/eft/health/IHealthTreatmentRequestData"; +import { IOffraidEatRequestData } from "../models/eft/health/IOffraidEatRequestData"; +import { IOffraidHealRequestData } from "../models/eft/health/IOffraidHealRequestData"; +import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class HealthController { private logger; private itemEventRouter; diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/HideoutController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/HideoutController.d.ts index 59e05d9..22b7040 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/HideoutController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/HideoutController.d.ts @@ -10,20 +10,20 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { PaymentHelper } from "../helpers/PaymentHelper"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { HideoutHelper } from "../helpers/HideoutHelper"; -import { IHideoutUpgradeRequestData } from "../@types/eft/hideout/IHideoutUpgradeRequestData"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { HideoutUpgradeCompleteRequestData } from "../@types/eft/hideout/HideoutUpgradeCompleteRequestData"; -import { IHideoutPutItemInRequestData } from "../@types/eft/hideout/IHideoutPutItemInRequestData"; -import { IHideoutTakeItemOutRequestData } from "../@types/eft/hideout/IHideoutTakeItemOutRequestData"; -import { IHideoutToggleAreaRequestData } from "../@types/eft/hideout/IHideoutToggleAreaRequestData"; -import { IHideoutSingleProductionStartRequestData } from "../@types/eft/hideout/IHideoutSingleProductionStartRequestData"; -import { IHideoutScavCaseStartRequestData } from "../@types/eft/hideout/IHideoutScavCaseStartRequestData"; -import { IHideoutTakeProductionRequestData } from "../@types/eft/hideout/IHideoutTakeProductionRequestData"; -import { IHideoutContinousProductionStartRequestData } from "../@types/eft/hideout/IHideoutContinousProductionStartRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { HideoutUpgradeCompleteRequestData } from "../models/eft/hideout/HideoutUpgradeCompleteRequestData"; +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 { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; +import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; +import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HttpResponse } from "../utils/HttpResponse"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class HideoutController { private logger; private hashUtil; @@ -41,7 +41,7 @@ export declare class HideoutController { private hideoutHelper; private configServer; private hideoutConfig; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponse, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, configServer: ConfigServer); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, configServer: ConfigServer); upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; upgradeComplete(pmcData: IPmcData, body: HideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse; putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/InraidController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/InraidController.d.ts index e0be58a..1033e5f 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/InraidController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/InraidController.d.ts @@ -2,31 +2,29 @@ import { SaveServer } from "../servers/SaveServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "../helpers/ItemHelper"; import { TraderHelper } from "../helpers/TraderHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; import { HealthHelper } from "../helpers/HealthHelper"; -import { IRegisterPlayerRequestData } from "../@types/eft/inRaid/IRegisterPlayerRequestData"; -import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData"; +import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; +import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ConfigServer } from "../servers/ConfigServer"; import { JsonUtil } from "../utils/JsonUtil"; import { QuestHelper } from "../helpers/QuestHelper"; import { InRaidHelper } from "../helpers/InRaidHelper"; import { InsuranceService } from "../services/InsuranceService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; export declare class InraidController { - private logger; private saveServer; private jsonUtil; private databaseServer; private questHelper; private itemHelper; - private profileHelper; + private extendedProfileHelper; private healthHelper; private traderHelper; private insuranceService; private inRaidHelper; private configServer; private inraidConfig; - constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, profileHelper: ProfileHelper, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); + constructor(saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, extendedProfileHelper: ExtendedProfileHelper, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); addPlayer(sessionID: string, info: IRegisterPlayerRequestData): void; saveProgress(offraidData: ISaveProgressRequestData, sessionID: string): void; } diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/InsuranceController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/InsuranceController.d.ts index 5e43c2b..44c61fa 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/InsuranceController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/InsuranceController.d.ts @@ -8,12 +8,12 @@ import { PaymentService } from "../services/PaymentService"; import { DialogueHelper } from "../helpers/DialogueHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { ItemHelper } from "../helpers/ItemHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IGetInsuranceCostRequestData } from "../@types/eft/insurance/IGetInsuranceCostRequestData"; -import { IInsureRequestData } from "../@types/eft/insurance/IInsureRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData"; +import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { InsuranceService } from "../services/InsuranceService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class InsuranceController { private logger; private randomUtil; diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/InventoryController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/InventoryController.d.ts index a29fd1a..4ff07b8 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/InventoryController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/InventoryController.d.ts @@ -6,25 +6,25 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { PaymentHelper } from "../helpers/PaymentHelper"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IInventoryMoveRequestData } from "../@types/eft/inventory/IInventoryMoveRequestData"; -import { IInventoryRemoveRequestData } from "../@types/eft/inventory/IInventoryRemoveRequestData"; -import { IInventorySplitRequestData } from "../@types/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMergeRequestData } from "../@types/eft/inventory/IInventoryMergeRequestData"; -import { IInventoryTransferRequestData } from "../@types/eft/inventory/IInventoryTransferRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IInventorySwapRequestData } from "../@types/eft/inventory/IInventorySwapRequestData"; -import { IInventoryFoldRequestData } from "../@types/eft/inventory/IInventoryFoldRequestData"; -import { IInventoryToggleRequestData } from "../@types/eft/inventory/IInventoryToggleRequestData"; -import { IInventoryTagRequestData } from "../@types/eft/inventory/IInventoryTagRequestData"; -import { IInventoryBindRequestData } from "../@types/eft/inventory/IInventoryBindRequestData"; -import { IInventoryExamineRequestData } from "../@types/eft/inventory/IInventoryExamineRequestData"; -import { IInventoryReadEncyclopediaRequestData } from "../@types/eft/inventory/IInventoryReadEncyclopediaRequestData"; -import { IInventorySortRequestData } from "../@types/eft/inventory/IInventorySortRequestData"; -import { IInventoryCreateMarkerRequestData } from "../@types/eft/inventory/IInventoryCreateMarkerRequestData"; -import { IInventoryDeleteMarkerRequestData } from "../@types/eft/inventory/IInventoryDeleteMarkerRequestData"; -import { IInventoryEditMarkerRequestData } from "../@types/eft/inventory/IInventoryEditMarkerRequestData"; -import { ILogger } from "../@types/spt/utils/ILogger"; +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 { 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 { ILogger } from "../models/spt/utils/ILogger"; export declare class InventoryController { private logger; private hashUtil; diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/LauncherController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/LauncherController.d.ts index 687c295..d3d8e6a 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/LauncherController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/LauncherController.d.ts @@ -2,11 +2,10 @@ import { HashUtil } from "../utils/HashUtil"; import { SaveServer } from "../servers/SaveServer"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { IRegisterData } from "../@types/eft/launcher/IRegisterData"; -import { ILoginRequestData } from "../@types/eft/launcher/ILoginRequestData"; -import { IChangeRequestData } from "../@types/eft/launcher/IChangeRequestData"; -import { Info } from "../@types/eft/profile/IAkiProfile"; -import { ICoreConfig } from "../@types/spt/config/ICoreConfig"; +import { IRegisterData } from "../models/eft/launcher/IRegisterData"; +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 { private hashUtil; @@ -14,7 +13,7 @@ export declare class LauncherController { private httpServerHelper; private databaseServer; private configServer; - coreConfig: ICoreConfig; + private coreConfig; constructor(hashUtil: HashUtil, saveServer: SaveServer, httpServerHelper: HttpServerHelper, databaseServer: DatabaseServer, configServer: ConfigServer); connect(): any; find(sessionIdKey: string): Info; diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/LocationController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/LocationController.d.ts index 64168b4..dde270c 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/LocationController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/LocationController.d.ts @@ -1,10 +1,10 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { LocationGenerator } from "../generators/LocationGenerator"; -import { ILocationBase } from "../@types/eft/common/ILocationBase"; -import { ILocationsGenerateAllResponse } from "../@types/eft/common/ILocationsSourceDestinationBase"; +import { ILocationBase } from "../models/eft/common/ILocationBase"; +import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSourceDestinationBase"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class LocationController { private jsonUtil; private logger; diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/MatchController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/MatchController.d.ts index 6ab5759..229b884 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/MatchController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/MatchController.d.ts @@ -1,11 +1,9 @@ import { TraderHelper } from "../helpers/TraderHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IEndOfflineRaidRequestData } from "../@types/eft/match/IEndOfflineRaidRequestData"; -import { IStartOfflineRaidRequestData } from "../@types/eft/match/IStartOffineRaidRequestData"; -import { IPmcData } from "../@types/eft/common/IPmcData"; +import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; +import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { ConfigServer } from "../servers/ConfigServer"; -import { IMatchConfig } from "../@types/spt/config/IMatchConfig"; -import { IInRaidConfig } from "../@types/spt/config/IInRaidConfig"; import { SaveServer } from "../servers/SaveServer"; import { MatchLocationService } from "../services/MatchLocationService"; export declare class MatchController { @@ -14,8 +12,8 @@ export declare class MatchController { private matchLocationService; private traderHelper; private configServer; - matchConfig: IMatchConfig; - inraidConfig: IInRaidConfig; + private matchConfig; + private inraidConfig; constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, configServer: ConfigServer); getEnabled(): boolean; getProfile(info: any): IPmcData[]; diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/NoteController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/NoteController.d.ts index bb02d23..ecd8001 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/NoteController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/NoteController.d.ts @@ -1,6 +1,6 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { INoteActionData } from "../@types/eft/notes/INoteActionData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { private itemEventRouter; diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/NotifierController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/NotifierController.d.ts index 3366add..36fef66 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/NotifierController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/NotifierController.d.ts @@ -1,6 +1,6 @@ import { NotifierHelper } from "../helpers/NotifierHelper"; import { NotificationService } from "../services/NotificationService"; -import { INotifierChannel } from "../@types/eft/notifier/INotifier"; +import { INotifierChannel } from "../models/eft/notifier/INotifier"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; export declare class NotifierController { private notifierHelper; diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/PaymentController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/PaymentController.d.ts deleted file mode 100644 index a9a4235..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/PaymentController.d.ts +++ /dev/null @@ -1,56 +0,0 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IProcessBuyTradeRequestData } from "../@types/eft/trade/IProcessBuyTradeRequestData"; -import { IProcessSellTradeRequestData } from "../@types/eft/trade/IProcessSellTradeRequestData"; -export declare class PaymentController { - /** - * Check whether tpl is Money - * @param {string} tpl - * @returns void - */ - static isMoneyTpl(tpl: string): boolean; - /** - * Gets currency TPL from TAG - * @param {string} currency - * @returns string - */ - static getCurrency(currency: string): string; - /** - * Gets currency TAG from TPL - * @param {string} currency - * @returns string - */ - static getCurrencyTag(currency: string): string; - /** - * Gets Currency to Ruble conversion Value - * @param {number} value - * @param {string} currencyFrom - * @returns number - */ - static inRUB(value: number, currencyFrom: string): number; - /** - * Gets Ruble to Currency conversion Value - * @param {number} value - * @param {string} currencyTo - * @returns number - */ - static fromRUB(value: number, currencyTo: string): number; - /** - * Take money and insert items into return to server request - * @param {Object} pmcData - * @param {Object} body - * @param {string} sessionID - * @returns Object - */ - static payMoney(pmcData: IPmcData, body: IProcessBuyTradeRequestData, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse; - /** - * Receive money back after selling - * @param {IPmcData} pmcData - * @param {number} amount - * @param {IProcessSellTradeRequestData} body - * @param {IItemEventRouterResponse} output - * @param {string} sessionID - * @returns IItemEventRouterResponse - */ - static getMoney(pmcData: IPmcData, amount: number, body: IProcessSellTradeRequestData, output: IItemEventRouterResponse, sessionID: string): IItemEventRouterResponse; -} diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/PlayerController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/PlayerController.d.ts deleted file mode 100644 index b33606d..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/PlayerController.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IPlayerIncrementSkillLevelRequestData } from "../@types/eft/player/IPlayerIncrementSkillLevelRequestData"; -export declare class PlayerController { - /** - * increases the profile skill and updates any output - * @param {Object} pmcData - * @param {Object} output - * @param {String} skillName - * @param {Number} amount - */ - static incrementSkillLevel(pmcData: IPmcData, output: IPlayerIncrementSkillLevelRequestData, skillName: string, amount: number): void; - /** - * @param {Object} pmcData - * @returns number - */ - static calculateLevel(pmcData: IPmcData): number; - /** - * @returns number - */ - static getRandomExperience(): number; - /** - * Made a 2d array table with 0 - free slot and 1 - used slot - * @param {Object} pmcData - * @param {string} sessionID - * @returns Array - */ - static getStashSlotMap(pmcData: IPmcData, sessionID: string): any[][]; -} diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/PresetBuildController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/PresetBuildController.d.ts index e0702f4..a15b181 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/PresetBuildController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/PresetBuildController.d.ts @@ -1,9 +1,9 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { SaveServer } from "../servers/SaveServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IPresetBuildActionRequestData } from "../@types/eft/presetBuild/IPresetBuildActionRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { WeaponBuild } from "../@types/eft/profile/IAkiProfile"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IPresetBuildActionRequestData } from "../models/eft/presetBuild/IPresetBuildActionRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { WeaponBuild } from "../models/eft/profile/IAkiProfile"; import { HashUtil } from "../utils/HashUtil"; import { ItemEventRouter } from "../routers/ItemEventRouter"; export declare class PresetBuildController { diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/ProfileController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/ProfileController.d.ts index 938a866..46b66d8 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/ProfileController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/ProfileController.d.ts @@ -1,18 +1,18 @@ import { SaveServer } from "../servers/SaveServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "../helpers/ItemHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; import { TraderHelper } from "../helpers/TraderHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IProfileChangeNicknameRequestData } from "../@types/eft/profile/IProfileChangeNicknameRequestData"; -import { IProfileChangeVoiceRequestData } from "../@types/eft/profile/IProfileChangeVoiceRequestData"; -import { IProfileCreateRequestData } from "../@types/eft/profile/IProfileCreateRequestData"; -import { IValidateNicknameRequestData } from "../@types/eft/profile/IValidateNicknameRequestData"; -import { ISearchFriendRequestData } from "../@types/eft/profile/ISearchFriendRequestData"; -import { ISearchFriendResponse } from "../@types/eft/profile/ISearchFriendResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +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 { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; -import { IMiniProfile } from "../@types/eft/launcher/IMiniProfile"; +import { IMiniProfile } from "../models/eft/launcher/IMiniProfile"; +import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; export declare class ProfileController { private hashUtil; private timeUtil; @@ -20,8 +20,8 @@ export declare class ProfileController { private databaseServer; private itemHelper; private traderHelper; - private profileHelper; - constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, traderHelper: TraderHelper, profileHelper: ProfileHelper); + private extendedProfileHelper; + constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, traderHelper: TraderHelper, extendedProfileHelper: ExtendedProfileHelper); getMiniProfiles(): IMiniProfile[]; getMiniProfile(sessionID: string): any; getCompleteProfile(sessionID: string): IPmcData[]; diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/QuestController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/QuestController.d.ts index bb89a3b..a964c32 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/QuestController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/QuestController.d.ts @@ -8,13 +8,13 @@ import { QuestConditionHelper } from "../helpers/QuestConditionHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; import { PlayerService } from "../services/PlayerService"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IQuest } from "../@types/eft/common/tables/IQuest"; -import { IAcceptQuestRequestData } from "../@types/eft/quests/IAcceptQuestRequestData"; -import { ICompleteQuestRequestData } from "../@types/eft/quests/ICompleteQuestRequestData"; -import { IHandoverQuestRequestData } from "../@types/eft/quests/IHandoverQuestRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IQuest } from "../models/eft/common/tables/IQuest"; +import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; +import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; +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 { private logger; private timeUtil; diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/RagfairController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/RagfairController.d.ts index 0b6757e..6e71edd 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/RagfairController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/RagfairController.d.ts @@ -1,5 +1,5 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { RagfairServer } from "../servers/RagfairServer"; import { SaveServer } from "../servers/SaveServer"; @@ -14,24 +14,24 @@ import { PaymentHelper } from "../helpers/PaymentHelper"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { RagfairHelper } from "../helpers/RagfairHelper"; import { RagfairSellHelper } from "../helpers/RagfairSellHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IAddOfferRequestData, Requirement } from "../@types/eft/ragfair/IAddOfferRequestData"; -import { IExtendOfferRequestData } from "../@types/eft/ragfair/IExtendOfferRequestData"; -import { IGetMarketPriceRequestData } from "../@types/eft/ragfair/IGetMarketPriceRequestData"; -import { ISearchRequestData } from "../@types/eft/ragfair/ISearchRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { IGetItemPriceResult } from "../@types/eft/ragfair/IGetItemPriceResult"; -import { IGetOffersResult } from "../@types/eft/ragfair/IGetOffersResult"; +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 "../@types/eft/profile/IAkiProfile"; -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; import { RagfairSortHelper } from "../helpers/RagfairSortHelper"; import { RagfairTaxHelper } from "../helpers/RagfairTaxHelper"; import { RagfairOfferHelper } from "../helpers/RagfairOfferHelper"; import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairController { private logger; private timeUtil; @@ -57,7 +57,7 @@ export declare class RagfairController { private ragfairOfferGenerator; private configServer; private ragfairConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, httpResponse: HttpResponse, itemEventRouter: ItemEventRouter, ragfairServer: RagfairServer, ragfairPriceService: RagfairPriceService, databaseServer: DatabaseServer, itemHelper: ItemHelper, saveServer: SaveServer, ragfairSellHelper: RagfairSellHelper, ragfairTaxHelper: RagfairTaxHelper, ragfairSortHelper: RagfairSortHelper, ragfairOfferHelper: RagfairOfferHelper, profileHelper: ProfileHelper, paymentService: PaymentService, handbookHelper: HandbookHelper, paymentHelper: PaymentHelper, inventoryHelper: InventoryHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, ragfairOfferGenerator: RagfairOfferGenerator, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter, ragfairServer: RagfairServer, ragfairPriceService: RagfairPriceService, databaseServer: DatabaseServer, itemHelper: ItemHelper, saveServer: SaveServer, ragfairSellHelper: RagfairSellHelper, ragfairTaxHelper: RagfairTaxHelper, ragfairSortHelper: RagfairSortHelper, ragfairOfferHelper: RagfairOfferHelper, profileHelper: ProfileHelper, paymentService: PaymentService, handbookHelper: HandbookHelper, paymentHelper: PaymentHelper, inventoryHelper: InventoryHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, ragfairOfferGenerator: RagfairOfferGenerator, configServer: ConfigServer); getOffers(sessionID: string, info: ISearchRequestData): IGetOffersResult; update(): void; getItemPrice(info: IGetMarketPriceRequestData): IGetItemPriceResult; diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/RepairController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/RepairController.d.ts index 86ab1e1..3a9f3a2 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/RepairController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/RepairController.d.ts @@ -2,15 +2,14 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { QuestHelper } from "../helpers/QuestHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { PaymentService } from "../services/PaymentService"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IRepairActionDataRequest } from "../@types/eft/repair/IRepairActionDataRequest"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { ITraderRepairActionDataRequest } from "../@types/eft/repair/ITraderRepairActionDataRequest"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepairActionDataRequest"; import { ConfigServer } from "../servers/ConfigServer"; -import { IRepairConfig } from "../@types/spt/config/IRepairConfig"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { RepairHelper } from "../helpers/RepairHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RepairController { private logger; private itemEventRouter; @@ -20,7 +19,7 @@ export declare class RepairController { private paymentService; private repairHelper; private configServer; - repairConfig: IRepairConfig; + private repairConfig; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, questHelper: QuestHelper, traderHelper: TraderHelper, paymentService: PaymentService, repairHelper: RepairHelper, configServer: ConfigServer); /** * Repair with trader diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/RepeatableQuestController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/RepeatableQuestController.d.ts index 23d56e5..d2de5df 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/RepeatableQuestController.d.ts @@ -5,20 +5,20 @@ import { JsonUtil } from "../utils/JsonUtil"; import { MathUtil } from "../utils/MathUtil"; import { ItemHelper } from "../helpers/ItemHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IPmcData, TraderInfo } from "../@types/eft/common/IPmcData"; -import { IRepeatableQuestConfig, ELocationName, IQuestConfig } from "../@types/spt/config/IQuestConfig"; -import { IExploration, IRepeatableQuest, IReward, IRewards, IExplorationCondition, ICompletionAvailableFor, IEliminationCondition, ICompletion, IElimination, IPmcDataRepeatableQuest } from "../@types/eft/common/tables/IRepeatableQuests"; -import { Exit } from "../@types/eft/common/ILocationBase"; -import { IRepeatableQuestChangeRequest } from "../@types/eft/quests/IRepeatableQuestChangeRequest"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export interface IQuestTypePool { types: string[]; pool: IQuestPool; @@ -61,7 +61,7 @@ export declare class RepeatableQuestController { private paymentService; private objectId; private configServer; - questConfig: IQuestConfig; + private questConfig; constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, itemEventRouter: ItemEventRouter, paymentService: PaymentService, objectId: ObjectId, configServer: ConfigServer); /** * This is the method reached by the /client/repeatalbeQuests/activityPeriods endpoint diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/TradeController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/TradeController.d.ts index 916ed9c..f0a177b 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/TradeController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/TradeController.d.ts @@ -1,13 +1,13 @@ import { RagfairServer } from "../servers/RagfairServer"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { TradeHelper } from "../helpers/TradeHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IProcessRagfairTradeRequestData } from "../@types/eft/trade/IProcessRagfairTradeRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { Upd } from "../@types/eft/common/tables/IItem"; -import { IProcessBaseTradeRequestData } from "../@types/eft/trade/IProcessBaseTradeRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { Upd } from "../models/eft/common/tables/IItem"; +import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; declare class TradeController { private logger; private itemEventRouter; diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/TraderController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/TraderController.d.ts index e125cf1..5cd85c9 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/TraderController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/TraderController.d.ts @@ -2,12 +2,11 @@ import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { DatabaseServer } from "../servers/DatabaseServer"; import { TraderAssortService } from "../services/TraderAssortService"; -import { IBarterScheme, ITraderAssort, ITraderBase } from "../@types/eft/common/tables/ITrader"; +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 { ITraderConfig } from "../@types/spt/config/ITraderConfig"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; import { TraderAssortHelper } from "../helpers/TraderAssortHelper"; export declare class TraderController { private logger; @@ -19,7 +18,7 @@ export declare class TraderController { private traderAssortService; private jsonUtil; private configServer; - traderConfig: ITraderConfig; + private traderConfig; constructor(logger: ILogger, databaseServer: DatabaseServer, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, timeUtil: TimeUtil, traderAssortService: TraderAssortService, jsonUtil: JsonUtil, configServer: ConfigServer); load(): void; getTrader(traderID: string, sessionID: string): ITraderBase; diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/WeatherController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/WeatherController.d.ts index 2d17179..4f8bcf1 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/WeatherController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/WeatherController.d.ts @@ -1,11 +1,10 @@ import { ConfigServer } from "../servers/ConfigServer"; -import { IWeatherConfig } from "../@types/spt/config/IWeatherConfig"; import { WeatherGenerator } from "../generators/WeatherGenerator"; -import { IWeatherData } from "../@types/eft/weather/IWeatherData"; +import { IWeatherData } from "../models/eft/weather/IWeatherData"; export declare class WeatherController { private weatherGenerator; private configServer; - weatherConfig: IWeatherConfig; + private weatherConfig; constructor(weatherGenerator: WeatherGenerator, configServer: ConfigServer); generate(): IWeatherData; } diff --git a/TypeScript/3.0GetSptConfigFile/types/controllers/WishlistController.d.ts b/TypeScript/3.0GetSptConfigFile/types/controllers/WishlistController.d.ts index c935452..5ef8df3 100644 --- a/TypeScript/3.0GetSptConfigFile/types/controllers/WishlistController.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/controllers/WishlistController.d.ts @@ -1,7 +1,7 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IWishlistActionData } from "../@types/eft/wishlist/IWishlistActionData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { private itemEvenRouter; constructor(itemEvenRouter: ItemEventRouter); diff --git a/TypeScript/3.0GetSptConfigFile/types/di/Container.d.ts b/TypeScript/3.0GetSptConfigFile/types/di/Container.d.ts index bd40dbd..b67523f 100644 --- a/TypeScript/3.0GetSptConfigFile/types/di/Container.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/di/Container.d.ts @@ -1,7 +1,6 @@ import { DependencyContainer } from "tsyringe"; export declare class Container { static registerTypes(depContainer: DependencyContainer): void; - static registerServerSpecificClasses(depContainer: DependencyContainer): void; private static registerUtils; private static registerRouters; private static registerGenerators; diff --git a/TypeScript/3.0GetSptConfigFile/types/di/Router.d.ts b/TypeScript/3.0GetSptConfigFile/types/di/Router.d.ts index d27ac97..ac48587 100644 --- a/TypeScript/3.0GetSptConfigFile/types/di/Router.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/di/Router.d.ts @@ -1,5 +1,6 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IAkiProfile } from "../@types/eft/profile/IAkiProfile"; +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 { private handledRoutes; constructor(); @@ -17,7 +18,7 @@ export declare class DynamicRouter extends Router { } export declare class ItemEventRouterDefinition extends Router { constructor(); - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } export declare class SaveLoadRouter extends Router { constructor(); diff --git a/TypeScript/3.0GetSptConfigFile/types/di/Serializer.d.ts b/TypeScript/3.0GetSptConfigFile/types/di/Serializer.d.ts index 076407d..70aa7c5 100644 --- a/TypeScript/3.0GetSptConfigFile/types/di/Serializer.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/di/Serializer.d.ts @@ -1,4 +1,4 @@ -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class Serializer { serialize(sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; canHandle(something: string): boolean; diff --git a/TypeScript/3.0GetSptConfigFile/types/generators/BotEquipmentGenerator.d.ts b/TypeScript/3.0GetSptConfigFile/types/generators/BotEquipmentGenerator.d.ts deleted file mode 100644 index 2cc98b8..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/generators/BotEquipmentGenerator.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; -import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData"; -import { Chances, Mods } from "../@types/eft/common/tables/IBotType"; -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { HashUtil } from "../utils/HashUtil"; -import { Logger } from "../utils/Logger"; -import { RandomUtil } from "../utils/RandomUtil"; -import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -export declare class BotEquipmentGenerator { - private logger; - private hashUtil; - private randomUtil; - private databaseServer; - private botGeneratorHelper; - private weightedRandomHelper; - constructor(logger: Logger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, botGeneratorHelper: BotGeneratorHelper, weightedRandomHelper: WeightedRandomHelper); - generateEquipment(equipmentSlot: string, equipmentPool: Record, modPool: Mods, spawnChances: Chances, botRole: string, inventory: PmcInventory): void; -} diff --git a/TypeScript/3.0GetSptConfigFile/types/generators/BotGenerator.d.ts b/TypeScript/3.0GetSptConfigFile/types/generators/BotGenerator.d.ts index 4a1b8a3..af7d7d4 100644 --- a/TypeScript/3.0GetSptConfigFile/types/generators/BotGenerator.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/generators/BotGenerator.d.ts @@ -1,20 +1,14 @@ import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; -import { IGenerateBotsRequestData } from "../@types/eft/bot/IGenerateBotsRequestData"; -import { IBotBase } from "../@types/eft/common/tables/IBotBase"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; +import { IBotBase } from "../models/eft/common/tables/IBotBase"; import { DatabaseServer } from "../servers/DatabaseServer"; import { JsonUtil } from "../utils/JsonUtil"; import { ConfigServer } from "../servers/ConfigServer"; import { GameEventHelper } from "../helpers/GameEventHelper"; import { BotInventoryGenerator } from "./BotInventoryGenerator"; import { BotHelper } from "../helpers/BotHelper"; -declare namespace BotGenerator { - interface IRandomisedBotLevelResult { - level: number; - exp: number; - } -} export declare class BotGenerator { private logger; private hashUtil; @@ -28,8 +22,8 @@ export declare class BotGenerator { private botConfig; constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; - generateBot(bot: IBotBase, role: string, isPmc: boolean): IBotBase; - generateRandomLevel(min: number, max: number): BotGenerator.IRandomisedBotLevelResult; + private generateBot; + private generateRandomLevel; /** Converts health object to the required format */ private generateHealth; private generateSkills; @@ -40,4 +34,3 @@ export declare class BotGenerator { private getPMCDifficulty; private generateDogtag; } -export {}; diff --git a/TypeScript/3.0GetSptConfigFile/types/generators/BotInventoryGenerator.d.ts b/TypeScript/3.0GetSptConfigFile/types/generators/BotInventoryGenerator.d.ts index c151b83..e9f09de 100644 --- a/TypeScript/3.0GetSptConfigFile/types/generators/BotInventoryGenerator.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/generators/BotInventoryGenerator.d.ts @@ -1,11 +1,11 @@ -import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData"; -import { Inventory, Chances, Generation, Mods } from "../@types/eft/common/tables/IBotType"; +import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { Inventory, Chances, Generation } from "../models/eft/common/tables/IBotType"; import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; import { BotWeaponGenerator } from "./BotWeaponGenerator"; import { BotLootGenerator } from "./BotLootGenerator"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; export declare class BotInventoryGenerator { @@ -20,6 +20,6 @@ export declare class BotInventoryGenerator { 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; - generateEquipment(equipmentSlot: string, equipmentPool: Record, modPool: Mods, spawnChances: Chances, botRole: string, inventory: PmcInventory): void; + private generateEquipment; private generateInventoryBase; } diff --git a/TypeScript/3.0GetSptConfigFile/types/generators/BotLootGenerator.d.ts b/TypeScript/3.0GetSptConfigFile/types/generators/BotLootGenerator.d.ts index 0ec991e..3bf1b36 100644 --- a/TypeScript/3.0GetSptConfigFile/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/generators/BotLootGenerator.d.ts @@ -1,17 +1,14 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; -import { IBotConfig } from "../@types/spt/config/IBotConfig"; import { HandbookHelper } from "../helpers/HandbookHelper"; import { PMCLootGenerator } from "../generators/PMCLootGenerator"; -import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData"; -import { ItemMinMax, Items } from "../@types/eft/common/tables/IBotType"; +import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { ItemMinMax, Items } from "../models/eft/common/tables/IBotType"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; export declare class BotLootGenerator { - private logger; private jsonUtil; private hashUtil; private randomUtil; @@ -20,8 +17,8 @@ export declare class BotLootGenerator { private botGeneratorHelper; private pmcLootGenerator; private configServer; - botConfig: IBotConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, pmcLootGenerator: PMCLootGenerator, configServer: ConfigServer); + private botConfig; + constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, pmcLootGenerator: PMCLootGenerator, configServer: ConfigServer); generateLoot(lootPool: Items, itemCounts: ItemMinMax, isPmc: boolean, inventory: PmcInventory): void; private getRandomisedCount; private addLootFromPool; diff --git a/TypeScript/3.0GetSptConfigFile/types/generators/BotWeaponGenerator.d.ts b/TypeScript/3.0GetSptConfigFile/types/generators/BotWeaponGenerator.d.ts index 8eb643c..3e9d59c 100644 --- a/TypeScript/3.0GetSptConfigFile/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/generators/BotWeaponGenerator.d.ts @@ -1,11 +1,12 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "../helpers/ItemHelper"; -import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData"; -import { MinMax, ModsChances, Mods } from "../@types/eft/common/tables/IBotType"; +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 { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { RandomUtil } from "../utils/RandomUtil"; export declare class BotWeaponGenerator { private logger; private hashUtil; @@ -13,7 +14,8 @@ export declare class BotWeaponGenerator { private itemHelper; private weightedRandomHelper; private botGeneratorHelper; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper); + private randomUtil; + constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil); generateWeapon(equipmentSlot: string, weaponPool: Record, modPool: Mods, modChances: ModsChances, magCounts: MinMax, botRole: string, isPmc: boolean, inventory: PmcInventory): void; /** Checks if all required slots are occupied on a weapon and all it's mods */ private isWeaponValid; diff --git a/TypeScript/3.0GetSptConfigFile/types/generators/LocationGenerator.d.ts b/TypeScript/3.0GetSptConfigFile/types/generators/LocationGenerator.d.ts index c37814f..b7ba7c5 100644 --- a/TypeScript/3.0GetSptConfigFile/types/generators/LocationGenerator.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/generators/LocationGenerator.d.ts @@ -1,18 +1,17 @@ import { RandomUtil } from "../utils/RandomUtil"; -import { IStaticContainerProps, IStaticLootDetails, IStaticAmmoDetails, IStaticForcedProps } from "../@types/eft/common/tables/ILootBase"; -import { ILooseLoot, SpawnpointTemplate } from "../@types/eft/common/ILooseLoot"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { IStaticContainerProps, IStaticLootDetails, IStaticAmmoDetails, IStaticForcedProps } from "../models/eft/common/tables/ILootBase"; +import { ILooseLoot, SpawnpointTemplate } from "../models/eft/common/ILooseLoot"; +import { Item } from "../models/eft/common/tables/IItem"; import { ItemHelper } from "../helpers/ItemHelper"; import { GameEventHelper } from "../helpers/GameEventHelper"; import { ContainerHelper } from "../helpers/ContainerHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILocationConfig } from "../@types/spt/config/ILocationConfig"; import { JsonUtil } from "../utils/JsonUtil"; import { MathUtil } from "../utils/MathUtil"; import { ObjectId } from "../utils/ObjectId"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export interface IContainerItem { items: Item[]; width: number; @@ -30,7 +29,7 @@ export declare class LocationGenerator { private containerHelper; private presetHelper; private configServer; - locationConfig: ILocationConfig; + private locationConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, objectId: ObjectId, randomUtil: RandomUtil, ragfairServerHelper: RagfairServerHelper, itemHelper: ItemHelper, mathUtil: MathUtil, gameEventHelper: GameEventHelper, containerHelper: ContainerHelper, presetHelper: PresetHelper, configServer: ConfigServer); generateContainerLoot(containerIn: IStaticContainerProps, staticForced: IStaticForcedProps[], staticLootDist: Record, staticAmmoDist: Record, locationName: string): IStaticContainerProps; private getLooseLootMultiplerForLocation; diff --git a/TypeScript/3.0GetSptConfigFile/types/generators/PMCLootGenerator.d.ts b/TypeScript/3.0GetSptConfigFile/types/generators/PMCLootGenerator.d.ts index 1ac7ffe..601431b 100644 --- a/TypeScript/3.0GetSptConfigFile/types/generators/PMCLootGenerator.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/generators/PMCLootGenerator.d.ts @@ -1,14 +1,13 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; -import { IBotConfig } from "../@types/spt/config/IBotConfig"; export declare class PMCLootGenerator { private itemHelper; private databaseServer; private configServer; private pocketLootPool; private backpackLootPool; - botConfig: IBotConfig; + private botConfig; constructor(itemHelper: ItemHelper, databaseServer: DatabaseServer, configServer: ConfigServer); generatePMCPocketLootPool(): string[]; generatePMCBackpackLootPool(): string[]; diff --git a/TypeScript/3.0GetSptConfigFile/types/generators/RagfairAssortGenerator.d.ts b/TypeScript/3.0GetSptConfigFile/types/generators/RagfairAssortGenerator.d.ts index dcdb057..8b52a90 100644 --- a/TypeScript/3.0GetSptConfigFile/types/generators/RagfairAssortGenerator.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/generators/RagfairAssortGenerator.d.ts @@ -1,4 +1,4 @@ -import { Item } from "../@types/eft/common/tables/IItem"; +import { Item } from "../models/eft/common/tables/IItem"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "../helpers/ItemHelper"; import { HashUtil } from "../utils/HashUtil"; diff --git a/TypeScript/3.0GetSptConfigFile/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/3.0GetSptConfigFile/types/generators/RagfairOfferGenerator.d.ts index d28d3af..cb2566c 100644 --- a/TypeScript/3.0GetSptConfigFile/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/generators/RagfairOfferGenerator.d.ts @@ -2,9 +2,9 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; import { SaveServer } from "../servers/SaveServer"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; -import { IBarterScheme } from "../@types/eft/common/tables/ITrader"; -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { IBarterScheme } from "../models/eft/common/tables/ITrader"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { Item } from "../models/eft/common/tables/IItem"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; @@ -15,7 +15,7 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { RagfairPriceService } from "../services/RagfairPriceService"; import { FenceService } from "../services/FenceService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairOfferGenerator { private logger; private jsonUtil; diff --git a/TypeScript/3.0GetSptConfigFile/types/generators/WeatherGenerator.d.ts b/TypeScript/3.0GetSptConfigFile/types/generators/WeatherGenerator.d.ts index 5c340e2..b9faa3a 100644 --- a/TypeScript/3.0GetSptConfigFile/types/generators/WeatherGenerator.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/generators/WeatherGenerator.d.ts @@ -1,7 +1,6 @@ import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; import { ConfigServer } from "../servers/ConfigServer"; -import { IWeatherData } from "../@types/eft/weather/IWeatherData"; -import { IWeatherConfig } from "../@types/spt/config/IWeatherConfig"; +import { IWeatherData } from "../models/eft/weather/IWeatherData"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class WeatherGenerator { @@ -9,7 +8,7 @@ export declare class WeatherGenerator { private randomUtil; private timeUtil; private configServer; - weatherConfig: IWeatherConfig; + private weatherConfig; constructor(weightedRandomHelper: WeightedRandomHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer); calculateTime(data: IWeatherData): IWeatherData; generateWeather(data: IWeatherData): IWeatherData; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/AssortHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/AssortHelper.d.ts index 95b7bf2..33cb5c6 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/AssortHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/AssortHelper.d.ts @@ -1,6 +1,6 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "./ItemHelper"; import { QuestHelper } from "./QuestHelper"; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/BotGeneratorHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/BotGeneratorHelper.d.ts index 83f7068..c3cf4d3 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/BotGeneratorHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/BotGeneratorHelper.d.ts @@ -1,10 +1,9 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; -import { IBotConfig } from "../@types/spt/config/IBotConfig"; -import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData"; -import { ModsChances, Mods } from "../@types/eft/common/tables/IBotType"; -import { Item, Upd } from "../@types/eft/common/tables/IItem"; -import { ITemplateItem } from "../@types/eft/common/tables/ITemplateItem"; +import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { ModsChances, Mods } 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 { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; @@ -12,7 +11,7 @@ import { RandomUtil } from "../utils/RandomUtil"; import { InventoryHelper } from "./InventoryHelper"; import { ContainerHelper } from "./ContainerHelper"; import { ItemHelper } from "./ItemHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; declare class BotGeneratorHelper { private logger; private jsonUtil; @@ -24,7 +23,7 @@ declare class BotGeneratorHelper { private inventoryHelper; private containerHelper; private configServer; - botConfig: IBotConfig; + private botConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer); generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances, isPmc?: boolean): Item[]; /** @@ -44,7 +43,6 @@ declare class BotGeneratorHelper { }; private getModTplFromItemDb; isItemIncompatibleWithCurrentItems(items: Item[], tplToCheck: string, equipmentSlot: string): boolean; - getBiasedRandomNumber(min: number, max: number, shift: number, n: number): number; /** Adds an item with all its childern into specified equipmentSlots, wherever it fits. * Returns a `boolean` indicating success. */ addItemWithChildrenToEquipmentSlot(equipmentSlots: string[], parentId: string, parentTpl: string, itemWithChildren: Item[], inventory: PmcInventory): boolean; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/BotHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/BotHelper.d.ts index 231e114..032218b 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/BotHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/BotHelper.d.ts @@ -1,9 +1,9 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { Difficulty } from "../@types/eft/common/tables/IBotType"; +import { Difficulty } from "../models/eft/common/tables/IBotType"; import { ConfigServer } from "../servers/ConfigServer"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class BotHelper { private logger; private jsonUtil; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/DialogueHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/DialogueHelper.d.ts index abe13de..d8082e4 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/DialogueHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/DialogueHelper.d.ts @@ -1,7 +1,7 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { ItemHelper } from "./ItemHelper"; -import { Dialogue, MessageContent, MessagePreview, MessageType } from "../@types/eft/profile/IAkiProfile"; +import { Dialogue, MessageContent, MessagePreview, MessageType } from "../models/eft/profile/IAkiProfile"; import { HashUtil } from "../utils/HashUtil"; import { NotifierHelper } from "./NotifierHelper"; import { NotificationSendHelper } from "./NotificationSendHelper"; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/DurabilityLimitsHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/DurabilityLimitsHelper.d.ts index 70f545b..ee8c887 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/DurabilityLimitsHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/DurabilityLimitsHelper.d.ts @@ -1,13 +1,12 @@ import { ConfigServer } from "../servers/ConfigServer"; -import { IBotConfig } from "../@types/spt/config/IBotConfig"; -import { ITemplateItem } from "../@types/eft/common/tables/ITemplateItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { RandomUtil } from "../utils/RandomUtil"; import { BotHelper } from "./BotHelper"; export declare class DurabilityLimitsHelper { private randomUtil; private botHelper; private configServer; - botConfig: IBotConfig; + private botConfig; constructor(randomUtil: RandomUtil, botHelper: BotHelper, configServer: ConfigServer); getRandomisedMaxWeaponDurability(itemTemplate: ITemplateItem, botRole: string): number; getRandomisedMaxArmorDurability(itemTemplate: ITemplateItem, botRole: string): number; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/ExtendedProfileHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/ExtendedProfileHelper.d.ts new file mode 100644 index 0000000..22ead31 --- /dev/null +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/ExtendedProfileHelper.d.ts @@ -0,0 +1,22 @@ +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 { 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); + generatePlayerScav(sessionID: string): IPmcData; + private getScavSkills; + private removeSecureContainer; + private getDefaultScavSkills; + private getScavStats; + private getScavLevel; + private getScavExperience; + private setScavCooldownTimer; +} diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/HealthHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/HealthHelper.d.ts index 6cbbe45..fb5bed7 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/HealthHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/HealthHelper.d.ts @@ -1,19 +1,18 @@ import { SaveServer } from "../servers/SaveServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IAkiProfile } from "../@types/eft/profile/IAkiProfile"; -import { ISyncHealthRequestData } from "../@types/eft/health/ISyncHealthRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; import { ConfigServer } from "../servers/ConfigServer"; -import { IHealthConfig } from "../@types/spt/config/IHealthConfig"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class HealthHelper { private jsonUtil; private logger; private timeUtil; private saveServer; private configServer; - healthConfig: IHealthConfig; + private healthConfig; constructor(jsonUtil: JsonUtil, logger: ILogger, timeUtil: TimeUtil, saveServer: SaveServer, configServer: ConfigServer); resetVitality(sessionID: string): IAkiProfile; saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string): void; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/HideoutHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/HideoutHelper.d.ts index 08f30e6..d60e370 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 "../@types/eft/common/IPmcData"; -import { IHideoutSingleProductionStartRequestData } from "../@types/eft/hideout/IHideoutSingleProductionStartRequestData"; -import { StageBonus } from "../@types/eft/hideout/IHideoutArea"; +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 "../@types/eft/hideout/IHideoutContinousProductionStartRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { PlayerService } from "../services/PlayerService"; -import { IHideoutTakeProductionRequestData } from "../@types/eft/hideout/IHideoutTakeProductionRequestData"; +import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; import { InventoryHelper } from "./InventoryHelper"; -import { ITemplateItem } from "../@types/eft/common/tables/ITemplateItem"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class HideoutHelper { private logger; private hashUtil; @@ -29,15 +29,15 @@ export declare class HideoutHelper { private playerService; private configServer; static BITCOIN_FARM: string; - static WATER_COLLECTOR: string; - static BITCOIN: string; - static EXPEDITIONARY_FUEL_TANK: string; + private WATER_COLLECTOR; + private BITCOIN; + private EXPEDITIONARY_FUEL_TANK; static NAME_BACKENDCOUNTERS_CRAFTING: string; static SKILL_NAME_HIDEOUT: string; static HOUR_FOR_SKILL_CRAFTING: number; static SKILL_NAME_CRAFITING: string; private hideoutConfig; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, itemEventRouter: ItemEventRouter, httpResponse: HttpResponse, profileHelper: ProfileHelper, inventoryHelper: InventoryHelper, playerService: PlayerService, configServer: ConfigServer); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, inventoryHelper: InventoryHelper, playerService: PlayerService, configServer: ConfigServer); registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; /** * This convinience function intialies new Production Object diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/InRaidHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/InRaidHelper.d.ts index 24e5f54..e79d384 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/InRaidHelper.d.ts @@ -1,7 +1,7 @@ -import { IPmcData, Victim } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { IPmcData, Victim } 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 { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { JsonUtil } from "../utils/JsonUtil"; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/InsuranceHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/InsuranceHelper.d.ts deleted file mode 100644 index 0bfa37b..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/InsuranceHelper.d.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData"; -import { IInsuranceConfig } from "../@types/spt/config/IInsuranceConfig"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { InsuranceService } from "../services/InsuranceService"; -import { Logger } from "../utils/Logger"; -import { RandomUtil } from "../utils/RandomUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { DialogueHelper } from "./DialogueHelper"; -import { InventoryHelper } from "./InventoryHelper"; -import { TraderHelper } from "./TraderHelper"; -export declare class InsuranceHelper { - private logger; - private insuranceService; - private inventoryHelper; - private randomUtil; - private timeUtil; - private saveServer; - private databaseServer; - private traderHelper; - private dialogueHelper; - private configServer; - insuranceConfig: IInsuranceConfig; - constructor(logger: Logger, insuranceService: InsuranceService, inventoryHelper: InventoryHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, configServer: ConfigServer); - storeLostGear(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; - addGearToSend(pmcData: IPmcData, insuredItem: any, actualItem: any, sessionID: string): any; - storeInsuredItemsForReturn(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; - sendInsuredItems(pmcData: IPmcData, sessionID: string): void; - getPremium(pmcData: IPmcData, inventoryItem: Item, traderId: string): number; -} diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/InventoryHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/InventoryHelper.d.ts index 5d17048..4b3460c 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/InventoryHelper.d.ts @@ -1,6 +1,6 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { FenceService } from "../services/FenceService"; @@ -10,12 +10,12 @@ import { PaymentHelper } from "./PaymentHelper"; import { ProfileHelper } from "./ProfileHelper"; import { DialogueHelper } from "./DialogueHelper"; import { HashUtil } from "../utils/HashUtil"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; -import { IInventoryMoveRequestData } from "../@types/eft/inventory/IInventoryMoveRequestData"; -import { IInventorySplitRequestData } from "../@types/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMergeRequestData } from "../@types/eft/inventory/IInventoryMergeRequestData"; -import { ILogger } from "../@types/spt/utils/ILogger"; +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 { TraderAssortHelper } from "./TraderAssortHelper"; export interface OwnerInventoryItems { from: Item[]; @@ -38,19 +38,12 @@ export declare class InventoryHelper { private profileHelper; private configServer; private inventoryConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, httpResponse: HttpResponse, fenceService: FenceService, databaseServer: DatabaseServer, paymentHelper: PaymentHelper, traderAssortHelper: TraderAssortHelper, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, containerHelper: ContainerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); + 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; removeItem(pmcData: IPmcData, itemId: string, sessionID: string, output?: IItemEventRouterResponse): IItemEventRouterResponse; - getSecureContainerItems(items: Item[]): string[]; getItemSize(itemTpl: string, itemID: string, inventoryItem: Item[]): Record; private getSizeByInventoryItemHash; private getInventoryItemHash; - /** - * Recursively checks if the given item is - * inside the stash, that is it has the stash as - * ancestor with slotId=hideout - */ - isItemInStash(pmcData: IPmcData, item: Item): boolean; getContainerMap(containerW: number, containerH: number, itemList: Item[], containerId: string): number[][]; /** * Based on the item action, determine whose inventories we should be looking at for from and to. diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/ItemHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/ItemHelper.d.ts index 2c894e6..8c1175a 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/ItemHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/ItemHelper.d.ts @@ -1,10 +1,10 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { InsuredItem, IPmcData } from "../@types/eft/common/IPmcData"; -import { ITemplateItem, StackSlot } from "../@types/eft/common/tables/ITemplateItem"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { InsuredItem, IPmcData } from "../models/eft/common/IPmcData"; +import { ITemplateItem, StackSlot } from "../models/eft/common/tables/ITemplateItem"; +import { Item } from "../models/eft/common/tables/IItem"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; declare class ItemHelper { private logger; private hashUtil; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/NotificationSendHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/NotificationSendHelper.d.ts index 40b6dec..b9298da 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/NotificationSendHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/NotificationSendHelper.d.ts @@ -1,5 +1,5 @@ -import { INotification } from "../@types/eft/notifier/INotifier"; -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +import { INotification } from "../models/eft/notifier/INotifier"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; import { NotificationService } from "../services/NotificationService"; export declare class NotificationSendHelper { private httpServer; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/NotifierHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/NotifierHelper.d.ts index 9998054..0d524e9 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/NotifierHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/NotifierHelper.d.ts @@ -1,5 +1,5 @@ -import { INotification } from "../@types/eft/notifier/INotifier"; -import { Message, MessageContentRagfair } from "../@types/eft/profile/IAkiProfile"; +import { INotification } from "../models/eft/notifier/INotifier"; +import { Message, MessageContentRagfair } from "../models/eft/profile/IAkiProfile"; import { HttpServerHelper } from "./HttpServerHelper"; export declare class NotifierHelper { private httpServerHelper; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/PresetHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/PresetHelper.d.ts index 7695248..0a24128 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/PresetHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/PresetHelper.d.ts @@ -1,4 +1,4 @@ -import { Preset } from "../@types/eft/common/IGlobals"; +import { Preset } from "../models/eft/common/IGlobals"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class PresetHelper { private databaseServer; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/ProfileHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/ProfileHelper.d.ts index 1d868b1..515e55e 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/ProfileHelper.d.ts @@ -1,44 +1,33 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { FenceService } from "../services/FenceService"; -import { IPmcData, Skills, Stats } from "../@types/eft/common/IPmcData"; -import { IAkiProfile } from "../@types/eft/profile/IAkiProfile"; -import { IValidateNicknameRequestData } from "../@types/eft/profile/IValidateNicknameRequestData"; +import { IPmcData, Stats } from "../models/eft/common/IPmcData"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { ItemHelper } from "./ItemHelper"; -import { IWatermark } from "../@types/spt/utils/IWatermark"; -import { BotGenerator } from "../generators/BotGenerator"; +import { IWatermark } from "../models/spt/utils/IWatermark"; export declare class ProfileHelper { - private jsonUtil; - private watermark; - private timeUtil; - private saveServer; - private databaseServer; - private botGenerator; - private itemHelper; - private fenceService; - constructor(jsonUtil: JsonUtil, watermark: IWatermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, botGenerator: BotGenerator, itemHelper: ItemHelper, fenceService: FenceService); + protected jsonUtil: JsonUtil; + protected watermark: IWatermark; + 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); resetProfileQuestCondition(sessionID: string, conditionId: string): void; getCompleteProfile(sessionID: string): IPmcData[]; - private isWiped; - getFullProfile(sessionID: string): IAkiProfile; - getPmcProfile(sessionID: string): IPmcData; - getScavProfile(sessionID: string): IPmcData; - setScavProfile(sessionID: string, scavData: IPmcData): void; - getScavSkills(sessionID: string): Skills; - generatePlayerScav(sessionID: string): IPmcData; - private removeSecureContainer; - private getDefaultScavSkills; - getScavStats(sessionID: string): Stats; - getDefaultCounters(): Stats; - getServerVersion(): string; - getScavLevel(sessionID: string): number; - getScavExperience(sessionID: string): number; - setScavCooldownTimer(profile: IPmcData, pmcData: IPmcData): IPmcData; isNicknameTaken(info: IValidateNicknameRequestData, sessionID: string): boolean; getProfileByPmcId(pmcId: string): IPmcData; getExperience(level: number): number; getMaxLevel(): number; getDefaultAkiDataObject(): any; + getFullProfile(sessionID: string): IAkiProfile; + getPmcProfile(sessionID: string): IPmcData; + getScavProfile(sessionID: string): IPmcData; + getDefaultCounters(): Stats; + private isWiped; + private getServerVersion; } diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/QuestConditionHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/QuestConditionHelper.d.ts index 8f7b706..2a0ee94 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/QuestConditionHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/QuestConditionHelper.d.ts @@ -1,4 +1,4 @@ -import { AvailableForConditions } from "../@types/eft/common/tables/IQuest"; +import { AvailableForConditions } from "../models/eft/common/tables/IQuest"; export declare class QuestConditionHelper { getQuestConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; getLevelConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/QuestHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/QuestHelper.d.ts index c29158b..3474884 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/QuestHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/QuestHelper.d.ts @@ -8,15 +8,14 @@ import { ProfileHelper } from "./ProfileHelper"; import { DialogueHelper } from "./DialogueHelper"; import { PaymentHelper } from "./PaymentHelper"; import { TraderHelper } from "./TraderHelper"; -import { IPmcData, Quest } from "../@types/eft/common/IPmcData"; -import { AvailableForConditions, AvailableForProps, IQuest, Reward } from "../@types/eft/common/tables/IQuest"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IAcceptQuestRequestData } from "../@types/eft/quests/IAcceptQuestRequestData"; -import { ICompleteQuestRequestData } from "../@types/eft/quests/ICompleteQuestRequestData"; +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 { IQuestConfig } from "../@types/spt/config/IQuestConfig"; import { RagfairServerHelper } from "./RagfairServerHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class QuestHelper { private logger; private jsonUtil; @@ -31,7 +30,7 @@ export declare class QuestHelper { private paymentHelper; private traderHelper; private configServer; - questConfig: IQuestConfig; + private questConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer); static get STATUS(): Record; questStatus(pmcData: IPmcData, questID: string): string; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairHelper.d.ts index 7d867bb..2bce4a6 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairHelper.d.ts @@ -1,15 +1,15 @@ import { JsonUtil } from "../utils/JsonUtil"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; -import { IGetOffersResult } from "../@types/eft/ragfair/IGetOffersResult"; -import { ISearchRequestData } from "../@types/eft/ragfair/ISearchRequestData"; +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 { DatabaseServer } from "../servers/DatabaseServer"; 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 "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; import { TraderAssortHelper } from "./TraderAssortHelper"; export declare class RagfairHelper { private logger; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairOfferHelper.d.ts index 873271f..da3ceb8 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairOfferHelper.d.ts @@ -1,9 +1,9 @@ import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; -import { ISearchRequestData } from "../@types/eft/ragfair/ISearchRequestData"; +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 { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { RagfairOfferService } from "../services/RagfairOfferService"; @@ -17,7 +17,7 @@ import { ConfigServer } from "../servers/ConfigServer"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { RagfairSortHelper } from "./RagfairSortHelper"; import { RagfairHelper } from "./RagfairHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairOfferHelper { private logger; private timeUtil; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairSellHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairSellHelper.d.ts index 2e21589..929d112 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairSellHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairSellHelper.d.ts @@ -1,6 +1,5 @@ -import { SellResult } from "../@types/eft/ragfair/IRagfairOffer"; -import { IRagfairConfig } from "../@types/spt/config/IRagfairConfig"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { SellResult } from "../models/eft/ragfair/IRagfairOffer"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; @@ -9,7 +8,7 @@ export declare class RagfairSellHelper { private randomUtil; private timeUtil; private configServer; - ragfairConfig: IRagfairConfig; + private ragfairConfig; constructor(logger: ILogger, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer); calculateSellChance(baseChance: number, offerPrice: number, requirementsPriceInRub: number): number; rollForSale(sellChance: number, count: number): SellResult[]; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairServerHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairServerHelper.d.ts index 51b02cb..9a26261 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairServerHelper.d.ts @@ -1,13 +1,13 @@ import { SaveServer } from "../servers/SaveServer"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { ITemplateItem } from "../@types/eft/common/tables/ITemplateItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { ItemHelper } from "./ItemHelper"; import { ProfileHelper } from "./ProfileHelper"; -import { MemberCategory } from "../@types/eft/common/MemberCategory"; +import { MemberCategory } from "../models/eft/common/MemberCategory"; import { ConfigServer } from "../servers/ConfigServer"; import { RandomUtil } from "../utils/RandomUtil"; import { DialogueHelper } from "./DialogueHelper"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { Item } from "../models/eft/common/tables/IItem"; import { JsonUtil } from "../utils/JsonUtil"; import { HashUtil } from "../utils/HashUtil"; export declare class RagfairServerHelper { diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairSortHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairSortHelper.d.ts index fbd4b78..e9d8069 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairSortHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairSortHelper.d.ts @@ -1,4 +1,4 @@ -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class RagfairSortHelper { private databaseServer; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairTaxHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairTaxHelper.d.ts index bb78afd..e87334f 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairTaxHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/RagfairTaxHelper.d.ts @@ -1,9 +1,9 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; import { DatabaseServer } from "../servers/DatabaseServer"; import { RagfairPriceService } from "../services/RagfairPriceService"; import { ItemHelper } from "./ItemHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairTaxHelper { private logger; private databaseServer; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/RepairHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/RepairHelper.d.ts index f2852d7..d11d0d2 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/RepairHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/RepairHelper.d.ts @@ -1,18 +1,17 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; import { ConfigServer } from "../servers/ConfigServer"; -import { IRepairConfig } from "../@types/spt/config/IRepairConfig"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RepairHelper { private logger; private jsonUtil; private randomUtil; private databaseServer; private configServer; - repairConfig: IRepairConfig; + private repairConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); updateItemDurability(itemToRepairId: string, amountToRepair: number, pmcData: IPmcData, useRepairKit?: boolean): Item; private getRandomisedArmorRepairDegredationValue; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/SecureContainerHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/SecureContainerHelper.d.ts new file mode 100644 index 0000000..8f246b6 --- /dev/null +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/SecureContainerHelper.d.ts @@ -0,0 +1,13 @@ +import { Item } from "../models/eft/common/tables/IItem"; +import { ItemHelper } from "./ItemHelper"; +export interface OwnerInventoryItems { + from: Item[]; + to: Item[]; + sameInventory: boolean; + isMail: boolean; +} +export declare class SecureContainerHelper { + private itemHelper; + constructor(itemHelper: ItemHelper); + getSecureContainerItems(items: Item[]): string[]; +} diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/TradeHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/TradeHelper.d.ts index f3d9a50..0712ff4 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/TradeHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/TradeHelper.d.ts @@ -3,14 +3,14 @@ import { InventoryHelper } from "../helpers/InventoryHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { FenceService } from "../services/FenceService"; import { PaymentService } from "../services/PaymentService"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IProcessBuyTradeRequestData } from "../@types/eft/trade/IProcessBuyTradeRequestData"; -import { IProcessSellTradeRequestData } from "../@types/eft/trade/IProcessSellTradeRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { Upd } from "../@types/eft/common/tables/IItem"; +import { IPmcData } from "../models/eft/common/IPmcData"; +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 "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class TradeHelper { private logger; private itemEventRouter; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/TraderAssortHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/TraderAssortHelper.d.ts index 7dfed48..d95879c 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/TraderAssortHelper.d.ts @@ -1,5 +1,5 @@ -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { ILogger } from "../models/spt/utils/ILogger"; import { RagfairAssortGenerator } from "../generators/RagfairAssortGenerator"; import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; import { DatabaseServer } from "../servers/DatabaseServer"; diff --git a/TypeScript/3.0GetSptConfigFile/types/helpers/TraderHelper.d.ts b/TypeScript/3.0GetSptConfigFile/types/helpers/TraderHelper.d.ts index d9f37a7..5440afe 100644 --- a/TypeScript/3.0GetSptConfigFile/types/helpers/TraderHelper.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/helpers/TraderHelper.d.ts @@ -6,10 +6,10 @@ import { ItemHelper } from "./ItemHelper"; import { ProfileHelper } from "./ProfileHelper"; import { PaymentHelper } from "./PaymentHelper"; import { FenceService } from "../services/FenceService"; -import { IBarterScheme, ITraderAssort, ITraderBase, LoyaltyLevel } from "../@types/eft/common/tables/ITrader"; -import { IPmcData } from "../@types/eft/common/IPmcData"; +import { IBarterScheme, ITraderAssort, ITraderBase, LoyaltyLevel } from "../models/eft/common/tables/ITrader"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class TraderHelper { private logger; private databaseServer; diff --git a/TypeScript/3.0GetSptConfigFile/types/ide/CheckVersion.d.ts b/TypeScript/3.0GetSptConfigFile/types/ide/CheckVersion.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/ide/CheckVersion.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/3.0GetSptConfigFile/types/ide/Compiler.d.ts b/TypeScript/3.0GetSptConfigFile/types/ide/Compiler.d.ts index cb0ff5c..fded23a 100644 --- a/TypeScript/3.0GetSptConfigFile/types/ide/Compiler.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/ide/Compiler.d.ts @@ -1 +1 @@ -export {}; +import "reflect-metadata"; diff --git a/TypeScript/3.0GetSptConfigFile/types/loaders/DelayedModLoader.d.ts b/TypeScript/3.0GetSptConfigFile/types/loaders/DelayedModLoader.d.ts index ed6d3f8..db86c75 100644 --- a/TypeScript/3.0GetSptConfigFile/types/loaders/DelayedModLoader.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/loaders/DelayedModLoader.d.ts @@ -3,13 +3,15 @@ import { VFS } from "../utils/VFS"; import { InitialModLoader } from "./InitialModLoader"; import { BundleLoader } from "./BundleLoader"; import { HandbookController } from "../controllers/HandbookController"; -import { IModLoader } from "../@types/spt/mod/IModLoader"; +import { IModLoader } from "../models/spt/mod/IModLoader"; +import { ModCompilerService } from "../services/ModCompilerService"; export declare class DelayedModLoader implements IModLoader { private bundleLoader; private handbookController; private vfs; + private modCompilerService; private initialModLoader; - constructor(bundleLoader: BundleLoader, handbookController: HandbookController, vfs: VFS, initialModLoader: InitialModLoader); + constructor(bundleLoader: BundleLoader, handbookController: HandbookController, vfs: VFS, modCompilerService: ModCompilerService, initialModLoader: InitialModLoader); getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; getImportedModsNames(): string[]; diff --git a/TypeScript/3.0GetSptConfigFile/types/loaders/IMod.d.ts b/TypeScript/3.0GetSptConfigFile/types/loaders/IMod.d.ts deleted file mode 100644 index 20813f9..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/loaders/IMod.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export interface IMod { - onload(): any; -} -export interface IContainerMod extends IMod { - onContainerLoad(): any; -} diff --git a/TypeScript/3.0GetSptConfigFile/types/loaders/InitialModLoader.d.ts b/TypeScript/3.0GetSptConfigFile/types/loaders/InitialModLoader.d.ts index 612c821..35503c8 100644 --- a/TypeScript/3.0GetSptConfigFile/types/loaders/InitialModLoader.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/loaders/InitialModLoader.d.ts @@ -1,20 +1,24 @@ -import { DependencyContainer } from 'tsyringe'; +import { DependencyContainer } from "tsyringe"; import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; -import { IModLoader } from "../@types/spt/mod/IModLoader"; -import { ILogger } from '../@types/spt/utils/ILogger'; +import { ModCompilerService } from "../services/ModCompilerService"; +import { HashCacheService } from "../services/HashCacheService"; +import { IModLoader } from "../models/spt/mod/IModLoader"; export declare class InitialModLoader implements IModLoader { private logger; private vfs; private jsonUtil; + private modCompilerService; + private hashCacheService; private configServer; - private basepath; + private readonly basepath; private imported; private onLoad; private akiConfig; - constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, configServer: ConfigServer); - load(container: DependencyContainer): void; + constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, hashCacheService: HashCacheService, configServer: ConfigServer); + load(container: DependencyContainer): Promise; getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; getImportedModsNames(): string[]; @@ -23,7 +27,9 @@ export declare class InitialModLoader implements IModLoader { private importMods; private isModCombatibleWithAki; private executeMods; + private sortModsLoadOrder; private addMod; + private compileModIfNeeded; private areModDependenciesFulfilled; private isModCompatible; private validMod; diff --git a/TypeScript/3.0GetSptConfigFile/types/loaders/ModLoader.d.ts b/TypeScript/3.0GetSptConfigFile/types/loaders/ModLoader.d.ts deleted file mode 100644 index eed6d69..0000000 --- a/TypeScript/3.0GetSptConfigFile/types/loaders/ModLoader.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { IPackageJsonData } from "../@types/spt/mod/IPackageJsonData"; -export declare class ModLoader { - static basepath: string; - static imported: {}; - static onLoad: {}; - static load(): void; - static getBundles(local: any): string; - static getBundle(key: any, arg1: any): void; - static importClass(name: string, filepath: string): void; - static importMods(): void; - static isModCombatibleWithAki(mod: IPackageJsonData): boolean; - static executeMods(): void; - static getModPath(mod: string): string; - static addMod(mod: string): void; - static areModDependenciesFulfilled(mod: IPackageJsonData, loadedMods: any): boolean; - static isModCompatible(mod: any, loadedMods: any): boolean; - static validMod(mod: any): boolean; - static getLoadOrderRecursive(mod: any, result: any, visited: any): void; - static getLoadOrder(mods: any): {}; -} diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/bot/IGenerateBotsRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/bot/IGenerateBotsRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/bot/IGenerateBotsRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/bot/IGenerateBotsRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/common/IEmptyRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/common/IEmptyRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/common/IEmptyRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/common/IEmptyRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/common/IGlobals.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/common/IGlobals.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/common/IGlobals.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/common/IGlobals.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/common/ILocation.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/common/ILocation.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/common/ILocation.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/common/ILocation.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/common/ILocationBase.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/common/ILocationBase.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/common/ILocationBase.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/common/ILocationBase.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/common/ILocationsSourceDestinationBase.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/common/ILocationsSourceDestinationBase.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/common/ILocationsSourceDestinationBase.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/common/ILocationsSourceDestinationBase.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/common/ILooseLoot.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/common/ILooseLoot.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/common/ILooseLoot.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/common/ILooseLoot.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/common/IMetricsTableData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/common/IMetricsTableData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/common/IMetricsTableData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/common/IMetricsTableData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/common/IPmcData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/common/IPmcData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/common/IPmcData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/common/IPmcData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/common/MemberCategory.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/common/MemberCategory.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/common/MemberCategory.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/common/MemberCategory.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/common/request/IBaseInteractionRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/common/request/IBaseInteractionRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/common/request/IBaseInteractionRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/common/request/IBaseInteractionRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/common/tables/IBotBase.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/IBotBase.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/common/tables/IBotBase.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/IBotBase.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/common/tables/IBotCore.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/IBotCore.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/common/tables/IBotCore.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/IBotCore.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/common/tables/IBotType.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/IBotType.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/common/tables/IBotType.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/IBotType.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/common/tables/ICustomizationItem.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/ICustomizationItem.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/common/tables/ICustomizationItem.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/ICustomizationItem.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/common/tables/IHandbookBase.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/IHandbookBase.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/common/tables/IHandbookBase.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/IHandbookBase.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/common/tables/IItem.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/IItem.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/common/tables/IItem.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/IItem.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/common/tables/ILocationsBase.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/ILocationsBase.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/common/tables/ILocationsBase.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/ILocationsBase.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/common/tables/ILootBase.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/ILootBase.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/common/tables/ILootBase.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/ILootBase.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/common/tables/IQuest.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/IQuest.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/common/tables/IQuest.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/IQuest.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/IRepeatableQuests.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/common/tables/IRepeatableQuests.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/IRepeatableQuests.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/common/tables/ITemplateItem.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/ITemplateItem.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/common/tables/ITemplateItem.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/ITemplateItem.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/common/tables/ITrader.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/ITrader.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/common/tables/ITrader.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/common/tables/ITrader.d.ts diff --git a/TypeScript/1LogToConsole/types/@types/eft/customization/IBuyClothingRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/customization/IBuyClothingRequestData.d.ts similarity index 71% rename from TypeScript/1LogToConsole/types/@types/eft/customization/IBuyClothingRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/customization/IBuyClothingRequestData.d.ts index be5d930..d19b70d 100644 --- a/TypeScript/1LogToConsole/types/@types/eft/customization/IBuyClothingRequestData.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/models/eft/customization/IBuyClothingRequestData.d.ts @@ -1,9 +1,9 @@ export interface IBuyClothingRequestData { Action: "CustomizationBuy"; offer: string; - items: Item[]; + items: ClothingItem[]; } -export interface Item { +export interface ClothingItem { del: boolean; id: string; count: number; diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/customization/IWearClothingRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/customization/IWearClothingRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/customization/IWearClothingRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/customization/IWearClothingRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/dialog/IFriendRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/dialog/IFriendRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/dialog/IFriendRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/dialog/IFriendRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/dialog/IGetAllAttachmentsRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/dialog/IGetAllAttachmentsRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/dialog/IGetAllAttachmentsResponse.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/dialog/IGetAllAttachmentsResponse.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/dialog/IGetChatServerListRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/dialog/IGetChatServerListRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/dialog/IGetChatServerListRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/dialog/IGetChatServerListRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/dialog/IGetFriendListDataResponse.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/dialog/IGetFriendListDataResponse.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/dialog/IGetFriendListDataResponse.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/dialog/IGetFriendListDataResponse.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/dialog/IGetMailDialogInfoRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/dialog/IGetMailDialogInfoRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/dialog/IGetMailDialogListRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/dialog/IGetMailDialogListRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/dialog/IGetMailDialogViewRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/dialog/IGetMailDialogViewRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/dialog/IGetMailDialogViewResponseData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/dialog/IGetMailDialogViewResponseData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/dialog/IPinDialogRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/dialog/IPinDialogRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/dialog/IPinDialogRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/dialog/IPinDialogRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/dialog/IRemoveDialogRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/dialog/IRemoveDialogRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/dialog/IRemoveDialogRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/dialog/IRemoveDialogRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/dialog/ISendMessageRequest.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/dialog/ISendMessageRequest.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/dialog/ISendMessageRequest.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/dialog/ISendMessageRequest.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/dialog/ISetDialogReadRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/dialog/ISetDialogReadRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/dialog/ISetDialogReadRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/dialog/ISetDialogReadRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/game/IGameConfigResponse.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/game/IGameConfigResponse.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/game/IGameConfigResponse.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/game/IGameConfigResponse.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/game/IGameEmptyCrcRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/game/IGameEmptyCrcRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/game/IGameEmptyCrcRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/game/IGameEmptyCrcRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/game/IVersionValidateRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/game/IVersionValidateRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/game/IVersionValidateRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/game/IVersionValidateRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/health/IHealthTreatmentRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/health/IHealthTreatmentRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/health/IHealthTreatmentRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/health/IHealthTreatmentRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/health/IOffraidEatRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/health/IOffraidEatRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/health/IOffraidEatRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/health/IOffraidEatRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/health/IOffraidHealRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/health/IOffraidHealRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/health/IOffraidHealRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/health/IOffraidHealRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/health/ISyncHealthRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/health/ISyncHealthRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/health/ISyncHealthRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/health/ISyncHealthRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/HideoutAreasEnum.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/hideout/HideoutAreasEnum.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/HideoutAreasEnum.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/hideout/HideoutAreasEnum.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/IHideoutArea.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/hideout/IHideoutArea.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/IHideoutArea.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/hideout/IHideoutArea.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/IHideoutProduction.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/hideout/IHideoutProduction.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/IHideoutProduction.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/hideout/IHideoutProduction.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/IHideoutPutItemInRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/IHideoutPutItemInRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/IHideoutScavCase.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/hideout/IHideoutScavCase.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/IHideoutScavCase.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/hideout/IHideoutScavCase.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/IHideoutScavCaseStartRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/IHideoutScavCaseStartRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/IHideoutSettingsBase.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/hideout/IHideoutSettingsBase.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/IHideoutSettingsBase.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/hideout/IHideoutSettingsBase.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/IHideoutTakeItemOutRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/IHideoutTakeItemOutRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/IHideoutTakeProductionRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/IHideoutTakeProductionRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/IHideoutToggleAreaRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/IHideoutToggleAreaRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/IHideoutUpgradeRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/hideout/IHideoutUpgradeRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/httpResponse/IGetBodyResponseData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/httpResponse/IGetBodyResponseData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/httpResponse/IGetBodyResponseData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/httpResponse/IGetBodyResponseData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/httpResponse/INullResponseData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/httpResponse/INullResponseData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/httpResponse/INullResponseData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/httpResponse/INullResponseData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/inRaid/IRegisterPlayerRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/inRaid/IRegisterPlayerRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/inRaid/ISaveProgressRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/inRaid/ISaveProgressRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/inRaid/ISaveProgressRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/inRaid/ISaveProgressRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/insurance/IGetInsuranceCostRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/insurance/IGetInsuranceCostRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/insurance/IInsureRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/insurance/IInsureRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/insurance/IInsureRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/insurance/IInsureRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventoryAddRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventoryAddRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventoryAddRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventoryAddRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventoryBaseActionRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventoryBaseActionRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventoryBindRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventoryBindRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventoryBindRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventoryBindRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventoryCreateMarkerRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventoryCreateMarkerRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventoryEditMarkerRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventoryEditMarkerRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventoryExamineRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventoryExamineRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventoryExamineRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventoryExamineRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventoryFoldRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventoryFoldRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventoryFoldRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventoryFoldRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventoryMergeRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventoryMergeRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventoryMergeRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventoryMergeRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventoryMoveRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventoryMoveRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventoryMoveRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventoryMoveRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventoryRemoveRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventoryRemoveRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventorySortRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventorySortRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventorySortRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventorySortRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventorySplitRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventorySplitRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventorySplitRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventorySplitRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventorySwapRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventorySwapRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventorySwapRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventorySwapRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventoryTagRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventoryTagRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventoryTagRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventoryTagRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventoryToggleRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventoryToggleRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventoryToggleRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventoryToggleRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventoryTransferRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventoryTransferRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/inventory/IInventoryTransferRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/inventory/IInventoryTransferRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/itemEvent/IItemEventRouterBase.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/itemEvent/IItemEventRouterBase.d.ts similarity index 91% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/itemEvent/IItemEventRouterBase.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/itemEvent/IItemEventRouterBase.d.ts index 0e12850..31e62fe 100644 --- a/TypeScript/4UseACustomConfigFile/types/@types/eft/itemEvent/IItemEventRouterBase.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/models/eft/itemEvent/IItemEventRouterBase.d.ts @@ -49,9 +49,15 @@ export interface Product { _tpl?: string; parentId?: string; slotId?: string; - location?: any; + location?: ItemChangeLocation; upd?: Upd; } +export interface ItemChangeLocation { + x: number; + y: number; + r: number; + isSearched?: boolean; +} export interface TraderRelations { salesSum?: number; standing?: number; diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/itemEvent/IItemEventRouterRequest.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/itemEvent/IItemEventRouterRequest.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/itemEvent/IItemEventRouterResponse.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/itemEvent/IItemEventRouterResponse.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/launcher/IChangeRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/launcher/IChangeRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/launcher/IChangeRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/launcher/IChangeRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/launcher/IGetMiniProfileRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/launcher/IGetMiniProfileRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/launcher/ILoginRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/launcher/ILoginRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/launcher/ILoginRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/launcher/ILoginRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/launcher/IMiniProfile.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/launcher/IMiniProfile.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/launcher/IMiniProfile.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/launcher/IMiniProfile.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/launcher/IRegisterData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/launcher/IRegisterData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/launcher/IRegisterData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/launcher/IRegisterData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/launcher/IRemoveProfileData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/launcher/IRemoveProfileData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/launcher/IRemoveProfileData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/launcher/IRemoveProfileData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/location/IGetLocationRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/location/IGetLocationRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/location/IGetLocationRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/location/IGetLocationRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/match/IEndOfflineRaidRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/match/IEndOfflineRaidRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/match/IEndOfflineRaidRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/match/IEndOfflineRaidRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/match/IStartOffineRaidRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/match/IStartOffineRaidRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/match/IStartOffineRaidRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/match/IStartOffineRaidRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/notes/INoteActionData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/notes/INoteActionData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/notes/INoteActionData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/notes/INoteActionData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/notifier/INotifier.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/notifier/INotifier.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/notifier/INotifier.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/notifier/INotifier.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/notifier/ISelectProfileRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/notifier/ISelectProfileRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/notifier/ISelectProfileRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/notifier/ISelectProfileRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/presetBuild/IPresetBuildActionRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/presetBuild/IPresetBuildActionRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/profile/IAkiProfile.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/profile/IAkiProfile.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/profile/IAkiProfile.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/profile/IAkiProfile.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/profile/IProfileChangeNicknameRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/profile/IProfileChangeNicknameRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/profile/IProfileChangeVoiceRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/profile/IProfileChangeVoiceRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/profile/IProfileCreateRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/profile/IProfileCreateRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/profile/IProfileCreateRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/profile/IProfileCreateRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/profile/ISearchFriendRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/profile/ISearchFriendRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/profile/ISearchFriendRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/profile/ISearchFriendRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/profile/ISearchFriendResponse.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/profile/ISearchFriendResponse.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/profile/ISearchFriendResponse.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/profile/ISearchFriendResponse.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/profile/IValidateNicknameRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/profile/IValidateNicknameRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/profile/IValidateNicknameRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/profile/IValidateNicknameRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/quests/IAcceptQuestRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/quests/IAcceptQuestRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/quests/IAcceptQuestRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/quests/IAcceptQuestRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/quests/ICompleteQuestRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/quests/ICompleteQuestRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/quests/ICompleteQuestRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/quests/ICompleteQuestRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/quests/IHandoverQuestRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/quests/IHandoverQuestRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/quests/IHandoverQuestRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/quests/IHandoverQuestRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/quests/IListQuestsRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/quests/IListQuestsRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/quests/IListQuestsRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/quests/IListQuestsRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/quests/IRepeatableQuestChangeRequest.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/quests/IRepeatableQuestChangeRequest.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/ragfair/IAddOfferRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/ragfair/IAddOfferRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/ragfair/IAddOfferRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/ragfair/IAddOfferRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/ragfair/IExtendOfferRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/ragfair/IExtendOfferRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/ragfair/IExtendOfferRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/ragfair/IExtendOfferRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/ragfair/IGetItemPriceResult.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/ragfair/IGetItemPriceResult.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/ragfair/IGetItemPriceResult.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/ragfair/IGetItemPriceResult.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/ragfair/IGetMarketPriceRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/ragfair/IGetMarketPriceRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/ragfair/IGetOffersResult.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/ragfair/IGetOffersResult.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/ragfair/IGetOffersResult.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/ragfair/IGetOffersResult.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/ragfair/IRagfairOffer.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/ragfair/IRagfairOffer.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/ragfair/IRagfairOffer.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/ragfair/IRemoveOfferRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/ragfair/IRemoveOfferRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/ragfair/ISearchRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/ragfair/ISearchRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/ragfair/ISearchRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/repair/IBaseRepairActionDataRequest.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/repair/IBaseRepairActionDataRequest.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/repair/IRepairActionDataRequest.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/repair/IRepairActionDataRequest.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/repair/IRepairActionDataRequest.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/repair/IRepairActionDataRequest.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/repair/ITraderRepairActionDataRequest.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/repair/ITraderRepairActionDataRequest.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/trade/IProcessBaseTradeRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/trade/IProcessBaseTradeRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/trade/IProcessBuyTradeRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/trade/IProcessBuyTradeRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/trade/IProcessRagfairTradeRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/trade/IProcessRagfairTradeRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/trade/IProcessSellTradeRequestData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/trade/IProcessSellTradeRequestData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/trade/IProcessSellTradeRequestData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/trade/IProcessSellTradeRequestData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/weather/IWeatherData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/weather/IWeatherData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/weather/IWeatherData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/weather/IWeatherData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/wishlist/IWishlistActionData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/eft/wishlist/IWishlistActionData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/eft/wishlist/IWishlistActionData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/eft/wishlist/IWishlistActionData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/external/mod.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/external/mod.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/external/mod.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/external/mod.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/external/tsyringe.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/external/tsyringe.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/external/tsyringe.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/external/tsyringe.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/bindings/Route.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/bindings/Route.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/bindings/Route.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/bindings/Route.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IBotCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IBotCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IBotCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IBotCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IBundleCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IBundleCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IBundleCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IBundleCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/ICustomizationCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/ICustomizationCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/ICustomizationCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/ICustomizationCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IDataCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IDataCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IDataCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IDataCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IDialogueCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IDialogueCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IDialogueCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IDialogueCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IGameCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IGameCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IGameCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IGameCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IHandbookCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IHandbookCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IHandbookCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IHandbookCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IHealthCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IHealthCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IHealthCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IHealthCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IHideoutCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IHideoutCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IHideoutCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IHideoutCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IHttpCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IHttpCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IHttpCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IHttpCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IInraidCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IInraidCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IInraidCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IInraidCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IInsuranceCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IInsuranceCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IInsuranceCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IInsuranceCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IInventoryCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IInventoryCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IInventoryCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IInventoryCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IItemEventCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IItemEventCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IItemEventCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IItemEventCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/ILauncherCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/ILauncherCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/ILauncherCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/ILauncherCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/ILocationCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/ILocationCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/ILocationCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/ILocationCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IMatchCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IMatchCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IMatchCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IMatchCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IModCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IModCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IModCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IModCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/INoteCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/INoteCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/INoteCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/INoteCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/INotifierCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/INotifierCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/INotifierCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/INotifierCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IPresetBuildCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IPresetBuildCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IPresetCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IPresetCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IPresetCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IPresetCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IProfileCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IProfileCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IProfileCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IProfileCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IQuestCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IQuestCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IQuestCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IQuestCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IRagfairCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IRagfairCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IRagfairCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IRagfairCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IRepairCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IRepairCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IRepairCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IRepairCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/ISaveCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/ISaveCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/ISaveCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/ISaveCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/ITradeCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/ITradeCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/ITradeCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/ITradeCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/ITraderCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/ITraderCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/ITraderCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/ITraderCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IWeatherCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IWeatherCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IWeatherCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IWeatherCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IWishlistCallbacks.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IWishlistCallbacks.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/callbacks/IWishlistCallbacks.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/callbacks/IWishlistCallbacks.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/config/IAirdropConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/config/IAirdropConfig.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/config/IAirdropConfig.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/config/IAirdropConfig.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/config/IBaseConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/config/IBaseConfig.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/config/IBaseConfig.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/config/IBaseConfig.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/config/IBotConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/config/IBotConfig.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/config/IBotConfig.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/config/IBotConfig.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/config/ICoreConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/config/ICoreConfig.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/config/ICoreConfig.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/config/ICoreConfig.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/config/IHealthConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/config/IHealthConfig.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/config/IHealthConfig.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/config/IHealthConfig.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/config/IHideoutConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/config/IHideoutConfig.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/config/IHideoutConfig.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/config/IHideoutConfig.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/config/IHttpConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/config/IHttpConfig.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/config/IHttpConfig.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/config/IHttpConfig.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/config/IInRaidConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/config/IInRaidConfig.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/config/IInRaidConfig.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/config/IInRaidConfig.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/config/IInsuranceConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/config/IInsuranceConfig.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/config/IInsuranceConfig.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/config/IInsuranceConfig.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/config/IInventoryConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/config/IInventoryConfig.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/config/IInventoryConfig.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/config/IInventoryConfig.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/config/ILocationConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/config/ILocationConfig.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/config/ILocationConfig.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/config/ILocationConfig.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/config/IMatchConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/config/IMatchConfig.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/config/IMatchConfig.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/config/IMatchConfig.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/config/IQuestConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/config/IQuestConfig.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/config/IQuestConfig.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/config/IQuestConfig.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/config/IRagfairConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/config/IRagfairConfig.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/config/IRagfairConfig.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/config/IRagfairConfig.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/config/IRepairConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/config/IRepairConfig.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/config/IRepairConfig.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/config/IRepairConfig.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/config/ITraderConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/config/ITraderConfig.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/config/ITraderConfig.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/config/ITraderConfig.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/config/IWeatherConfig.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/config/IWeatherConfig.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/config/IWeatherConfig.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/config/IWeatherConfig.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/controllers/IBotController.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/controllers/IBotController.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/controllers/IBotController.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/controllers/IBotController.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/generators/IBotGenerator.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/generators/IBotGenerator.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/generators/IBotGenerator.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/generators/IBotGenerator.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/generators/ILocationGenerator.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/generators/ILocationGenerator.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/generators/ILocationGenerator.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/generators/ILocationGenerator.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/generators/IPMCLootGenerator.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/generators/IPMCLootGenerator.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/generators/IPMCLootGenerator.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/generators/IPMCLootGenerator.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/generators/IRagfairAssortGenerator.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/generators/IRagfairAssortGenerator.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/generators/IRagfairAssortGenerator.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/generators/IRagfairAssortGenerator.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/generators/IRagfairOfferGenerator.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/generators/IRagfairOfferGenerator.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/generators/IRagfairOfferGenerator.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/generators/IRagfairOfferGenerator.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/helpers/Traders.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/helpers/Traders.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/helpers/Traders.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/helpers/Traders.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/mod/IMod.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/mod/IMod.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/mod/IMod.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/mod/IMod.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/mod/IModLoader.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/mod/IModLoader.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/mod/IModLoader.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/mod/IModLoader.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/mod/IPackageJsonData.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/mod/IPackageJsonData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/mod/IPackageJsonData.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/mod/IPackageJsonData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/ragfair/IRagfairServerPrices.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/ragfair/IRagfairServerPrices.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/ragfair/IRagfairServerPrices.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/ragfair/IRagfairServerPrices.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/server/IDatabaseTables.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/server/IDatabaseTables.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/server/IDatabaseTables.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/server/IDatabaseTables.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/server/IHttpServer.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/server/IHttpServer.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/server/IHttpServer.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/server/IHttpServer.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/server/ILocaleBase.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/server/ILocaleBase.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/server/ILocaleBase.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/server/ILocaleBase.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/server/ILocations.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/server/ILocations.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/server/ILocations.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/server/ILocations.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/server/IServerBase.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/server/IServerBase.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/server/IServerBase.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/server/IServerBase.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/server/ISettingsBase.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/server/ISettingsBase.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/server/ISettingsBase.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/server/ISettingsBase.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/utils/IAsyncQueue.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/utils/IAsyncQueue.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/utils/IAsyncQueue.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/utils/IAsyncQueue.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/utils/ICommand.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/utils/ICommand.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/utils/ICommand.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/utils/ICommand.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/utils/ILogger.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/utils/ILogger.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/utils/ILogger.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/utils/ILogger.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/utils/IUuidGenerator.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/utils/IUuidGenerator.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/utils/IUuidGenerator.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/utils/IUuidGenerator.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/spt/utils/IWatermark.d.ts b/TypeScript/3.0GetSptConfigFile/types/models/spt/utils/IWatermark.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/spt/utils/IWatermark.d.ts rename to TypeScript/3.0GetSptConfigFile/types/models/spt/utils/IWatermark.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/ImageRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/ImageRouter.d.ts index 511d5b2..07a0606 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/ImageRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/ImageRouter.d.ts @@ -1,7 +1,7 @@ /// import { IncomingMessage, ServerResponse } from "http"; import { VFS } from "../utils/VFS"; -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class ImageRouter { private vfs; constructor(vfs: VFS); diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/ItemEventRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/ItemEventRouter.d.ts index bb5e843..bb20152 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/ItemEventRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/ItemEventRouter.d.ts @@ -1,9 +1,9 @@ import { JsonUtil } from "../utils/JsonUtil"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IItemEventRouterRequest } from "../@types/eft/itemEvent/IItemEventRouterRequest"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IItemEventRouterRequest } from "../models/eft/itemEvent/IItemEventRouterRequest"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { ItemEventRouterDefinition } from "../di/Router"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class ItemEventRouter { private logger; private jsonUtil; diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/item_events/CustomizationItemEventRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/item_events/CustomizationItemEventRouter.d.ts index eebc28c..3025e2c 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/item_events/CustomizationItemEventRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/item_events/CustomizationItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private customizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/item_events/HealthItemEventRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/item_events/HealthItemEventRouter.d.ts index 333c18a..bad9af2 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/item_events/HealthItemEventRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/item_events/HealthItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private healthCallbacks; constructor(healthCallbacks: HealthCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/item_events/HideoutItemEventRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/item_events/HideoutItemEventRouter.d.ts index f68b112..2cec18b 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/item_events/HideoutItemEventRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/item_events/HideoutItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private hideoutCallbacks; constructor(hideoutCallbacks: HideoutCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/item_events/InsuranceItemEventRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/item_events/InsuranceItemEventRouter.d.ts index de185db..8efc2c2 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/item_events/InsuranceItemEventRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/item_events/InsuranceItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private insuranceCallbacks; constructor(insuranceCallbacks: InsuranceCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/item_events/InventoryItemEventRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/item_events/InventoryItemEventRouter.d.ts index 40496f7..1d93e7b 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/item_events/InventoryItemEventRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/item_events/InventoryItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private inventoryCallbacks; constructor(inventoryCallbacks: InventoryCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/item_events/NoteItemEventRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/item_events/NoteItemEventRouter.d.ts index 8b703a3..12af594 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/item_events/NoteItemEventRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/item_events/NoteItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private noteCallbacks; constructor(noteCallbacks: NoteCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/item_events/PresetBuildItemEventRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/item_events/PresetBuildItemEventRouter.d.ts index 7a915b1..7298c52 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/item_events/PresetBuildItemEventRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/item_events/PresetBuildItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private presetBuildCallbacks; constructor(presetBuildCallbacks: PresetBuildCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/item_events/QuestItemEventRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/item_events/QuestItemEventRouter.d.ts index 6f4d3f6..9944ae9 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/item_events/QuestItemEventRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/item_events/QuestItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private questCallbacks; constructor(questCallbacks: QuestCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/item_events/RagfairItemEventRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/item_events/RagfairItemEventRouter.d.ts index 8361e1e..88e52ba 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/item_events/RagfairItemEventRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/item_events/RagfairItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private ragfairCallbacks; constructor(ragfairCallbacks: RagfairCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/item_events/RepairItemEventRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/item_events/RepairItemEventRouter.d.ts index 544a656..b292ded 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/item_events/RepairItemEventRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/item_events/RepairItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private repairCallbacks; constructor(repairCallbacks: RepairCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/item_events/TradeItemEventRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/item_events/TradeItemEventRouter.d.ts index eb5c294..1bca2b8 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/item_events/TradeItemEventRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/item_events/TradeItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private tradeCallbacks; constructor(tradeCallbacks: TradeCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/item_events/WishlistItemEventRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/item_events/WishlistItemEventRouter.d.ts index e7fdc9b..38831f6 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/item_events/WishlistItemEventRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/item_events/WishlistItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private wishlistCallbacks; constructor(wishlistCallbacks: WishlistCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/save_load/HealthSaveLoadRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/save_load/HealthSaveLoadRouter.d.ts index c068915..114f5b2 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/save_load/HealthSaveLoadRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/save_load/HealthSaveLoadRouter.d.ts @@ -1,4 +1,4 @@ -import { IAkiProfile } from "../../@types/eft/profile/IAkiProfile"; +import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; export declare class HealthSaveLoadRouter extends SaveLoadRouter { constructor(); diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/save_load/InraidSaveLoadRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/save_load/InraidSaveLoadRouter.d.ts index eb5cf5a..4c00b40 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/save_load/InraidSaveLoadRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/save_load/InraidSaveLoadRouter.d.ts @@ -1,4 +1,4 @@ -import { IAkiProfile } from "../../@types/eft/profile/IAkiProfile"; +import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; export declare class InraidSaveLoadRouter extends SaveLoadRouter { constructor(); diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/save_load/InsuranceSaveLoadRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/save_load/InsuranceSaveLoadRouter.d.ts index 07df122..30ce98e 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/save_load/InsuranceSaveLoadRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/save_load/InsuranceSaveLoadRouter.d.ts @@ -1,4 +1,4 @@ -import { IAkiProfile } from "../../@types/eft/profile/IAkiProfile"; +import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; export declare class InsuranceSaveLoadRouter extends SaveLoadRouter { constructor(); diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/save_load/ProfileSaveLoadRouter.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/save_load/ProfileSaveLoadRouter.d.ts index 51b4cb5..16c7619 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/save_load/ProfileSaveLoadRouter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/save_load/ProfileSaveLoadRouter.d.ts @@ -1,4 +1,4 @@ -import { IAkiProfile } from "../../@types/eft/profile/IAkiProfile"; +import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; export declare class ProfileSaveLoadRouter extends SaveLoadRouter { constructor(); diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/serializers/BundleSerializer.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/serializers/BundleSerializer.d.ts index cf09797..5f275c4 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/serializers/BundleSerializer.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/serializers/BundleSerializer.d.ts @@ -1,5 +1,5 @@ -import { IHttpServer } from "../../@types/spt/server/IHttpServer"; -import { ILogger } from "../../@types/spt/utils/ILogger"; +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 { diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/serializers/ImageSerializer.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/serializers/ImageSerializer.d.ts index 1d0b9c4..29340d0 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/serializers/ImageSerializer.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/serializers/ImageSerializer.d.ts @@ -1,4 +1,4 @@ -import { IHttpServer } from "../../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { Serializer } from "../../di/Serializer"; import { ImageRouter } from "../ImageRouter"; export declare class ImageSerializer extends Serializer { diff --git a/TypeScript/3.0GetSptConfigFile/types/routers/serializers/NotifySerializer.d.ts b/TypeScript/3.0GetSptConfigFile/types/routers/serializers/NotifySerializer.d.ts index d97fc0a..7be87ef 100644 --- a/TypeScript/3.0GetSptConfigFile/types/routers/serializers/NotifySerializer.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/routers/serializers/NotifySerializer.d.ts @@ -1,4 +1,4 @@ -import { IHttpServer } from "../../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { NotifierController } from "../../controllers/NotifierController"; import { Serializer } from "../../di/Serializer"; import { HttpServerHelper } from "../../helpers/HttpServerHelper"; diff --git a/TypeScript/3.0GetSptConfigFile/types/servers/ConfigServer.d.ts b/TypeScript/3.0GetSptConfigFile/types/servers/ConfigServer.d.ts index d25d1a8..9c2e114 100644 --- a/TypeScript/3.0GetSptConfigFile/types/servers/ConfigServer.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/servers/ConfigServer.d.ts @@ -1,6 +1,6 @@ import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class ConfigServer { private logger; private vfs; diff --git a/TypeScript/3.0GetSptConfigFile/types/servers/DatabaseServer.d.ts b/TypeScript/3.0GetSptConfigFile/types/servers/DatabaseServer.d.ts index b66e847..521bcf9 100644 --- a/TypeScript/3.0GetSptConfigFile/types/servers/DatabaseServer.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/servers/DatabaseServer.d.ts @@ -1,4 +1,4 @@ -import { IDatabaseTables } from "../@types/spt/server/IDatabaseTables"; +import { IDatabaseTables } from "../models/spt/server/IDatabaseTables"; export declare class DatabaseServer { private tableData; getTables(): IDatabaseTables; diff --git a/TypeScript/3.0GetSptConfigFile/types/servers/HttpServer.d.ts b/TypeScript/3.0GetSptConfigFile/types/servers/HttpServer.d.ts index e38263d..0ba20c6 100644 --- a/TypeScript/3.0GetSptConfigFile/types/servers/HttpServer.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/servers/HttpServer.d.ts @@ -1,16 +1,16 @@ /// import { HttpRouter } from "../routers/HttpRouter"; import { JsonUtil } from "../utils/JsonUtil"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { DatabaseServer } from "./DatabaseServer"; import { Serializer } from "../di/Serializer"; import http, { ServerResponse } from "http"; -import { INotification } from "../@types/eft/notifier/INotifier"; +import { INotification } from "../models/eft/notifier/INotifier"; import { NotifierHelper } from "../helpers/NotifierHelper"; import { ConfigServer } from "./ConfigServer"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class HttpServer implements IHttpServer { private httpRouter; private logger; @@ -21,7 +21,7 @@ export declare class HttpServer implements IHttpServer { private httpServerHelper; private serializers; private configServer; - constructor(httpRouter: HttpRouter, logger: ILogger, jsonUtil: JsonUtil, httpResponse: HttpResponse, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); + constructor(httpRouter: HttpRouter, logger: ILogger, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); private buffers; private onReceive; private onRespond; diff --git a/TypeScript/3.0GetSptConfigFile/types/servers/RagfairServer.d.ts b/TypeScript/3.0GetSptConfigFile/types/servers/RagfairServer.d.ts index ef69106..d103625 100644 --- a/TypeScript/3.0GetSptConfigFile/types/servers/RagfairServer.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/servers/RagfairServer.d.ts @@ -1,4 +1,4 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; @@ -7,12 +7,12 @@ import { RagfairPriceService } from "../services/RagfairPriceService"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { RagfairCategoriesService } from "../services/RagfairCategoriesService"; import { RagfairLinkedItemService } from "../services/RagfairLinkedItemService"; -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ConfigServer } from "./ConfigServer"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairServer { private logger; private ragfairOfferGenerator; @@ -28,7 +28,7 @@ export declare class RagfairServer { private ragfairRequiredItemsService; private configServer; private ragfairConfig; - constructor(logger: ILogger, ragfairOfferGenerator: RagfairOfferGenerator, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponse, saveServer: SaveServer, ragfairPriceService: RagfairPriceService, ragfairOfferService: RagfairOfferService, ragfairLinkedItemService: RagfairLinkedItemService, ragfairCategoriesService: RagfairCategoriesService, ragfairRequiredItemsService: RagfairRequiredItemsService, configServer: ConfigServer); + constructor(logger: ILogger, ragfairOfferGenerator: RagfairOfferGenerator, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, saveServer: SaveServer, ragfairPriceService: RagfairPriceService, ragfairOfferService: RagfairOfferService, ragfairLinkedItemService: RagfairLinkedItemService, ragfairCategoriesService: RagfairCategoriesService, ragfairRequiredItemsService: RagfairRequiredItemsService, configServer: ConfigServer); load(): void; update(): void; private processExpiredOffer; diff --git a/TypeScript/3.0GetSptConfigFile/types/servers/SaveServer.d.ts b/TypeScript/3.0GetSptConfigFile/types/servers/SaveServer.d.ts index 23da9ea..fdf92e4 100644 --- a/TypeScript/3.0GetSptConfigFile/types/servers/SaveServer.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/servers/SaveServer.d.ts @@ -1,9 +1,9 @@ -import { IAkiProfile, Info } from "../@types/eft/profile/IAkiProfile"; +import { IAkiProfile, Info } from "../models/eft/profile/IAkiProfile"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; import { SaveLoadRouter } from "../di/Router"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class SaveServer { private vfs; private saveLoadRouters; diff --git a/TypeScript/3.0GetSptConfigFile/types/services/FenceService.d.ts b/TypeScript/3.0GetSptConfigFile/types/services/FenceService.d.ts index 4b80d50..eef87b3 100644 --- a/TypeScript/3.0GetSptConfigFile/types/services/FenceService.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/services/FenceService.d.ts @@ -2,14 +2,14 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { HandbookHelper } from "../helpers/HandbookHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { PresetHelper } from "../helpers/PresetHelper"; -import { FenceLevel } from "../@types/eft/common/IGlobals"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; +import { FenceLevel } from "../models/eft/common/IGlobals"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; import { ConfigServer } from "../servers/ConfigServer"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class FenceService { private logger; private hashUtil; diff --git a/TypeScript/3.0GetSptConfigFile/types/services/HashCacheService.d.ts b/TypeScript/3.0GetSptConfigFile/types/services/HashCacheService.d.ts new file mode 100644 index 0000000..c9b0170 --- /dev/null +++ b/TypeScript/3.0GetSptConfigFile/types/services/HashCacheService.d.ts @@ -0,0 +1,19 @@ +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 { + private vfs; + private hashUtil; + private jsonUtil; + private logger; + private jsonHashes; + private modHashes; + private readonly modCachePath; + constructor(vfs: VFS, hashUtil: HashUtil, jsonUtil: JsonUtil, logger: ILogger); + getStoredModHash(modName: string): string; + modContentMatchesStoredHash(modName: string, modContent: string): boolean; + hashMatchesStoredHash(modName: string, modHash: string): boolean; + storeModContent(modName: string, modContent: string): void; + storeModHash(modName: string, modHash: string): void; +} diff --git a/TypeScript/3.0GetSptConfigFile/types/services/InsuranceService.d.ts b/TypeScript/3.0GetSptConfigFile/types/services/InsuranceService.d.ts index cd91136..35f0dbc 100644 --- a/TypeScript/3.0GetSptConfigFile/types/services/InsuranceService.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/services/InsuranceService.d.ts @@ -1,10 +1,9 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData"; -import { IInsuranceConfig } from "../@types/spt/config/IInsuranceConfig"; -import { ILogger } from "../@types/spt/utils/ILogger"; +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 { InventoryHelper } from "../helpers/InventoryHelper"; +import { SecureContainerHelper } from "../helpers/SecureContainerHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -14,7 +13,7 @@ import { TimeUtil } from "../utils/TimeUtil"; export declare class InsuranceService { private logger; private databaseServer; - private inventoryHelper; + private secureContainerHelper; private randomUtil; private timeUtil; private saveServer; @@ -23,8 +22,8 @@ export declare class InsuranceService { private configServer; private insured; private templatesById; - insuranceConfig: IInsuranceConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, inventoryHelper: InventoryHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, configServer: ConfigServer); + private insuranceConfig; + constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, configServer: ConfigServer); insuranceExists(sessionId: string): boolean; insuranceTraderArrayExists(sessionId: string, traderId: string): boolean; getInsurance(sessionId: string): Record; diff --git a/TypeScript/3.0GetSptConfigFile/types/services/ModCompilerService.d.ts b/TypeScript/3.0GetSptConfigFile/types/services/ModCompilerService.d.ts new file mode 100644 index 0000000..7e750c3 --- /dev/null +++ b/TypeScript/3.0GetSptConfigFile/types/services/ModCompilerService.d.ts @@ -0,0 +1,11 @@ +import { ILogger } from "../models/spt/utils/ILogger"; +import { VFS } from "../utils/VFS"; +export declare class ModCompilerService { + private logger; + private vfs; + constructor(logger: ILogger, vfs: VFS); + compileMod(path: string, modTypeScriptFiles: string[]): Promise; + private compile; + private areFilesReady; + private delay; +} diff --git a/TypeScript/3.0GetSptConfigFile/types/services/NotificationService.d.ts b/TypeScript/3.0GetSptConfigFile/types/services/NotificationService.d.ts index 5c0e0ec..9c6c143 100644 --- a/TypeScript/3.0GetSptConfigFile/types/services/NotificationService.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/services/NotificationService.d.ts @@ -1,4 +1,4 @@ -import { INotification } from "../@types/eft/notifier/INotifier"; +import { INotification } from "../models/eft/notifier/INotifier"; export declare class NotificationService { private messageQueue; getMessageQueue(): {}; diff --git a/TypeScript/3.0GetSptConfigFile/types/services/PaymentService.d.ts b/TypeScript/3.0GetSptConfigFile/types/services/PaymentService.d.ts index 245bb34..20cee50 100644 --- a/TypeScript/3.0GetSptConfigFile/types/services/PaymentService.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/services/PaymentService.d.ts @@ -1,15 +1,15 @@ import { InventoryHelper } from "../helpers/InventoryHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IProcessBuyTradeRequestData } from "../@types/eft/trade/IProcessBuyTradeRequestData"; -import { IProcessSellTradeRequestData } from "../@types/eft/trade/IProcessSellTradeRequestData"; +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 { HttpResponse } from "../utils/HttpResponse"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class PaymentService { private logger; private httpResponse; @@ -19,7 +19,7 @@ export declare class PaymentService { private itemHelper; private inventoryHelper; private paymentHelper; - constructor(logger: ILogger, httpResponse: HttpResponse, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); + constructor(logger: ILogger, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request * @param {Object} pmcData @@ -38,5 +38,11 @@ export declare class PaymentService { * @returns IItemEventRouterResponse */ getMoney(pmcData: IPmcData, amount: number, body: IProcessSellTradeRequestData, output: IItemEventRouterResponse, sessionID: string): IItemEventRouterResponse; + /** + * Recursively checks if the given item is + * inside the stash, that is it has the stash as + * ancestor with slotId=hideout + */ + private isItemInStash; addPaymentToOutput(pmcData: IPmcData, currencyTpl: string, amountToPay: number, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse; } diff --git a/TypeScript/3.0GetSptConfigFile/types/services/PlayerService.d.ts b/TypeScript/3.0GetSptConfigFile/types/services/PlayerService.d.ts index ec6e32c..4a74b4a 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 "../@types/eft/common/IPmcData"; -import { IPlayerIncrementSkillLevelRequestData } from "../@types/eft/player/IPlayerIncrementSkillLevelRequestData"; -import { ILogger } from "../@types/spt/utils/ILogger"; +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 { private logger; private databaseServer; diff --git a/TypeScript/3.0GetSptConfigFile/types/services/RagfairCategoriesService.d.ts b/TypeScript/3.0GetSptConfigFile/types/services/RagfairCategoriesService.d.ts index 370886e..fb9efa2 100644 --- a/TypeScript/3.0GetSptConfigFile/types/services/RagfairCategoriesService.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/services/RagfairCategoriesService.d.ts @@ -1,4 +1,4 @@ -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; export declare class RagfairCategoriesService { updateCategories(offers: IRagfairOffer[]): void; private categories; diff --git a/TypeScript/3.0GetSptConfigFile/types/services/RagfairOfferService.d.ts b/TypeScript/3.0GetSptConfigFile/types/services/RagfairOfferService.d.ts index 1b7682d..4e4ae26 100644 --- a/TypeScript/3.0GetSptConfigFile/types/services/RagfairOfferService.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/services/RagfairOfferService.d.ts @@ -2,9 +2,8 @@ import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { TimeUtil } from "../utils/TimeUtil"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; -import { IRagfairConfig } from "../@types/spt/config/IRagfairConfig"; +import { Item } from "../models/eft/common/tables/IItem"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; export declare class RagfairOfferService { private timeUtil; private databaseServer; @@ -14,7 +13,7 @@ export declare class RagfairOfferService { private toUpdate; private expiredOffers; private offers; - ragfairConfig: IRagfairConfig; + private ragfairConfig; constructor(timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, configServer: ConfigServer); getOffers(): IRagfairOffer[]; getOfferByOfferId(offerId: string): IRagfairOffer; diff --git a/TypeScript/3.0GetSptConfigFile/types/services/RagfairPriceService.d.ts b/TypeScript/3.0GetSptConfigFile/types/services/RagfairPriceService.d.ts index d91df24..7cc42f9 100644 --- a/TypeScript/3.0GetSptConfigFile/types/services/RagfairPriceService.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/services/RagfairPriceService.d.ts @@ -4,9 +4,9 @@ import { ConfigServer } from "../servers/ConfigServer"; import { HandbookHelper } from "../helpers/HandbookHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { PresetHelper } from "../helpers/PresetHelper"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { IBarterScheme } from "../@types/eft/common/tables/ITrader"; -import { ILogger } from "../@types/spt/utils/ILogger"; +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 { private handbookHelper; private databaseServer; diff --git a/TypeScript/3.0GetSptConfigFile/types/services/RagfairRequiredItemsService.d.ts b/TypeScript/3.0GetSptConfigFile/types/services/RagfairRequiredItemsService.d.ts index 3908cb9..e4582d0 100644 --- a/TypeScript/3.0GetSptConfigFile/types/services/RagfairRequiredItemsService.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/services/RagfairRequiredItemsService.d.ts @@ -1,6 +1,6 @@ import { PaymentHelper } from "../helpers/PaymentHelper"; import { RagfairOfferService } from "../services/RagfairOfferService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairRequiredItemsService { private logger; private paymentHelper; diff --git a/TypeScript/3.0GetSptConfigFile/types/services/TraderAssortService.d.ts b/TypeScript/3.0GetSptConfigFile/types/services/TraderAssortService.d.ts index 99b23f1..ccb9e45 100644 --- a/TypeScript/3.0GetSptConfigFile/types/services/TraderAssortService.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/services/TraderAssortService.d.ts @@ -1,4 +1,4 @@ -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; export declare class TraderAssortService { private pristineTraderAssorts; getPristineTraderAssort(traderId: string): ITraderAssort; diff --git a/TypeScript/3.0GetSptConfigFile/types/utils/App.d.ts b/TypeScript/3.0GetSptConfigFile/types/utils/App.d.ts index 4b082a0..a11f576 100644 --- a/TypeScript/3.0GetSptConfigFile/types/utils/App.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/utils/App.d.ts @@ -1,7 +1,7 @@ import { TimeUtil } from "./TimeUtil"; import { OnLoad } from "../di/OnLoad"; import { OnUpdate } from "../di/OnUpdate"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class App { private logger; private timeUtil; diff --git a/TypeScript/3.0GetSptConfigFile/types/utils/AyncQueue.d.ts b/TypeScript/3.0GetSptConfigFile/types/utils/AyncQueue.d.ts index 773a5e4..8f1559b 100644 --- a/TypeScript/3.0GetSptConfigFile/types/utils/AyncQueue.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/utils/AyncQueue.d.ts @@ -1,5 +1,5 @@ -import { IAsyncQueue } from "../@types/spt/utils/IAsyncQueue"; -import { ICommand } from "../@types/spt/utils/ICommand"; +import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; +import { ICommand } from "../models/spt/utils/ICommand"; export declare class AsyncQueue implements IAsyncQueue { commandsQueue: ICommand[]; constructor(); diff --git a/TypeScript/3.0GetSptConfigFile/types/utils/DatabaseImporter.d.ts b/TypeScript/3.0GetSptConfigFile/types/utils/DatabaseImporter.d.ts index 41b3e5f..97dda30 100644 --- a/TypeScript/3.0GetSptConfigFile/types/utils/DatabaseImporter.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/utils/DatabaseImporter.d.ts @@ -3,7 +3,7 @@ import { JsonUtil } from "./JsonUtil"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ImageRouter } from "../routers/ImageRouter"; import { OnLoad } from "../di/OnLoad"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class DatabaseImporter extends OnLoad { private logger; private vfs; diff --git a/TypeScript/3.0GetSptConfigFile/types/utils/HttpResponse.d.ts b/TypeScript/3.0GetSptConfigFile/types/utils/HttpResponseUtil.d.ts similarity index 73% rename from TypeScript/3.0GetSptConfigFile/types/utils/HttpResponse.d.ts rename to TypeScript/3.0GetSptConfigFile/types/utils/HttpResponseUtil.d.ts index d5a90d7..85c28bd 100644 --- a/TypeScript/3.0GetSptConfigFile/types/utils/HttpResponse.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/utils/HttpResponseUtil.d.ts @@ -1,8 +1,8 @@ import { JsonUtil } from "./JsonUtil"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -export declare class HttpResponse { +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 { private jsonUtil; constructor(jsonUtil: JsonUtil); private clearString; diff --git a/TypeScript/3.0GetSptConfigFile/types/utils/JsonUtil.d.ts b/TypeScript/3.0GetSptConfigFile/types/utils/JsonUtil.d.ts index 69cf8f1..20b7448 100644 --- a/TypeScript/3.0GetSptConfigFile/types/utils/JsonUtil.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/utils/JsonUtil.d.ts @@ -1,12 +1,12 @@ -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; import { HashUtil } from "./HashUtil"; import { VFS } from "./VFS"; export declare class JsonUtil { private vfs; - private hashutil; + private hashUtil; private logger; private fileHashes; - constructor(vfs: VFS, hashutil: HashUtil, logger: ILogger); + constructor(vfs: VFS, hashUtil: HashUtil, logger: ILogger); /** * From object to string * @param data object to turn into JSON diff --git a/TypeScript/3.0GetSptConfigFile/types/utils/Logger.d.ts b/TypeScript/3.0GetSptConfigFile/types/utils/Logger.d.ts index 57da5ae..9d5b32a 100644 --- a/TypeScript/3.0GetSptConfigFile/types/utils/Logger.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/utils/Logger.d.ts @@ -1,14 +1,16 @@ /// -import { Daum } from "../@types/eft/itemEvent/IItemEventRouterRequest"; -import { ILogger } from "../@types/spt/utils/ILogger"; -import { IAsyncQueue } from "../@types/spt/utils/IAsyncQueue"; -import { IUUidGenerator } from "../@types/spt/utils/IUuidGenerator"; +import { Daum } from "../models/eft/itemEvent/IItemEventRouterRequest"; +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 { private asyncQueue; private uuidGenerator; private showDebugInConsole; - private filepath; + private folderPath; + private file; + private filePath; private logLevels; private logger; writeFilePromisify: (path: fs.PathLike, data: string, options?: any) => Promise; diff --git a/TypeScript/3.0GetSptConfigFile/types/utils/RandomUtil.d.ts b/TypeScript/3.0GetSptConfigFile/types/utils/RandomUtil.d.ts index a1bac79..3a3ecb6 100644 --- a/TypeScript/3.0GetSptConfigFile/types/utils/RandomUtil.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/utils/RandomUtil.d.ts @@ -1,3 +1,4 @@ +import { ILogger } from "../models/spt/utils/ILogger"; import { JsonUtil } from "./JsonUtil"; import { MathUtil } from "./MathUtil"; /** @@ -103,7 +104,8 @@ export declare class ProbabilityObject { } export declare class RandomUtil { private jsonUtil; - constructor(jsonUtil: JsonUtil); + private logger; + constructor(jsonUtil: JsonUtil, logger: ILogger); getInt(min: number, max: number): number; getIntEx(max: number): number; getFloat(min: number, max: number): number; @@ -147,4 +149,5 @@ export declare class RandomUtil { * @return {array} Array consisting of N random keys of the dictionary */ drawRandomFromDict(dict: any, count?: number, replacement?: boolean): any[]; + getBiasedRandomNumber(min: number, max: number, shift: number, n: number): number; } diff --git a/TypeScript/3.0GetSptConfigFile/types/utils/UUidGenerator.d.ts b/TypeScript/3.0GetSptConfigFile/types/utils/UUidGenerator.d.ts index 763424a..000b719 100644 --- a/TypeScript/3.0GetSptConfigFile/types/utils/UUidGenerator.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/utils/UUidGenerator.d.ts @@ -1,4 +1,4 @@ -import { IUUidGenerator } from "../@types/spt/utils/IUuidGenerator"; +import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; export declare class UUidGenerator implements IUUidGenerator { generate: () => string; } diff --git a/TypeScript/3.0GetSptConfigFile/types/utils/VFS.d.ts b/TypeScript/3.0GetSptConfigFile/types/utils/VFS.d.ts index c8d32f1..b064cf4 100644 --- a/TypeScript/3.0GetSptConfigFile/types/utils/VFS.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/utils/VFS.d.ts @@ -1,8 +1,8 @@ /// import "reflect-metadata"; import fs from "fs"; -import { IAsyncQueue } from "../@types/spt/utils/IAsyncQueue"; -import { IUUidGenerator } from "../@types/spt/utils/IUuidGenerator"; +import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; +import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; export declare class VFS { private asyncQueue; private uuidGenerator; @@ -50,4 +50,5 @@ export declare class VFS { stripExtension(filepath: string): string; minifyAllJsonInDirRecursive(filepath: string): Promise; minifyAllJsonInDirRecursiveAsync(filepath: string): Promise; + getFilesOfType(directory: string, fileType: string, files?: string[]): string[]; } diff --git a/TypeScript/3.0GetSptConfigFile/types/utils/Watermark.d.ts b/TypeScript/3.0GetSptConfigFile/types/utils/Watermark.d.ts index e7765e1..598d5a6 100644 --- a/TypeScript/3.0GetSptConfigFile/types/utils/Watermark.d.ts +++ b/TypeScript/3.0GetSptConfigFile/types/utils/Watermark.d.ts @@ -1,6 +1,6 @@ -import { IWatermark, IWatermarkLocale } from "../@types/spt/utils/IWatermark"; +import { IWatermark, IWatermarkLocale } from "../models/spt/utils/IWatermark"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class WatermarkLocale implements IWatermarkLocale { private locales; getLocale(): string; diff --git a/TypeScript/4UseACustomConfigFile/package.json b/TypeScript/4UseACustomConfigFile/package.json index cfa0bd8..6003fa6 100644 --- a/TypeScript/4UseACustomConfigFile/package.json +++ b/TypeScript/4UseACustomConfigFile/package.json @@ -4,7 +4,7 @@ "main": "src/mod.js", "license": "MIT", "author": "Chomp", - "akiVersion": "2.4.0", + "akiVersion": "3.0.0", "scripts": { "install": "npx handpick --target=devDependencies", "build": "tsc" diff --git a/TypeScript/4UseACustomConfigFile/src/mod.js b/TypeScript/4UseACustomConfigFile/src/mod.js new file mode 100644 index 0000000..98e0a0a --- /dev/null +++ b/TypeScript/4UseACustomConfigFile/src/mod.js @@ -0,0 +1,16 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +class Mod { + constructor() { + this.modConfig = require("../config/config.json"); + } + // not used for this example + load(container) { return; } + delayedLoad(container) { + // get logger + const logger = container.resolve("WinstonLogger"); + // log the 'myProperty' value to the console + logger.info(`here is the value from my config: ${this.modConfig.myProperty}`); + } +} +module.exports = { mod: new Mod() }; diff --git a/TypeScript/4UseACustomConfigFile/src/mod.ts b/TypeScript/4UseACustomConfigFile/src/mod.ts index 1ea8830..5445e08 100644 --- a/TypeScript/4UseACustomConfigFile/src/mod.ts +++ b/TypeScript/4UseACustomConfigFile/src/mod.ts @@ -1,7 +1,7 @@ import type { DependencyContainer } from "tsyringe"; -import { IMod } from "../types/@types/external/mod"; -import type { ILogger } from "../types/@types/spt/utils/ILogger"; +import { IMod } from "../types/models/external/mod"; +import type { ILogger } from "../types/models/spt/utils/ILogger"; class Mod implements IMod { diff --git a/TypeScript/4UseACustomConfigFile/tsconfig.json b/TypeScript/4UseACustomConfigFile/tsconfig.json index 4204c72..8ba3117 100644 --- a/TypeScript/4UseACustomConfigFile/tsconfig.json +++ b/TypeScript/4UseACustomConfigFile/tsconfig.json @@ -9,7 +9,6 @@ "experimentalDecorators": true, "emitDecoratorMetadata": true, "resolveJsonModule": true, - "esModuleInterop": true, "outDir": "out" }, "lib": [ diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/common/IItemEventResponseData.d.ts b/TypeScript/4UseACustomConfigFile/types/@types/eft/common/IItemEventResponseData.d.ts deleted file mode 100644 index 08fb8a7..0000000 --- a/TypeScript/4UseACustomConfigFile/types/@types/eft/common/IItemEventResponseData.d.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { Skills } from "./IPmcData"; -export interface IItemEventResponseData { - warnings: any[]; - profileChanges: Record; -} -export interface ProfileChange { - _id: string; - experience: number; - quests: any[]; - ragFairOffers: any[]; - builds: any[]; - items: Items; - production: Production; - skills: Skills; - traderRelations: TraderRelations; -} -export interface Items { - new: any[]; - change: any[]; - del: any[]; -} -export interface Production { -} -export interface TraderRelations { -} diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/common/IPmcDataRepeatableQuest.d.ts b/TypeScript/4UseACustomConfigFile/types/@types/eft/common/IPmcDataRepeatableQuest.d.ts deleted file mode 100644 index 15a1c09..0000000 --- a/TypeScript/4UseACustomConfigFile/types/@types/eft/common/IPmcDataRepeatableQuest.d.ts +++ /dev/null @@ -1,71 +0,0 @@ -export interface IPmcDataRepeatableQuest { - name: string; - activeQuests: Quest[]; - inactiveQuests: Quest[]; - endTime: number; -} -export interface Quest { - _id: string; - traderId: string; - location: string; - image: string; - type: string; - isKey: boolean; - restartable: boolean; - instantComplete: boolean; - secretQuest: boolean; - canShowNotificationsInGame: boolean; - rewards: Rewards; - conditions: Conditions; - name: string; - note: string; - description: string; - successMessageText: string; - failMessageText: string; - startedMessageText: string; - templateId: string; -} -export interface Rewards { - Started: Reward[]; - Success: Reward[]; - Fail: Reward[]; -} -export interface Reward { - value: number; - type: string; - index: number; - target?: string; - items?: Item[]; -} -export interface Item { - _id: string; - _tpl: string; - upd: Upd; -} -export interface Conditions { - AvailableForStart: any[]; - AvailableForFinish: AvailableForFinish[]; - Fail: any[]; -} -export interface AvailableForFinish { - _props: Props; - _parent: string; - dynamicLocale: boolean; -} -export interface Props { - id: string; - parentId: string; - dynamicLocale: boolean; - index: number; - visibilityConditions: any[]; - target: string[]; - value: number; - minDurability: number; - maxDurability: number; - dogtagLevel: number; - onlyFoundInRaid: boolean; -} -export interface Upd { - StackObjectsCount: number; - SpawnedInSession?: boolean; -} diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/IHideoutRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/IHideoutRequestData.d.ts deleted file mode 100644 index 77c0665..0000000 --- a/TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/IHideoutRequestData.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -export interface IHideoutRequestData { - Action: "HideoutUpgrade"; - areaType: number; - items: HideoutItem[]; - timestamp: number; -} -export interface HideoutItem { - count: number; - id: string; -} diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/itemEvent/IHandleEventRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/@types/eft/itemEvent/IHandleEventRequestData.d.ts deleted file mode 100644 index a7ae306..0000000 --- a/TypeScript/4UseACustomConfigFile/types/@types/eft/itemEvent/IHandleEventRequestData.d.ts +++ /dev/null @@ -1,21 +0,0 @@ -export interface IHandleEventRequestData { - data: Daum[]; - tm: number; - reload: number; -} -export interface Daum { - Action: string; - item: string; - to?: To; -} -export interface To { - id: string; - container: string; - location: Location; -} -export interface Location { - x: number; - y: number; - r: string; - isSearched: boolean; -} diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/notes/INoteData.d.ts b/TypeScript/4UseACustomConfigFile/types/@types/eft/notes/INoteData.d.ts deleted file mode 100644 index 4021bb7..0000000 --- a/TypeScript/4UseACustomConfigFile/types/@types/eft/notes/INoteData.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface INote { - Time: number; - Text: string; -} diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/presetBuild/IPresetBuildActionData.d.ts b/TypeScript/4UseACustomConfigFile/types/@types/eft/presetBuild/IPresetBuildActionData.d.ts deleted file mode 100644 index 13ec722..0000000 --- a/TypeScript/4UseACustomConfigFile/types/@types/eft/presetBuild/IPresetBuildActionData.d.ts +++ /dev/null @@ -1,25 +0,0 @@ -export interface IPresetBuildActionData { - Action: string; - id: string; - name: string; - root: string; - items: Item[]; -} -export interface Item { - _id: string; - _tpl: string; - upd?: Upd; - parentId?: string; - slotId?: string; -} -export interface Upd { - Repairable: Repairable; - FireMode: FireMode; -} -export interface Repairable { - MaxDurability: number; - Durability: number; -} -export interface FireMode { - FireMode: string; -} diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/ragfair/ISaleChance.d.ts b/TypeScript/4UseACustomConfigFile/types/@types/eft/ragfair/ISaleChance.d.ts deleted file mode 100644 index 14b434a..0000000 --- a/TypeScript/4UseACustomConfigFile/types/@types/eft/ragfair/ISaleChance.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface ISaleChance { - sellTime: number; - amount: number; -} diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/repair/IRepairActionData.d.ts b/TypeScript/4UseACustomConfigFile/types/@types/eft/repair/IRepairActionData.d.ts deleted file mode 100644 index e6f90c8..0000000 --- a/TypeScript/4UseACustomConfigFile/types/@types/eft/repair/IRepairActionData.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -export interface IRepairActionData { - Action: string; - tid: string; - repairItems: RepairItem[]; -} -export interface RepairItem { - _id: string; - count: number; -} diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/wishlist/IWishlistActionData.d.ts b/TypeScript/4UseACustomConfigFile/types/@types/eft/wishlist/IWishlistActionData.d.ts deleted file mode 100644 index 9217864..0000000 --- a/TypeScript/4UseACustomConfigFile/types/@types/eft/wishlist/IWishlistActionData.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface IWishlistActionData { - Action: string; - templateId: string; -} diff --git a/TypeScript/4UseACustomConfigFile/types/@types/notes/INoteActionData.d.ts b/TypeScript/4UseACustomConfigFile/types/@types/notes/INoteActionData.d.ts deleted file mode 100644 index 7d07cdd..0000000 --- a/TypeScript/4UseACustomConfigFile/types/@types/notes/INoteActionData.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { INote } from "../eft/notes/INoteData"; -export interface INoteActionData { - Action: string; - index: number; - note: INote; -} diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/helpers/IGetItemResponse.d.ts b/TypeScript/4UseACustomConfigFile/types/@types/spt/helpers/IGetItemResponse.d.ts deleted file mode 100644 index e6f3783..0000000 --- a/TypeScript/4UseACustomConfigFile/types/@types/spt/helpers/IGetItemResponse.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export interface IGetItemResponse { -} diff --git a/TypeScript/4UseACustomConfigFile/types/@types/wishlist/IWishlistActionData.d.ts b/TypeScript/4UseACustomConfigFile/types/@types/wishlist/IWishlistActionData.d.ts deleted file mode 100644 index 9217864..0000000 --- a/TypeScript/4UseACustomConfigFile/types/@types/wishlist/IWishlistActionData.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface IWishlistActionData { - Action: string; - templateId: string; -} diff --git a/TypeScript/4UseACustomConfigFile/types/Lib.d.ts b/TypeScript/4UseACustomConfigFile/types/Lib.d.ts deleted file mode 100644 index 5c77c26..0000000 --- a/TypeScript/4UseACustomConfigFile/types/Lib.d.ts +++ /dev/null @@ -1,94 +0,0 @@ -import { BundleLoader } from "./loaders/BundleLoader"; -export { BundleLoader }; -import { ModLoader } from "./loaders/ModLoader"; -export { ModLoader }; -import { ContainerHelper } from "./helpers/ContainerHelper.js"; -export { ContainerHelper }; -import { InventoryHelper } from "./helpers/InventoryHelper.js"; -export { InventoryHelper }; -import { ItemHelper } from "./helpers/ItemHelper.js"; -export { ItemHelper }; -import { GameEventHelper } from "./helpers/GameEventHelper.js"; -export { GameEventHelper }; -import { QuestHelper } from "./helpers/QuestHelper.js"; -export { QuestHelper }; -import { UtilityHelper } from "./helpers/UtilityHelper.js"; -export { UtilityHelper }; -import { TraderHelper } from "./helpers/TraderHelper.js"; -export { TraderHelper }; -import { RagfairServerHelper } from "./helpers/RagfairServerHelper.js"; -export { RagfairServerHelper }; -import { DurabilityLimitsHelper } from "./helpers/DurabilityLimitsHelper.js"; -export { DurabilityLimitsHelper }; -import { WeightedRandomHelper } from "./helpers/WeightedRandomHelper.js"; -export { WeightedRandomHelper }; -import { BotCallbacks } from "./callbacks/BotCallbacks.js"; -export { BotCallbacks }; -import { DataCallbacks } from "./callbacks/DataCallbacks.js"; -export { DataCallbacks }; -import { DialogueCallbacks } from "./callbacks/DialogueCallbacks.js"; -export { DialogueCallbacks }; -import { GameCallbacks } from "./callbacks/GameCallbacks.js"; -export { GameCallbacks }; -import { HideoutCallbacks } from "./callbacks/HideoutCallbacks"; -export { HideoutCallbacks }; -import { HttpCallbacks } from "./callbacks/HttpCallbacks.js"; -export { HttpCallbacks }; -import { InraidCallbacks } from "./callbacks/InraidCallbacks.js"; -export { InraidCallbacks }; -import { InventoryCallbacks } from "./callbacks/InventoryCallbacks.js"; -export { InventoryCallbacks }; -import { NotifierCallbacks } from "./callbacks/NotifierCallbacks.js"; -export { NotifierCallbacks }; -import { ProfileCallbacks } from "./callbacks/ProfileCallbacks.js"; -export { ProfileCallbacks }; -import { QuestCallbacks } from "./callbacks/QuestCallbacks.js"; -export { QuestCallbacks }; -import { RagfairCallbacks } from "./callbacks/RagfairCallbacks.js"; -export { RagfairCallbacks }; -import { TraderCallbacks } from "./callbacks/TraderCallbacks.js"; -export { TraderCallbacks }; -import { BotController } from "./controllers/BotController.js"; -export { BotController }; -import { DialogueController } from "./controllers/DialogueController.js"; -export { DialogueController }; -import { GameController } from "./controllers/GameController.js"; -export { GameController }; -import { HealthController } from "./controllers/HealthController.js"; -export { HealthController }; -import { HideoutController } from "./controllers/HideoutController.js"; -export { HideoutController }; -import { InsuranceController } from "./controllers/InsuranceController.js"; -export { InsuranceController }; -import { InventoryController } from "./controllers/InventoryController.js"; -export { InventoryController }; -import { LocationController } from "./controllers/LocationController.js"; -export { LocationController }; -import { NotifierController } from "./controllers/NotifierController.js"; -export { NotifierController }; -import { PresetController } from "./controllers/PresetController.js"; -export { PresetController }; -import { ProfileController } from "./controllers/ProfileController.js"; -export { ProfileController }; -import { QuestController } from "./controllers/QuestController.js"; -export { QuestController }; -import { RepeatableQuestController } from "./controllers/RepeatableQuestController.js"; -export { RepeatableQuestController }; -import { RagfairController } from "./controllers/RagfairController.js"; -export { RagfairController }; -import { TraderController } from "./controllers/TraderController.js"; -export { TraderController }; -import { PaymentController } from "./controllers/PaymentController"; -export { PaymentController }; -import { PlayerController } from "./controllers/PlayerController.js"; -export { PlayerController }; -import { HandbookController } from "./controllers/HandbookController.js"; -export { HandbookController }; -import { DatabaseServer } from "./servers/DatabaseServer"; -export { DatabaseServer }; -import { HttpServer } from "./servers/HttpServer.js"; -export { HttpServer }; -import { RagfairServer } from "./servers/RagfairServer.js"; -export { RagfairServer }; -import { SaveServer } from "./servers/SaveServer"; -export { SaveServer }; diff --git a/TypeScript/4UseACustomConfigFile/types/Program.d.ts b/TypeScript/4UseACustomConfigFile/types/Program.d.ts index fe57d08..d4b71b9 100644 --- a/TypeScript/4UseACustomConfigFile/types/Program.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/Program.d.ts @@ -1,8 +1,4 @@ -import "reflect-metadata"; -import { App } from "./utils/App"; -export interface IProgram { -} -export declare class Program implements IProgram { - private app; - constructor(app: App); +export declare class Program { + constructor(); + start(): void; } diff --git a/TypeScript/4UseACustomConfigFile/types/bindings/AppLoad.d.ts b/TypeScript/4UseACustomConfigFile/types/bindings/AppLoad.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/4UseACustomConfigFile/types/bindings/AppLoad.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/4UseACustomConfigFile/types/bindings/AppUpdate.d.ts b/TypeScript/4UseACustomConfigFile/types/bindings/AppUpdate.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/4UseACustomConfigFile/types/bindings/AppUpdate.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/4UseACustomConfigFile/types/bindings/DynamicRoutes.d.ts b/TypeScript/4UseACustomConfigFile/types/bindings/DynamicRoutes.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/4UseACustomConfigFile/types/bindings/DynamicRoutes.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/4UseACustomConfigFile/types/bindings/ItemEvents.d.ts b/TypeScript/4UseACustomConfigFile/types/bindings/ItemEvents.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/4UseACustomConfigFile/types/bindings/ItemEvents.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/4UseACustomConfigFile/types/bindings/SaveLoad.d.ts b/TypeScript/4UseACustomConfigFile/types/bindings/SaveLoad.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/4UseACustomConfigFile/types/bindings/SaveLoad.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/4UseACustomConfigFile/types/bindings/ServerRespond.d.ts b/TypeScript/4UseACustomConfigFile/types/bindings/ServerRespond.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/4UseACustomConfigFile/types/bindings/ServerRespond.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/4UseACustomConfigFile/types/bindings/StaticRoutes.d.ts b/TypeScript/4UseACustomConfigFile/types/bindings/StaticRoutes.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/4UseACustomConfigFile/types/bindings/StaticRoutes.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 511c545..358d5e3 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/BotCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/BotCallbacks.d.ts @@ -1,13 +1,13 @@ import { BotController } from "../controllers/BotController"; -import { IGenerateBotsRequestData } from "../@types/eft/bot/IGenerateBotsRequestData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IBotBase } from "../@types/eft/common/tables/IBotBase"; -import { HttpResponse } from "../utils/HttpResponse"; +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 { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class BotCallbacks { private botController; private httpResponse; - constructor(botController: BotController, httpResponse: HttpResponse); + constructor(botController: BotController, httpResponse: HttpResponseUtil); 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/4UseACustomConfigFile/types/callbacks/BundleCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/BundleCallbacks.d.ts index 1fb6275..08c33c0 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/BundleCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/BundleCallbacks.d.ts @@ -1,17 +1,16 @@ import { BundleLoader } from "../loaders/BundleLoader"; import { ConfigServer } from "../servers/ConfigServer"; -import { IHttpConfig } from "../@types/spt/config/IHttpConfig"; -import { HttpResponse } from "../utils/HttpResponse"; -import { ILogger } from "../@types/spt/utils/ILogger"; -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +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; private httpServer; private bundleLoader; private configServer; - httpConfig: IHttpConfig; - constructor(logger: ILogger, httpResponse: HttpResponse, httpServer: IHttpServer, bundleLoader: BundleLoader, configServer: ConfigServer); + private httpConfig; + constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, bundleLoader: BundleLoader, configServer: ConfigServer); 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/4UseACustomConfigFile/types/callbacks/CustomizationCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/CustomizationCallbacks.d.ts index 4c27712..0a4265b 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/CustomizationCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/CustomizationCallbacks.d.ts @@ -1,17 +1,17 @@ import { SaveServer } from "../servers/SaveServer"; import { CustomizationController } from "../controllers/CustomizationController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IBuyClothingRequestData } from "../@types/eft/customization/IBuyClothingRequestData"; -import { IWearClothingRequestData } from "../@types/eft/customization/IWearClothingRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { ISuit } from "../@types/eft/common/tables/ITrader"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { HttpResponse } from "../utils/HttpResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +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 { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class CustomizationCallbacks { private customizationController; private saveServer; private httpResponse; - constructor(customizationController: CustomizationController, saveServer: SaveServer, httpResponse: HttpResponse); + constructor(customizationController: CustomizationController, saveServer: SaveServer, httpResponse: HttpResponseUtil); getSuits(url: string, info: any, sessionID: string): IGetBodyResponseData<{ _id: string; suites: string[]; diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/DataCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/DataCallbacks.d.ts index add55b5..ac9cab7 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/DataCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/DataCallbacks.d.ts @@ -1,20 +1,20 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGlobals } from "../@types/eft/common/IGlobals"; -import { ICustomizationItem } from "../@types/eft/common/tables/ICustomizationItem"; -import { IQuest } from "../@types/eft/common/tables/IQuest"; -import { IHideoutArea } from "../@types/eft/hideout/IHideoutArea"; -import { IHideoutProduction } from "../@types/eft/hideout/IHideoutProduction"; -import { IHideoutScavCase } from "../@types/eft/hideout/IHideoutScavCase"; -import { IHideoutSettingsBase } from "../@types/eft/hideout/IHideoutSettingsBase"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { ILanguageBase } from "../@types/spt/server/ILocaleBase"; -import { ISettingsBase } from "../@types/spt/server/ISettingsBase"; -import { HttpResponse } from "../utils/HttpResponse"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IGlobals } from "../models/eft/common/IGlobals"; +import { ICustomizationItem } from "../models/eft/common/tables/ICustomizationItem"; +import { IQuest } from "../models/eft/common/tables/IQuest"; +import { IHideoutArea } from "../models/eft/hideout/IHideoutArea"; +import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction"; +import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; +import { IHideoutSettingsBase } from "../models/eft/hideout/IHideoutSettingsBase"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { ILanguageBase } from "../models/spt/server/ILocaleBase"; +import { ISettingsBase } from "../models/spt/server/ISettingsBase"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class DataCallbacks { private httpResponse; private databaseServer; - constructor(httpResponse: HttpResponse, databaseServer: DatabaseServer); + constructor(httpResponse: HttpResponseUtil, databaseServer: DatabaseServer); 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/4UseACustomConfigFile/types/callbacks/DialogueCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/DialogueCallbacks.d.ts index ccc074b..e81255c 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/DialogueCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/DialogueCallbacks.d.ts @@ -1,31 +1,31 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { DialogueController } from "../controllers/DialogueController"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { DialogueInfo } from "../@types/eft/profile/IAkiProfile"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IGetMailDialogViewRequestData } from "../@types/eft/dialog/IGetMailDialogViewRequestData"; -import { IGetMailDialogInfoRequestData } from "../@types/eft/dialog/IGetMailDialogInfoRequestData"; -import { IRemoveDialogRequestData } from "../@types/eft/dialog/IRemoveDialogRequestData"; -import { IGetMailDialogListRequestData } from "../@types/eft/dialog/IGetMailDialogListRequestData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IFriendRequestData } from "../@types/eft/dialog/IFriendRequestData"; -import { IPinDialogRequestData } from "../@types/eft/dialog/IPinDialogRequestData"; -import { ISetDialogReadRequestData } from "../@types/eft/dialog/ISetDialogReadRequestData"; -import { IGetAllAttachmentsRequestData } from "../@types/eft/dialog/IGetAllAttachmentsRequestData"; -import { IGetChatServerListRequestData } from "../@types/eft/dialog/IGetChatServerListRequestData"; -import { IGetFriendListDataResponse } from "../@types/eft/dialog/IGetFriendListDataResponse"; -import { ISendMessageRequest } from "../@types/eft/dialog/ISendMessageRequest"; -import { IGetMailDialogViewResponseData } from "../@types/eft/dialog/IGetMailDialogViewResponseData"; -import { IGetAllAttachmentsResponse } from "../@types/eft/dialog/IGetAllAttachmentsResponse"; +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 { 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 { IGetChatServerListRequestData } from "../models/eft/dialog/IGetChatServerListRequestData"; +import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse"; +import { ISendMessageRequest } from "../models/eft/dialog/ISendMessageRequest"; +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 { private hashUtil; private timeUtil; private httpResponse; private dialogueController; - constructor(hashUtil: HashUtil, timeUtil: TimeUtil, httpResponse: HttpResponse, dialogueController: DialogueController); + constructor(hashUtil: HashUtil, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, dialogueController: DialogueController); 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/4UseACustomConfigFile/types/callbacks/GameCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/GameCallbacks.d.ts index 25912c1..9481129 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 "../@types/eft/common/IEmptyRequestData"; -import { IGameEmptyCrcRequestData } from "../@types/eft/game/IGameEmptyCrcRequestData"; -import { IVersionValidateRequestData } from "../@types/eft/game/IVersionValidateRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IGameConfigResponse } from "../@types/eft/game/IGameConfigResponse"; -import { HttpResponse } from "../utils/HttpResponse"; -import { IWatermark } from "../@types/spt/utils/IWatermark"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +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 { private httpResponse; private watermark; private gameController; - constructor(httpResponse: HttpResponse, watermark: IWatermark, gameController: GameController); + constructor(httpResponse: HttpResponseUtil, watermark: IWatermark, 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 50ec0b6..b223bb3 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/HealthCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/HealthCallbacks.d.ts @@ -1,19 +1,20 @@ import { HealthController } from "../controllers/HealthController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { ISyncHealthRequestData } from "../@types/eft/health/ISyncHealthRequestData"; -import { IOffraidEatRequestData } from "../@types/eft/health/IOffraidEatRequestData"; -import { IOffraidHealRequestData } from "../@types/eft/health/IOffraidHealRequestData"; -import { IHealthTreatmentRequestData } from "../@types/eft/health/IHealthTreatmentRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; +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 { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { HttpResponse } from "../utils/HttpResponse"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class HealthCallbacks { private httpResponse; private profileHelper; private healthController; - constructor(httpResponse: HttpResponse, profileHelper: ProfileHelper, healthController: HealthController); + constructor(httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, healthController: HealthController); syncHealth(url: string, info: ISyncHealthRequestData, sessionID: string): IGetBodyResponseData; - offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): any; - offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): any; - healthTreatment(pmcData: IPmcData, info: IHealthTreatmentRequestData, sessionID: string): any; + offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): IItemEventRouterResponse; + offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse; + healthTreatment(pmcData: IPmcData, info: IHealthTreatmentRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/HideoutCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/HideoutCallbacks.d.ts index 3ef61bc..b574232 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/HideoutCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/HideoutCallbacks.d.ts @@ -1,15 +1,15 @@ import { HideoutController } from "../controllers/HideoutController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IHideoutUpgradeRequestData } from "../@types/eft/hideout/IHideoutUpgradeRequestData"; -import { IHideoutUpgradeCompleteRequestData } from "../@types/eft/hideout/IHideoutUpgradeCompleteRequestData"; -import { IHideoutScavCaseStartRequestData } from "../@types/eft/hideout/IHideoutScavCaseStartRequestData"; -import { IHideoutPutItemInRequestData } from "../@types/eft/hideout/IHideoutPutItemInRequestData"; -import { IHideoutTakeItemOutRequestData } from "../@types/eft/hideout/IHideoutTakeItemOutRequestData"; -import { IHideoutToggleAreaRequestData } from "../@types/eft/hideout/IHideoutToggleAreaRequestData"; -import { IHideoutSingleProductionStartRequestData } from "../@types/eft/hideout/IHideoutSingleProductionStartRequestData"; -import { IHideoutContinousProductionStartRequestData } from "../@types/eft/hideout/IHideoutContinousProductionStartRequestData"; -import { IHideoutTakeProductionRequestData } from "../@types/eft/hideout/IHideoutTakeProductionRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ConfigServer } from "../servers/ConfigServer"; import { OnUpdate } from "../di/OnUpdate"; export declare class HideoutCallbacks extends OnUpdate { diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/HttpCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/HttpCallbacks.d.ts index 9bb00bf..7072297 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/HttpCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/HttpCallbacks.d.ts @@ -1,4 +1,4 @@ -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; import { OnLoad } from "../di/OnLoad"; export declare class HttpCallbacks extends OnLoad { private httpServer; diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/InraidCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/InraidCallbacks.d.ts index 2ccaa0a..1948d01 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/InraidCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/InraidCallbacks.d.ts @@ -1,17 +1,17 @@ import { InraidController } from "../controllers/InraidController"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IRegisterPlayerRequestData } from "../@types/eft/inRaid/IRegisterPlayerRequestData"; -import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; +import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ConfigServer } from "../servers/ConfigServer"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class InraidCallbacks { private inraidController; private httpResponse; private configServer; private airdropConfig; private inraidConfig; - constructor(inraidController: InraidController, httpResponse: HttpResponse, configServer: ConfigServer); + constructor(inraidController: InraidController, httpResponse: HttpResponseUtil, configServer: ConfigServer); registerPlayer(url: string, info: IRegisterPlayerRequestData, sessionID: string): INullResponseData; saveProgress(url: string, info: ISaveProgressRequestData, sessionID: string): INullResponseData; getRaidEndState(): string; diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/InsuranceCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/InsuranceCallbacks.d.ts index f3d9832..73b7bd9 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/InsuranceCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/InsuranceCallbacks.d.ts @@ -1,22 +1,23 @@ import { InsuranceController } from "../controllers/InsuranceController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IGetInsuranceCostRequestData } from "../@types/eft/insurance/IGetInsuranceCostRequestData"; -import { IInsureRequestData } from "../@types/eft/insurance/IInsureRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +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 { HttpResponse } from "../utils/HttpResponse"; +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 { private insuranceController; private insuranceService; private httpResponse; private configServer; private insuranceConfig; - constructor(insuranceController: InsuranceController, insuranceService: InsuranceService, httpResponse: HttpResponse, configServer: ConfigServer); + constructor(insuranceController: InsuranceController, insuranceService: InsuranceService, httpResponse: HttpResponseUtil, configServer: ConfigServer); onLoad(): void; getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): IGetBodyResponseData; - insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): any; + insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse; onUpdate(secondsSinceLastRun: number): boolean; getRoute(): string; } diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/InventoryCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/InventoryCallbacks.d.ts index 1807e4b..90d6936 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/InventoryCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/InventoryCallbacks.d.ts @@ -1,22 +1,22 @@ import { InventoryController } from "../controllers/InventoryController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IInventoryFoldRequestData } from "../@types/eft/inventory/IInventoryFoldRequestData"; -import { IInventorySplitRequestData } from "../@types/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMoveRequestData } from "../@types/eft/inventory/IInventoryMoveRequestData"; -import { IInventoryMergeRequestData } from "../@types/eft/inventory/IInventoryMergeRequestData"; -import { IInventoryRemoveRequestData } from "../@types/eft/inventory/IInventoryRemoveRequestData"; -import { IInventoryTransferRequestData } from "../@types/eft/inventory/IInventoryTransferRequestData"; -import { IInventorySwapRequestData } from "../@types/eft/inventory/IInventorySwapRequestData"; -import { IInventoryToggleRequestData } from "../@types/eft/inventory/IInventoryToggleRequestData"; -import { IInventoryTagRequestData } from "../@types/eft/inventory/IInventoryTagRequestData"; -import { IInventoryBindRequestData } from "../@types/eft/inventory/IInventoryBindRequestData"; -import { IInventoryExamineRequestData } from "../@types/eft/inventory/IInventoryExamineRequestData"; -import { IInventoryReadEncyclopediaRequestData } from "../@types/eft/inventory/IInventoryReadEncyclopediaRequestData"; -import { IInventorySortRequestData } from "../@types/eft/inventory/IInventorySortRequestData"; -import { IInventoryCreateMarkerRequestData } from "../@types/eft/inventory/IInventoryCreateMarkerRequestData"; -import { IInventoryDeleteMarkerRequestData } from "../@types/eft/inventory/IInventoryDeleteMarkerRequestData"; -import { IInventoryEditMarkerRequestData } from "../@types/eft/inventory/IInventoryEditMarkerRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class InventoryCallbacks { private inventoryController; constructor(inventoryController: InventoryController); diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/ItemEventCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/ItemEventCallbacks.d.ts index ca069ad..74e79c4 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/ItemEventCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/ItemEventCallbacks.d.ts @@ -1,11 +1,11 @@ -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IItemEventRouterRequest } from "../@types/eft/itemEvent/IItemEventRouterRequest"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterRequest } from "../models/eft/itemEvent/IItemEventRouterRequest"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class ItemEventCallbacks { private httpResponse; private itemEventRouter; - constructor(httpResponse: HttpResponse, itemEventRouter: ItemEventRouter); + constructor(httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter); handleEvents(url: string, info: IItemEventRouterRequest, sessionID: string): IGetBodyResponseData; } diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/LauncherCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/LauncherCallbacks.d.ts index 5e3ec40..addf76b 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/LauncherCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/LauncherCallbacks.d.ts @@ -1,17 +1,17 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { SaveServer } from "../servers/SaveServer"; import { LauncherController } from "../controllers/LauncherController"; -import { IRegisterData } from "../@types/eft/launcher/IRegisterData"; -import { IRemoveProfileData } from "../@types/eft/launcher/IRemoveProfileData"; -import { ILoginRequestData } from "../@types/eft/launcher/ILoginRequestData"; -import { IChangeRequestData } from "../@types/eft/launcher/IChangeRequestData"; -import { IWatermark } from "../@types/spt/utils/IWatermark"; +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 { private httpResponse; private launcherController; private saveServer; private watermark; - constructor(httpResponse: HttpResponse, launcherController: LauncherController, saveServer: SaveServer, watermark: IWatermark); + constructor(httpResponse: HttpResponseUtil, launcherController: LauncherController, saveServer: SaveServer, watermark: IWatermark); connect(): string; login(url: string, info: ILoginRequestData, sessionID: string): string; register(url: string, info: IRegisterData, sessionID: string): "FAILED" | "OK"; diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/LocationCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/LocationCallbacks.d.ts index 6142ad5..346893b 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/LocationCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/LocationCallbacks.d.ts @@ -1,13 +1,13 @@ import { LocationController } from "../controllers/LocationController"; -import { IGetLocationRequestData } from "../@types/eft/location/IGetLocationRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { ILocationsGenerateAllResponse } from "../@types/eft/common/ILocationsSourceDestinationBase"; -import { ILocationBase } from "../@types/eft/common/ILocationBase"; -import { HttpResponse } from "../utils/HttpResponse"; +import { IGetLocationRequestData } from "../models/eft/location/IGetLocationRequestData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSourceDestinationBase"; +import { ILocationBase } from "../models/eft/common/ILocationBase"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class LocationCallbacks { private httpResponse; private locationController; - constructor(httpResponse: HttpResponse, locationController: LocationController); + constructor(httpResponse: HttpResponseUtil, locationController: LocationController); getLocationData(url: string, info: any, 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 373566b..9364a2f 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/MatchCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/MatchCallbacks.d.ts @@ -1,18 +1,18 @@ import { MatchController } from "../controllers/MatchController"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { IStartOfflineRaidRequestData } from "../@types/eft/match/IStartOffineRaidRequestData"; -import { IEndOfflineRaidRequestData } from "../@types/eft/match/IEndOfflineRaidRequestData"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { HttpResponse } from "../utils/HttpResponse"; +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 { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class MatchCallbacks { private httpResponse; private jsonUtil; private matchController; private databaseServer; - constructor(httpResponse: HttpResponse, jsonUtil: JsonUtil, matchController: MatchController, databaseServer: DatabaseServer); + constructor(httpResponse: HttpResponseUtil, jsonUtil: JsonUtil, matchController: MatchController, databaseServer: DatabaseServer); updatePing(url: string, info: any, sessionID: string): INullResponseData; exitMatch(url: string, info: any, sessionID: string): INullResponseData; exitToMenu(url: string, info: any, sessionID: string): INullResponseData; diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/ModCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/ModCallbacks.d.ts index 18ebfce..b4c18c2 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/ModCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/ModCallbacks.d.ts @@ -1,9 +1,9 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { OnLoad } from "../di/OnLoad"; import { DelayedModLoader } from "../loaders/DelayedModLoader"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from '../@types/spt/utils/ILogger'; -import { IHttpServer } from '../@types/spt/server/IHttpServer'; +import { ILogger } from '../models/spt/utils/ILogger'; +import { IHttpServer } from '../models/spt/server/IHttpServer'; declare class ModCallbacks extends OnLoad { private logger; private httpResponse; @@ -11,7 +11,7 @@ declare class ModCallbacks extends OnLoad { private modLoader; private configServer; private httpConfig; - constructor(logger: ILogger, httpResponse: HttpResponse, httpServer: IHttpServer, modLoader: DelayedModLoader, configServer: ConfigServer); + constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, modLoader: DelayedModLoader, configServer: ConfigServer); onLoad(): void; getRoute(): string; sendBundle(sessionID: string, req: any, resp: any, body: any): void; diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/NoteCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/NoteCallbacks.d.ts index ed30fcd..36cbd44 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 "../@types/eft/common/IPmcData"; -import { INoteActionData } from "../@types/eft/notes/INoteActionData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { private noteController; constructor(noteController: NoteController); diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/NotifierCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/NotifierCallbacks.d.ts index d982db5..f47dcc9 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/NotifierCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/NotifierCallbacks.d.ts @@ -1,15 +1,15 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { INotifierChannel } from "../@types/eft/notifier/INotifier"; -import { ISelectProfileRequestData } from "../@types/eft/notifier/ISelectProfileRequestData"; +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 { private httpServerHelper; private httpResponse; private notifierController; - constructor(httpServerHelper: HttpServerHelper, httpResponse: HttpResponse, notifierController: NotifierController); + constructor(httpServerHelper: HttpServerHelper, httpResponse: HttpResponseUtil, notifierController: NotifierController); /** * If we don't have anything to send, it's ok to not send anything back * because notification requests can be long-polling. In fact, we SHOULD wait diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/PresetBuildCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/PresetBuildCallbacks.d.ts index ee1b592..fd22c8f 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/PresetBuildCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/PresetBuildCallbacks.d.ts @@ -1,14 +1,14 @@ import { PresetBuildController } from "../controllers/PresetBuildController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IPresetBuildActionRequestData } from "../@types/eft/presetBuild/IPresetBuildActionRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { WeaponBuild } from "../@types/eft/profile/IAkiProfile"; -import { HttpResponse } from "../utils/HttpResponse"; +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 { WeaponBuild } from "../models/eft/profile/IAkiProfile"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class PresetBuildCallbacks { private httpResponse; private presetBuildController; - constructor(httpResponse: HttpResponse, presetBuildController: PresetBuildController); + constructor(httpResponse: HttpResponseUtil, presetBuildController: PresetBuildController); 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/4UseACustomConfigFile/types/callbacks/ProfileCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/ProfileCallbacks.d.ts index 94e05b8..e50c130 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/ProfileCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/ProfileCallbacks.d.ts @@ -1,21 +1,21 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { ProfileController } from "../controllers/ProfileController"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IProfileChangeNicknameRequestData } from "../@types/eft/profile/IProfileChangeNicknameRequestData"; -import { IProfileChangeVoiceRequestData } from "../@types/eft/profile/IProfileChangeVoiceRequestData"; -import { IProfileCreateRequestData } from "../@types/eft/profile/IProfileCreateRequestData"; -import { IValidateNicknameRequestData } from "../@types/eft/profile/IValidateNicknameRequestData"; -import { ISearchFriendRequestData } from "../@types/eft/profile/ISearchFriendRequestData"; -import { ISearchFriendResponse } from "../@types/eft/profile/ISearchFriendResponse"; -import { IGetMiniProfileRequestData } from "../@types/eft/launcher/IGetMiniProfileRequestData"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +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 { private httpResponse; private timeUtil; private profileController; - constructor(httpResponse: HttpResponse, timeUtil: TimeUtil, profileController: ProfileController); + constructor(httpResponse: HttpResponseUtil, timeUtil: TimeUtil, profileController: ProfileController); createProfile(url: string, info: IProfileCreateRequestData, sessionID: string): IGetBodyResponseData; getProfileData(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; regenerateScav(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/QuestCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/QuestCallbacks.d.ts index 589682b..1f3964b 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/QuestCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/QuestCallbacks.d.ts @@ -1,22 +1,22 @@ import { QuestController } from "../controllers/QuestController"; import { RepeatableQuestController } from "../controllers/RepeatableQuestController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IAcceptQuestRequestData } from "../@types/eft/quests/IAcceptQuestRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IListQuestsRequestData } from "../@types/eft/quests/IListQuestsRequestData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { ICompleteQuestRequestData } from "../@types/eft/quests/ICompleteQuestRequestData"; -import { IHandoverQuestRequestData } from "../@types/eft/quests/IHandoverQuestRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IQuest } from "../@types/eft/common/tables/IQuest"; -import { IPmcDataRepeatableQuest } from "../@types/eft/common/tables/IRepeatableQuests"; -import { IRepeatableQuestChangeRequest } from "../@types/eft/quests/IRepeatableQuestChangeRequest"; -import { HttpResponse } from "../utils/HttpResponse"; +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 { IQuest } from "../models/eft/common/tables/IQuest"; +import { IPmcDataRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; +import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class QuestCallbacks { private httpResponse; private questController; private repeatableQuestController; - constructor(httpResponse: HttpResponse, questController: QuestController, repeatableQuestController: RepeatableQuestController); + constructor(httpResponse: HttpResponseUtil, questController: QuestController, repeatableQuestController: RepeatableQuestController); 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/4UseACustomConfigFile/types/callbacks/RagfairCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/RagfairCallbacks.d.ts index 31af479..260fd13 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 { IPmcData } from "../@types/eft/common/IPmcData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { ISearchRequestData } from "../@types/eft/ragfair/ISearchRequestData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGetMarketPriceRequestData } from "../@types/eft/ragfair/IGetMarketPriceRequestData"; -import { IAddOfferRequestData } from "../@types/eft/ragfair/IAddOfferRequestData"; -import { IRemoveOfferRequestData } from "../@types/eft/ragfair/IRemoveOfferRequestData"; -import { IExtendOfferRequestData } from "../@types/eft/ragfair/IExtendOfferRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IGetItemPriceResult } from "../@types/eft/ragfair/IGetItemPriceResult"; +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 { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult"; import { ConfigServer } from "../servers/ConfigServer"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairCallbacks extends OnLoadOnUpdate { private httpResponse; private logger; @@ -23,7 +23,7 @@ export declare class RagfairCallbacks extends OnLoadOnUpdate { private ragfairController; private configServer; private ragfairConfig; - constructor(httpResponse: HttpResponse, logger: ILogger, jsonUtil: JsonUtil, ragfairServer: RagfairServer, ragfairController: RagfairController, configServer: ConfigServer); + constructor(httpResponse: HttpResponseUtil, logger: ILogger, jsonUtil: JsonUtil, ragfairServer: RagfairServer, ragfairController: RagfairController, configServer: ConfigServer); onLoad(): void; getRoute(): string; search(url: string, info: ISearchRequestData, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/RepairCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/RepairCallbacks.d.ts index e28e48b..4acd364 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 "../@types/eft/common/IPmcData"; -import { IRepairActionDataRequest } from "../@types/eft/repair/IRepairActionDataRequest"; -import { ITraderRepairActionDataRequest } from "../@types/eft/repair/ITraderRepairActionDataRequest"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +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/TradeCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/TradeCallbacks.d.ts index 5117a82..4cf8497 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 "../@types/eft/common/IPmcData"; -import { IProcessRagfairTradeRequestData } from "../@types/eft/trade/IProcessRagfairTradeRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IProcessBaseTradeRequestData } from "../@types/eft/trade/IProcessBaseTradeRequestData"; +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 { private tradeController; constructor(tradeController: TradeController); diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/TraderCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/TraderCallbacks.d.ts index 3f72e2b..264ef94 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/TraderCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/TraderCallbacks.d.ts @@ -1,13 +1,13 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TraderController } from "../controllers/TraderController"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IBarterScheme, ITraderAssort, ITraderBase } from "../@types/eft/common/tables/ITrader"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; +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 { private httpResponse; private traderController; - constructor(httpResponse: HttpResponse, traderController: TraderController); + constructor(httpResponse: HttpResponseUtil, traderController: TraderController); onLoad(): void; getRoute(): string; getTraderSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/WeatherCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/WeatherCallbacks.d.ts index 99d5c1f..2474417 100644 --- a/TypeScript/4UseACustomConfigFile/types/callbacks/WeatherCallbacks.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/callbacks/WeatherCallbacks.d.ts @@ -1,10 +1,10 @@ import { WeatherController } from "../controllers/WeatherController"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { HttpResponse } from "../utils/HttpResponse"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class WeatherCallbacks { private httpResponse; private weatherController; - constructor(httpResponse: HttpResponse, weatherController: WeatherController); + constructor(httpResponse: HttpResponseUtil, weatherController: WeatherController); getWeather(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; } diff --git a/TypeScript/4UseACustomConfigFile/types/callbacks/WishlistCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/callbacks/WishlistCallbacks.d.ts index 870f049..1816600 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 "../@types/eft/common/IPmcData"; -import { IWishlistActionData } from "../@types/eft/wishlist/IWishlistActionData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { private wishlistController; constructor(wishlistController: WishlistController); diff --git a/TypeScript/4UseACustomConfigFile/types/configs/AkiConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/configs/AkiConfig.d.ts deleted file mode 100644 index f9b9e31..0000000 --- a/TypeScript/4UseACustomConfigFile/types/configs/AkiConfig.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -export const akiVersion: string; -export const projectName: string; -export const compatibleTarkovVersion: string; diff --git a/TypeScript/4UseACustomConfigFile/types/configs/BotConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/configs/BotConfig.d.ts deleted file mode 100644 index 6c7ea7b..0000000 --- a/TypeScript/4UseACustomConfigFile/types/configs/BotConfig.d.ts +++ /dev/null @@ -1,309 +0,0 @@ -export declare namespace presetBatch { - const assault: number; - const bossBully: number; - const bossGluhar: number; - const bossKilla: number; - const bossKojaniy: number; - const bossSanitar: number; - const bossTagilla: number; - const bossTest: number; - const cursedAssault: number; - const followerBully: number; - const followerGluharAssault: number; - const followerGluharScout: number; - const followerGluharSecurity: number; - const followerGluharSnipe: number; - const followerKojaniy: number; - const followerSanitar: number; - const followerTagilla: number; - const followerTest: number; - const marksman: number; - const pmcBot: number; - const sectantPriest: number; - const sectantWarrior: number; - const gifter: number; - const test: number; - const exUsec: number; -} -export declare const bosses: string[]; -export declare namespace durability { - namespace _default { - namespace armor { - const maxDelta: number; - const minDelta: number; - } - namespace weapon { - export const lowestMax: number; - export const highestMax: number; - const maxDelta_1: number; - export { maxDelta_1 as maxDelta }; - const minDelta_1: number; - export { minDelta_1 as minDelta }; - } - } - export { _default as default }; - export namespace pmc { - export namespace armor_1 { - export const lowestMaxPercent: number; - export const highestMaxPercent: number; - const maxDelta_2: number; - export { maxDelta_2 as maxDelta }; - const minDelta_2: number; - export { minDelta_2 as minDelta }; - } - export { armor_1 as armor }; - export namespace weapon_1 { - const lowestMax_1: number; - export { lowestMax_1 as lowestMax }; - const highestMax_1: number; - export { highestMax_1 as highestMax }; - const maxDelta_3: number; - export { maxDelta_3 as maxDelta }; - const minDelta_3: number; - export { minDelta_3 as minDelta }; - } - export { weapon_1 as weapon }; - } - export namespace boss { - export namespace armor_2 { - const maxDelta_4: number; - export { maxDelta_4 as maxDelta }; - const minDelta_4: number; - export { minDelta_4 as minDelta }; - } - export { armor_2 as armor }; - export namespace weapon_2 { - const lowestMax_2: number; - export { lowestMax_2 as lowestMax }; - const highestMax_2: number; - export { highestMax_2 as highestMax }; - const maxDelta_5: number; - export { maxDelta_5 as maxDelta }; - const minDelta_5: number; - export { minDelta_5 as minDelta }; - } - export { weapon_2 as weapon }; - } - export namespace follower { - export namespace armor_3 { - const maxDelta_6: number; - export { maxDelta_6 as maxDelta }; - const minDelta_6: number; - export { minDelta_6 as minDelta }; - } - export { armor_3 as armor }; - export namespace weapon_3 { - const lowestMax_3: number; - export { lowestMax_3 as lowestMax }; - const highestMax_3: number; - export { highestMax_3 as highestMax }; - const maxDelta_7: number; - export { maxDelta_7 as maxDelta }; - const minDelta_7: number; - export { minDelta_7 as minDelta }; - } - export { weapon_3 as weapon }; - } - export namespace assault_1 { - export namespace armor_4 { - const maxDelta_8: number; - export { maxDelta_8 as maxDelta }; - const minDelta_8: number; - export { minDelta_8 as minDelta }; - } - export { armor_4 as armor }; - export namespace weapon_4 { - const lowestMax_4: number; - export { lowestMax_4 as lowestMax }; - const highestMax_4: number; - export { highestMax_4 as highestMax }; - const maxDelta_9: number; - export { maxDelta_9 as maxDelta }; - const minDelta_9: number; - export { minDelta_9 as minDelta }; - } - export { weapon_4 as weapon }; - } - export { assault_1 as assault }; - export namespace cursedassault { - export namespace armor_5 { - const maxDelta_10: number; - export { maxDelta_10 as maxDelta }; - const minDelta_10: number; - export { minDelta_10 as minDelta }; - } - export { armor_5 as armor }; - export namespace weapon_5 { - const lowestMax_5: number; - export { lowestMax_5 as lowestMax }; - const highestMax_5: number; - export { highestMax_5 as highestMax }; - const maxDelta_11: number; - export { maxDelta_11 as maxDelta }; - const minDelta_11: number; - export { minDelta_11 as minDelta }; - } - export { weapon_5 as weapon }; - } - export namespace marksman_1 { - export namespace armor_6 { - const maxDelta_12: number; - export { maxDelta_12 as maxDelta }; - const minDelta_12: number; - export { minDelta_12 as minDelta }; - } - export { armor_6 as armor }; - export namespace weapon_6 { - const lowestMax_6: number; - export { lowestMax_6 as lowestMax }; - const highestMax_6: number; - export { highestMax_6 as highestMax }; - const maxDelta_13: number; - export { maxDelta_13 as maxDelta }; - const minDelta_13: number; - export { minDelta_13 as minDelta }; - } - export { weapon_6 as weapon }; - } - export { marksman_1 as marksman }; - export namespace pmcbot { - export namespace armor_7 { - const maxDelta_14: number; - export { maxDelta_14 as maxDelta }; - const minDelta_14: number; - export { minDelta_14 as minDelta }; - } - export { armor_7 as armor }; - export namespace weapon_7 { - const lowestMax_7: number; - export { lowestMax_7 as lowestMax }; - const highestMax_7: number; - export { highestMax_7 as highestMax }; - const maxDelta_15: number; - export { maxDelta_15 as maxDelta }; - const minDelta_15: number; - export { minDelta_15 as minDelta }; - } - export { weapon_7 as weapon }; - } - export namespace exusec { - export namespace armor_8 { - const maxDelta_16: number; - export { maxDelta_16 as maxDelta }; - const minDelta_16: number; - export { minDelta_16 as minDelta }; - } - export { armor_8 as armor }; - export namespace weapon_8 { - const lowestMax_8: number; - export { lowestMax_8 as lowestMax }; - const highestMax_8: number; - export { highestMax_8 as highestMax }; - const maxDelta_17: number; - export { maxDelta_17 as maxDelta }; - const minDelta_17: number; - export { minDelta_17 as minDelta }; - } - export { weapon_8 as weapon }; - } - export namespace sectantpriest { - export namespace armor_9 { - const maxDelta_18: number; - export { maxDelta_18 as maxDelta }; - const minDelta_18: number; - export { minDelta_18 as minDelta }; - } - export { armor_9 as armor }; - export namespace weapon_9 { - const lowestMax_9: number; - export { lowestMax_9 as lowestMax }; - const highestMax_9: number; - export { highestMax_9 as highestMax }; - const maxDelta_19: number; - export { maxDelta_19 as maxDelta }; - const minDelta_19: number; - export { minDelta_19 as minDelta }; - } - export { weapon_9 as weapon }; - } - export namespace sectantwarrior { - export namespace armor_10 { - const maxDelta_20: number; - export { maxDelta_20 as maxDelta }; - const minDelta_20: number; - export { minDelta_20 as minDelta }; - } - export { armor_10 as armor }; - export namespace weapon_10 { - const lowestMax_10: number; - export { lowestMax_10 as lowestMax }; - const highestMax_10: number; - export { highestMax_10 as highestMax }; - const maxDelta_21: number; - export { maxDelta_21 as maxDelta }; - const minDelta_21: number; - export { minDelta_21 as minDelta }; - } - export { weapon_10 as weapon }; - } -} -export declare namespace lootNValue { - export const scav: number; - const pmc_1: number; - export { pmc_1 as pmc }; -} -export declare namespace pmc_2 { - namespace dynamicLoot { - const whitelist: any[]; - const blacklist: string[]; - const spawnLimits: { - "5c99f98d86f7745c314214b3": number; - "5c164d2286f774194c5e69fa": number; - "550aa4cd4bdc2dd8348b456c": number; - "55818add4bdc2d5b648b456f": number; - "55818ad54bdc2ddc698b4569": number; - "55818aeb4bdc2ddc698b456a": number; - "55818ae44bdc2dde698b456c": number; - "55818af64bdc2d5b648b4570": number; - "5448e54d4bdc2dcc718b4568": number; - "5448f3a64bdc2d60728b456a": number; - "5447e1d04bdc2dff2f8b4567": number; - "5a341c4686f77469e155819e": number; - "55818b164bdc2ddc698b456c": number; - "5448bc234bdc2d3c308b4569": number; - "543be5dd4bdc2deb348b4569": number; - "543be5cb4bdc2deb348b4568": number; - "5485a8684bdc2da71d8b4567": number; - "5d650c3e815116009f6201d2": number; - "5448f39d4bdc2d0a728b4568": number; - "543be6564bdc2df4348b4568": number; - }; - const moneyStackLimits: { - "5449016a4bdc2d6f028b456f": number; - "5696686a4bdc2da3298b456a": number; - "569668774bdc2da2298b4568": number; - }; - } - const cartridgeBlacklist: string[]; - const difficulty: string; - const isUsec: number; - const chanceSameSideIsHostilePercent: number; - const usecType: string; - const bearType: string; - const maxBackpackLootTotalRub: number; - const maxPocketLootTotalRub: number; - const maxVestLootTotalRub: number; - namespace types { - const assault_2: number; - export { assault_2 as assault }; - const cursedAssault_1: number; - export { cursedAssault_1 as cursedAssault }; - const pmcBot_1: number; - export { pmcBot_1 as pmcBot }; - const exUsec_1: number; - export { exUsec_1 as exUsec }; - } -} -export { pmc_2 as pmc }; -export declare const showTypeInNickname: boolean; -export declare const maxBotCap: number; diff --git a/TypeScript/4UseACustomConfigFile/types/configs/HealthConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/configs/HealthConfig.d.ts deleted file mode 100644 index 49bef94..0000000 --- a/TypeScript/4UseACustomConfigFile/types/configs/HealthConfig.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -export namespace healthMultipliers { - const death: number; - const blacked: number; -} -export namespace save { - const health: boolean; - const effects: boolean; -} diff --git a/TypeScript/4UseACustomConfigFile/types/configs/HideoutConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/configs/HideoutConfig.d.ts deleted file mode 100644 index 3894576..0000000 --- a/TypeScript/4UseACustomConfigFile/types/configs/HideoutConfig.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -export const runIntervalSeconds: number; -export namespace scavCase { - const rewardParentBlacklist: any[]; - const rewardItemBlacklist: any[]; - namespace ammoRewards { - const giveMultipleOfTen: boolean; - const minAmount: number; - } - namespace moneyRewards { - const enabled: boolean; - namespace rub { - const min: number; - const max: number; - } - namespace usd { - const min_1: number; - export { min_1 as min }; - const max_1: number; - export { max_1 as max }; - } - namespace eur { - const min_2: number; - export { min_2 as min }; - const max_2: number; - export { max_2 as max }; - } - } -} diff --git a/TypeScript/4UseACustomConfigFile/types/configs/HttpConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/configs/HttpConfig.d.ts deleted file mode 100644 index d7572a0..0000000 --- a/TypeScript/4UseACustomConfigFile/types/configs/HttpConfig.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export const ip: string; -export const port: number; diff --git a/TypeScript/4UseACustomConfigFile/types/configs/InraidConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/configs/InraidConfig.d.ts deleted file mode 100644 index 7ac112c..0000000 --- a/TypeScript/4UseACustomConfigFile/types/configs/InraidConfig.d.ts +++ /dev/null @@ -1,15 +0,0 @@ -export const MIAOnRaidEnd: boolean; -export namespace raidMenuSettings { - const aiAmount: string; - const aiDifficulty: string; - const bossEnabled: boolean; - const scavWars: boolean; - const taggedAndCursed: boolean; -} -export namespace save { - const loot: boolean; - const durability: boolean; -} -export const carExtracts: string[]; -export const carExtractBaseStandingGain: number; -export const scavExtractGain: number; diff --git a/TypeScript/4UseACustomConfigFile/types/configs/InsuranceConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/configs/InsuranceConfig.d.ts deleted file mode 100644 index 441319e..0000000 --- a/TypeScript/4UseACustomConfigFile/types/configs/InsuranceConfig.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -export const insuranceMultiplier: { - "54cb50c76803fa8b248b4571": number; - "54cb57776803fa99248b456e": number; -}; -export const returnChancePercent: { - "54cb50c76803fa8b248b4571": number; - "54cb57776803fa99248b456e": number; -}; -export const runIntervalSeconds: number; diff --git a/TypeScript/4UseACustomConfigFile/types/configs/InventoryConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/configs/InventoryConfig.d.ts deleted file mode 100644 index 8d0b82f..0000000 --- a/TypeScript/4UseACustomConfigFile/types/configs/InventoryConfig.d.ts +++ /dev/null @@ -1 +0,0 @@ -export const newItemsMarkedFound: boolean; diff --git a/TypeScript/4UseACustomConfigFile/types/configs/LocationConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/configs/LocationConfig.d.ts deleted file mode 100644 index 848096a..0000000 --- a/TypeScript/4UseACustomConfigFile/types/configs/LocationConfig.d.ts +++ /dev/null @@ -1,52 +0,0 @@ -export namespace looseLootMultiplier { - const bigmap: number; - const develop: number; - const factory4_day: number; - const factory4_night: number; - const interchange: number; - const laboratory: number; - const rezervbase: number; - const shoreline: number; - const woods: number; - const hideout: number; - const lighthouse: number; - const privatearea: number; - const suburbs: number; - const tarkovstreets: number; - const terminal: number; - const town: number; -} -export namespace staticLootMultiplier { - const bigmap_1: number; - export { bigmap_1 as bigmap }; - const develop_1: number; - export { develop_1 as develop }; - const factory4_day_1: number; - export { factory4_day_1 as factory4_day }; - const factory4_night_1: number; - export { factory4_night_1 as factory4_night }; - const interchange_1: number; - export { interchange_1 as interchange }; - const laboratory_1: number; - export { laboratory_1 as laboratory }; - const rezervbase_1: number; - export { rezervbase_1 as rezervbase }; - const shoreline_1: number; - export { shoreline_1 as shoreline }; - const woods_1: number; - export { woods_1 as woods }; - const hideout_1: number; - export { hideout_1 as hideout }; - const lighthouse_1: number; - export { lighthouse_1 as lighthouse }; - const privatearea_1: number; - export { privatearea_1 as privatearea }; - const suburbs_1: number; - export { suburbs_1 as suburbs }; - const tarkovstreets_1: number; - export { tarkovstreets_1 as tarkovstreets }; - const terminal_1: number; - export { terminal_1 as terminal }; - const town_1: number; - export { town_1 as town }; -} diff --git a/TypeScript/4UseACustomConfigFile/types/configs/MatchConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/configs/MatchConfig.d.ts deleted file mode 100644 index 59524e0..0000000 --- a/TypeScript/4UseACustomConfigFile/types/configs/MatchConfig.d.ts +++ /dev/null @@ -1 +0,0 @@ -export const enabled: boolean; diff --git a/TypeScript/4UseACustomConfigFile/types/configs/QuestConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/configs/QuestConfig.d.ts deleted file mode 100644 index 069e0ac..0000000 --- a/TypeScript/4UseACustomConfigFile/types/configs/QuestConfig.d.ts +++ /dev/null @@ -1,70 +0,0 @@ -export const redeemTime: number; -export const repeatableQuests: { - name: string; - types: string[]; - resetTime: number; - numQuests: number; - minPlayerLevel: number; - rewardScaling: { - levels: number[]; - experience: number[]; - roubles: number[]; - items: number[]; - reputation: number[]; - rewardSpread: number; - }; - locations: { - any: string[]; - factory4_day: string[]; - bigmap: string[]; - Woods: string[]; - Shoreline: string[]; - Interchange: string[]; - Lighthouse: string[]; - laboratory: string[]; - RezervBase: string[]; - }; - traderWhitelist: { - traderId: any; - questTypes: string[]; - }[]; - questConfig: { - Exploration: { - maxExtracts: number; - specificExits: { - probability: number; - passageRequirementWhitelist: string[]; - }; - }; - Completion: { - minRequestedAmount: number; - maxRequestedAmount: number; - minRequestedBulletAmount: number; - maxRequestedBulletAmount: number; - useWhitelist: boolean; - useBlacklist: boolean; - }; - Elimination: { - targets: { - key: string; - relativeProbability: number; - data: { - isBoss: boolean; - }; - }[]; - bodyPartProb: number; - bodyParts: { - key: string; - relativeProbability: number; - data: string[]; - }[]; - specificLocationProb: number; - distLocationBlacklist: string[]; - distProb: number; - maxDist: number; - minDist: number; - maxKills: number; - minKills: number; - }; - }; -}[]; diff --git a/TypeScript/4UseACustomConfigFile/types/configs/RagfairConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/configs/RagfairConfig.d.ts deleted file mode 100644 index 4a0f68c..0000000 --- a/TypeScript/4UseACustomConfigFile/types/configs/RagfairConfig.d.ts +++ /dev/null @@ -1,87 +0,0 @@ -export const runIntervalSeconds: number; -export namespace sell { - const fees: boolean; - namespace chance { - const base: number; - const overprices: number; - const underpriced: number; - } - namespace time { - const base_1: number; - export { base_1 as base }; - export const min: number; - export const max: number; - } - namespace reputation { - const gain: number; - const loss: number; - } -} -export const traders: { - "54cb50c76803fa8b248b4571": boolean; - "54cb57776803fa99248b456e": boolean; - "579dc571d53a0658a154fbec": boolean; - "58330581ace78e27b8b10cee": boolean; - "5935c25fb3acc3127c3d8cd9": boolean; - "5a7c2eca46aef81a7ca2145d": boolean; - "5ac3b934156ae10c4430e83c": boolean; - "5c0647fdd443bc2504c2d371": boolean; - ragfair: boolean; -}; -export namespace dynamic { - const expiredOfferThreshold: number; - namespace offerItemCount { - const min_1: number; - export { min_1 as min }; - const max_1: number; - export { max_1 as max }; - } - namespace price { - const min_2: number; - export { min_2 as min }; - const max_2: number; - export { max_2 as max }; - } - namespace endTimeSeconds { - const min_3: number; - export { min_3 as min }; - const max_3: number; - export { max_3 as max }; - } - namespace condition { - export const conditionChance: number; - const min_4: number; - export { min_4 as min }; - const max_4: number; - export { max_4 as max }; - } - namespace stackablePercent { - const min_5: number; - export { min_5 as min }; - const max_5: number; - export { max_5 as max }; - } - namespace nonStackableCount { - const min_6: number; - export { min_6 as min }; - const max_6: number; - export { max_6 as max }; - } - namespace rating { - const min_7: number; - export { min_7 as min }; - const max_7: number; - export { max_7 as max }; - } - const currencies: { - "5449016a4bdc2d6f028b456f": number; - "5696686a4bdc2da3298b456a": number; - "569668774bdc2da2298b4568": number; - }; - const showAsSingleStack: any[]; - namespace blacklist { - const custom: string[]; - const enableBsgList: boolean; - const enableQuestList: boolean; - } -} diff --git a/TypeScript/4UseACustomConfigFile/types/configs/RepairConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/configs/RepairConfig.d.ts deleted file mode 100644 index d2bec52..0000000 --- a/TypeScript/4UseACustomConfigFile/types/configs/RepairConfig.d.ts +++ /dev/null @@ -1 +0,0 @@ -export const priceMultiplier: number; diff --git a/TypeScript/4UseACustomConfigFile/types/configs/TraderConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/configs/TraderConfig.d.ts deleted file mode 100644 index c7fc65d..0000000 --- a/TypeScript/4UseACustomConfigFile/types/configs/TraderConfig.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -export const updateTime: { - traderId: any; - seconds: number; -}[]; -export const updateTimeDefault: number; -export const fenceAssortSize: number; -export const fenceMaxPresetsCount: number; -export const fencePresetPriceMult: number; -export const minDurabilityForSale: number; -export const fenceItemIgnoreList: string[]; diff --git a/TypeScript/4UseACustomConfigFile/types/configs/WeatherConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/configs/WeatherConfig.d.ts deleted file mode 100644 index ca37604..0000000 --- a/TypeScript/4UseACustomConfigFile/types/configs/WeatherConfig.d.ts +++ /dev/null @@ -1,55 +0,0 @@ -export const acceleration: number; -export namespace weather { - namespace clouds { - const min: number; - const max: number; - } - namespace windSpeed { - const min_1: number; - export { min_1 as min }; - const max_1: number; - export { max_1 as max }; - } - namespace windDirection { - const min_2: number; - export { min_2 as min }; - const max_2: number; - export { max_2 as max }; - } - namespace windGustiness { - const min_3: number; - export { min_3 as min }; - const max_3: number; - export { max_3 as max }; - } - namespace rain { - const min_4: number; - export { min_4 as min }; - const max_4: number; - export { max_4 as max }; - } - namespace rainIntensity { - const min_5: number; - export { min_5 as min }; - const max_5: number; - export { max_5 as max }; - } - namespace fog { - const min_6: number; - export { min_6 as min }; - const max_6: number; - export { max_6 as max }; - } - namespace temp { - const min_7: number; - export { min_7 as min }; - const max_7: number; - export { max_7 as max }; - } - namespace pressure { - const min_8: number; - export { min_8 as min }; - const max_8: number; - export { max_8 as max }; - } -} diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/BotController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/BotController.d.ts index 1fc8fc4..d7dc36d 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/BotController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/BotController.d.ts @@ -1,8 +1,8 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { Difficulty } from "../@types/eft/common/tables/IBotType"; -import { IGenerateBotsRequestData } from "../@types/eft/bot/IGenerateBotsRequestData"; -import { IBotBase } from "../@types/eft/common/tables/IBotBase"; -import { IBotCore } from "../@types/eft/common/tables/IBotCore"; +import { Difficulty } from "../models/eft/common/tables/IBotType"; +import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; +import { IBotBase } from "../models/eft/common/tables/IBotBase"; +import { IBotCore } from "../models/eft/common/tables/IBotCore"; import { ConfigServer } from "../servers/ConfigServer"; import { BotHelper } from "../helpers/BotHelper"; import { BotGenerator } from "../generators/BotGenerator"; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/CustomizationController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/CustomizationController.d.ts index 4255154..6fd3b12 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/CustomizationController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/CustomizationController.d.ts @@ -1,13 +1,13 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IWearClothingRequestData } from "../@types/eft/customization/IWearClothingRequestData"; -import { IBuyClothingRequestData } from "../@types/eft/customization/IBuyClothingRequestData"; -import { ISuit } from "../@types/eft/common/tables/ITrader"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IWearClothingRequestData } from "../models/eft/customization/IWearClothingRequestData"; +import { IBuyClothingRequestData } from "../models/eft/customization/IBuyClothingRequestData"; +import { ISuit } from "../models/eft/common/tables/ITrader"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class CustomizationController { private logger; private itemEventRouter; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/DialogueController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/DialogueController.d.ts index a855ad1..8095666 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/DialogueController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/DialogueController.d.ts @@ -1,16 +1,16 @@ import { SaveServer } from "../servers/SaveServer"; import { DialogueHelper } from "../helpers/DialogueHelper"; -import { DialogueInfo } from "../@types/eft/profile/IAkiProfile"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IGetFriendListDataResponse } from "../@types/eft/dialog/IGetFriendListDataResponse"; -import { IGetMailDialogViewResponseData } from "../@types/eft/dialog/IGetMailDialogViewResponseData"; -import { IGetAllAttachmentsResponse } from "../@types/eft/dialog/IGetAllAttachmentsResponse"; -import { HttpResponse } from "../utils/HttpResponse"; +import { DialogueInfo } from "../models/eft/profile/IAkiProfile"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse"; +import { IGetMailDialogViewResponseData } from "../models/eft/dialog/IGetMailDialogViewResponseData"; +import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachmentsResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class DialogueController { private httpResponse; private saveServer; private dialogueHelper; - constructor(httpResponse: HttpResponse, saveServer: SaveServer, dialogueHelper: DialogueHelper); + constructor(httpResponse: HttpResponseUtil, saveServer: SaveServer, dialogueHelper: DialogueHelper); getFriendList(sessionID: string): IGetFriendListDataResponse; generateDialogueList(sessionID: string): IGetBodyResponseData; getDialogueInfo(dialogueID: string, sessionID: string): DialogueInfo; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/GameController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/GameController.d.ts index 883bed3..614d270 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/GameController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/GameController.d.ts @@ -1,9 +1,9 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGameConfigResponse } from "../@types/eft/game/IGameConfigResponse"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from "../@types/spt/utils/ILogger"; -import { IWatermark } from "../@types/spt/utils/IWatermark"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { IWatermark } from "../models/spt/utils/IWatermark"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; export declare class GameController { private logger; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/HealthController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/HealthController.d.ts index 3d2120b..ca049f6 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/HealthController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/HealthController.d.ts @@ -2,14 +2,14 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { PaymentService } from "../services/PaymentService"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { HealthHelper } from "../helpers/HealthHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IHealthTreatmentRequestData } from "../@types/eft/health/IHealthTreatmentRequestData"; -import { IOffraidEatRequestData } from "../@types/eft/health/IOffraidEatRequestData"; -import { IOffraidHealRequestData } from "../@types/eft/health/IOffraidHealRequestData"; -import { ISyncHealthRequestData } from "../@types/eft/health/ISyncHealthRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IHealthTreatmentRequestData } from "../models/eft/health/IHealthTreatmentRequestData"; +import { IOffraidEatRequestData } from "../models/eft/health/IOffraidEatRequestData"; +import { IOffraidHealRequestData } from "../models/eft/health/IOffraidHealRequestData"; +import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class HealthController { private logger; private itemEventRouter; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/HideoutController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/HideoutController.d.ts index 59e05d9..22b7040 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/HideoutController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/HideoutController.d.ts @@ -10,20 +10,20 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { PaymentHelper } from "../helpers/PaymentHelper"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { HideoutHelper } from "../helpers/HideoutHelper"; -import { IHideoutUpgradeRequestData } from "../@types/eft/hideout/IHideoutUpgradeRequestData"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { HideoutUpgradeCompleteRequestData } from "../@types/eft/hideout/HideoutUpgradeCompleteRequestData"; -import { IHideoutPutItemInRequestData } from "../@types/eft/hideout/IHideoutPutItemInRequestData"; -import { IHideoutTakeItemOutRequestData } from "../@types/eft/hideout/IHideoutTakeItemOutRequestData"; -import { IHideoutToggleAreaRequestData } from "../@types/eft/hideout/IHideoutToggleAreaRequestData"; -import { IHideoutSingleProductionStartRequestData } from "../@types/eft/hideout/IHideoutSingleProductionStartRequestData"; -import { IHideoutScavCaseStartRequestData } from "../@types/eft/hideout/IHideoutScavCaseStartRequestData"; -import { IHideoutTakeProductionRequestData } from "../@types/eft/hideout/IHideoutTakeProductionRequestData"; -import { IHideoutContinousProductionStartRequestData } from "../@types/eft/hideout/IHideoutContinousProductionStartRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { HideoutUpgradeCompleteRequestData } from "../models/eft/hideout/HideoutUpgradeCompleteRequestData"; +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 { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; +import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; +import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HttpResponse } from "../utils/HttpResponse"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class HideoutController { private logger; private hashUtil; @@ -41,7 +41,7 @@ export declare class HideoutController { private hideoutHelper; private configServer; private hideoutConfig; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponse, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, configServer: ConfigServer); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, configServer: ConfigServer); upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; upgradeComplete(pmcData: IPmcData, body: HideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse; putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/InraidController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/InraidController.d.ts index e0be58a..1033e5f 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/InraidController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/InraidController.d.ts @@ -2,31 +2,29 @@ import { SaveServer } from "../servers/SaveServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "../helpers/ItemHelper"; import { TraderHelper } from "../helpers/TraderHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; import { HealthHelper } from "../helpers/HealthHelper"; -import { IRegisterPlayerRequestData } from "../@types/eft/inRaid/IRegisterPlayerRequestData"; -import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData"; +import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; +import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ConfigServer } from "../servers/ConfigServer"; import { JsonUtil } from "../utils/JsonUtil"; import { QuestHelper } from "../helpers/QuestHelper"; import { InRaidHelper } from "../helpers/InRaidHelper"; import { InsuranceService } from "../services/InsuranceService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; export declare class InraidController { - private logger; private saveServer; private jsonUtil; private databaseServer; private questHelper; private itemHelper; - private profileHelper; + private extendedProfileHelper; private healthHelper; private traderHelper; private insuranceService; private inRaidHelper; private configServer; private inraidConfig; - constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, profileHelper: ProfileHelper, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); + constructor(saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, extendedProfileHelper: ExtendedProfileHelper, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); addPlayer(sessionID: string, info: IRegisterPlayerRequestData): void; saveProgress(offraidData: ISaveProgressRequestData, sessionID: string): void; } diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/InsuranceController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/InsuranceController.d.ts index 5e43c2b..44c61fa 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/InsuranceController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/InsuranceController.d.ts @@ -8,12 +8,12 @@ import { PaymentService } from "../services/PaymentService"; import { DialogueHelper } from "../helpers/DialogueHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { ItemHelper } from "../helpers/ItemHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IGetInsuranceCostRequestData } from "../@types/eft/insurance/IGetInsuranceCostRequestData"; -import { IInsureRequestData } from "../@types/eft/insurance/IInsureRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData"; +import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { InsuranceService } from "../services/InsuranceService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class InsuranceController { private logger; private randomUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/InventoryController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/InventoryController.d.ts index a29fd1a..4ff07b8 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/InventoryController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/InventoryController.d.ts @@ -6,25 +6,25 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { PaymentHelper } from "../helpers/PaymentHelper"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IInventoryMoveRequestData } from "../@types/eft/inventory/IInventoryMoveRequestData"; -import { IInventoryRemoveRequestData } from "../@types/eft/inventory/IInventoryRemoveRequestData"; -import { IInventorySplitRequestData } from "../@types/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMergeRequestData } from "../@types/eft/inventory/IInventoryMergeRequestData"; -import { IInventoryTransferRequestData } from "../@types/eft/inventory/IInventoryTransferRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IInventorySwapRequestData } from "../@types/eft/inventory/IInventorySwapRequestData"; -import { IInventoryFoldRequestData } from "../@types/eft/inventory/IInventoryFoldRequestData"; -import { IInventoryToggleRequestData } from "../@types/eft/inventory/IInventoryToggleRequestData"; -import { IInventoryTagRequestData } from "../@types/eft/inventory/IInventoryTagRequestData"; -import { IInventoryBindRequestData } from "../@types/eft/inventory/IInventoryBindRequestData"; -import { IInventoryExamineRequestData } from "../@types/eft/inventory/IInventoryExamineRequestData"; -import { IInventoryReadEncyclopediaRequestData } from "../@types/eft/inventory/IInventoryReadEncyclopediaRequestData"; -import { IInventorySortRequestData } from "../@types/eft/inventory/IInventorySortRequestData"; -import { IInventoryCreateMarkerRequestData } from "../@types/eft/inventory/IInventoryCreateMarkerRequestData"; -import { IInventoryDeleteMarkerRequestData } from "../@types/eft/inventory/IInventoryDeleteMarkerRequestData"; -import { IInventoryEditMarkerRequestData } from "../@types/eft/inventory/IInventoryEditMarkerRequestData"; -import { ILogger } from "../@types/spt/utils/ILogger"; +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 { 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 { ILogger } from "../models/spt/utils/ILogger"; export declare class InventoryController { private logger; private hashUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/LauncherController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/LauncherController.d.ts index 687c295..d3d8e6a 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/LauncherController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/LauncherController.d.ts @@ -2,11 +2,10 @@ import { HashUtil } from "../utils/HashUtil"; import { SaveServer } from "../servers/SaveServer"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { IRegisterData } from "../@types/eft/launcher/IRegisterData"; -import { ILoginRequestData } from "../@types/eft/launcher/ILoginRequestData"; -import { IChangeRequestData } from "../@types/eft/launcher/IChangeRequestData"; -import { Info } from "../@types/eft/profile/IAkiProfile"; -import { ICoreConfig } from "../@types/spt/config/ICoreConfig"; +import { IRegisterData } from "../models/eft/launcher/IRegisterData"; +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 { private hashUtil; @@ -14,7 +13,7 @@ export declare class LauncherController { private httpServerHelper; private databaseServer; private configServer; - coreConfig: ICoreConfig; + private coreConfig; constructor(hashUtil: HashUtil, saveServer: SaveServer, httpServerHelper: HttpServerHelper, databaseServer: DatabaseServer, configServer: ConfigServer); connect(): any; find(sessionIdKey: string): Info; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/LocationController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/LocationController.d.ts index 64168b4..dde270c 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/LocationController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/LocationController.d.ts @@ -1,10 +1,10 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { LocationGenerator } from "../generators/LocationGenerator"; -import { ILocationBase } from "../@types/eft/common/ILocationBase"; -import { ILocationsGenerateAllResponse } from "../@types/eft/common/ILocationsSourceDestinationBase"; +import { ILocationBase } from "../models/eft/common/ILocationBase"; +import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSourceDestinationBase"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class LocationController { private jsonUtil; private logger; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/MatchController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/MatchController.d.ts index 6ab5759..229b884 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/MatchController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/MatchController.d.ts @@ -1,11 +1,9 @@ import { TraderHelper } from "../helpers/TraderHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IEndOfflineRaidRequestData } from "../@types/eft/match/IEndOfflineRaidRequestData"; -import { IStartOfflineRaidRequestData } from "../@types/eft/match/IStartOffineRaidRequestData"; -import { IPmcData } from "../@types/eft/common/IPmcData"; +import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; +import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { ConfigServer } from "../servers/ConfigServer"; -import { IMatchConfig } from "../@types/spt/config/IMatchConfig"; -import { IInRaidConfig } from "../@types/spt/config/IInRaidConfig"; import { SaveServer } from "../servers/SaveServer"; import { MatchLocationService } from "../services/MatchLocationService"; export declare class MatchController { @@ -14,8 +12,8 @@ export declare class MatchController { private matchLocationService; private traderHelper; private configServer; - matchConfig: IMatchConfig; - inraidConfig: IInRaidConfig; + private matchConfig; + private inraidConfig; constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, configServer: ConfigServer); getEnabled(): boolean; getProfile(info: any): IPmcData[]; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/NoteController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/NoteController.d.ts index bb02d23..ecd8001 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/NoteController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/NoteController.d.ts @@ -1,6 +1,6 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { INoteActionData } from "../@types/eft/notes/INoteActionData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { private itemEventRouter; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/NotifierController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/NotifierController.d.ts index 3366add..36fef66 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/NotifierController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/NotifierController.d.ts @@ -1,6 +1,6 @@ import { NotifierHelper } from "../helpers/NotifierHelper"; import { NotificationService } from "../services/NotificationService"; -import { INotifierChannel } from "../@types/eft/notifier/INotifier"; +import { INotifierChannel } from "../models/eft/notifier/INotifier"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; export declare class NotifierController { private notifierHelper; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/PaymentController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/PaymentController.d.ts deleted file mode 100644 index a9a4235..0000000 --- a/TypeScript/4UseACustomConfigFile/types/controllers/PaymentController.d.ts +++ /dev/null @@ -1,56 +0,0 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IProcessBuyTradeRequestData } from "../@types/eft/trade/IProcessBuyTradeRequestData"; -import { IProcessSellTradeRequestData } from "../@types/eft/trade/IProcessSellTradeRequestData"; -export declare class PaymentController { - /** - * Check whether tpl is Money - * @param {string} tpl - * @returns void - */ - static isMoneyTpl(tpl: string): boolean; - /** - * Gets currency TPL from TAG - * @param {string} currency - * @returns string - */ - static getCurrency(currency: string): string; - /** - * Gets currency TAG from TPL - * @param {string} currency - * @returns string - */ - static getCurrencyTag(currency: string): string; - /** - * Gets Currency to Ruble conversion Value - * @param {number} value - * @param {string} currencyFrom - * @returns number - */ - static inRUB(value: number, currencyFrom: string): number; - /** - * Gets Ruble to Currency conversion Value - * @param {number} value - * @param {string} currencyTo - * @returns number - */ - static fromRUB(value: number, currencyTo: string): number; - /** - * Take money and insert items into return to server request - * @param {Object} pmcData - * @param {Object} body - * @param {string} sessionID - * @returns Object - */ - static payMoney(pmcData: IPmcData, body: IProcessBuyTradeRequestData, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse; - /** - * Receive money back after selling - * @param {IPmcData} pmcData - * @param {number} amount - * @param {IProcessSellTradeRequestData} body - * @param {IItemEventRouterResponse} output - * @param {string} sessionID - * @returns IItemEventRouterResponse - */ - static getMoney(pmcData: IPmcData, amount: number, body: IProcessSellTradeRequestData, output: IItemEventRouterResponse, sessionID: string): IItemEventRouterResponse; -} diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/PlayerController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/PlayerController.d.ts deleted file mode 100644 index b33606d..0000000 --- a/TypeScript/4UseACustomConfigFile/types/controllers/PlayerController.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IPlayerIncrementSkillLevelRequestData } from "../@types/eft/player/IPlayerIncrementSkillLevelRequestData"; -export declare class PlayerController { - /** - * increases the profile skill and updates any output - * @param {Object} pmcData - * @param {Object} output - * @param {String} skillName - * @param {Number} amount - */ - static incrementSkillLevel(pmcData: IPmcData, output: IPlayerIncrementSkillLevelRequestData, skillName: string, amount: number): void; - /** - * @param {Object} pmcData - * @returns number - */ - static calculateLevel(pmcData: IPmcData): number; - /** - * @returns number - */ - static getRandomExperience(): number; - /** - * Made a 2d array table with 0 - free slot and 1 - used slot - * @param {Object} pmcData - * @param {string} sessionID - * @returns Array - */ - static getStashSlotMap(pmcData: IPmcData, sessionID: string): any[][]; -} diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/PresetBuildController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/PresetBuildController.d.ts index e0702f4..a15b181 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/PresetBuildController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/PresetBuildController.d.ts @@ -1,9 +1,9 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { SaveServer } from "../servers/SaveServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IPresetBuildActionRequestData } from "../@types/eft/presetBuild/IPresetBuildActionRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { WeaponBuild } from "../@types/eft/profile/IAkiProfile"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IPresetBuildActionRequestData } from "../models/eft/presetBuild/IPresetBuildActionRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { WeaponBuild } from "../models/eft/profile/IAkiProfile"; import { HashUtil } from "../utils/HashUtil"; import { ItemEventRouter } from "../routers/ItemEventRouter"; export declare class PresetBuildController { diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/ProfileController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/ProfileController.d.ts index 938a866..46b66d8 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/ProfileController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/ProfileController.d.ts @@ -1,18 +1,18 @@ import { SaveServer } from "../servers/SaveServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "../helpers/ItemHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; import { TraderHelper } from "../helpers/TraderHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IProfileChangeNicknameRequestData } from "../@types/eft/profile/IProfileChangeNicknameRequestData"; -import { IProfileChangeVoiceRequestData } from "../@types/eft/profile/IProfileChangeVoiceRequestData"; -import { IProfileCreateRequestData } from "../@types/eft/profile/IProfileCreateRequestData"; -import { IValidateNicknameRequestData } from "../@types/eft/profile/IValidateNicknameRequestData"; -import { ISearchFriendRequestData } from "../@types/eft/profile/ISearchFriendRequestData"; -import { ISearchFriendResponse } from "../@types/eft/profile/ISearchFriendResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +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 { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; -import { IMiniProfile } from "../@types/eft/launcher/IMiniProfile"; +import { IMiniProfile } from "../models/eft/launcher/IMiniProfile"; +import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; export declare class ProfileController { private hashUtil; private timeUtil; @@ -20,8 +20,8 @@ export declare class ProfileController { private databaseServer; private itemHelper; private traderHelper; - private profileHelper; - constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, traderHelper: TraderHelper, profileHelper: ProfileHelper); + private extendedProfileHelper; + constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, traderHelper: TraderHelper, extendedProfileHelper: ExtendedProfileHelper); getMiniProfiles(): IMiniProfile[]; getMiniProfile(sessionID: string): any; getCompleteProfile(sessionID: string): IPmcData[]; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/QuestController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/QuestController.d.ts index bb89a3b..a964c32 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/QuestController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/QuestController.d.ts @@ -8,13 +8,13 @@ import { QuestConditionHelper } from "../helpers/QuestConditionHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; import { PlayerService } from "../services/PlayerService"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IQuest } from "../@types/eft/common/tables/IQuest"; -import { IAcceptQuestRequestData } from "../@types/eft/quests/IAcceptQuestRequestData"; -import { ICompleteQuestRequestData } from "../@types/eft/quests/ICompleteQuestRequestData"; -import { IHandoverQuestRequestData } from "../@types/eft/quests/IHandoverQuestRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IQuest } from "../models/eft/common/tables/IQuest"; +import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; +import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; +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 { private logger; private timeUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/RagfairController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/RagfairController.d.ts index 0b6757e..6e71edd 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/RagfairController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/RagfairController.d.ts @@ -1,5 +1,5 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { RagfairServer } from "../servers/RagfairServer"; import { SaveServer } from "../servers/SaveServer"; @@ -14,24 +14,24 @@ import { PaymentHelper } from "../helpers/PaymentHelper"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { RagfairHelper } from "../helpers/RagfairHelper"; import { RagfairSellHelper } from "../helpers/RagfairSellHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IAddOfferRequestData, Requirement } from "../@types/eft/ragfair/IAddOfferRequestData"; -import { IExtendOfferRequestData } from "../@types/eft/ragfair/IExtendOfferRequestData"; -import { IGetMarketPriceRequestData } from "../@types/eft/ragfair/IGetMarketPriceRequestData"; -import { ISearchRequestData } from "../@types/eft/ragfair/ISearchRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { IGetItemPriceResult } from "../@types/eft/ragfair/IGetItemPriceResult"; -import { IGetOffersResult } from "../@types/eft/ragfair/IGetOffersResult"; +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 "../@types/eft/profile/IAkiProfile"; -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; import { RagfairSortHelper } from "../helpers/RagfairSortHelper"; import { RagfairTaxHelper } from "../helpers/RagfairTaxHelper"; import { RagfairOfferHelper } from "../helpers/RagfairOfferHelper"; import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairController { private logger; private timeUtil; @@ -57,7 +57,7 @@ export declare class RagfairController { private ragfairOfferGenerator; private configServer; private ragfairConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, httpResponse: HttpResponse, itemEventRouter: ItemEventRouter, ragfairServer: RagfairServer, ragfairPriceService: RagfairPriceService, databaseServer: DatabaseServer, itemHelper: ItemHelper, saveServer: SaveServer, ragfairSellHelper: RagfairSellHelper, ragfairTaxHelper: RagfairTaxHelper, ragfairSortHelper: RagfairSortHelper, ragfairOfferHelper: RagfairOfferHelper, profileHelper: ProfileHelper, paymentService: PaymentService, handbookHelper: HandbookHelper, paymentHelper: PaymentHelper, inventoryHelper: InventoryHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, ragfairOfferGenerator: RagfairOfferGenerator, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter, ragfairServer: RagfairServer, ragfairPriceService: RagfairPriceService, databaseServer: DatabaseServer, itemHelper: ItemHelper, saveServer: SaveServer, ragfairSellHelper: RagfairSellHelper, ragfairTaxHelper: RagfairTaxHelper, ragfairSortHelper: RagfairSortHelper, ragfairOfferHelper: RagfairOfferHelper, profileHelper: ProfileHelper, paymentService: PaymentService, handbookHelper: HandbookHelper, paymentHelper: PaymentHelper, inventoryHelper: InventoryHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, ragfairOfferGenerator: RagfairOfferGenerator, configServer: ConfigServer); getOffers(sessionID: string, info: ISearchRequestData): IGetOffersResult; update(): void; getItemPrice(info: IGetMarketPriceRequestData): IGetItemPriceResult; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/RepairController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/RepairController.d.ts index 86ab1e1..3a9f3a2 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/RepairController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/RepairController.d.ts @@ -2,15 +2,14 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { QuestHelper } from "../helpers/QuestHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { PaymentService } from "../services/PaymentService"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IRepairActionDataRequest } from "../@types/eft/repair/IRepairActionDataRequest"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { ITraderRepairActionDataRequest } from "../@types/eft/repair/ITraderRepairActionDataRequest"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepairActionDataRequest"; import { ConfigServer } from "../servers/ConfigServer"; -import { IRepairConfig } from "../@types/spt/config/IRepairConfig"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { RepairHelper } from "../helpers/RepairHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RepairController { private logger; private itemEventRouter; @@ -20,7 +19,7 @@ export declare class RepairController { private paymentService; private repairHelper; private configServer; - repairConfig: IRepairConfig; + private repairConfig; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, questHelper: QuestHelper, traderHelper: TraderHelper, paymentService: PaymentService, repairHelper: RepairHelper, configServer: ConfigServer); /** * Repair with trader diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/RepeatableQuestController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/RepeatableQuestController.d.ts index 23d56e5..d2de5df 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/RepeatableQuestController.d.ts @@ -5,20 +5,20 @@ import { JsonUtil } from "../utils/JsonUtil"; import { MathUtil } from "../utils/MathUtil"; import { ItemHelper } from "../helpers/ItemHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IPmcData, TraderInfo } from "../@types/eft/common/IPmcData"; -import { IRepeatableQuestConfig, ELocationName, IQuestConfig } from "../@types/spt/config/IQuestConfig"; -import { IExploration, IRepeatableQuest, IReward, IRewards, IExplorationCondition, ICompletionAvailableFor, IEliminationCondition, ICompletion, IElimination, IPmcDataRepeatableQuest } from "../@types/eft/common/tables/IRepeatableQuests"; -import { Exit } from "../@types/eft/common/ILocationBase"; -import { IRepeatableQuestChangeRequest } from "../@types/eft/quests/IRepeatableQuestChangeRequest"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export interface IQuestTypePool { types: string[]; pool: IQuestPool; @@ -61,7 +61,7 @@ export declare class RepeatableQuestController { private paymentService; private objectId; private configServer; - questConfig: IQuestConfig; + private questConfig; constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, itemEventRouter: ItemEventRouter, paymentService: PaymentService, objectId: ObjectId, configServer: ConfigServer); /** * This is the method reached by the /client/repeatalbeQuests/activityPeriods endpoint diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/TradeController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/TradeController.d.ts index 916ed9c..f0a177b 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/TradeController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/TradeController.d.ts @@ -1,13 +1,13 @@ import { RagfairServer } from "../servers/RagfairServer"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { TradeHelper } from "../helpers/TradeHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IProcessRagfairTradeRequestData } from "../@types/eft/trade/IProcessRagfairTradeRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { Upd } from "../@types/eft/common/tables/IItem"; -import { IProcessBaseTradeRequestData } from "../@types/eft/trade/IProcessBaseTradeRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { Upd } from "../models/eft/common/tables/IItem"; +import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; declare class TradeController { private logger; private itemEventRouter; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/TraderController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/TraderController.d.ts index e125cf1..5cd85c9 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/TraderController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/TraderController.d.ts @@ -2,12 +2,11 @@ import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { DatabaseServer } from "../servers/DatabaseServer"; import { TraderAssortService } from "../services/TraderAssortService"; -import { IBarterScheme, ITraderAssort, ITraderBase } from "../@types/eft/common/tables/ITrader"; +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 { ITraderConfig } from "../@types/spt/config/ITraderConfig"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; import { TraderAssortHelper } from "../helpers/TraderAssortHelper"; export declare class TraderController { private logger; @@ -19,7 +18,7 @@ export declare class TraderController { private traderAssortService; private jsonUtil; private configServer; - traderConfig: ITraderConfig; + private traderConfig; constructor(logger: ILogger, databaseServer: DatabaseServer, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, timeUtil: TimeUtil, traderAssortService: TraderAssortService, jsonUtil: JsonUtil, configServer: ConfigServer); load(): void; getTrader(traderID: string, sessionID: string): ITraderBase; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/WeatherController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/WeatherController.d.ts index 2d17179..4f8bcf1 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/WeatherController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/WeatherController.d.ts @@ -1,11 +1,10 @@ import { ConfigServer } from "../servers/ConfigServer"; -import { IWeatherConfig } from "../@types/spt/config/IWeatherConfig"; import { WeatherGenerator } from "../generators/WeatherGenerator"; -import { IWeatherData } from "../@types/eft/weather/IWeatherData"; +import { IWeatherData } from "../models/eft/weather/IWeatherData"; export declare class WeatherController { private weatherGenerator; private configServer; - weatherConfig: IWeatherConfig; + private weatherConfig; constructor(weatherGenerator: WeatherGenerator, configServer: ConfigServer); generate(): IWeatherData; } diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/WishlistController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/WishlistController.d.ts index c935452..5ef8df3 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/WishlistController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/WishlistController.d.ts @@ -1,7 +1,7 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IWishlistActionData } from "../@types/eft/wishlist/IWishlistActionData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { private itemEvenRouter; constructor(itemEvenRouter: ItemEventRouter); diff --git a/TypeScript/4UseACustomConfigFile/types/di/Container.d.ts b/TypeScript/4UseACustomConfigFile/types/di/Container.d.ts index bd40dbd..b67523f 100644 --- a/TypeScript/4UseACustomConfigFile/types/di/Container.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/di/Container.d.ts @@ -1,7 +1,6 @@ import { DependencyContainer } from "tsyringe"; export declare class Container { static registerTypes(depContainer: DependencyContainer): void; - static registerServerSpecificClasses(depContainer: DependencyContainer): void; private static registerUtils; private static registerRouters; private static registerGenerators; diff --git a/TypeScript/4UseACustomConfigFile/types/di/Router.d.ts b/TypeScript/4UseACustomConfigFile/types/di/Router.d.ts index d27ac97..ac48587 100644 --- a/TypeScript/4UseACustomConfigFile/types/di/Router.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/di/Router.d.ts @@ -1,5 +1,6 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IAkiProfile } from "../@types/eft/profile/IAkiProfile"; +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 { private handledRoutes; constructor(); @@ -17,7 +18,7 @@ export declare class DynamicRouter extends Router { } export declare class ItemEventRouterDefinition extends Router { constructor(); - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } export declare class SaveLoadRouter extends Router { constructor(); diff --git a/TypeScript/4UseACustomConfigFile/types/di/Serializer.d.ts b/TypeScript/4UseACustomConfigFile/types/di/Serializer.d.ts index 076407d..70aa7c5 100644 --- a/TypeScript/4UseACustomConfigFile/types/di/Serializer.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/di/Serializer.d.ts @@ -1,4 +1,4 @@ -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class Serializer { serialize(sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; canHandle(something: string): boolean; diff --git a/TypeScript/4UseACustomConfigFile/types/generators/BotEquipmentGenerator.d.ts b/TypeScript/4UseACustomConfigFile/types/generators/BotEquipmentGenerator.d.ts deleted file mode 100644 index 2cc98b8..0000000 --- a/TypeScript/4UseACustomConfigFile/types/generators/BotEquipmentGenerator.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; -import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData"; -import { Chances, Mods } from "../@types/eft/common/tables/IBotType"; -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { HashUtil } from "../utils/HashUtil"; -import { Logger } from "../utils/Logger"; -import { RandomUtil } from "../utils/RandomUtil"; -import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -export declare class BotEquipmentGenerator { - private logger; - private hashUtil; - private randomUtil; - private databaseServer; - private botGeneratorHelper; - private weightedRandomHelper; - constructor(logger: Logger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, botGeneratorHelper: BotGeneratorHelper, weightedRandomHelper: WeightedRandomHelper); - generateEquipment(equipmentSlot: string, equipmentPool: Record, modPool: Mods, spawnChances: Chances, botRole: string, inventory: PmcInventory): void; -} diff --git a/TypeScript/4UseACustomConfigFile/types/generators/BotGenerator.d.ts b/TypeScript/4UseACustomConfigFile/types/generators/BotGenerator.d.ts index 4a1b8a3..af7d7d4 100644 --- a/TypeScript/4UseACustomConfigFile/types/generators/BotGenerator.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/generators/BotGenerator.d.ts @@ -1,20 +1,14 @@ import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; -import { IGenerateBotsRequestData } from "../@types/eft/bot/IGenerateBotsRequestData"; -import { IBotBase } from "../@types/eft/common/tables/IBotBase"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; +import { IBotBase } from "../models/eft/common/tables/IBotBase"; import { DatabaseServer } from "../servers/DatabaseServer"; import { JsonUtil } from "../utils/JsonUtil"; import { ConfigServer } from "../servers/ConfigServer"; import { GameEventHelper } from "../helpers/GameEventHelper"; import { BotInventoryGenerator } from "./BotInventoryGenerator"; import { BotHelper } from "../helpers/BotHelper"; -declare namespace BotGenerator { - interface IRandomisedBotLevelResult { - level: number; - exp: number; - } -} export declare class BotGenerator { private logger; private hashUtil; @@ -28,8 +22,8 @@ export declare class BotGenerator { private botConfig; constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; - generateBot(bot: IBotBase, role: string, isPmc: boolean): IBotBase; - generateRandomLevel(min: number, max: number): BotGenerator.IRandomisedBotLevelResult; + private generateBot; + private generateRandomLevel; /** Converts health object to the required format */ private generateHealth; private generateSkills; @@ -40,4 +34,3 @@ export declare class BotGenerator { private getPMCDifficulty; private generateDogtag; } -export {}; diff --git a/TypeScript/4UseACustomConfigFile/types/generators/BotInventoryGenerator.d.ts b/TypeScript/4UseACustomConfigFile/types/generators/BotInventoryGenerator.d.ts index c151b83..e9f09de 100644 --- a/TypeScript/4UseACustomConfigFile/types/generators/BotInventoryGenerator.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/generators/BotInventoryGenerator.d.ts @@ -1,11 +1,11 @@ -import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData"; -import { Inventory, Chances, Generation, Mods } from "../@types/eft/common/tables/IBotType"; +import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { Inventory, Chances, Generation } from "../models/eft/common/tables/IBotType"; import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; import { BotWeaponGenerator } from "./BotWeaponGenerator"; import { BotLootGenerator } from "./BotLootGenerator"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; export declare class BotInventoryGenerator { @@ -20,6 +20,6 @@ export declare class BotInventoryGenerator { 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; - generateEquipment(equipmentSlot: string, equipmentPool: Record, modPool: Mods, spawnChances: Chances, botRole: string, inventory: PmcInventory): void; + private generateEquipment; private generateInventoryBase; } diff --git a/TypeScript/4UseACustomConfigFile/types/generators/BotLootGenerator.d.ts b/TypeScript/4UseACustomConfigFile/types/generators/BotLootGenerator.d.ts index 0ec991e..3bf1b36 100644 --- a/TypeScript/4UseACustomConfigFile/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/generators/BotLootGenerator.d.ts @@ -1,17 +1,14 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; -import { IBotConfig } from "../@types/spt/config/IBotConfig"; import { HandbookHelper } from "../helpers/HandbookHelper"; import { PMCLootGenerator } from "../generators/PMCLootGenerator"; -import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData"; -import { ItemMinMax, Items } from "../@types/eft/common/tables/IBotType"; +import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { ItemMinMax, Items } from "../models/eft/common/tables/IBotType"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; export declare class BotLootGenerator { - private logger; private jsonUtil; private hashUtil; private randomUtil; @@ -20,8 +17,8 @@ export declare class BotLootGenerator { private botGeneratorHelper; private pmcLootGenerator; private configServer; - botConfig: IBotConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, pmcLootGenerator: PMCLootGenerator, configServer: ConfigServer); + private botConfig; + constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, pmcLootGenerator: PMCLootGenerator, configServer: ConfigServer); generateLoot(lootPool: Items, itemCounts: ItemMinMax, isPmc: boolean, inventory: PmcInventory): void; private getRandomisedCount; private addLootFromPool; diff --git a/TypeScript/4UseACustomConfigFile/types/generators/BotWeaponGenerator.d.ts b/TypeScript/4UseACustomConfigFile/types/generators/BotWeaponGenerator.d.ts index 8eb643c..3e9d59c 100644 --- a/TypeScript/4UseACustomConfigFile/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/generators/BotWeaponGenerator.d.ts @@ -1,11 +1,12 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "../helpers/ItemHelper"; -import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData"; -import { MinMax, ModsChances, Mods } from "../@types/eft/common/tables/IBotType"; +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 { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { RandomUtil } from "../utils/RandomUtil"; export declare class BotWeaponGenerator { private logger; private hashUtil; @@ -13,7 +14,8 @@ export declare class BotWeaponGenerator { private itemHelper; private weightedRandomHelper; private botGeneratorHelper; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper); + private randomUtil; + constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil); generateWeapon(equipmentSlot: string, weaponPool: Record, modPool: Mods, modChances: ModsChances, magCounts: MinMax, botRole: string, isPmc: boolean, inventory: PmcInventory): void; /** Checks if all required slots are occupied on a weapon and all it's mods */ private isWeaponValid; diff --git a/TypeScript/4UseACustomConfigFile/types/generators/LocationGenerator.d.ts b/TypeScript/4UseACustomConfigFile/types/generators/LocationGenerator.d.ts index c37814f..b7ba7c5 100644 --- a/TypeScript/4UseACustomConfigFile/types/generators/LocationGenerator.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/generators/LocationGenerator.d.ts @@ -1,18 +1,17 @@ import { RandomUtil } from "../utils/RandomUtil"; -import { IStaticContainerProps, IStaticLootDetails, IStaticAmmoDetails, IStaticForcedProps } from "../@types/eft/common/tables/ILootBase"; -import { ILooseLoot, SpawnpointTemplate } from "../@types/eft/common/ILooseLoot"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { IStaticContainerProps, IStaticLootDetails, IStaticAmmoDetails, IStaticForcedProps } from "../models/eft/common/tables/ILootBase"; +import { ILooseLoot, SpawnpointTemplate } from "../models/eft/common/ILooseLoot"; +import { Item } from "../models/eft/common/tables/IItem"; import { ItemHelper } from "../helpers/ItemHelper"; import { GameEventHelper } from "../helpers/GameEventHelper"; import { ContainerHelper } from "../helpers/ContainerHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILocationConfig } from "../@types/spt/config/ILocationConfig"; import { JsonUtil } from "../utils/JsonUtil"; import { MathUtil } from "../utils/MathUtil"; import { ObjectId } from "../utils/ObjectId"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export interface IContainerItem { items: Item[]; width: number; @@ -30,7 +29,7 @@ export declare class LocationGenerator { private containerHelper; private presetHelper; private configServer; - locationConfig: ILocationConfig; + private locationConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, objectId: ObjectId, randomUtil: RandomUtil, ragfairServerHelper: RagfairServerHelper, itemHelper: ItemHelper, mathUtil: MathUtil, gameEventHelper: GameEventHelper, containerHelper: ContainerHelper, presetHelper: PresetHelper, configServer: ConfigServer); generateContainerLoot(containerIn: IStaticContainerProps, staticForced: IStaticForcedProps[], staticLootDist: Record, staticAmmoDist: Record, locationName: string): IStaticContainerProps; private getLooseLootMultiplerForLocation; diff --git a/TypeScript/4UseACustomConfigFile/types/generators/PMCLootGenerator.d.ts b/TypeScript/4UseACustomConfigFile/types/generators/PMCLootGenerator.d.ts index 1ac7ffe..601431b 100644 --- a/TypeScript/4UseACustomConfigFile/types/generators/PMCLootGenerator.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/generators/PMCLootGenerator.d.ts @@ -1,14 +1,13 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; -import { IBotConfig } from "../@types/spt/config/IBotConfig"; export declare class PMCLootGenerator { private itemHelper; private databaseServer; private configServer; private pocketLootPool; private backpackLootPool; - botConfig: IBotConfig; + private botConfig; constructor(itemHelper: ItemHelper, databaseServer: DatabaseServer, configServer: ConfigServer); generatePMCPocketLootPool(): string[]; generatePMCBackpackLootPool(): string[]; diff --git a/TypeScript/4UseACustomConfigFile/types/generators/RagfairAssortGenerator.d.ts b/TypeScript/4UseACustomConfigFile/types/generators/RagfairAssortGenerator.d.ts index dcdb057..8b52a90 100644 --- a/TypeScript/4UseACustomConfigFile/types/generators/RagfairAssortGenerator.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/generators/RagfairAssortGenerator.d.ts @@ -1,4 +1,4 @@ -import { Item } from "../@types/eft/common/tables/IItem"; +import { Item } from "../models/eft/common/tables/IItem"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "../helpers/ItemHelper"; import { HashUtil } from "../utils/HashUtil"; diff --git a/TypeScript/4UseACustomConfigFile/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/4UseACustomConfigFile/types/generators/RagfairOfferGenerator.d.ts index d28d3af..cb2566c 100644 --- a/TypeScript/4UseACustomConfigFile/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/generators/RagfairOfferGenerator.d.ts @@ -2,9 +2,9 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; import { SaveServer } from "../servers/SaveServer"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; -import { IBarterScheme } from "../@types/eft/common/tables/ITrader"; -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { IBarterScheme } from "../models/eft/common/tables/ITrader"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { Item } from "../models/eft/common/tables/IItem"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; @@ -15,7 +15,7 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { RagfairPriceService } from "../services/RagfairPriceService"; import { FenceService } from "../services/FenceService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairOfferGenerator { private logger; private jsonUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/generators/WeatherGenerator.d.ts b/TypeScript/4UseACustomConfigFile/types/generators/WeatherGenerator.d.ts index 5c340e2..b9faa3a 100644 --- a/TypeScript/4UseACustomConfigFile/types/generators/WeatherGenerator.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/generators/WeatherGenerator.d.ts @@ -1,7 +1,6 @@ import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; import { ConfigServer } from "../servers/ConfigServer"; -import { IWeatherData } from "../@types/eft/weather/IWeatherData"; -import { IWeatherConfig } from "../@types/spt/config/IWeatherConfig"; +import { IWeatherData } from "../models/eft/weather/IWeatherData"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class WeatherGenerator { @@ -9,7 +8,7 @@ export declare class WeatherGenerator { private randomUtil; private timeUtil; private configServer; - weatherConfig: IWeatherConfig; + private weatherConfig; constructor(weightedRandomHelper: WeightedRandomHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer); calculateTime(data: IWeatherData): IWeatherData; generateWeather(data: IWeatherData): IWeatherData; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/AssortHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/AssortHelper.d.ts index 95b7bf2..33cb5c6 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/AssortHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/AssortHelper.d.ts @@ -1,6 +1,6 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "./ItemHelper"; import { QuestHelper } from "./QuestHelper"; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/BotGeneratorHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/BotGeneratorHelper.d.ts index 83f7068..c3cf4d3 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/BotGeneratorHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/BotGeneratorHelper.d.ts @@ -1,10 +1,9 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; -import { IBotConfig } from "../@types/spt/config/IBotConfig"; -import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData"; -import { ModsChances, Mods } from "../@types/eft/common/tables/IBotType"; -import { Item, Upd } from "../@types/eft/common/tables/IItem"; -import { ITemplateItem } from "../@types/eft/common/tables/ITemplateItem"; +import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { ModsChances, Mods } 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 { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; @@ -12,7 +11,7 @@ import { RandomUtil } from "../utils/RandomUtil"; import { InventoryHelper } from "./InventoryHelper"; import { ContainerHelper } from "./ContainerHelper"; import { ItemHelper } from "./ItemHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; declare class BotGeneratorHelper { private logger; private jsonUtil; @@ -24,7 +23,7 @@ declare class BotGeneratorHelper { private inventoryHelper; private containerHelper; private configServer; - botConfig: IBotConfig; + private botConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer); generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances, isPmc?: boolean): Item[]; /** @@ -44,7 +43,6 @@ declare class BotGeneratorHelper { }; private getModTplFromItemDb; isItemIncompatibleWithCurrentItems(items: Item[], tplToCheck: string, equipmentSlot: string): boolean; - getBiasedRandomNumber(min: number, max: number, shift: number, n: number): number; /** Adds an item with all its childern into specified equipmentSlots, wherever it fits. * Returns a `boolean` indicating success. */ addItemWithChildrenToEquipmentSlot(equipmentSlots: string[], parentId: string, parentTpl: string, itemWithChildren: Item[], inventory: PmcInventory): boolean; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/BotHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/BotHelper.d.ts index 231e114..032218b 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/BotHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/BotHelper.d.ts @@ -1,9 +1,9 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { Difficulty } from "../@types/eft/common/tables/IBotType"; +import { Difficulty } from "../models/eft/common/tables/IBotType"; import { ConfigServer } from "../servers/ConfigServer"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class BotHelper { private logger; private jsonUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/DialogueHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/DialogueHelper.d.ts index abe13de..d8082e4 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/DialogueHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/DialogueHelper.d.ts @@ -1,7 +1,7 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { ItemHelper } from "./ItemHelper"; -import { Dialogue, MessageContent, MessagePreview, MessageType } from "../@types/eft/profile/IAkiProfile"; +import { Dialogue, MessageContent, MessagePreview, MessageType } from "../models/eft/profile/IAkiProfile"; import { HashUtil } from "../utils/HashUtil"; import { NotifierHelper } from "./NotifierHelper"; import { NotificationSendHelper } from "./NotificationSendHelper"; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/DurabilityLimitsHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/DurabilityLimitsHelper.d.ts index 70f545b..ee8c887 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/DurabilityLimitsHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/DurabilityLimitsHelper.d.ts @@ -1,13 +1,12 @@ import { ConfigServer } from "../servers/ConfigServer"; -import { IBotConfig } from "../@types/spt/config/IBotConfig"; -import { ITemplateItem } from "../@types/eft/common/tables/ITemplateItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { RandomUtil } from "../utils/RandomUtil"; import { BotHelper } from "./BotHelper"; export declare class DurabilityLimitsHelper { private randomUtil; private botHelper; private configServer; - botConfig: IBotConfig; + private botConfig; constructor(randomUtil: RandomUtil, botHelper: BotHelper, configServer: ConfigServer); getRandomisedMaxWeaponDurability(itemTemplate: ITemplateItem, botRole: string): number; getRandomisedMaxArmorDurability(itemTemplate: ITemplateItem, botRole: string): number; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/ExtendedProfileHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/ExtendedProfileHelper.d.ts new file mode 100644 index 0000000..22ead31 --- /dev/null +++ b/TypeScript/4UseACustomConfigFile/types/helpers/ExtendedProfileHelper.d.ts @@ -0,0 +1,22 @@ +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 { 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); + generatePlayerScav(sessionID: string): IPmcData; + private getScavSkills; + private removeSecureContainer; + private getDefaultScavSkills; + private getScavStats; + private getScavLevel; + private getScavExperience; + private setScavCooldownTimer; +} diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/HealthHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/HealthHelper.d.ts index 6cbbe45..fb5bed7 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/HealthHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/HealthHelper.d.ts @@ -1,19 +1,18 @@ import { SaveServer } from "../servers/SaveServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IAkiProfile } from "../@types/eft/profile/IAkiProfile"; -import { ISyncHealthRequestData } from "../@types/eft/health/ISyncHealthRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; import { ConfigServer } from "../servers/ConfigServer"; -import { IHealthConfig } from "../@types/spt/config/IHealthConfig"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class HealthHelper { private jsonUtil; private logger; private timeUtil; private saveServer; private configServer; - healthConfig: IHealthConfig; + private healthConfig; constructor(jsonUtil: JsonUtil, logger: ILogger, timeUtil: TimeUtil, saveServer: SaveServer, configServer: ConfigServer); resetVitality(sessionID: string): IAkiProfile; saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string): void; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/HideoutHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/HideoutHelper.d.ts index 08f30e6..d60e370 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 "../@types/eft/common/IPmcData"; -import { IHideoutSingleProductionStartRequestData } from "../@types/eft/hideout/IHideoutSingleProductionStartRequestData"; -import { StageBonus } from "../@types/eft/hideout/IHideoutArea"; +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 "../@types/eft/hideout/IHideoutContinousProductionStartRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { PlayerService } from "../services/PlayerService"; -import { IHideoutTakeProductionRequestData } from "../@types/eft/hideout/IHideoutTakeProductionRequestData"; +import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; import { InventoryHelper } from "./InventoryHelper"; -import { ITemplateItem } from "../@types/eft/common/tables/ITemplateItem"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class HideoutHelper { private logger; private hashUtil; @@ -29,15 +29,15 @@ export declare class HideoutHelper { private playerService; private configServer; static BITCOIN_FARM: string; - static WATER_COLLECTOR: string; - static BITCOIN: string; - static EXPEDITIONARY_FUEL_TANK: string; + private WATER_COLLECTOR; + private BITCOIN; + private EXPEDITIONARY_FUEL_TANK; static NAME_BACKENDCOUNTERS_CRAFTING: string; static SKILL_NAME_HIDEOUT: string; static HOUR_FOR_SKILL_CRAFTING: number; static SKILL_NAME_CRAFITING: string; private hideoutConfig; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, itemEventRouter: ItemEventRouter, httpResponse: HttpResponse, profileHelper: ProfileHelper, inventoryHelper: InventoryHelper, playerService: PlayerService, configServer: ConfigServer); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, inventoryHelper: InventoryHelper, playerService: PlayerService, configServer: ConfigServer); registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; /** * This convinience function intialies new Production Object diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/InRaidHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/InRaidHelper.d.ts index 24e5f54..e79d384 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/InRaidHelper.d.ts @@ -1,7 +1,7 @@ -import { IPmcData, Victim } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { IPmcData, Victim } 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 { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { JsonUtil } from "../utils/JsonUtil"; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/InsuranceHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/InsuranceHelper.d.ts deleted file mode 100644 index 0bfa37b..0000000 --- a/TypeScript/4UseACustomConfigFile/types/helpers/InsuranceHelper.d.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData"; -import { IInsuranceConfig } from "../@types/spt/config/IInsuranceConfig"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { InsuranceService } from "../services/InsuranceService"; -import { Logger } from "../utils/Logger"; -import { RandomUtil } from "../utils/RandomUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { DialogueHelper } from "./DialogueHelper"; -import { InventoryHelper } from "./InventoryHelper"; -import { TraderHelper } from "./TraderHelper"; -export declare class InsuranceHelper { - private logger; - private insuranceService; - private inventoryHelper; - private randomUtil; - private timeUtil; - private saveServer; - private databaseServer; - private traderHelper; - private dialogueHelper; - private configServer; - insuranceConfig: IInsuranceConfig; - constructor(logger: Logger, insuranceService: InsuranceService, inventoryHelper: InventoryHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, configServer: ConfigServer); - storeLostGear(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; - addGearToSend(pmcData: IPmcData, insuredItem: any, actualItem: any, sessionID: string): any; - storeInsuredItemsForReturn(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; - sendInsuredItems(pmcData: IPmcData, sessionID: string): void; - getPremium(pmcData: IPmcData, inventoryItem: Item, traderId: string): number; -} diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/InventoryHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/InventoryHelper.d.ts index 5d17048..4b3460c 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/InventoryHelper.d.ts @@ -1,6 +1,6 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { FenceService } from "../services/FenceService"; @@ -10,12 +10,12 @@ import { PaymentHelper } from "./PaymentHelper"; import { ProfileHelper } from "./ProfileHelper"; import { DialogueHelper } from "./DialogueHelper"; import { HashUtil } from "../utils/HashUtil"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; -import { IInventoryMoveRequestData } from "../@types/eft/inventory/IInventoryMoveRequestData"; -import { IInventorySplitRequestData } from "../@types/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMergeRequestData } from "../@types/eft/inventory/IInventoryMergeRequestData"; -import { ILogger } from "../@types/spt/utils/ILogger"; +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 { TraderAssortHelper } from "./TraderAssortHelper"; export interface OwnerInventoryItems { from: Item[]; @@ -38,19 +38,12 @@ export declare class InventoryHelper { private profileHelper; private configServer; private inventoryConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, httpResponse: HttpResponse, fenceService: FenceService, databaseServer: DatabaseServer, paymentHelper: PaymentHelper, traderAssortHelper: TraderAssortHelper, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, containerHelper: ContainerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); + 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; removeItem(pmcData: IPmcData, itemId: string, sessionID: string, output?: IItemEventRouterResponse): IItemEventRouterResponse; - getSecureContainerItems(items: Item[]): string[]; getItemSize(itemTpl: string, itemID: string, inventoryItem: Item[]): Record; private getSizeByInventoryItemHash; private getInventoryItemHash; - /** - * Recursively checks if the given item is - * inside the stash, that is it has the stash as - * ancestor with slotId=hideout - */ - isItemInStash(pmcData: IPmcData, item: Item): boolean; getContainerMap(containerW: number, containerH: number, itemList: Item[], containerId: string): number[][]; /** * Based on the item action, determine whose inventories we should be looking at for from and to. diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/ItemHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/ItemHelper.d.ts index 2c894e6..8c1175a 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/ItemHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/ItemHelper.d.ts @@ -1,10 +1,10 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { InsuredItem, IPmcData } from "../@types/eft/common/IPmcData"; -import { ITemplateItem, StackSlot } from "../@types/eft/common/tables/ITemplateItem"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { InsuredItem, IPmcData } from "../models/eft/common/IPmcData"; +import { ITemplateItem, StackSlot } from "../models/eft/common/tables/ITemplateItem"; +import { Item } from "../models/eft/common/tables/IItem"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; declare class ItemHelper { private logger; private hashUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/NotificationSendHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/NotificationSendHelper.d.ts index 40b6dec..b9298da 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/NotificationSendHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/NotificationSendHelper.d.ts @@ -1,5 +1,5 @@ -import { INotification } from "../@types/eft/notifier/INotifier"; -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +import { INotification } from "../models/eft/notifier/INotifier"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; import { NotificationService } from "../services/NotificationService"; export declare class NotificationSendHelper { private httpServer; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/NotifierHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/NotifierHelper.d.ts index 9998054..0d524e9 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/NotifierHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/NotifierHelper.d.ts @@ -1,5 +1,5 @@ -import { INotification } from "../@types/eft/notifier/INotifier"; -import { Message, MessageContentRagfair } from "../@types/eft/profile/IAkiProfile"; +import { INotification } from "../models/eft/notifier/INotifier"; +import { Message, MessageContentRagfair } from "../models/eft/profile/IAkiProfile"; import { HttpServerHelper } from "./HttpServerHelper"; export declare class NotifierHelper { private httpServerHelper; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/PresetHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/PresetHelper.d.ts index 7695248..0a24128 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/PresetHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/PresetHelper.d.ts @@ -1,4 +1,4 @@ -import { Preset } from "../@types/eft/common/IGlobals"; +import { Preset } from "../models/eft/common/IGlobals"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class PresetHelper { private databaseServer; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/ProfileHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/ProfileHelper.d.ts index 1d868b1..515e55e 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/ProfileHelper.d.ts @@ -1,44 +1,33 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { FenceService } from "../services/FenceService"; -import { IPmcData, Skills, Stats } from "../@types/eft/common/IPmcData"; -import { IAkiProfile } from "../@types/eft/profile/IAkiProfile"; -import { IValidateNicknameRequestData } from "../@types/eft/profile/IValidateNicknameRequestData"; +import { IPmcData, Stats } from "../models/eft/common/IPmcData"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { ItemHelper } from "./ItemHelper"; -import { IWatermark } from "../@types/spt/utils/IWatermark"; -import { BotGenerator } from "../generators/BotGenerator"; +import { IWatermark } from "../models/spt/utils/IWatermark"; export declare class ProfileHelper { - private jsonUtil; - private watermark; - private timeUtil; - private saveServer; - private databaseServer; - private botGenerator; - private itemHelper; - private fenceService; - constructor(jsonUtil: JsonUtil, watermark: IWatermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, botGenerator: BotGenerator, itemHelper: ItemHelper, fenceService: FenceService); + protected jsonUtil: JsonUtil; + protected watermark: IWatermark; + 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); resetProfileQuestCondition(sessionID: string, conditionId: string): void; getCompleteProfile(sessionID: string): IPmcData[]; - private isWiped; - getFullProfile(sessionID: string): IAkiProfile; - getPmcProfile(sessionID: string): IPmcData; - getScavProfile(sessionID: string): IPmcData; - setScavProfile(sessionID: string, scavData: IPmcData): void; - getScavSkills(sessionID: string): Skills; - generatePlayerScav(sessionID: string): IPmcData; - private removeSecureContainer; - private getDefaultScavSkills; - getScavStats(sessionID: string): Stats; - getDefaultCounters(): Stats; - getServerVersion(): string; - getScavLevel(sessionID: string): number; - getScavExperience(sessionID: string): number; - setScavCooldownTimer(profile: IPmcData, pmcData: IPmcData): IPmcData; isNicknameTaken(info: IValidateNicknameRequestData, sessionID: string): boolean; getProfileByPmcId(pmcId: string): IPmcData; getExperience(level: number): number; getMaxLevel(): number; getDefaultAkiDataObject(): any; + getFullProfile(sessionID: string): IAkiProfile; + getPmcProfile(sessionID: string): IPmcData; + getScavProfile(sessionID: string): IPmcData; + getDefaultCounters(): Stats; + private isWiped; + private getServerVersion; } diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/QuestConditionHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/QuestConditionHelper.d.ts index 8f7b706..2a0ee94 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/QuestConditionHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/QuestConditionHelper.d.ts @@ -1,4 +1,4 @@ -import { AvailableForConditions } from "../@types/eft/common/tables/IQuest"; +import { AvailableForConditions } from "../models/eft/common/tables/IQuest"; export declare class QuestConditionHelper { getQuestConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; getLevelConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/QuestHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/QuestHelper.d.ts index c29158b..3474884 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/QuestHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/QuestHelper.d.ts @@ -8,15 +8,14 @@ import { ProfileHelper } from "./ProfileHelper"; import { DialogueHelper } from "./DialogueHelper"; import { PaymentHelper } from "./PaymentHelper"; import { TraderHelper } from "./TraderHelper"; -import { IPmcData, Quest } from "../@types/eft/common/IPmcData"; -import { AvailableForConditions, AvailableForProps, IQuest, Reward } from "../@types/eft/common/tables/IQuest"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IAcceptQuestRequestData } from "../@types/eft/quests/IAcceptQuestRequestData"; -import { ICompleteQuestRequestData } from "../@types/eft/quests/ICompleteQuestRequestData"; +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 { IQuestConfig } from "../@types/spt/config/IQuestConfig"; import { RagfairServerHelper } from "./RagfairServerHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class QuestHelper { private logger; private jsonUtil; @@ -31,7 +30,7 @@ export declare class QuestHelper { private paymentHelper; private traderHelper; private configServer; - questConfig: IQuestConfig; + private questConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer); static get STATUS(): Record; questStatus(pmcData: IPmcData, questID: string): string; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/RagfairHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/RagfairHelper.d.ts index 7d867bb..2bce4a6 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/RagfairHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/RagfairHelper.d.ts @@ -1,15 +1,15 @@ import { JsonUtil } from "../utils/JsonUtil"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; -import { IGetOffersResult } from "../@types/eft/ragfair/IGetOffersResult"; -import { ISearchRequestData } from "../@types/eft/ragfair/ISearchRequestData"; +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 { DatabaseServer } from "../servers/DatabaseServer"; 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 "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; import { TraderAssortHelper } from "./TraderAssortHelper"; export declare class RagfairHelper { private logger; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/RagfairOfferHelper.d.ts index 873271f..da3ceb8 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/RagfairOfferHelper.d.ts @@ -1,9 +1,9 @@ import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; -import { ISearchRequestData } from "../@types/eft/ragfair/ISearchRequestData"; +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 { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { RagfairOfferService } from "../services/RagfairOfferService"; @@ -17,7 +17,7 @@ import { ConfigServer } from "../servers/ConfigServer"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { RagfairSortHelper } from "./RagfairSortHelper"; import { RagfairHelper } from "./RagfairHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairOfferHelper { private logger; private timeUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/RagfairSellHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/RagfairSellHelper.d.ts index 2e21589..929d112 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/RagfairSellHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/RagfairSellHelper.d.ts @@ -1,6 +1,5 @@ -import { SellResult } from "../@types/eft/ragfair/IRagfairOffer"; -import { IRagfairConfig } from "../@types/spt/config/IRagfairConfig"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { SellResult } from "../models/eft/ragfair/IRagfairOffer"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; @@ -9,7 +8,7 @@ export declare class RagfairSellHelper { private randomUtil; private timeUtil; private configServer; - ragfairConfig: IRagfairConfig; + private ragfairConfig; constructor(logger: ILogger, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer); calculateSellChance(baseChance: number, offerPrice: number, requirementsPriceInRub: number): number; rollForSale(sellChance: number, count: number): SellResult[]; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/RagfairServerHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/RagfairServerHelper.d.ts index 51b02cb..9a26261 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/RagfairServerHelper.d.ts @@ -1,13 +1,13 @@ import { SaveServer } from "../servers/SaveServer"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { ITemplateItem } from "../@types/eft/common/tables/ITemplateItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { ItemHelper } from "./ItemHelper"; import { ProfileHelper } from "./ProfileHelper"; -import { MemberCategory } from "../@types/eft/common/MemberCategory"; +import { MemberCategory } from "../models/eft/common/MemberCategory"; import { ConfigServer } from "../servers/ConfigServer"; import { RandomUtil } from "../utils/RandomUtil"; import { DialogueHelper } from "./DialogueHelper"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { Item } from "../models/eft/common/tables/IItem"; import { JsonUtil } from "../utils/JsonUtil"; import { HashUtil } from "../utils/HashUtil"; export declare class RagfairServerHelper { diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/RagfairSortHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/RagfairSortHelper.d.ts index fbd4b78..e9d8069 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/RagfairSortHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/RagfairSortHelper.d.ts @@ -1,4 +1,4 @@ -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class RagfairSortHelper { private databaseServer; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/RagfairTaxHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/RagfairTaxHelper.d.ts index bb78afd..e87334f 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/RagfairTaxHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/RagfairTaxHelper.d.ts @@ -1,9 +1,9 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; import { DatabaseServer } from "../servers/DatabaseServer"; import { RagfairPriceService } from "../services/RagfairPriceService"; import { ItemHelper } from "./ItemHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairTaxHelper { private logger; private databaseServer; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/RepairHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/RepairHelper.d.ts index f2852d7..d11d0d2 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/RepairHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/RepairHelper.d.ts @@ -1,18 +1,17 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; import { ConfigServer } from "../servers/ConfigServer"; -import { IRepairConfig } from "../@types/spt/config/IRepairConfig"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RepairHelper { private logger; private jsonUtil; private randomUtil; private databaseServer; private configServer; - repairConfig: IRepairConfig; + private repairConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); updateItemDurability(itemToRepairId: string, amountToRepair: number, pmcData: IPmcData, useRepairKit?: boolean): Item; private getRandomisedArmorRepairDegredationValue; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/SecureContainerHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/SecureContainerHelper.d.ts new file mode 100644 index 0000000..8f246b6 --- /dev/null +++ b/TypeScript/4UseACustomConfigFile/types/helpers/SecureContainerHelper.d.ts @@ -0,0 +1,13 @@ +import { Item } from "../models/eft/common/tables/IItem"; +import { ItemHelper } from "./ItemHelper"; +export interface OwnerInventoryItems { + from: Item[]; + to: Item[]; + sameInventory: boolean; + isMail: boolean; +} +export declare class SecureContainerHelper { + private itemHelper; + constructor(itemHelper: ItemHelper); + getSecureContainerItems(items: Item[]): string[]; +} diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/TradeHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/TradeHelper.d.ts index f3d9a50..0712ff4 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/TradeHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/TradeHelper.d.ts @@ -3,14 +3,14 @@ import { InventoryHelper } from "../helpers/InventoryHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { FenceService } from "../services/FenceService"; import { PaymentService } from "../services/PaymentService"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IProcessBuyTradeRequestData } from "../@types/eft/trade/IProcessBuyTradeRequestData"; -import { IProcessSellTradeRequestData } from "../@types/eft/trade/IProcessSellTradeRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { Upd } from "../@types/eft/common/tables/IItem"; +import { IPmcData } from "../models/eft/common/IPmcData"; +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 "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class TradeHelper { private logger; private itemEventRouter; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/TraderAssortHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/TraderAssortHelper.d.ts index 7dfed48..d95879c 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/TraderAssortHelper.d.ts @@ -1,5 +1,5 @@ -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { ILogger } from "../models/spt/utils/ILogger"; import { RagfairAssortGenerator } from "../generators/RagfairAssortGenerator"; import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; import { DatabaseServer } from "../servers/DatabaseServer"; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/TraderHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/TraderHelper.d.ts index d9f37a7..5440afe 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/TraderHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/TraderHelper.d.ts @@ -6,10 +6,10 @@ import { ItemHelper } from "./ItemHelper"; import { ProfileHelper } from "./ProfileHelper"; import { PaymentHelper } from "./PaymentHelper"; import { FenceService } from "../services/FenceService"; -import { IBarterScheme, ITraderAssort, ITraderBase, LoyaltyLevel } from "../@types/eft/common/tables/ITrader"; -import { IPmcData } from "../@types/eft/common/IPmcData"; +import { IBarterScheme, ITraderAssort, ITraderBase, LoyaltyLevel } from "../models/eft/common/tables/ITrader"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class TraderHelper { private logger; private databaseServer; diff --git a/TypeScript/4UseACustomConfigFile/types/ide/CheckVersion.d.ts b/TypeScript/4UseACustomConfigFile/types/ide/CheckVersion.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/4UseACustomConfigFile/types/ide/CheckVersion.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/4UseACustomConfigFile/types/ide/Compiler.d.ts b/TypeScript/4UseACustomConfigFile/types/ide/Compiler.d.ts index cb0ff5c..fded23a 100644 --- a/TypeScript/4UseACustomConfigFile/types/ide/Compiler.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/ide/Compiler.d.ts @@ -1 +1 @@ -export {}; +import "reflect-metadata"; diff --git a/TypeScript/4UseACustomConfigFile/types/loaders/DelayedModLoader.d.ts b/TypeScript/4UseACustomConfigFile/types/loaders/DelayedModLoader.d.ts index ed6d3f8..db86c75 100644 --- a/TypeScript/4UseACustomConfigFile/types/loaders/DelayedModLoader.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/loaders/DelayedModLoader.d.ts @@ -3,13 +3,15 @@ import { VFS } from "../utils/VFS"; import { InitialModLoader } from "./InitialModLoader"; import { BundleLoader } from "./BundleLoader"; import { HandbookController } from "../controllers/HandbookController"; -import { IModLoader } from "../@types/spt/mod/IModLoader"; +import { IModLoader } from "../models/spt/mod/IModLoader"; +import { ModCompilerService } from "../services/ModCompilerService"; export declare class DelayedModLoader implements IModLoader { private bundleLoader; private handbookController; private vfs; + private modCompilerService; private initialModLoader; - constructor(bundleLoader: BundleLoader, handbookController: HandbookController, vfs: VFS, initialModLoader: InitialModLoader); + constructor(bundleLoader: BundleLoader, handbookController: HandbookController, vfs: VFS, modCompilerService: ModCompilerService, initialModLoader: InitialModLoader); getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; getImportedModsNames(): string[]; diff --git a/TypeScript/4UseACustomConfigFile/types/loaders/IMod.d.ts b/TypeScript/4UseACustomConfigFile/types/loaders/IMod.d.ts deleted file mode 100644 index 20813f9..0000000 --- a/TypeScript/4UseACustomConfigFile/types/loaders/IMod.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export interface IMod { - onload(): any; -} -export interface IContainerMod extends IMod { - onContainerLoad(): any; -} diff --git a/TypeScript/4UseACustomConfigFile/types/loaders/InitialModLoader.d.ts b/TypeScript/4UseACustomConfigFile/types/loaders/InitialModLoader.d.ts index 612c821..35503c8 100644 --- a/TypeScript/4UseACustomConfigFile/types/loaders/InitialModLoader.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/loaders/InitialModLoader.d.ts @@ -1,20 +1,24 @@ -import { DependencyContainer } from 'tsyringe'; +import { DependencyContainer } from "tsyringe"; import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; -import { IModLoader } from "../@types/spt/mod/IModLoader"; -import { ILogger } from '../@types/spt/utils/ILogger'; +import { ModCompilerService } from "../services/ModCompilerService"; +import { HashCacheService } from "../services/HashCacheService"; +import { IModLoader } from "../models/spt/mod/IModLoader"; export declare class InitialModLoader implements IModLoader { private logger; private vfs; private jsonUtil; + private modCompilerService; + private hashCacheService; private configServer; - private basepath; + private readonly basepath; private imported; private onLoad; private akiConfig; - constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, configServer: ConfigServer); - load(container: DependencyContainer): void; + constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, hashCacheService: HashCacheService, configServer: ConfigServer); + load(container: DependencyContainer): Promise; getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; getImportedModsNames(): string[]; @@ -23,7 +27,9 @@ export declare class InitialModLoader implements IModLoader { private importMods; private isModCombatibleWithAki; private executeMods; + private sortModsLoadOrder; private addMod; + private compileModIfNeeded; private areModDependenciesFulfilled; private isModCompatible; private validMod; diff --git a/TypeScript/4UseACustomConfigFile/types/loaders/ModLoader.d.ts b/TypeScript/4UseACustomConfigFile/types/loaders/ModLoader.d.ts deleted file mode 100644 index eed6d69..0000000 --- a/TypeScript/4UseACustomConfigFile/types/loaders/ModLoader.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { IPackageJsonData } from "../@types/spt/mod/IPackageJsonData"; -export declare class ModLoader { - static basepath: string; - static imported: {}; - static onLoad: {}; - static load(): void; - static getBundles(local: any): string; - static getBundle(key: any, arg1: any): void; - static importClass(name: string, filepath: string): void; - static importMods(): void; - static isModCombatibleWithAki(mod: IPackageJsonData): boolean; - static executeMods(): void; - static getModPath(mod: string): string; - static addMod(mod: string): void; - static areModDependenciesFulfilled(mod: IPackageJsonData, loadedMods: any): boolean; - static isModCompatible(mod: any, loadedMods: any): boolean; - static validMod(mod: any): boolean; - static getLoadOrderRecursive(mod: any, result: any, visited: any): void; - static getLoadOrder(mods: any): {}; -} diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/bot/IGenerateBotsRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/bot/IGenerateBotsRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/bot/IGenerateBotsRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/bot/IGenerateBotsRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/common/IEmptyRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/IEmptyRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/common/IEmptyRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/common/IEmptyRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/common/IGlobals.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/IGlobals.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/common/IGlobals.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/common/IGlobals.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/common/ILocation.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/ILocation.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/common/ILocation.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/common/ILocation.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/common/ILocationBase.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/ILocationBase.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/common/ILocationBase.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/common/ILocationBase.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/common/ILocationsSourceDestinationBase.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/ILocationsSourceDestinationBase.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/common/ILocationsSourceDestinationBase.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/common/ILocationsSourceDestinationBase.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/common/ILooseLoot.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/ILooseLoot.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/common/ILooseLoot.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/common/ILooseLoot.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/common/IMetricsTableData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/IMetricsTableData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/common/IMetricsTableData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/common/IMetricsTableData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/common/IPmcData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/IPmcData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/common/IPmcData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/common/IPmcData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/common/MemberCategory.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/MemberCategory.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/common/MemberCategory.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/common/MemberCategory.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/common/request/IBaseInteractionRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/request/IBaseInteractionRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/common/request/IBaseInteractionRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/common/request/IBaseInteractionRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/common/tables/IBotBase.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IBotBase.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/common/tables/IBotBase.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IBotBase.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/common/tables/IBotCore.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IBotCore.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/common/tables/IBotCore.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IBotCore.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/common/tables/IBotType.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IBotType.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/common/tables/IBotType.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IBotType.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/common/tables/ICustomizationItem.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/ICustomizationItem.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/common/tables/ICustomizationItem.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/ICustomizationItem.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/common/tables/IHandbookBase.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IHandbookBase.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/common/tables/IHandbookBase.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IHandbookBase.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/common/tables/IItem.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IItem.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/common/tables/IItem.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IItem.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/common/tables/ILocationsBase.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/ILocationsBase.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/common/tables/ILocationsBase.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/ILocationsBase.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/common/tables/ILootBase.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/ILootBase.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/common/tables/ILootBase.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/ILootBase.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/common/tables/IQuest.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IQuest.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/common/tables/IQuest.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IQuest.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IRepeatableQuests.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/common/tables/IRepeatableQuests.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IRepeatableQuests.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/common/tables/ITemplateItem.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/ITemplateItem.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/common/tables/ITemplateItem.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/ITemplateItem.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/common/tables/ITrader.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/ITrader.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/common/tables/ITrader.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/ITrader.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/customization/IBuyClothingRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/customization/IBuyClothingRequestData.d.ts similarity index 71% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/customization/IBuyClothingRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/customization/IBuyClothingRequestData.d.ts index be5d930..d19b70d 100644 --- a/TypeScript/4UseACustomConfigFile/types/@types/eft/customization/IBuyClothingRequestData.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/models/eft/customization/IBuyClothingRequestData.d.ts @@ -1,9 +1,9 @@ export interface IBuyClothingRequestData { Action: "CustomizationBuy"; offer: string; - items: Item[]; + items: ClothingItem[]; } -export interface Item { +export interface ClothingItem { del: boolean; id: string; count: number; diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/customization/IWearClothingRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/customization/IWearClothingRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/customization/IWearClothingRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/customization/IWearClothingRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/dialog/IFriendRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/dialog/IFriendRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/dialog/IFriendRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/dialog/IFriendRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/dialog/IGetAllAttachmentsRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/dialog/IGetAllAttachmentsRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/dialog/IGetAllAttachmentsResponse.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/dialog/IGetAllAttachmentsResponse.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/dialog/IGetChatServerListRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/dialog/IGetChatServerListRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/dialog/IGetChatServerListRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/dialog/IGetChatServerListRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/dialog/IGetFriendListDataResponse.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/dialog/IGetFriendListDataResponse.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/dialog/IGetFriendListDataResponse.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/dialog/IGetFriendListDataResponse.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/dialog/IGetMailDialogInfoRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/dialog/IGetMailDialogInfoRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/dialog/IGetMailDialogListRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/dialog/IGetMailDialogListRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/dialog/IGetMailDialogViewRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/dialog/IGetMailDialogViewRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/dialog/IGetMailDialogViewResponseData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/dialog/IGetMailDialogViewResponseData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/dialog/IPinDialogRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/dialog/IPinDialogRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/dialog/IPinDialogRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/dialog/IPinDialogRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/dialog/IRemoveDialogRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/dialog/IRemoveDialogRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/dialog/IRemoveDialogRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/dialog/IRemoveDialogRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/dialog/ISendMessageRequest.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/dialog/ISendMessageRequest.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/dialog/ISendMessageRequest.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/dialog/ISendMessageRequest.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/dialog/ISetDialogReadRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/dialog/ISetDialogReadRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/dialog/ISetDialogReadRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/dialog/ISetDialogReadRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/game/IGameConfigResponse.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/game/IGameConfigResponse.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/game/IGameConfigResponse.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/game/IGameConfigResponse.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/game/IGameEmptyCrcRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/game/IGameEmptyCrcRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/game/IGameEmptyCrcRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/game/IGameEmptyCrcRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/game/IVersionValidateRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/game/IVersionValidateRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/game/IVersionValidateRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/game/IVersionValidateRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/health/IHealthTreatmentRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/health/IHealthTreatmentRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/health/IHealthTreatmentRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/health/IHealthTreatmentRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/health/IOffraidEatRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/health/IOffraidEatRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/health/IOffraidEatRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/health/IOffraidEatRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/health/IOffraidHealRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/health/IOffraidHealRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/health/IOffraidHealRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/health/IOffraidHealRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/health/ISyncHealthRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/health/ISyncHealthRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/health/ISyncHealthRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/health/ISyncHealthRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/HideoutAreasEnum.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/hideout/HideoutAreasEnum.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/HideoutAreasEnum.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/hideout/HideoutAreasEnum.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/IHideoutArea.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/hideout/IHideoutArea.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/IHideoutArea.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/hideout/IHideoutArea.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/IHideoutProduction.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/hideout/IHideoutProduction.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/IHideoutProduction.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/hideout/IHideoutProduction.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/IHideoutPutItemInRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/IHideoutPutItemInRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/IHideoutScavCase.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/hideout/IHideoutScavCase.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/IHideoutScavCase.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/hideout/IHideoutScavCase.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/IHideoutScavCaseStartRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/IHideoutScavCaseStartRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/IHideoutSettingsBase.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/hideout/IHideoutSettingsBase.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/IHideoutSettingsBase.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/hideout/IHideoutSettingsBase.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/IHideoutTakeItemOutRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/IHideoutTakeItemOutRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/IHideoutTakeProductionRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/IHideoutTakeProductionRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/IHideoutToggleAreaRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/IHideoutToggleAreaRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/IHideoutUpgradeRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/hideout/IHideoutUpgradeRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/httpResponse/IGetBodyResponseData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/httpResponse/IGetBodyResponseData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/httpResponse/IGetBodyResponseData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/httpResponse/IGetBodyResponseData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/httpResponse/INullResponseData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/httpResponse/INullResponseData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/httpResponse/INullResponseData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/httpResponse/INullResponseData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/inRaid/IRegisterPlayerRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/inRaid/IRegisterPlayerRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/inRaid/ISaveProgressRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/inRaid/ISaveProgressRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/inRaid/ISaveProgressRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/inRaid/ISaveProgressRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/insurance/IGetInsuranceCostRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/insurance/IGetInsuranceCostRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/insurance/IInsureRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/insurance/IInsureRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/insurance/IInsureRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/insurance/IInsureRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventoryAddRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventoryAddRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventoryAddRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventoryAddRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventoryBaseActionRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventoryBaseActionRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventoryBindRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventoryBindRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventoryBindRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventoryBindRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventoryCreateMarkerRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventoryCreateMarkerRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventoryEditMarkerRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventoryEditMarkerRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventoryExamineRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventoryExamineRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventoryExamineRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventoryExamineRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventoryFoldRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventoryFoldRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventoryFoldRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventoryFoldRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventoryMergeRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventoryMergeRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventoryMergeRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventoryMergeRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventoryMoveRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventoryMoveRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventoryMoveRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventoryMoveRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventoryRemoveRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventoryRemoveRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventorySortRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventorySortRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventorySortRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventorySortRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventorySplitRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventorySplitRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventorySplitRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventorySplitRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventorySwapRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventorySwapRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventorySwapRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventorySwapRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventoryTagRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventoryTagRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventoryTagRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventoryTagRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventoryToggleRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventoryToggleRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventoryToggleRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventoryToggleRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventoryTransferRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventoryTransferRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/inventory/IInventoryTransferRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/inventory/IInventoryTransferRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/eft/itemEvent/IItemEventRouterBase.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/itemEvent/IItemEventRouterBase.d.ts similarity index 91% rename from TypeScript/2EditDatabase/types/@types/eft/itemEvent/IItemEventRouterBase.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/itemEvent/IItemEventRouterBase.d.ts index 0e12850..31e62fe 100644 --- a/TypeScript/2EditDatabase/types/@types/eft/itemEvent/IItemEventRouterBase.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/models/eft/itemEvent/IItemEventRouterBase.d.ts @@ -49,9 +49,15 @@ export interface Product { _tpl?: string; parentId?: string; slotId?: string; - location?: any; + location?: ItemChangeLocation; upd?: Upd; } +export interface ItemChangeLocation { + x: number; + y: number; + r: number; + isSearched?: boolean; +} export interface TraderRelations { salesSum?: number; standing?: number; diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/itemEvent/IItemEventRouterRequest.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/itemEvent/IItemEventRouterRequest.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/itemEvent/IItemEventRouterResponse.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/itemEvent/IItemEventRouterResponse.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/launcher/IChangeRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/launcher/IChangeRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/launcher/IChangeRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/launcher/IChangeRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/launcher/IGetMiniProfileRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/launcher/IGetMiniProfileRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/launcher/ILoginRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/launcher/ILoginRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/launcher/ILoginRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/launcher/ILoginRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/launcher/IMiniProfile.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/launcher/IMiniProfile.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/launcher/IMiniProfile.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/launcher/IMiniProfile.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/launcher/IRegisterData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/launcher/IRegisterData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/launcher/IRegisterData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/launcher/IRegisterData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/launcher/IRemoveProfileData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/launcher/IRemoveProfileData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/launcher/IRemoveProfileData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/launcher/IRemoveProfileData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/location/IGetLocationRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/location/IGetLocationRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/location/IGetLocationRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/location/IGetLocationRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/match/IEndOfflineRaidRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/match/IEndOfflineRaidRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/match/IEndOfflineRaidRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/match/IEndOfflineRaidRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/match/IStartOffineRaidRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/match/IStartOffineRaidRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/match/IStartOffineRaidRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/match/IStartOffineRaidRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/notes/INoteActionData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/notes/INoteActionData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/notes/INoteActionData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/notes/INoteActionData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/notifier/INotifier.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/notifier/INotifier.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/notifier/INotifier.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/notifier/INotifier.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/notifier/ISelectProfileRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/notifier/ISelectProfileRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/notifier/ISelectProfileRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/notifier/ISelectProfileRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/presetBuild/IPresetBuildActionRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/presetBuild/IPresetBuildActionRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/profile/IAkiProfile.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/profile/IAkiProfile.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/profile/IAkiProfile.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/profile/IAkiProfile.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/profile/IProfileChangeNicknameRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/profile/IProfileChangeNicknameRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/profile/IProfileChangeVoiceRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/profile/IProfileChangeVoiceRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/profile/IProfileCreateRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/profile/IProfileCreateRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/profile/IProfileCreateRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/profile/IProfileCreateRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/profile/ISearchFriendRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/profile/ISearchFriendRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/profile/ISearchFriendRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/profile/ISearchFriendRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/profile/ISearchFriendResponse.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/profile/ISearchFriendResponse.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/profile/ISearchFriendResponse.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/profile/ISearchFriendResponse.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/profile/IValidateNicknameRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/profile/IValidateNicknameRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/profile/IValidateNicknameRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/profile/IValidateNicknameRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/quests/IAcceptQuestRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/quests/IAcceptQuestRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/quests/IAcceptQuestRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/quests/IAcceptQuestRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/quests/ICompleteQuestRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/quests/ICompleteQuestRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/quests/ICompleteQuestRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/quests/ICompleteQuestRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/quests/IHandoverQuestRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/quests/IHandoverQuestRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/quests/IHandoverQuestRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/quests/IHandoverQuestRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/quests/IListQuestsRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/quests/IListQuestsRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/quests/IListQuestsRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/quests/IListQuestsRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/quests/IRepeatableQuestChangeRequest.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/quests/IRepeatableQuestChangeRequest.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/ragfair/IAddOfferRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/ragfair/IAddOfferRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/ragfair/IAddOfferRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/ragfair/IAddOfferRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/ragfair/IExtendOfferRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/ragfair/IExtendOfferRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/ragfair/IExtendOfferRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/ragfair/IExtendOfferRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/ragfair/IGetItemPriceResult.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/ragfair/IGetItemPriceResult.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/ragfair/IGetItemPriceResult.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/ragfair/IGetItemPriceResult.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/ragfair/IGetMarketPriceRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/ragfair/IGetMarketPriceRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/ragfair/IGetOffersResult.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/ragfair/IGetOffersResult.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/ragfair/IGetOffersResult.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/ragfair/IGetOffersResult.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/ragfair/IRagfairOffer.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/ragfair/IRagfairOffer.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/ragfair/IRagfairOffer.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/ragfair/IRemoveOfferRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/ragfair/IRemoveOfferRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/ragfair/ISearchRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/ragfair/ISearchRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/ragfair/ISearchRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/repair/IBaseRepairActionDataRequest.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/repair/IBaseRepairActionDataRequest.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/repair/IRepairActionDataRequest.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/repair/IRepairActionDataRequest.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/repair/IRepairActionDataRequest.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/repair/IRepairActionDataRequest.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/repair/ITraderRepairActionDataRequest.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/repair/ITraderRepairActionDataRequest.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/trade/IProcessBaseTradeRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/trade/IProcessBaseTradeRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/trade/IProcessBuyTradeRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/trade/IProcessBuyTradeRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/trade/IProcessRagfairTradeRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/trade/IProcessRagfairTradeRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/trade/IProcessSellTradeRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/trade/IProcessSellTradeRequestData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/trade/IProcessSellTradeRequestData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/trade/IProcessSellTradeRequestData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/eft/weather/IWeatherData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/weather/IWeatherData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/eft/weather/IWeatherData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/weather/IWeatherData.d.ts diff --git a/TypeScript/2EditDatabase/types/@types/wishlist/IWishlistActionData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/wishlist/IWishlistActionData.d.ts similarity index 100% rename from TypeScript/2EditDatabase/types/@types/wishlist/IWishlistActionData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/eft/wishlist/IWishlistActionData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/external/mod.d.ts b/TypeScript/4UseACustomConfigFile/types/models/external/mod.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/external/mod.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/external/mod.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/external/tsyringe.d.ts b/TypeScript/4UseACustomConfigFile/types/models/external/tsyringe.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/external/tsyringe.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/external/tsyringe.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/bindings/Route.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/bindings/Route.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/bindings/Route.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/bindings/Route.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IBotCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IBotCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IBotCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IBotCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IBundleCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IBundleCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IBundleCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IBundleCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/ICustomizationCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/ICustomizationCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/ICustomizationCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/ICustomizationCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IDataCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IDataCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IDataCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IDataCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IDialogueCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IDialogueCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IDialogueCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IDialogueCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IGameCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IGameCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IGameCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IGameCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IHandbookCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IHandbookCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IHandbookCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IHandbookCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IHealthCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IHealthCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IHealthCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IHealthCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IHideoutCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IHideoutCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IHideoutCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IHideoutCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IHttpCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IHttpCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IHttpCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IHttpCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IInraidCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IInraidCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IInraidCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IInraidCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IInsuranceCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IInsuranceCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IInsuranceCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IInsuranceCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IInventoryCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IInventoryCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IInventoryCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IInventoryCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IItemEventCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IItemEventCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IItemEventCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IItemEventCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/ILauncherCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/ILauncherCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/ILauncherCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/ILauncherCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/ILocationCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/ILocationCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/ILocationCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/ILocationCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IMatchCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IMatchCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IMatchCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IMatchCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IModCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IModCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IModCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IModCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/INoteCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/INoteCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/INoteCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/INoteCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/INotifierCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/INotifierCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/INotifierCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/INotifierCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IPresetBuildCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IPresetBuildCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IPresetCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IPresetCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IPresetCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IPresetCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IProfileCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IProfileCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IProfileCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IProfileCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IQuestCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IQuestCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IQuestCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IQuestCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IRagfairCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IRagfairCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IRagfairCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IRagfairCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IRepairCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IRepairCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IRepairCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IRepairCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/ISaveCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/ISaveCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/ISaveCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/ISaveCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/ITradeCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/ITradeCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/ITradeCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/ITradeCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/ITraderCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/ITraderCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/ITraderCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/ITraderCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IWeatherCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IWeatherCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IWeatherCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IWeatherCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IWishlistCallbacks.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IWishlistCallbacks.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/callbacks/IWishlistCallbacks.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/callbacks/IWishlistCallbacks.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/config/IAirdropConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/config/IAirdropConfig.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/config/IAirdropConfig.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/config/IAirdropConfig.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/config/IBaseConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/config/IBaseConfig.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/config/IBaseConfig.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/config/IBaseConfig.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/config/IBotConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/config/IBotConfig.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/config/IBotConfig.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/config/IBotConfig.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/config/ICoreConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/config/ICoreConfig.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/config/ICoreConfig.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/config/ICoreConfig.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/config/IHealthConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/config/IHealthConfig.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/config/IHealthConfig.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/config/IHealthConfig.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/config/IHideoutConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/config/IHideoutConfig.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/config/IHideoutConfig.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/config/IHideoutConfig.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/config/IHttpConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/config/IHttpConfig.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/config/IHttpConfig.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/config/IHttpConfig.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/config/IInRaidConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/config/IInRaidConfig.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/config/IInRaidConfig.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/config/IInRaidConfig.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/config/IInsuranceConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/config/IInsuranceConfig.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/config/IInsuranceConfig.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/config/IInsuranceConfig.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/config/IInventoryConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/config/IInventoryConfig.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/config/IInventoryConfig.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/config/IInventoryConfig.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/config/ILocationConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/config/ILocationConfig.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/config/ILocationConfig.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/config/ILocationConfig.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/config/IMatchConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/config/IMatchConfig.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/config/IMatchConfig.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/config/IMatchConfig.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/config/IQuestConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/config/IQuestConfig.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/config/IQuestConfig.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/config/IQuestConfig.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/config/IRagfairConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/config/IRagfairConfig.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/config/IRagfairConfig.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/config/IRagfairConfig.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/config/IRepairConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/config/IRepairConfig.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/config/IRepairConfig.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/config/IRepairConfig.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/config/ITraderConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/config/ITraderConfig.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/config/ITraderConfig.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/config/ITraderConfig.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/config/IWeatherConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/config/IWeatherConfig.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/config/IWeatherConfig.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/config/IWeatherConfig.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/controllers/IBotController.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/controllers/IBotController.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/controllers/IBotController.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/controllers/IBotController.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/generators/IBotGenerator.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/generators/IBotGenerator.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/generators/IBotGenerator.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/generators/IBotGenerator.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/generators/ILocationGenerator.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/generators/ILocationGenerator.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/generators/ILocationGenerator.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/generators/ILocationGenerator.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/generators/IPMCLootGenerator.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/generators/IPMCLootGenerator.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/generators/IPMCLootGenerator.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/generators/IPMCLootGenerator.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/generators/IRagfairAssortGenerator.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/generators/IRagfairAssortGenerator.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/generators/IRagfairAssortGenerator.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/generators/IRagfairAssortGenerator.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/generators/IRagfairOfferGenerator.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/generators/IRagfairOfferGenerator.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/generators/IRagfairOfferGenerator.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/generators/IRagfairOfferGenerator.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/helpers/Traders.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/helpers/Traders.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/helpers/Traders.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/helpers/Traders.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/mod/IMod.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/mod/IMod.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/mod/IMod.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/mod/IMod.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/mod/IModLoader.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/mod/IModLoader.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/mod/IModLoader.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/mod/IModLoader.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/mod/IPackageJsonData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/mod/IPackageJsonData.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/mod/IPackageJsonData.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/mod/IPackageJsonData.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/ragfair/IRagfairServerPrices.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/ragfair/IRagfairServerPrices.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/ragfair/IRagfairServerPrices.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/ragfair/IRagfairServerPrices.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/server/IDatabaseTables.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/server/IDatabaseTables.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/server/IDatabaseTables.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/server/IDatabaseTables.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/server/IHttpServer.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/server/IHttpServer.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/server/IHttpServer.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/server/IHttpServer.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/server/ILocaleBase.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/server/ILocaleBase.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/server/ILocaleBase.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/server/ILocaleBase.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/server/ILocations.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/server/ILocations.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/server/ILocations.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/server/ILocations.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/server/IServerBase.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/server/IServerBase.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/server/IServerBase.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/server/IServerBase.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/server/ISettingsBase.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/server/ISettingsBase.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/server/ISettingsBase.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/server/ISettingsBase.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/utils/IAsyncQueue.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/utils/IAsyncQueue.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/utils/IAsyncQueue.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/utils/IAsyncQueue.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/utils/ICommand.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/utils/ICommand.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/utils/ICommand.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/utils/ICommand.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/utils/ILogger.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/utils/ILogger.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/utils/ILogger.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/utils/ILogger.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/utils/IUuidGenerator.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/utils/IUuidGenerator.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/utils/IUuidGenerator.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/utils/IUuidGenerator.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/@types/spt/utils/IWatermark.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/utils/IWatermark.d.ts similarity index 100% rename from TypeScript/4UseACustomConfigFile/types/@types/spt/utils/IWatermark.d.ts rename to TypeScript/4UseACustomConfigFile/types/models/spt/utils/IWatermark.d.ts diff --git a/TypeScript/4UseACustomConfigFile/types/routers/ImageRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/ImageRouter.d.ts index 511d5b2..07a0606 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/ImageRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/ImageRouter.d.ts @@ -1,7 +1,7 @@ /// import { IncomingMessage, ServerResponse } from "http"; import { VFS } from "../utils/VFS"; -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class ImageRouter { private vfs; constructor(vfs: VFS); diff --git a/TypeScript/4UseACustomConfigFile/types/routers/ItemEventRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/ItemEventRouter.d.ts index bb5e843..bb20152 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/ItemEventRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/ItemEventRouter.d.ts @@ -1,9 +1,9 @@ import { JsonUtil } from "../utils/JsonUtil"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IItemEventRouterRequest } from "../@types/eft/itemEvent/IItemEventRouterRequest"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IItemEventRouterRequest } from "../models/eft/itemEvent/IItemEventRouterRequest"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { ItemEventRouterDefinition } from "../di/Router"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class ItemEventRouter { private logger; private jsonUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/routers/item_events/CustomizationItemEventRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/item_events/CustomizationItemEventRouter.d.ts index eebc28c..3025e2c 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/item_events/CustomizationItemEventRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/item_events/CustomizationItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private customizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/item_events/HealthItemEventRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/item_events/HealthItemEventRouter.d.ts index 333c18a..bad9af2 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/item_events/HealthItemEventRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/item_events/HealthItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private healthCallbacks; constructor(healthCallbacks: HealthCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/item_events/HideoutItemEventRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/item_events/HideoutItemEventRouter.d.ts index f68b112..2cec18b 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/item_events/HideoutItemEventRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/item_events/HideoutItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private hideoutCallbacks; constructor(hideoutCallbacks: HideoutCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/item_events/InsuranceItemEventRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/item_events/InsuranceItemEventRouter.d.ts index de185db..8efc2c2 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/item_events/InsuranceItemEventRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/item_events/InsuranceItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private insuranceCallbacks; constructor(insuranceCallbacks: InsuranceCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/item_events/InventoryItemEventRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/item_events/InventoryItemEventRouter.d.ts index 40496f7..1d93e7b 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/item_events/InventoryItemEventRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/item_events/InventoryItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private inventoryCallbacks; constructor(inventoryCallbacks: InventoryCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/item_events/NoteItemEventRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/item_events/NoteItemEventRouter.d.ts index 8b703a3..12af594 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/item_events/NoteItemEventRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/item_events/NoteItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private noteCallbacks; constructor(noteCallbacks: NoteCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/item_events/PresetBuildItemEventRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/item_events/PresetBuildItemEventRouter.d.ts index 7a915b1..7298c52 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/item_events/PresetBuildItemEventRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/item_events/PresetBuildItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private presetBuildCallbacks; constructor(presetBuildCallbacks: PresetBuildCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/item_events/QuestItemEventRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/item_events/QuestItemEventRouter.d.ts index 6f4d3f6..9944ae9 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/item_events/QuestItemEventRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/item_events/QuestItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private questCallbacks; constructor(questCallbacks: QuestCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/item_events/RagfairItemEventRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/item_events/RagfairItemEventRouter.d.ts index 8361e1e..88e52ba 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/item_events/RagfairItemEventRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/item_events/RagfairItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private ragfairCallbacks; constructor(ragfairCallbacks: RagfairCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/item_events/RepairItemEventRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/item_events/RepairItemEventRouter.d.ts index 544a656..b292ded 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/item_events/RepairItemEventRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/item_events/RepairItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private repairCallbacks; constructor(repairCallbacks: RepairCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/item_events/TradeItemEventRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/item_events/TradeItemEventRouter.d.ts index eb5c294..1bca2b8 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/item_events/TradeItemEventRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/item_events/TradeItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private tradeCallbacks; constructor(tradeCallbacks: TradeCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/item_events/WishlistItemEventRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/item_events/WishlistItemEventRouter.d.ts index e7fdc9b..38831f6 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/item_events/WishlistItemEventRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/item_events/WishlistItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private wishlistCallbacks; constructor(wishlistCallbacks: WishlistCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/4UseACustomConfigFile/types/routers/save_load/HealthSaveLoadRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/save_load/HealthSaveLoadRouter.d.ts index c068915..114f5b2 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/save_load/HealthSaveLoadRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/save_load/HealthSaveLoadRouter.d.ts @@ -1,4 +1,4 @@ -import { IAkiProfile } from "../../@types/eft/profile/IAkiProfile"; +import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; export declare class HealthSaveLoadRouter extends SaveLoadRouter { constructor(); diff --git a/TypeScript/4UseACustomConfigFile/types/routers/save_load/InraidSaveLoadRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/save_load/InraidSaveLoadRouter.d.ts index eb5cf5a..4c00b40 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/save_load/InraidSaveLoadRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/save_load/InraidSaveLoadRouter.d.ts @@ -1,4 +1,4 @@ -import { IAkiProfile } from "../../@types/eft/profile/IAkiProfile"; +import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; export declare class InraidSaveLoadRouter extends SaveLoadRouter { constructor(); diff --git a/TypeScript/4UseACustomConfigFile/types/routers/save_load/InsuranceSaveLoadRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/save_load/InsuranceSaveLoadRouter.d.ts index 07df122..30ce98e 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/save_load/InsuranceSaveLoadRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/save_load/InsuranceSaveLoadRouter.d.ts @@ -1,4 +1,4 @@ -import { IAkiProfile } from "../../@types/eft/profile/IAkiProfile"; +import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; export declare class InsuranceSaveLoadRouter extends SaveLoadRouter { constructor(); diff --git a/TypeScript/4UseACustomConfigFile/types/routers/save_load/ProfileSaveLoadRouter.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/save_load/ProfileSaveLoadRouter.d.ts index 51b4cb5..16c7619 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/save_load/ProfileSaveLoadRouter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/save_load/ProfileSaveLoadRouter.d.ts @@ -1,4 +1,4 @@ -import { IAkiProfile } from "../../@types/eft/profile/IAkiProfile"; +import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; export declare class ProfileSaveLoadRouter extends SaveLoadRouter { constructor(); diff --git a/TypeScript/4UseACustomConfigFile/types/routers/serializers/BundleSerializer.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/serializers/BundleSerializer.d.ts index cf09797..5f275c4 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/serializers/BundleSerializer.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/serializers/BundleSerializer.d.ts @@ -1,5 +1,5 @@ -import { IHttpServer } from "../../@types/spt/server/IHttpServer"; -import { ILogger } from "../../@types/spt/utils/ILogger"; +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 { diff --git a/TypeScript/4UseACustomConfigFile/types/routers/serializers/ImageSerializer.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/serializers/ImageSerializer.d.ts index 1d0b9c4..29340d0 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/serializers/ImageSerializer.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/serializers/ImageSerializer.d.ts @@ -1,4 +1,4 @@ -import { IHttpServer } from "../../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { Serializer } from "../../di/Serializer"; import { ImageRouter } from "../ImageRouter"; export declare class ImageSerializer extends Serializer { diff --git a/TypeScript/4UseACustomConfigFile/types/routers/serializers/NotifySerializer.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/serializers/NotifySerializer.d.ts index d97fc0a..7be87ef 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/serializers/NotifySerializer.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/serializers/NotifySerializer.d.ts @@ -1,4 +1,4 @@ -import { IHttpServer } from "../../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { NotifierController } from "../../controllers/NotifierController"; import { Serializer } from "../../di/Serializer"; import { HttpServerHelper } from "../../helpers/HttpServerHelper"; diff --git a/TypeScript/4UseACustomConfigFile/types/servers/ConfigServer.d.ts b/TypeScript/4UseACustomConfigFile/types/servers/ConfigServer.d.ts index d25d1a8..9c2e114 100644 --- a/TypeScript/4UseACustomConfigFile/types/servers/ConfigServer.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/servers/ConfigServer.d.ts @@ -1,6 +1,6 @@ import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class ConfigServer { private logger; private vfs; diff --git a/TypeScript/4UseACustomConfigFile/types/servers/DatabaseServer.d.ts b/TypeScript/4UseACustomConfigFile/types/servers/DatabaseServer.d.ts index b66e847..521bcf9 100644 --- a/TypeScript/4UseACustomConfigFile/types/servers/DatabaseServer.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/servers/DatabaseServer.d.ts @@ -1,4 +1,4 @@ -import { IDatabaseTables } from "../@types/spt/server/IDatabaseTables"; +import { IDatabaseTables } from "../models/spt/server/IDatabaseTables"; export declare class DatabaseServer { private tableData; getTables(): IDatabaseTables; diff --git a/TypeScript/4UseACustomConfigFile/types/servers/HttpServer.d.ts b/TypeScript/4UseACustomConfigFile/types/servers/HttpServer.d.ts index e38263d..0ba20c6 100644 --- a/TypeScript/4UseACustomConfigFile/types/servers/HttpServer.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/servers/HttpServer.d.ts @@ -1,16 +1,16 @@ /// import { HttpRouter } from "../routers/HttpRouter"; import { JsonUtil } from "../utils/JsonUtil"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { DatabaseServer } from "./DatabaseServer"; import { Serializer } from "../di/Serializer"; import http, { ServerResponse } from "http"; -import { INotification } from "../@types/eft/notifier/INotifier"; +import { INotification } from "../models/eft/notifier/INotifier"; import { NotifierHelper } from "../helpers/NotifierHelper"; import { ConfigServer } from "./ConfigServer"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class HttpServer implements IHttpServer { private httpRouter; private logger; @@ -21,7 +21,7 @@ export declare class HttpServer implements IHttpServer { private httpServerHelper; private serializers; private configServer; - constructor(httpRouter: HttpRouter, logger: ILogger, jsonUtil: JsonUtil, httpResponse: HttpResponse, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); + constructor(httpRouter: HttpRouter, logger: ILogger, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); private buffers; private onReceive; private onRespond; diff --git a/TypeScript/4UseACustomConfigFile/types/servers/RagfairServer.d.ts b/TypeScript/4UseACustomConfigFile/types/servers/RagfairServer.d.ts index ef69106..d103625 100644 --- a/TypeScript/4UseACustomConfigFile/types/servers/RagfairServer.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/servers/RagfairServer.d.ts @@ -1,4 +1,4 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; @@ -7,12 +7,12 @@ import { RagfairPriceService } from "../services/RagfairPriceService"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { RagfairCategoriesService } from "../services/RagfairCategoriesService"; import { RagfairLinkedItemService } from "../services/RagfairLinkedItemService"; -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ConfigServer } from "./ConfigServer"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairServer { private logger; private ragfairOfferGenerator; @@ -28,7 +28,7 @@ export declare class RagfairServer { private ragfairRequiredItemsService; private configServer; private ragfairConfig; - constructor(logger: ILogger, ragfairOfferGenerator: RagfairOfferGenerator, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponse, saveServer: SaveServer, ragfairPriceService: RagfairPriceService, ragfairOfferService: RagfairOfferService, ragfairLinkedItemService: RagfairLinkedItemService, ragfairCategoriesService: RagfairCategoriesService, ragfairRequiredItemsService: RagfairRequiredItemsService, configServer: ConfigServer); + constructor(logger: ILogger, ragfairOfferGenerator: RagfairOfferGenerator, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, saveServer: SaveServer, ragfairPriceService: RagfairPriceService, ragfairOfferService: RagfairOfferService, ragfairLinkedItemService: RagfairLinkedItemService, ragfairCategoriesService: RagfairCategoriesService, ragfairRequiredItemsService: RagfairRequiredItemsService, configServer: ConfigServer); load(): void; update(): void; private processExpiredOffer; diff --git a/TypeScript/4UseACustomConfigFile/types/servers/SaveServer.d.ts b/TypeScript/4UseACustomConfigFile/types/servers/SaveServer.d.ts index 23da9ea..fdf92e4 100644 --- a/TypeScript/4UseACustomConfigFile/types/servers/SaveServer.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/servers/SaveServer.d.ts @@ -1,9 +1,9 @@ -import { IAkiProfile, Info } from "../@types/eft/profile/IAkiProfile"; +import { IAkiProfile, Info } from "../models/eft/profile/IAkiProfile"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; import { SaveLoadRouter } from "../di/Router"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class SaveServer { private vfs; private saveLoadRouters; diff --git a/TypeScript/4UseACustomConfigFile/types/services/FenceService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/FenceService.d.ts index 4b80d50..eef87b3 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/FenceService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/FenceService.d.ts @@ -2,14 +2,14 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { HandbookHelper } from "../helpers/HandbookHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { PresetHelper } from "../helpers/PresetHelper"; -import { FenceLevel } from "../@types/eft/common/IGlobals"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; +import { FenceLevel } from "../models/eft/common/IGlobals"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; import { ConfigServer } from "../servers/ConfigServer"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class FenceService { private logger; private hashUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/services/HashCacheService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/HashCacheService.d.ts new file mode 100644 index 0000000..c9b0170 --- /dev/null +++ b/TypeScript/4UseACustomConfigFile/types/services/HashCacheService.d.ts @@ -0,0 +1,19 @@ +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 { + private vfs; + private hashUtil; + private jsonUtil; + private logger; + private jsonHashes; + private modHashes; + private readonly modCachePath; + constructor(vfs: VFS, hashUtil: HashUtil, jsonUtil: JsonUtil, logger: ILogger); + getStoredModHash(modName: string): string; + modContentMatchesStoredHash(modName: string, modContent: string): boolean; + hashMatchesStoredHash(modName: string, modHash: string): boolean; + storeModContent(modName: string, modContent: string): void; + storeModHash(modName: string, modHash: string): void; +} diff --git a/TypeScript/4UseACustomConfigFile/types/services/InsuranceService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/InsuranceService.d.ts index cd91136..35f0dbc 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/InsuranceService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/InsuranceService.d.ts @@ -1,10 +1,9 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData"; -import { IInsuranceConfig } from "../@types/spt/config/IInsuranceConfig"; -import { ILogger } from "../@types/spt/utils/ILogger"; +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 { InventoryHelper } from "../helpers/InventoryHelper"; +import { SecureContainerHelper } from "../helpers/SecureContainerHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -14,7 +13,7 @@ import { TimeUtil } from "../utils/TimeUtil"; export declare class InsuranceService { private logger; private databaseServer; - private inventoryHelper; + private secureContainerHelper; private randomUtil; private timeUtil; private saveServer; @@ -23,8 +22,8 @@ export declare class InsuranceService { private configServer; private insured; private templatesById; - insuranceConfig: IInsuranceConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, inventoryHelper: InventoryHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, configServer: ConfigServer); + private insuranceConfig; + constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, configServer: ConfigServer); insuranceExists(sessionId: string): boolean; insuranceTraderArrayExists(sessionId: string, traderId: string): boolean; getInsurance(sessionId: string): Record; diff --git a/TypeScript/4UseACustomConfigFile/types/services/ModCompilerService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/ModCompilerService.d.ts new file mode 100644 index 0000000..7e750c3 --- /dev/null +++ b/TypeScript/4UseACustomConfigFile/types/services/ModCompilerService.d.ts @@ -0,0 +1,11 @@ +import { ILogger } from "../models/spt/utils/ILogger"; +import { VFS } from "../utils/VFS"; +export declare class ModCompilerService { + private logger; + private vfs; + constructor(logger: ILogger, vfs: VFS); + compileMod(path: string, modTypeScriptFiles: string[]): Promise; + private compile; + private areFilesReady; + private delay; +} diff --git a/TypeScript/4UseACustomConfigFile/types/services/NotificationService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/NotificationService.d.ts index 5c0e0ec..9c6c143 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/NotificationService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/NotificationService.d.ts @@ -1,4 +1,4 @@ -import { INotification } from "../@types/eft/notifier/INotifier"; +import { INotification } from "../models/eft/notifier/INotifier"; export declare class NotificationService { private messageQueue; getMessageQueue(): {}; diff --git a/TypeScript/4UseACustomConfigFile/types/services/PaymentService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/PaymentService.d.ts index 245bb34..20cee50 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/PaymentService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/PaymentService.d.ts @@ -1,15 +1,15 @@ import { InventoryHelper } from "../helpers/InventoryHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IProcessBuyTradeRequestData } from "../@types/eft/trade/IProcessBuyTradeRequestData"; -import { IProcessSellTradeRequestData } from "../@types/eft/trade/IProcessSellTradeRequestData"; +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 { HttpResponse } from "../utils/HttpResponse"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class PaymentService { private logger; private httpResponse; @@ -19,7 +19,7 @@ export declare class PaymentService { private itemHelper; private inventoryHelper; private paymentHelper; - constructor(logger: ILogger, httpResponse: HttpResponse, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); + constructor(logger: ILogger, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request * @param {Object} pmcData @@ -38,5 +38,11 @@ export declare class PaymentService { * @returns IItemEventRouterResponse */ getMoney(pmcData: IPmcData, amount: number, body: IProcessSellTradeRequestData, output: IItemEventRouterResponse, sessionID: string): IItemEventRouterResponse; + /** + * Recursively checks if the given item is + * inside the stash, that is it has the stash as + * ancestor with slotId=hideout + */ + private isItemInStash; addPaymentToOutput(pmcData: IPmcData, currencyTpl: string, amountToPay: number, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse; } diff --git a/TypeScript/4UseACustomConfigFile/types/services/PlayerService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/PlayerService.d.ts index ec6e32c..4a74b4a 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 "../@types/eft/common/IPmcData"; -import { IPlayerIncrementSkillLevelRequestData } from "../@types/eft/player/IPlayerIncrementSkillLevelRequestData"; -import { ILogger } from "../@types/spt/utils/ILogger"; +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 { private logger; private databaseServer; diff --git a/TypeScript/4UseACustomConfigFile/types/services/RagfairCategoriesService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/RagfairCategoriesService.d.ts index 370886e..fb9efa2 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/RagfairCategoriesService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/RagfairCategoriesService.d.ts @@ -1,4 +1,4 @@ -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; export declare class RagfairCategoriesService { updateCategories(offers: IRagfairOffer[]): void; private categories; diff --git a/TypeScript/4UseACustomConfigFile/types/services/RagfairOfferService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/RagfairOfferService.d.ts index 1b7682d..4e4ae26 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/RagfairOfferService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/RagfairOfferService.d.ts @@ -2,9 +2,8 @@ import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { TimeUtil } from "../utils/TimeUtil"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; -import { IRagfairConfig } from "../@types/spt/config/IRagfairConfig"; +import { Item } from "../models/eft/common/tables/IItem"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; export declare class RagfairOfferService { private timeUtil; private databaseServer; @@ -14,7 +13,7 @@ export declare class RagfairOfferService { private toUpdate; private expiredOffers; private offers; - ragfairConfig: IRagfairConfig; + private ragfairConfig; constructor(timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, configServer: ConfigServer); getOffers(): IRagfairOffer[]; getOfferByOfferId(offerId: string): IRagfairOffer; diff --git a/TypeScript/4UseACustomConfigFile/types/services/RagfairPriceService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/RagfairPriceService.d.ts index d91df24..7cc42f9 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/RagfairPriceService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/RagfairPriceService.d.ts @@ -4,9 +4,9 @@ import { ConfigServer } from "../servers/ConfigServer"; import { HandbookHelper } from "../helpers/HandbookHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { PresetHelper } from "../helpers/PresetHelper"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { IBarterScheme } from "../@types/eft/common/tables/ITrader"; -import { ILogger } from "../@types/spt/utils/ILogger"; +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 { private handbookHelper; private databaseServer; diff --git a/TypeScript/4UseACustomConfigFile/types/services/RagfairRequiredItemsService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/RagfairRequiredItemsService.d.ts index 3908cb9..e4582d0 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/RagfairRequiredItemsService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/RagfairRequiredItemsService.d.ts @@ -1,6 +1,6 @@ import { PaymentHelper } from "../helpers/PaymentHelper"; import { RagfairOfferService } from "../services/RagfairOfferService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairRequiredItemsService { private logger; private paymentHelper; diff --git a/TypeScript/4UseACustomConfigFile/types/services/TraderAssortService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/TraderAssortService.d.ts index 99b23f1..ccb9e45 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/TraderAssortService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/TraderAssortService.d.ts @@ -1,4 +1,4 @@ -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; export declare class TraderAssortService { private pristineTraderAssorts; getPristineTraderAssort(traderId: string): ITraderAssort; diff --git a/TypeScript/4UseACustomConfigFile/types/utils/App.d.ts b/TypeScript/4UseACustomConfigFile/types/utils/App.d.ts index 4b082a0..a11f576 100644 --- a/TypeScript/4UseACustomConfigFile/types/utils/App.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/utils/App.d.ts @@ -1,7 +1,7 @@ import { TimeUtil } from "./TimeUtil"; import { OnLoad } from "../di/OnLoad"; import { OnUpdate } from "../di/OnUpdate"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class App { private logger; private timeUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/utils/AyncQueue.d.ts b/TypeScript/4UseACustomConfigFile/types/utils/AyncQueue.d.ts index 773a5e4..8f1559b 100644 --- a/TypeScript/4UseACustomConfigFile/types/utils/AyncQueue.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/utils/AyncQueue.d.ts @@ -1,5 +1,5 @@ -import { IAsyncQueue } from "../@types/spt/utils/IAsyncQueue"; -import { ICommand } from "../@types/spt/utils/ICommand"; +import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; +import { ICommand } from "../models/spt/utils/ICommand"; export declare class AsyncQueue implements IAsyncQueue { commandsQueue: ICommand[]; constructor(); diff --git a/TypeScript/4UseACustomConfigFile/types/utils/DatabaseImporter.d.ts b/TypeScript/4UseACustomConfigFile/types/utils/DatabaseImporter.d.ts index 41b3e5f..97dda30 100644 --- a/TypeScript/4UseACustomConfigFile/types/utils/DatabaseImporter.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/utils/DatabaseImporter.d.ts @@ -3,7 +3,7 @@ import { JsonUtil } from "./JsonUtil"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ImageRouter } from "../routers/ImageRouter"; import { OnLoad } from "../di/OnLoad"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class DatabaseImporter extends OnLoad { private logger; private vfs; diff --git a/TypeScript/4UseACustomConfigFile/types/utils/HttpResponse.d.ts b/TypeScript/4UseACustomConfigFile/types/utils/HttpResponseUtil.d.ts similarity index 73% rename from TypeScript/4UseACustomConfigFile/types/utils/HttpResponse.d.ts rename to TypeScript/4UseACustomConfigFile/types/utils/HttpResponseUtil.d.ts index d5a90d7..85c28bd 100644 --- a/TypeScript/4UseACustomConfigFile/types/utils/HttpResponse.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/utils/HttpResponseUtil.d.ts @@ -1,8 +1,8 @@ import { JsonUtil } from "./JsonUtil"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -export declare class HttpResponse { +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 { private jsonUtil; constructor(jsonUtil: JsonUtil); private clearString; diff --git a/TypeScript/4UseACustomConfigFile/types/utils/JsonUtil.d.ts b/TypeScript/4UseACustomConfigFile/types/utils/JsonUtil.d.ts index 69cf8f1..20b7448 100644 --- a/TypeScript/4UseACustomConfigFile/types/utils/JsonUtil.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/utils/JsonUtil.d.ts @@ -1,12 +1,12 @@ -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; import { HashUtil } from "./HashUtil"; import { VFS } from "./VFS"; export declare class JsonUtil { private vfs; - private hashutil; + private hashUtil; private logger; private fileHashes; - constructor(vfs: VFS, hashutil: HashUtil, logger: ILogger); + constructor(vfs: VFS, hashUtil: HashUtil, logger: ILogger); /** * From object to string * @param data object to turn into JSON diff --git a/TypeScript/4UseACustomConfigFile/types/utils/Logger.d.ts b/TypeScript/4UseACustomConfigFile/types/utils/Logger.d.ts index 57da5ae..9d5b32a 100644 --- a/TypeScript/4UseACustomConfigFile/types/utils/Logger.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/utils/Logger.d.ts @@ -1,14 +1,16 @@ /// -import { Daum } from "../@types/eft/itemEvent/IItemEventRouterRequest"; -import { ILogger } from "../@types/spt/utils/ILogger"; -import { IAsyncQueue } from "../@types/spt/utils/IAsyncQueue"; -import { IUUidGenerator } from "../@types/spt/utils/IUuidGenerator"; +import { Daum } from "../models/eft/itemEvent/IItemEventRouterRequest"; +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 { private asyncQueue; private uuidGenerator; private showDebugInConsole; - private filepath; + private folderPath; + private file; + private filePath; private logLevels; private logger; writeFilePromisify: (path: fs.PathLike, data: string, options?: any) => Promise; diff --git a/TypeScript/4UseACustomConfigFile/types/utils/RandomUtil.d.ts b/TypeScript/4UseACustomConfigFile/types/utils/RandomUtil.d.ts index a1bac79..3a3ecb6 100644 --- a/TypeScript/4UseACustomConfigFile/types/utils/RandomUtil.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/utils/RandomUtil.d.ts @@ -1,3 +1,4 @@ +import { ILogger } from "../models/spt/utils/ILogger"; import { JsonUtil } from "./JsonUtil"; import { MathUtil } from "./MathUtil"; /** @@ -103,7 +104,8 @@ export declare class ProbabilityObject { } export declare class RandomUtil { private jsonUtil; - constructor(jsonUtil: JsonUtil); + private logger; + constructor(jsonUtil: JsonUtil, logger: ILogger); getInt(min: number, max: number): number; getIntEx(max: number): number; getFloat(min: number, max: number): number; @@ -147,4 +149,5 @@ export declare class RandomUtil { * @return {array} Array consisting of N random keys of the dictionary */ drawRandomFromDict(dict: any, count?: number, replacement?: boolean): any[]; + getBiasedRandomNumber(min: number, max: number, shift: number, n: number): number; } diff --git a/TypeScript/4UseACustomConfigFile/types/utils/UUidGenerator.d.ts b/TypeScript/4UseACustomConfigFile/types/utils/UUidGenerator.d.ts index 763424a..000b719 100644 --- a/TypeScript/4UseACustomConfigFile/types/utils/UUidGenerator.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/utils/UUidGenerator.d.ts @@ -1,4 +1,4 @@ -import { IUUidGenerator } from "../@types/spt/utils/IUuidGenerator"; +import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; export declare class UUidGenerator implements IUUidGenerator { generate: () => string; } diff --git a/TypeScript/4UseACustomConfigFile/types/utils/VFS.d.ts b/TypeScript/4UseACustomConfigFile/types/utils/VFS.d.ts index c8d32f1..b064cf4 100644 --- a/TypeScript/4UseACustomConfigFile/types/utils/VFS.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/utils/VFS.d.ts @@ -1,8 +1,8 @@ /// import "reflect-metadata"; import fs from "fs"; -import { IAsyncQueue } from "../@types/spt/utils/IAsyncQueue"; -import { IUUidGenerator } from "../@types/spt/utils/IUuidGenerator"; +import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; +import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; export declare class VFS { private asyncQueue; private uuidGenerator; @@ -50,4 +50,5 @@ export declare class VFS { stripExtension(filepath: string): string; minifyAllJsonInDirRecursive(filepath: string): Promise; minifyAllJsonInDirRecursiveAsync(filepath: string): Promise; + getFilesOfType(directory: string, fileType: string, files?: string[]): string[]; } diff --git a/TypeScript/4UseACustomConfigFile/types/utils/Watermark.d.ts b/TypeScript/4UseACustomConfigFile/types/utils/Watermark.d.ts index e7765e1..598d5a6 100644 --- a/TypeScript/4UseACustomConfigFile/types/utils/Watermark.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/utils/Watermark.d.ts @@ -1,6 +1,6 @@ -import { IWatermark, IWatermarkLocale } from "../@types/spt/utils/IWatermark"; +import { IWatermark, IWatermarkLocale } from "../models/spt/utils/IWatermark"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class WatermarkLocale implements IWatermarkLocale { private locales; getLocale(): string; diff --git a/TypeScript/5ReplaceMethod/package.json b/TypeScript/5ReplaceMethod/package.json index e329c24..e7b03c5 100644 --- a/TypeScript/5ReplaceMethod/package.json +++ b/TypeScript/5ReplaceMethod/package.json @@ -4,7 +4,7 @@ "main": "src/mod.js", "license": "MIT", "author": "Chomp", - "akiVersion": "2.4.0", + "akiVersion": "3.0.0", "scripts": { "install": "npx handpick --target=devDependencies", "build": "tsc" diff --git a/TypeScript/5ReplaceMethod/src/mod.js b/TypeScript/5ReplaceMethod/src/mod.js new file mode 100644 index 0000000..d56ba96 --- /dev/null +++ b/TypeScript/5ReplaceMethod/src/mod.js @@ -0,0 +1,25 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +class Mod { + // Perform these actions before server fully loads + load(container) { + // get watermarkLocale class from server + const watermarkLocale = container.resolve("WatermarkLocale"); + // Approach #1 + // Replace the getDescription() function with the one below called 'replacementFunction()' + watermarkLocale.getDescription = this.replacementFunction; + // Approach #2 + // Wait until WatermarkLocale gets resolved by the server and run code afterwards to replace + // the getDescription() function with the one below called 'replacementFunction() + container.afterResolution("WatermarkLocale", (_t, result) => { + result.getDescription = this.replacementFunction; + }, { frequency: "Always" }); + } + // not used for this example + delayedLoad(container) { return; } + // our new replacement function, ready to be used + replacementFunction() { + return ["SPT AKI, WOW VERY COOL"]; + } +} +module.exports = { mod: new Mod() }; diff --git a/TypeScript/5ReplaceMethod/src/mod.ts b/TypeScript/5ReplaceMethod/src/mod.ts index 50f82c1..c8df12e 100644 --- a/TypeScript/5ReplaceMethod/src/mod.ts +++ b/TypeScript/5ReplaceMethod/src/mod.ts @@ -1,18 +1,27 @@ import type { DependencyContainer } from "tsyringe"; -import { IMod } from "../types/@types/external/mod"; +import { IMod } from "../types/models/external/mod"; import type { WatermarkLocale } from "../types/utils/Watermark"; class Mod implements IMod { // Perform these actions before server fully loads public load(container: DependencyContainer): void - { + { // get watermarkLocale class from server const watermarkLocale = container.resolve("WatermarkLocale"); + // Approach #1 // Replace the getDescription() function with the one below called 'replacementFunction()' watermarkLocale.getDescription = this.replacementFunction; + + // Approach #2 + // Wait until WatermarkLocale gets resolved by the server and run code afterwards to replace + // the getDescription() function with the one below called 'replacementFunction() + container.afterResolution("WatermarkLocale", (_t, result: WatermarkLocale) => + { + result.getDescription = this.replacementFunction; + }, {frequency: "Always"}); } // not used for this example diff --git a/TypeScript/5ReplaceMethod/tsconfig.json b/TypeScript/5ReplaceMethod/tsconfig.json index 4204c72..8ba3117 100644 --- a/TypeScript/5ReplaceMethod/tsconfig.json +++ b/TypeScript/5ReplaceMethod/tsconfig.json @@ -9,7 +9,6 @@ "experimentalDecorators": true, "emitDecoratorMetadata": true, "resolveJsonModule": true, - "esModuleInterop": true, "outDir": "out" }, "lib": [ diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/common/IItemEventResponseData.d.ts b/TypeScript/5ReplaceMethod/types/@types/eft/common/IItemEventResponseData.d.ts deleted file mode 100644 index 08fb8a7..0000000 --- a/TypeScript/5ReplaceMethod/types/@types/eft/common/IItemEventResponseData.d.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { Skills } from "./IPmcData"; -export interface IItemEventResponseData { - warnings: any[]; - profileChanges: Record; -} -export interface ProfileChange { - _id: string; - experience: number; - quests: any[]; - ragFairOffers: any[]; - builds: any[]; - items: Items; - production: Production; - skills: Skills; - traderRelations: TraderRelations; -} -export interface Items { - new: any[]; - change: any[]; - del: any[]; -} -export interface Production { -} -export interface TraderRelations { -} diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/common/IPmcDataRepeatableQuest.d.ts b/TypeScript/5ReplaceMethod/types/@types/eft/common/IPmcDataRepeatableQuest.d.ts deleted file mode 100644 index 15a1c09..0000000 --- a/TypeScript/5ReplaceMethod/types/@types/eft/common/IPmcDataRepeatableQuest.d.ts +++ /dev/null @@ -1,71 +0,0 @@ -export interface IPmcDataRepeatableQuest { - name: string; - activeQuests: Quest[]; - inactiveQuests: Quest[]; - endTime: number; -} -export interface Quest { - _id: string; - traderId: string; - location: string; - image: string; - type: string; - isKey: boolean; - restartable: boolean; - instantComplete: boolean; - secretQuest: boolean; - canShowNotificationsInGame: boolean; - rewards: Rewards; - conditions: Conditions; - name: string; - note: string; - description: string; - successMessageText: string; - failMessageText: string; - startedMessageText: string; - templateId: string; -} -export interface Rewards { - Started: Reward[]; - Success: Reward[]; - Fail: Reward[]; -} -export interface Reward { - value: number; - type: string; - index: number; - target?: string; - items?: Item[]; -} -export interface Item { - _id: string; - _tpl: string; - upd: Upd; -} -export interface Conditions { - AvailableForStart: any[]; - AvailableForFinish: AvailableForFinish[]; - Fail: any[]; -} -export interface AvailableForFinish { - _props: Props; - _parent: string; - dynamicLocale: boolean; -} -export interface Props { - id: string; - parentId: string; - dynamicLocale: boolean; - index: number; - visibilityConditions: any[]; - target: string[]; - value: number; - minDurability: number; - maxDurability: number; - dogtagLevel: number; - onlyFoundInRaid: boolean; -} -export interface Upd { - StackObjectsCount: number; - SpawnedInSession?: boolean; -} diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/customization/IBuyClothingRequestData.d.ts b/TypeScript/5ReplaceMethod/types/@types/eft/customization/IBuyClothingRequestData.d.ts deleted file mode 100644 index be5d930..0000000 --- a/TypeScript/5ReplaceMethod/types/@types/eft/customization/IBuyClothingRequestData.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -export interface IBuyClothingRequestData { - Action: "CustomizationBuy"; - offer: string; - items: Item[]; -} -export interface Item { - del: boolean; - id: string; - count: number; -} diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/hideout/IHideoutRequestData.d.ts b/TypeScript/5ReplaceMethod/types/@types/eft/hideout/IHideoutRequestData.d.ts deleted file mode 100644 index 77c0665..0000000 --- a/TypeScript/5ReplaceMethod/types/@types/eft/hideout/IHideoutRequestData.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -export interface IHideoutRequestData { - Action: "HideoutUpgrade"; - areaType: number; - items: HideoutItem[]; - timestamp: number; -} -export interface HideoutItem { - count: number; - id: string; -} diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/itemEvent/IHandleEventRequestData.d.ts b/TypeScript/5ReplaceMethod/types/@types/eft/itemEvent/IHandleEventRequestData.d.ts deleted file mode 100644 index a7ae306..0000000 --- a/TypeScript/5ReplaceMethod/types/@types/eft/itemEvent/IHandleEventRequestData.d.ts +++ /dev/null @@ -1,21 +0,0 @@ -export interface IHandleEventRequestData { - data: Daum[]; - tm: number; - reload: number; -} -export interface Daum { - Action: string; - item: string; - to?: To; -} -export interface To { - id: string; - container: string; - location: Location; -} -export interface Location { - x: number; - y: number; - r: string; - isSearched: boolean; -} diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/itemEvent/IItemEventRouterBase.d.ts b/TypeScript/5ReplaceMethod/types/@types/eft/itemEvent/IItemEventRouterBase.d.ts deleted file mode 100644 index 0e12850..0000000 --- a/TypeScript/5ReplaceMethod/types/@types/eft/itemEvent/IItemEventRouterBase.d.ts +++ /dev/null @@ -1,61 +0,0 @@ -import { Skills } from "../common/IPmcData"; -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 { - warnings: Warning[]; - profileChanges: TProfileChanges | ""; -} -export declare type TProfileChanges = Record; -export interface Warning { - index: number; - err: string; - errmsg: string; -} -export interface ProfileChange { - _id: string; - experience: number; - quests: IQuest[]; - ragFairOffers: IRagfairOffer[]; - builds: BuildChange[]; - items: ItemChanges; - production: Record; - skills: Skills; - traderRelations: Record; - repeatableQuests?: IPmcDataRepeatableQuest[]; -} -export interface BuildChange { - id: string; - name: string; - root: string; - items: Item[]; -} -export interface ItemChanges { - new: Product[]; - change: Product[]; - del: Product[]; -} -export interface Production { - Progress: number; - StartTimestamp: number; - ProductionTime: number; - inProgress: boolean; - RecipeId: string; - Products: Product[]; -} -export interface Product { - _id: string; - _tpl?: string; - parentId?: string; - slotId?: string; - location?: any; - upd?: Upd; -} -export interface TraderRelations { - salesSum?: number; - standing?: number; - loyalty?: number; - unlocked?: boolean; - disabled?: boolean; -} diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/notes/INoteData.d.ts b/TypeScript/5ReplaceMethod/types/@types/eft/notes/INoteData.d.ts deleted file mode 100644 index 4021bb7..0000000 --- a/TypeScript/5ReplaceMethod/types/@types/eft/notes/INoteData.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface INote { - Time: number; - Text: string; -} diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/presetBuild/IPresetBuildActionData.d.ts b/TypeScript/5ReplaceMethod/types/@types/eft/presetBuild/IPresetBuildActionData.d.ts deleted file mode 100644 index 13ec722..0000000 --- a/TypeScript/5ReplaceMethod/types/@types/eft/presetBuild/IPresetBuildActionData.d.ts +++ /dev/null @@ -1,25 +0,0 @@ -export interface IPresetBuildActionData { - Action: string; - id: string; - name: string; - root: string; - items: Item[]; -} -export interface Item { - _id: string; - _tpl: string; - upd?: Upd; - parentId?: string; - slotId?: string; -} -export interface Upd { - Repairable: Repairable; - FireMode: FireMode; -} -export interface Repairable { - MaxDurability: number; - Durability: number; -} -export interface FireMode { - FireMode: string; -} diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/ragfair/ISaleChance.d.ts b/TypeScript/5ReplaceMethod/types/@types/eft/ragfair/ISaleChance.d.ts deleted file mode 100644 index 14b434a..0000000 --- a/TypeScript/5ReplaceMethod/types/@types/eft/ragfair/ISaleChance.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface ISaleChance { - sellTime: number; - amount: number; -} diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/repair/IRepairActionData.d.ts b/TypeScript/5ReplaceMethod/types/@types/eft/repair/IRepairActionData.d.ts deleted file mode 100644 index e6f90c8..0000000 --- a/TypeScript/5ReplaceMethod/types/@types/eft/repair/IRepairActionData.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -export interface IRepairActionData { - Action: string; - tid: string; - repairItems: RepairItem[]; -} -export interface RepairItem { - _id: string; - count: number; -} diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/wishlist/IWishlistActionData.d.ts b/TypeScript/5ReplaceMethod/types/@types/eft/wishlist/IWishlistActionData.d.ts deleted file mode 100644 index 9217864..0000000 --- a/TypeScript/5ReplaceMethod/types/@types/eft/wishlist/IWishlistActionData.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface IWishlistActionData { - Action: string; - templateId: string; -} diff --git a/TypeScript/5ReplaceMethod/types/@types/notes/INoteActionData.d.ts b/TypeScript/5ReplaceMethod/types/@types/notes/INoteActionData.d.ts deleted file mode 100644 index 7d07cdd..0000000 --- a/TypeScript/5ReplaceMethod/types/@types/notes/INoteActionData.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { INote } from "../eft/notes/INoteData"; -export interface INoteActionData { - Action: string; - index: number; - note: INote; -} diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/helpers/IGetItemResponse.d.ts b/TypeScript/5ReplaceMethod/types/@types/spt/helpers/IGetItemResponse.d.ts deleted file mode 100644 index e6f3783..0000000 --- a/TypeScript/5ReplaceMethod/types/@types/spt/helpers/IGetItemResponse.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export interface IGetItemResponse { -} diff --git a/TypeScript/5ReplaceMethod/types/@types/wishlist/IWishlistActionData.d.ts b/TypeScript/5ReplaceMethod/types/@types/wishlist/IWishlistActionData.d.ts deleted file mode 100644 index 9217864..0000000 --- a/TypeScript/5ReplaceMethod/types/@types/wishlist/IWishlistActionData.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface IWishlistActionData { - Action: string; - templateId: string; -} diff --git a/TypeScript/5ReplaceMethod/types/Lib.d.ts b/TypeScript/5ReplaceMethod/types/Lib.d.ts deleted file mode 100644 index 5c77c26..0000000 --- a/TypeScript/5ReplaceMethod/types/Lib.d.ts +++ /dev/null @@ -1,94 +0,0 @@ -import { BundleLoader } from "./loaders/BundleLoader"; -export { BundleLoader }; -import { ModLoader } from "./loaders/ModLoader"; -export { ModLoader }; -import { ContainerHelper } from "./helpers/ContainerHelper.js"; -export { ContainerHelper }; -import { InventoryHelper } from "./helpers/InventoryHelper.js"; -export { InventoryHelper }; -import { ItemHelper } from "./helpers/ItemHelper.js"; -export { ItemHelper }; -import { GameEventHelper } from "./helpers/GameEventHelper.js"; -export { GameEventHelper }; -import { QuestHelper } from "./helpers/QuestHelper.js"; -export { QuestHelper }; -import { UtilityHelper } from "./helpers/UtilityHelper.js"; -export { UtilityHelper }; -import { TraderHelper } from "./helpers/TraderHelper.js"; -export { TraderHelper }; -import { RagfairServerHelper } from "./helpers/RagfairServerHelper.js"; -export { RagfairServerHelper }; -import { DurabilityLimitsHelper } from "./helpers/DurabilityLimitsHelper.js"; -export { DurabilityLimitsHelper }; -import { WeightedRandomHelper } from "./helpers/WeightedRandomHelper.js"; -export { WeightedRandomHelper }; -import { BotCallbacks } from "./callbacks/BotCallbacks.js"; -export { BotCallbacks }; -import { DataCallbacks } from "./callbacks/DataCallbacks.js"; -export { DataCallbacks }; -import { DialogueCallbacks } from "./callbacks/DialogueCallbacks.js"; -export { DialogueCallbacks }; -import { GameCallbacks } from "./callbacks/GameCallbacks.js"; -export { GameCallbacks }; -import { HideoutCallbacks } from "./callbacks/HideoutCallbacks"; -export { HideoutCallbacks }; -import { HttpCallbacks } from "./callbacks/HttpCallbacks.js"; -export { HttpCallbacks }; -import { InraidCallbacks } from "./callbacks/InraidCallbacks.js"; -export { InraidCallbacks }; -import { InventoryCallbacks } from "./callbacks/InventoryCallbacks.js"; -export { InventoryCallbacks }; -import { NotifierCallbacks } from "./callbacks/NotifierCallbacks.js"; -export { NotifierCallbacks }; -import { ProfileCallbacks } from "./callbacks/ProfileCallbacks.js"; -export { ProfileCallbacks }; -import { QuestCallbacks } from "./callbacks/QuestCallbacks.js"; -export { QuestCallbacks }; -import { RagfairCallbacks } from "./callbacks/RagfairCallbacks.js"; -export { RagfairCallbacks }; -import { TraderCallbacks } from "./callbacks/TraderCallbacks.js"; -export { TraderCallbacks }; -import { BotController } from "./controllers/BotController.js"; -export { BotController }; -import { DialogueController } from "./controllers/DialogueController.js"; -export { DialogueController }; -import { GameController } from "./controllers/GameController.js"; -export { GameController }; -import { HealthController } from "./controllers/HealthController.js"; -export { HealthController }; -import { HideoutController } from "./controllers/HideoutController.js"; -export { HideoutController }; -import { InsuranceController } from "./controllers/InsuranceController.js"; -export { InsuranceController }; -import { InventoryController } from "./controllers/InventoryController.js"; -export { InventoryController }; -import { LocationController } from "./controllers/LocationController.js"; -export { LocationController }; -import { NotifierController } from "./controllers/NotifierController.js"; -export { NotifierController }; -import { PresetController } from "./controllers/PresetController.js"; -export { PresetController }; -import { ProfileController } from "./controllers/ProfileController.js"; -export { ProfileController }; -import { QuestController } from "./controllers/QuestController.js"; -export { QuestController }; -import { RepeatableQuestController } from "./controllers/RepeatableQuestController.js"; -export { RepeatableQuestController }; -import { RagfairController } from "./controllers/RagfairController.js"; -export { RagfairController }; -import { TraderController } from "./controllers/TraderController.js"; -export { TraderController }; -import { PaymentController } from "./controllers/PaymentController"; -export { PaymentController }; -import { PlayerController } from "./controllers/PlayerController.js"; -export { PlayerController }; -import { HandbookController } from "./controllers/HandbookController.js"; -export { HandbookController }; -import { DatabaseServer } from "./servers/DatabaseServer"; -export { DatabaseServer }; -import { HttpServer } from "./servers/HttpServer.js"; -export { HttpServer }; -import { RagfairServer } from "./servers/RagfairServer.js"; -export { RagfairServer }; -import { SaveServer } from "./servers/SaveServer"; -export { SaveServer }; diff --git a/TypeScript/5ReplaceMethod/types/Program.d.ts b/TypeScript/5ReplaceMethod/types/Program.d.ts index fe57d08..d4b71b9 100644 --- a/TypeScript/5ReplaceMethod/types/Program.d.ts +++ b/TypeScript/5ReplaceMethod/types/Program.d.ts @@ -1,8 +1,4 @@ -import "reflect-metadata"; -import { App } from "./utils/App"; -export interface IProgram { -} -export declare class Program implements IProgram { - private app; - constructor(app: App); +export declare class Program { + constructor(); + start(): void; } diff --git a/TypeScript/5ReplaceMethod/types/bindings/AppLoad.d.ts b/TypeScript/5ReplaceMethod/types/bindings/AppLoad.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/5ReplaceMethod/types/bindings/AppLoad.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/5ReplaceMethod/types/bindings/AppUpdate.d.ts b/TypeScript/5ReplaceMethod/types/bindings/AppUpdate.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/5ReplaceMethod/types/bindings/AppUpdate.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/5ReplaceMethod/types/bindings/DynamicRoutes.d.ts b/TypeScript/5ReplaceMethod/types/bindings/DynamicRoutes.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/5ReplaceMethod/types/bindings/DynamicRoutes.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/5ReplaceMethod/types/bindings/ItemEvents.d.ts b/TypeScript/5ReplaceMethod/types/bindings/ItemEvents.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/5ReplaceMethod/types/bindings/ItemEvents.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/5ReplaceMethod/types/bindings/SaveLoad.d.ts b/TypeScript/5ReplaceMethod/types/bindings/SaveLoad.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/5ReplaceMethod/types/bindings/SaveLoad.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/5ReplaceMethod/types/bindings/ServerRespond.d.ts b/TypeScript/5ReplaceMethod/types/bindings/ServerRespond.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/5ReplaceMethod/types/bindings/ServerRespond.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/5ReplaceMethod/types/bindings/StaticRoutes.d.ts b/TypeScript/5ReplaceMethod/types/bindings/StaticRoutes.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/5ReplaceMethod/types/bindings/StaticRoutes.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/5ReplaceMethod/types/callbacks/BotCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/BotCallbacks.d.ts index 511c545..358d5e3 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/BotCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/BotCallbacks.d.ts @@ -1,13 +1,13 @@ import { BotController } from "../controllers/BotController"; -import { IGenerateBotsRequestData } from "../@types/eft/bot/IGenerateBotsRequestData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IBotBase } from "../@types/eft/common/tables/IBotBase"; -import { HttpResponse } from "../utils/HttpResponse"; +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 { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class BotCallbacks { private botController; private httpResponse; - constructor(botController: BotController, httpResponse: HttpResponse); + constructor(botController: BotController, httpResponse: HttpResponseUtil); 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/callbacks/BundleCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/BundleCallbacks.d.ts index 1fb6275..08c33c0 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/BundleCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/BundleCallbacks.d.ts @@ -1,17 +1,16 @@ import { BundleLoader } from "../loaders/BundleLoader"; import { ConfigServer } from "../servers/ConfigServer"; -import { IHttpConfig } from "../@types/spt/config/IHttpConfig"; -import { HttpResponse } from "../utils/HttpResponse"; -import { ILogger } from "../@types/spt/utils/ILogger"; -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +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; private httpServer; private bundleLoader; private configServer; - httpConfig: IHttpConfig; - constructor(logger: ILogger, httpResponse: HttpResponse, httpServer: IHttpServer, bundleLoader: BundleLoader, configServer: ConfigServer); + private httpConfig; + constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, bundleLoader: BundleLoader, configServer: ConfigServer); 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/callbacks/CustomizationCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/CustomizationCallbacks.d.ts index 4c27712..0a4265b 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/CustomizationCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/CustomizationCallbacks.d.ts @@ -1,17 +1,17 @@ import { SaveServer } from "../servers/SaveServer"; import { CustomizationController } from "../controllers/CustomizationController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IBuyClothingRequestData } from "../@types/eft/customization/IBuyClothingRequestData"; -import { IWearClothingRequestData } from "../@types/eft/customization/IWearClothingRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { ISuit } from "../@types/eft/common/tables/ITrader"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { HttpResponse } from "../utils/HttpResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +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 { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class CustomizationCallbacks { private customizationController; private saveServer; private httpResponse; - constructor(customizationController: CustomizationController, saveServer: SaveServer, httpResponse: HttpResponse); + constructor(customizationController: CustomizationController, saveServer: SaveServer, httpResponse: HttpResponseUtil); getSuits(url: string, info: any, sessionID: string): IGetBodyResponseData<{ _id: string; suites: string[]; diff --git a/TypeScript/5ReplaceMethod/types/callbacks/DataCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/DataCallbacks.d.ts index add55b5..ac9cab7 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/DataCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/DataCallbacks.d.ts @@ -1,20 +1,20 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGlobals } from "../@types/eft/common/IGlobals"; -import { ICustomizationItem } from "../@types/eft/common/tables/ICustomizationItem"; -import { IQuest } from "../@types/eft/common/tables/IQuest"; -import { IHideoutArea } from "../@types/eft/hideout/IHideoutArea"; -import { IHideoutProduction } from "../@types/eft/hideout/IHideoutProduction"; -import { IHideoutScavCase } from "../@types/eft/hideout/IHideoutScavCase"; -import { IHideoutSettingsBase } from "../@types/eft/hideout/IHideoutSettingsBase"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { ILanguageBase } from "../@types/spt/server/ILocaleBase"; -import { ISettingsBase } from "../@types/spt/server/ISettingsBase"; -import { HttpResponse } from "../utils/HttpResponse"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IGlobals } from "../models/eft/common/IGlobals"; +import { ICustomizationItem } from "../models/eft/common/tables/ICustomizationItem"; +import { IQuest } from "../models/eft/common/tables/IQuest"; +import { IHideoutArea } from "../models/eft/hideout/IHideoutArea"; +import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction"; +import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; +import { IHideoutSettingsBase } from "../models/eft/hideout/IHideoutSettingsBase"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { ILanguageBase } from "../models/spt/server/ILocaleBase"; +import { ISettingsBase } from "../models/spt/server/ISettingsBase"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class DataCallbacks { private httpResponse; private databaseServer; - constructor(httpResponse: HttpResponse, databaseServer: DatabaseServer); + constructor(httpResponse: HttpResponseUtil, databaseServer: DatabaseServer); 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/callbacks/DialogueCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/DialogueCallbacks.d.ts index ccc074b..e81255c 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/DialogueCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/DialogueCallbacks.d.ts @@ -1,31 +1,31 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { DialogueController } from "../controllers/DialogueController"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { DialogueInfo } from "../@types/eft/profile/IAkiProfile"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IGetMailDialogViewRequestData } from "../@types/eft/dialog/IGetMailDialogViewRequestData"; -import { IGetMailDialogInfoRequestData } from "../@types/eft/dialog/IGetMailDialogInfoRequestData"; -import { IRemoveDialogRequestData } from "../@types/eft/dialog/IRemoveDialogRequestData"; -import { IGetMailDialogListRequestData } from "../@types/eft/dialog/IGetMailDialogListRequestData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IFriendRequestData } from "../@types/eft/dialog/IFriendRequestData"; -import { IPinDialogRequestData } from "../@types/eft/dialog/IPinDialogRequestData"; -import { ISetDialogReadRequestData } from "../@types/eft/dialog/ISetDialogReadRequestData"; -import { IGetAllAttachmentsRequestData } from "../@types/eft/dialog/IGetAllAttachmentsRequestData"; -import { IGetChatServerListRequestData } from "../@types/eft/dialog/IGetChatServerListRequestData"; -import { IGetFriendListDataResponse } from "../@types/eft/dialog/IGetFriendListDataResponse"; -import { ISendMessageRequest } from "../@types/eft/dialog/ISendMessageRequest"; -import { IGetMailDialogViewResponseData } from "../@types/eft/dialog/IGetMailDialogViewResponseData"; -import { IGetAllAttachmentsResponse } from "../@types/eft/dialog/IGetAllAttachmentsResponse"; +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 { 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 { IGetChatServerListRequestData } from "../models/eft/dialog/IGetChatServerListRequestData"; +import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse"; +import { ISendMessageRequest } from "../models/eft/dialog/ISendMessageRequest"; +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 { private hashUtil; private timeUtil; private httpResponse; private dialogueController; - constructor(hashUtil: HashUtil, timeUtil: TimeUtil, httpResponse: HttpResponse, dialogueController: DialogueController); + constructor(hashUtil: HashUtil, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, dialogueController: DialogueController); 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/callbacks/GameCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/GameCallbacks.d.ts index 25912c1..9481129 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/GameCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/GameCallbacks.d.ts @@ -1,17 +1,17 @@ import { GameController } from "../controllers/GameController"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGameEmptyCrcRequestData } from "../@types/eft/game/IGameEmptyCrcRequestData"; -import { IVersionValidateRequestData } from "../@types/eft/game/IVersionValidateRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IGameConfigResponse } from "../@types/eft/game/IGameConfigResponse"; -import { HttpResponse } from "../utils/HttpResponse"; -import { IWatermark } from "../@types/spt/utils/IWatermark"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +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 { private httpResponse; private watermark; private gameController; - constructor(httpResponse: HttpResponse, watermark: IWatermark, gameController: GameController); + constructor(httpResponse: HttpResponseUtil, watermark: IWatermark, 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/HealthCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/HealthCallbacks.d.ts index 50ec0b6..b223bb3 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/HealthCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/HealthCallbacks.d.ts @@ -1,19 +1,20 @@ import { HealthController } from "../controllers/HealthController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { ISyncHealthRequestData } from "../@types/eft/health/ISyncHealthRequestData"; -import { IOffraidEatRequestData } from "../@types/eft/health/IOffraidEatRequestData"; -import { IOffraidHealRequestData } from "../@types/eft/health/IOffraidHealRequestData"; -import { IHealthTreatmentRequestData } from "../@types/eft/health/IHealthTreatmentRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; +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 { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { HttpResponse } from "../utils/HttpResponse"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class HealthCallbacks { private httpResponse; private profileHelper; private healthController; - constructor(httpResponse: HttpResponse, profileHelper: ProfileHelper, healthController: HealthController); + constructor(httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, healthController: HealthController); syncHealth(url: string, info: ISyncHealthRequestData, sessionID: string): IGetBodyResponseData; - offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): any; - offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): any; - healthTreatment(pmcData: IPmcData, info: IHealthTreatmentRequestData, sessionID: string): any; + offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): IItemEventRouterResponse; + offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse; + healthTreatment(pmcData: IPmcData, info: IHealthTreatmentRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/5ReplaceMethod/types/callbacks/HideoutCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/HideoutCallbacks.d.ts index 3ef61bc..b574232 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/HideoutCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/HideoutCallbacks.d.ts @@ -1,15 +1,15 @@ import { HideoutController } from "../controllers/HideoutController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IHideoutUpgradeRequestData } from "../@types/eft/hideout/IHideoutUpgradeRequestData"; -import { IHideoutUpgradeCompleteRequestData } from "../@types/eft/hideout/IHideoutUpgradeCompleteRequestData"; -import { IHideoutScavCaseStartRequestData } from "../@types/eft/hideout/IHideoutScavCaseStartRequestData"; -import { IHideoutPutItemInRequestData } from "../@types/eft/hideout/IHideoutPutItemInRequestData"; -import { IHideoutTakeItemOutRequestData } from "../@types/eft/hideout/IHideoutTakeItemOutRequestData"; -import { IHideoutToggleAreaRequestData } from "../@types/eft/hideout/IHideoutToggleAreaRequestData"; -import { IHideoutSingleProductionStartRequestData } from "../@types/eft/hideout/IHideoutSingleProductionStartRequestData"; -import { IHideoutContinousProductionStartRequestData } from "../@types/eft/hideout/IHideoutContinousProductionStartRequestData"; -import { IHideoutTakeProductionRequestData } from "../@types/eft/hideout/IHideoutTakeProductionRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ConfigServer } from "../servers/ConfigServer"; import { OnUpdate } from "../di/OnUpdate"; export declare class HideoutCallbacks extends OnUpdate { diff --git a/TypeScript/5ReplaceMethod/types/callbacks/HttpCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/HttpCallbacks.d.ts index 9bb00bf..7072297 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/HttpCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/HttpCallbacks.d.ts @@ -1,4 +1,4 @@ -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; import { OnLoad } from "../di/OnLoad"; export declare class HttpCallbacks extends OnLoad { private httpServer; diff --git a/TypeScript/5ReplaceMethod/types/callbacks/InraidCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/InraidCallbacks.d.ts index 2ccaa0a..1948d01 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/InraidCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/InraidCallbacks.d.ts @@ -1,17 +1,17 @@ import { InraidController } from "../controllers/InraidController"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IRegisterPlayerRequestData } from "../@types/eft/inRaid/IRegisterPlayerRequestData"; -import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; +import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ConfigServer } from "../servers/ConfigServer"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class InraidCallbacks { private inraidController; private httpResponse; private configServer; private airdropConfig; private inraidConfig; - constructor(inraidController: InraidController, httpResponse: HttpResponse, configServer: ConfigServer); + constructor(inraidController: InraidController, httpResponse: HttpResponseUtil, configServer: ConfigServer); registerPlayer(url: string, info: IRegisterPlayerRequestData, sessionID: string): INullResponseData; saveProgress(url: string, info: ISaveProgressRequestData, sessionID: string): INullResponseData; getRaidEndState(): string; diff --git a/TypeScript/5ReplaceMethod/types/callbacks/InsuranceCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/InsuranceCallbacks.d.ts index f3d9832..73b7bd9 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/InsuranceCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/InsuranceCallbacks.d.ts @@ -1,22 +1,23 @@ import { InsuranceController } from "../controllers/InsuranceController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IGetInsuranceCostRequestData } from "../@types/eft/insurance/IGetInsuranceCostRequestData"; -import { IInsureRequestData } from "../@types/eft/insurance/IInsureRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +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 { HttpResponse } from "../utils/HttpResponse"; +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 { private insuranceController; private insuranceService; private httpResponse; private configServer; private insuranceConfig; - constructor(insuranceController: InsuranceController, insuranceService: InsuranceService, httpResponse: HttpResponse, configServer: ConfigServer); + constructor(insuranceController: InsuranceController, insuranceService: InsuranceService, httpResponse: HttpResponseUtil, configServer: ConfigServer); onLoad(): void; getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): IGetBodyResponseData; - insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): any; + insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse; onUpdate(secondsSinceLastRun: number): boolean; getRoute(): string; } diff --git a/TypeScript/5ReplaceMethod/types/callbacks/InventoryCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/InventoryCallbacks.d.ts index 1807e4b..90d6936 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/InventoryCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/InventoryCallbacks.d.ts @@ -1,22 +1,22 @@ import { InventoryController } from "../controllers/InventoryController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IInventoryFoldRequestData } from "../@types/eft/inventory/IInventoryFoldRequestData"; -import { IInventorySplitRequestData } from "../@types/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMoveRequestData } from "../@types/eft/inventory/IInventoryMoveRequestData"; -import { IInventoryMergeRequestData } from "../@types/eft/inventory/IInventoryMergeRequestData"; -import { IInventoryRemoveRequestData } from "../@types/eft/inventory/IInventoryRemoveRequestData"; -import { IInventoryTransferRequestData } from "../@types/eft/inventory/IInventoryTransferRequestData"; -import { IInventorySwapRequestData } from "../@types/eft/inventory/IInventorySwapRequestData"; -import { IInventoryToggleRequestData } from "../@types/eft/inventory/IInventoryToggleRequestData"; -import { IInventoryTagRequestData } from "../@types/eft/inventory/IInventoryTagRequestData"; -import { IInventoryBindRequestData } from "../@types/eft/inventory/IInventoryBindRequestData"; -import { IInventoryExamineRequestData } from "../@types/eft/inventory/IInventoryExamineRequestData"; -import { IInventoryReadEncyclopediaRequestData } from "../@types/eft/inventory/IInventoryReadEncyclopediaRequestData"; -import { IInventorySortRequestData } from "../@types/eft/inventory/IInventorySortRequestData"; -import { IInventoryCreateMarkerRequestData } from "../@types/eft/inventory/IInventoryCreateMarkerRequestData"; -import { IInventoryDeleteMarkerRequestData } from "../@types/eft/inventory/IInventoryDeleteMarkerRequestData"; -import { IInventoryEditMarkerRequestData } from "../@types/eft/inventory/IInventoryEditMarkerRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class InventoryCallbacks { private inventoryController; constructor(inventoryController: InventoryController); diff --git a/TypeScript/5ReplaceMethod/types/callbacks/ItemEventCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/ItemEventCallbacks.d.ts index ca069ad..74e79c4 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/ItemEventCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/ItemEventCallbacks.d.ts @@ -1,11 +1,11 @@ -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IItemEventRouterRequest } from "../@types/eft/itemEvent/IItemEventRouterRequest"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterRequest } from "../models/eft/itemEvent/IItemEventRouterRequest"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class ItemEventCallbacks { private httpResponse; private itemEventRouter; - constructor(httpResponse: HttpResponse, itemEventRouter: ItemEventRouter); + constructor(httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter); handleEvents(url: string, info: IItemEventRouterRequest, sessionID: string): IGetBodyResponseData; } diff --git a/TypeScript/5ReplaceMethod/types/callbacks/LauncherCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/LauncherCallbacks.d.ts index 5e3ec40..addf76b 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/LauncherCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/LauncherCallbacks.d.ts @@ -1,17 +1,17 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { SaveServer } from "../servers/SaveServer"; import { LauncherController } from "../controllers/LauncherController"; -import { IRegisterData } from "../@types/eft/launcher/IRegisterData"; -import { IRemoveProfileData } from "../@types/eft/launcher/IRemoveProfileData"; -import { ILoginRequestData } from "../@types/eft/launcher/ILoginRequestData"; -import { IChangeRequestData } from "../@types/eft/launcher/IChangeRequestData"; -import { IWatermark } from "../@types/spt/utils/IWatermark"; +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 { private httpResponse; private launcherController; private saveServer; private watermark; - constructor(httpResponse: HttpResponse, launcherController: LauncherController, saveServer: SaveServer, watermark: IWatermark); + constructor(httpResponse: HttpResponseUtil, launcherController: LauncherController, saveServer: SaveServer, watermark: IWatermark); 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/callbacks/LocationCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/LocationCallbacks.d.ts index 6142ad5..346893b 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/LocationCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/LocationCallbacks.d.ts @@ -1,13 +1,13 @@ import { LocationController } from "../controllers/LocationController"; -import { IGetLocationRequestData } from "../@types/eft/location/IGetLocationRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { ILocationsGenerateAllResponse } from "../@types/eft/common/ILocationsSourceDestinationBase"; -import { ILocationBase } from "../@types/eft/common/ILocationBase"; -import { HttpResponse } from "../utils/HttpResponse"; +import { IGetLocationRequestData } from "../models/eft/location/IGetLocationRequestData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSourceDestinationBase"; +import { ILocationBase } from "../models/eft/common/ILocationBase"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class LocationCallbacks { private httpResponse; private locationController; - constructor(httpResponse: HttpResponse, locationController: LocationController); + constructor(httpResponse: HttpResponseUtil, locationController: LocationController); getLocationData(url: string, info: any, 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 373566b..9364a2f 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/MatchCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/MatchCallbacks.d.ts @@ -1,18 +1,18 @@ import { MatchController } from "../controllers/MatchController"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { IStartOfflineRaidRequestData } from "../@types/eft/match/IStartOffineRaidRequestData"; -import { IEndOfflineRaidRequestData } from "../@types/eft/match/IEndOfflineRaidRequestData"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { HttpResponse } from "../utils/HttpResponse"; +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 { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class MatchCallbacks { private httpResponse; private jsonUtil; private matchController; private databaseServer; - constructor(httpResponse: HttpResponse, jsonUtil: JsonUtil, matchController: MatchController, databaseServer: DatabaseServer); + constructor(httpResponse: HttpResponseUtil, jsonUtil: JsonUtil, matchController: MatchController, databaseServer: DatabaseServer); updatePing(url: string, info: any, sessionID: string): INullResponseData; exitMatch(url: string, info: any, sessionID: string): INullResponseData; exitToMenu(url: string, info: any, sessionID: string): INullResponseData; diff --git a/TypeScript/5ReplaceMethod/types/callbacks/ModCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/ModCallbacks.d.ts index 18ebfce..b4c18c2 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/ModCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/ModCallbacks.d.ts @@ -1,9 +1,9 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { OnLoad } from "../di/OnLoad"; import { DelayedModLoader } from "../loaders/DelayedModLoader"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from '../@types/spt/utils/ILogger'; -import { IHttpServer } from '../@types/spt/server/IHttpServer'; +import { ILogger } from '../models/spt/utils/ILogger'; +import { IHttpServer } from '../models/spt/server/IHttpServer'; declare class ModCallbacks extends OnLoad { private logger; private httpResponse; @@ -11,7 +11,7 @@ declare class ModCallbacks extends OnLoad { private modLoader; private configServer; private httpConfig; - constructor(logger: ILogger, httpResponse: HttpResponse, httpServer: IHttpServer, modLoader: DelayedModLoader, configServer: ConfigServer); + constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, modLoader: DelayedModLoader, configServer: ConfigServer); onLoad(): void; getRoute(): string; sendBundle(sessionID: string, req: any, resp: any, body: any): void; diff --git a/TypeScript/5ReplaceMethod/types/callbacks/NoteCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/NoteCallbacks.d.ts index ed30fcd..36cbd44 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/NoteCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/NoteCallbacks.d.ts @@ -1,7 +1,7 @@ import { NoteController } from "../controllers/NoteController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { INoteActionData } from "../@types/eft/notes/INoteActionData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { private noteController; constructor(noteController: NoteController); diff --git a/TypeScript/5ReplaceMethod/types/callbacks/NotifierCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/NotifierCallbacks.d.ts index d982db5..f47dcc9 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/NotifierCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/NotifierCallbacks.d.ts @@ -1,15 +1,15 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { INotifierChannel } from "../@types/eft/notifier/INotifier"; -import { ISelectProfileRequestData } from "../@types/eft/notifier/ISelectProfileRequestData"; +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 { private httpServerHelper; private httpResponse; private notifierController; - constructor(httpServerHelper: HttpServerHelper, httpResponse: HttpResponse, notifierController: NotifierController); + constructor(httpServerHelper: HttpServerHelper, httpResponse: HttpResponseUtil, notifierController: NotifierController); /** * If we don't have anything to send, it's ok to not send anything back * because notification requests can be long-polling. In fact, we SHOULD wait diff --git a/TypeScript/5ReplaceMethod/types/callbacks/PresetBuildCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/PresetBuildCallbacks.d.ts index ee1b592..fd22c8f 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/PresetBuildCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/PresetBuildCallbacks.d.ts @@ -1,14 +1,14 @@ import { PresetBuildController } from "../controllers/PresetBuildController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IPresetBuildActionRequestData } from "../@types/eft/presetBuild/IPresetBuildActionRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { WeaponBuild } from "../@types/eft/profile/IAkiProfile"; -import { HttpResponse } from "../utils/HttpResponse"; +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 { WeaponBuild } from "../models/eft/profile/IAkiProfile"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class PresetBuildCallbacks { private httpResponse; private presetBuildController; - constructor(httpResponse: HttpResponse, presetBuildController: PresetBuildController); + constructor(httpResponse: HttpResponseUtil, presetBuildController: PresetBuildController); 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/callbacks/ProfileCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/ProfileCallbacks.d.ts index 94e05b8..e50c130 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/ProfileCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/ProfileCallbacks.d.ts @@ -1,21 +1,21 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { ProfileController } from "../controllers/ProfileController"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IProfileChangeNicknameRequestData } from "../@types/eft/profile/IProfileChangeNicknameRequestData"; -import { IProfileChangeVoiceRequestData } from "../@types/eft/profile/IProfileChangeVoiceRequestData"; -import { IProfileCreateRequestData } from "../@types/eft/profile/IProfileCreateRequestData"; -import { IValidateNicknameRequestData } from "../@types/eft/profile/IValidateNicknameRequestData"; -import { ISearchFriendRequestData } from "../@types/eft/profile/ISearchFriendRequestData"; -import { ISearchFriendResponse } from "../@types/eft/profile/ISearchFriendResponse"; -import { IGetMiniProfileRequestData } from "../@types/eft/launcher/IGetMiniProfileRequestData"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +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 { private httpResponse; private timeUtil; private profileController; - constructor(httpResponse: HttpResponse, timeUtil: TimeUtil, profileController: ProfileController); + constructor(httpResponse: HttpResponseUtil, timeUtil: TimeUtil, profileController: ProfileController); createProfile(url: string, info: IProfileCreateRequestData, sessionID: string): IGetBodyResponseData; getProfileData(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; regenerateScav(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/5ReplaceMethod/types/callbacks/QuestCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/QuestCallbacks.d.ts index 589682b..1f3964b 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/QuestCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/QuestCallbacks.d.ts @@ -1,22 +1,22 @@ import { QuestController } from "../controllers/QuestController"; import { RepeatableQuestController } from "../controllers/RepeatableQuestController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IAcceptQuestRequestData } from "../@types/eft/quests/IAcceptQuestRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IListQuestsRequestData } from "../@types/eft/quests/IListQuestsRequestData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { ICompleteQuestRequestData } from "../@types/eft/quests/ICompleteQuestRequestData"; -import { IHandoverQuestRequestData } from "../@types/eft/quests/IHandoverQuestRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IQuest } from "../@types/eft/common/tables/IQuest"; -import { IPmcDataRepeatableQuest } from "../@types/eft/common/tables/IRepeatableQuests"; -import { IRepeatableQuestChangeRequest } from "../@types/eft/quests/IRepeatableQuestChangeRequest"; -import { HttpResponse } from "../utils/HttpResponse"; +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 { IQuest } from "../models/eft/common/tables/IQuest"; +import { IPmcDataRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; +import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class QuestCallbacks { private httpResponse; private questController; private repeatableQuestController; - constructor(httpResponse: HttpResponse, questController: QuestController, repeatableQuestController: RepeatableQuestController); + constructor(httpResponse: HttpResponseUtil, questController: QuestController, repeatableQuestController: RepeatableQuestController); 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/callbacks/RagfairCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/RagfairCallbacks.d.ts index 31af479..260fd13 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/RagfairCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/RagfairCallbacks.d.ts @@ -1,20 +1,20 @@ import { RagfairServer } from "../servers/RagfairServer"; import { RagfairController } from "../controllers/RagfairController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { ISearchRequestData } from "../@types/eft/ragfair/ISearchRequestData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGetMarketPriceRequestData } from "../@types/eft/ragfair/IGetMarketPriceRequestData"; -import { IAddOfferRequestData } from "../@types/eft/ragfair/IAddOfferRequestData"; -import { IRemoveOfferRequestData } from "../@types/eft/ragfair/IRemoveOfferRequestData"; -import { IExtendOfferRequestData } from "../@types/eft/ragfair/IExtendOfferRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IGetItemPriceResult } from "../@types/eft/ragfair/IGetItemPriceResult"; +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 { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult"; import { ConfigServer } from "../servers/ConfigServer"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairCallbacks extends OnLoadOnUpdate { private httpResponse; private logger; @@ -23,7 +23,7 @@ export declare class RagfairCallbacks extends OnLoadOnUpdate { private ragfairController; private configServer; private ragfairConfig; - constructor(httpResponse: HttpResponse, logger: ILogger, jsonUtil: JsonUtil, ragfairServer: RagfairServer, ragfairController: RagfairController, configServer: ConfigServer); + constructor(httpResponse: HttpResponseUtil, logger: ILogger, jsonUtil: JsonUtil, ragfairServer: RagfairServer, ragfairController: RagfairController, configServer: ConfigServer); onLoad(): void; getRoute(): string; search(url: string, info: ISearchRequestData, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/5ReplaceMethod/types/callbacks/RepairCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/RepairCallbacks.d.ts index e28e48b..4acd364 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/RepairCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/RepairCallbacks.d.ts @@ -1,8 +1,8 @@ import { RepairController } from "../controllers/RepairController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IRepairActionDataRequest } from "../@types/eft/repair/IRepairActionDataRequest"; -import { ITraderRepairActionDataRequest } from "../@types/eft/repair/ITraderRepairActionDataRequest"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +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/5ReplaceMethod/types/callbacks/TradeCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/TradeCallbacks.d.ts index 5117a82..4cf8497 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/TradeCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/TradeCallbacks.d.ts @@ -1,8 +1,8 @@ import { TradeController } from "../controllers/TradeController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IProcessRagfairTradeRequestData } from "../@types/eft/trade/IProcessRagfairTradeRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IProcessBaseTradeRequestData } from "../@types/eft/trade/IProcessBaseTradeRequestData"; +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 { private tradeController; constructor(tradeController: TradeController); diff --git a/TypeScript/5ReplaceMethod/types/callbacks/TraderCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/TraderCallbacks.d.ts index 3f72e2b..264ef94 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/TraderCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/TraderCallbacks.d.ts @@ -1,13 +1,13 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TraderController } from "../controllers/TraderController"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IBarterScheme, ITraderAssort, ITraderBase } from "../@types/eft/common/tables/ITrader"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; +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 { private httpResponse; private traderController; - constructor(httpResponse: HttpResponse, traderController: TraderController); + constructor(httpResponse: HttpResponseUtil, traderController: TraderController); onLoad(): void; getRoute(): string; getTraderSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/5ReplaceMethod/types/callbacks/WeatherCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/WeatherCallbacks.d.ts index 99d5c1f..2474417 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/WeatherCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/WeatherCallbacks.d.ts @@ -1,10 +1,10 @@ import { WeatherController } from "../controllers/WeatherController"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { HttpResponse } from "../utils/HttpResponse"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class WeatherCallbacks { private httpResponse; private weatherController; - constructor(httpResponse: HttpResponse, weatherController: WeatherController); + constructor(httpResponse: HttpResponseUtil, weatherController: WeatherController); getWeather(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; } diff --git a/TypeScript/5ReplaceMethod/types/callbacks/WishlistCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/callbacks/WishlistCallbacks.d.ts index 870f049..1816600 100644 --- a/TypeScript/5ReplaceMethod/types/callbacks/WishlistCallbacks.d.ts +++ b/TypeScript/5ReplaceMethod/types/callbacks/WishlistCallbacks.d.ts @@ -1,7 +1,7 @@ import { WishlistController } from "../controllers/WishlistController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IWishlistActionData } from "../@types/eft/wishlist/IWishlistActionData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { private wishlistController; constructor(wishlistController: WishlistController); diff --git a/TypeScript/5ReplaceMethod/types/configs/AkiConfig.d.ts b/TypeScript/5ReplaceMethod/types/configs/AkiConfig.d.ts deleted file mode 100644 index f9b9e31..0000000 --- a/TypeScript/5ReplaceMethod/types/configs/AkiConfig.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -export const akiVersion: string; -export const projectName: string; -export const compatibleTarkovVersion: string; diff --git a/TypeScript/5ReplaceMethod/types/configs/BotConfig.d.ts b/TypeScript/5ReplaceMethod/types/configs/BotConfig.d.ts deleted file mode 100644 index 6c7ea7b..0000000 --- a/TypeScript/5ReplaceMethod/types/configs/BotConfig.d.ts +++ /dev/null @@ -1,309 +0,0 @@ -export declare namespace presetBatch { - const assault: number; - const bossBully: number; - const bossGluhar: number; - const bossKilla: number; - const bossKojaniy: number; - const bossSanitar: number; - const bossTagilla: number; - const bossTest: number; - const cursedAssault: number; - const followerBully: number; - const followerGluharAssault: number; - const followerGluharScout: number; - const followerGluharSecurity: number; - const followerGluharSnipe: number; - const followerKojaniy: number; - const followerSanitar: number; - const followerTagilla: number; - const followerTest: number; - const marksman: number; - const pmcBot: number; - const sectantPriest: number; - const sectantWarrior: number; - const gifter: number; - const test: number; - const exUsec: number; -} -export declare const bosses: string[]; -export declare namespace durability { - namespace _default { - namespace armor { - const maxDelta: number; - const minDelta: number; - } - namespace weapon { - export const lowestMax: number; - export const highestMax: number; - const maxDelta_1: number; - export { maxDelta_1 as maxDelta }; - const minDelta_1: number; - export { minDelta_1 as minDelta }; - } - } - export { _default as default }; - export namespace pmc { - export namespace armor_1 { - export const lowestMaxPercent: number; - export const highestMaxPercent: number; - const maxDelta_2: number; - export { maxDelta_2 as maxDelta }; - const minDelta_2: number; - export { minDelta_2 as minDelta }; - } - export { armor_1 as armor }; - export namespace weapon_1 { - const lowestMax_1: number; - export { lowestMax_1 as lowestMax }; - const highestMax_1: number; - export { highestMax_1 as highestMax }; - const maxDelta_3: number; - export { maxDelta_3 as maxDelta }; - const minDelta_3: number; - export { minDelta_3 as minDelta }; - } - export { weapon_1 as weapon }; - } - export namespace boss { - export namespace armor_2 { - const maxDelta_4: number; - export { maxDelta_4 as maxDelta }; - const minDelta_4: number; - export { minDelta_4 as minDelta }; - } - export { armor_2 as armor }; - export namespace weapon_2 { - const lowestMax_2: number; - export { lowestMax_2 as lowestMax }; - const highestMax_2: number; - export { highestMax_2 as highestMax }; - const maxDelta_5: number; - export { maxDelta_5 as maxDelta }; - const minDelta_5: number; - export { minDelta_5 as minDelta }; - } - export { weapon_2 as weapon }; - } - export namespace follower { - export namespace armor_3 { - const maxDelta_6: number; - export { maxDelta_6 as maxDelta }; - const minDelta_6: number; - export { minDelta_6 as minDelta }; - } - export { armor_3 as armor }; - export namespace weapon_3 { - const lowestMax_3: number; - export { lowestMax_3 as lowestMax }; - const highestMax_3: number; - export { highestMax_3 as highestMax }; - const maxDelta_7: number; - export { maxDelta_7 as maxDelta }; - const minDelta_7: number; - export { minDelta_7 as minDelta }; - } - export { weapon_3 as weapon }; - } - export namespace assault_1 { - export namespace armor_4 { - const maxDelta_8: number; - export { maxDelta_8 as maxDelta }; - const minDelta_8: number; - export { minDelta_8 as minDelta }; - } - export { armor_4 as armor }; - export namespace weapon_4 { - const lowestMax_4: number; - export { lowestMax_4 as lowestMax }; - const highestMax_4: number; - export { highestMax_4 as highestMax }; - const maxDelta_9: number; - export { maxDelta_9 as maxDelta }; - const minDelta_9: number; - export { minDelta_9 as minDelta }; - } - export { weapon_4 as weapon }; - } - export { assault_1 as assault }; - export namespace cursedassault { - export namespace armor_5 { - const maxDelta_10: number; - export { maxDelta_10 as maxDelta }; - const minDelta_10: number; - export { minDelta_10 as minDelta }; - } - export { armor_5 as armor }; - export namespace weapon_5 { - const lowestMax_5: number; - export { lowestMax_5 as lowestMax }; - const highestMax_5: number; - export { highestMax_5 as highestMax }; - const maxDelta_11: number; - export { maxDelta_11 as maxDelta }; - const minDelta_11: number; - export { minDelta_11 as minDelta }; - } - export { weapon_5 as weapon }; - } - export namespace marksman_1 { - export namespace armor_6 { - const maxDelta_12: number; - export { maxDelta_12 as maxDelta }; - const minDelta_12: number; - export { minDelta_12 as minDelta }; - } - export { armor_6 as armor }; - export namespace weapon_6 { - const lowestMax_6: number; - export { lowestMax_6 as lowestMax }; - const highestMax_6: number; - export { highestMax_6 as highestMax }; - const maxDelta_13: number; - export { maxDelta_13 as maxDelta }; - const minDelta_13: number; - export { minDelta_13 as minDelta }; - } - export { weapon_6 as weapon }; - } - export { marksman_1 as marksman }; - export namespace pmcbot { - export namespace armor_7 { - const maxDelta_14: number; - export { maxDelta_14 as maxDelta }; - const minDelta_14: number; - export { minDelta_14 as minDelta }; - } - export { armor_7 as armor }; - export namespace weapon_7 { - const lowestMax_7: number; - export { lowestMax_7 as lowestMax }; - const highestMax_7: number; - export { highestMax_7 as highestMax }; - const maxDelta_15: number; - export { maxDelta_15 as maxDelta }; - const minDelta_15: number; - export { minDelta_15 as minDelta }; - } - export { weapon_7 as weapon }; - } - export namespace exusec { - export namespace armor_8 { - const maxDelta_16: number; - export { maxDelta_16 as maxDelta }; - const minDelta_16: number; - export { minDelta_16 as minDelta }; - } - export { armor_8 as armor }; - export namespace weapon_8 { - const lowestMax_8: number; - export { lowestMax_8 as lowestMax }; - const highestMax_8: number; - export { highestMax_8 as highestMax }; - const maxDelta_17: number; - export { maxDelta_17 as maxDelta }; - const minDelta_17: number; - export { minDelta_17 as minDelta }; - } - export { weapon_8 as weapon }; - } - export namespace sectantpriest { - export namespace armor_9 { - const maxDelta_18: number; - export { maxDelta_18 as maxDelta }; - const minDelta_18: number; - export { minDelta_18 as minDelta }; - } - export { armor_9 as armor }; - export namespace weapon_9 { - const lowestMax_9: number; - export { lowestMax_9 as lowestMax }; - const highestMax_9: number; - export { highestMax_9 as highestMax }; - const maxDelta_19: number; - export { maxDelta_19 as maxDelta }; - const minDelta_19: number; - export { minDelta_19 as minDelta }; - } - export { weapon_9 as weapon }; - } - export namespace sectantwarrior { - export namespace armor_10 { - const maxDelta_20: number; - export { maxDelta_20 as maxDelta }; - const minDelta_20: number; - export { minDelta_20 as minDelta }; - } - export { armor_10 as armor }; - export namespace weapon_10 { - const lowestMax_10: number; - export { lowestMax_10 as lowestMax }; - const highestMax_10: number; - export { highestMax_10 as highestMax }; - const maxDelta_21: number; - export { maxDelta_21 as maxDelta }; - const minDelta_21: number; - export { minDelta_21 as minDelta }; - } - export { weapon_10 as weapon }; - } -} -export declare namespace lootNValue { - export const scav: number; - const pmc_1: number; - export { pmc_1 as pmc }; -} -export declare namespace pmc_2 { - namespace dynamicLoot { - const whitelist: any[]; - const blacklist: string[]; - const spawnLimits: { - "5c99f98d86f7745c314214b3": number; - "5c164d2286f774194c5e69fa": number; - "550aa4cd4bdc2dd8348b456c": number; - "55818add4bdc2d5b648b456f": number; - "55818ad54bdc2ddc698b4569": number; - "55818aeb4bdc2ddc698b456a": number; - "55818ae44bdc2dde698b456c": number; - "55818af64bdc2d5b648b4570": number; - "5448e54d4bdc2dcc718b4568": number; - "5448f3a64bdc2d60728b456a": number; - "5447e1d04bdc2dff2f8b4567": number; - "5a341c4686f77469e155819e": number; - "55818b164bdc2ddc698b456c": number; - "5448bc234bdc2d3c308b4569": number; - "543be5dd4bdc2deb348b4569": number; - "543be5cb4bdc2deb348b4568": number; - "5485a8684bdc2da71d8b4567": number; - "5d650c3e815116009f6201d2": number; - "5448f39d4bdc2d0a728b4568": number; - "543be6564bdc2df4348b4568": number; - }; - const moneyStackLimits: { - "5449016a4bdc2d6f028b456f": number; - "5696686a4bdc2da3298b456a": number; - "569668774bdc2da2298b4568": number; - }; - } - const cartridgeBlacklist: string[]; - const difficulty: string; - const isUsec: number; - const chanceSameSideIsHostilePercent: number; - const usecType: string; - const bearType: string; - const maxBackpackLootTotalRub: number; - const maxPocketLootTotalRub: number; - const maxVestLootTotalRub: number; - namespace types { - const assault_2: number; - export { assault_2 as assault }; - const cursedAssault_1: number; - export { cursedAssault_1 as cursedAssault }; - const pmcBot_1: number; - export { pmcBot_1 as pmcBot }; - const exUsec_1: number; - export { exUsec_1 as exUsec }; - } -} -export { pmc_2 as pmc }; -export declare const showTypeInNickname: boolean; -export declare const maxBotCap: number; diff --git a/TypeScript/5ReplaceMethod/types/configs/HealthConfig.d.ts b/TypeScript/5ReplaceMethod/types/configs/HealthConfig.d.ts deleted file mode 100644 index 49bef94..0000000 --- a/TypeScript/5ReplaceMethod/types/configs/HealthConfig.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -export namespace healthMultipliers { - const death: number; - const blacked: number; -} -export namespace save { - const health: boolean; - const effects: boolean; -} diff --git a/TypeScript/5ReplaceMethod/types/configs/HideoutConfig.d.ts b/TypeScript/5ReplaceMethod/types/configs/HideoutConfig.d.ts deleted file mode 100644 index 3894576..0000000 --- a/TypeScript/5ReplaceMethod/types/configs/HideoutConfig.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -export const runIntervalSeconds: number; -export namespace scavCase { - const rewardParentBlacklist: any[]; - const rewardItemBlacklist: any[]; - namespace ammoRewards { - const giveMultipleOfTen: boolean; - const minAmount: number; - } - namespace moneyRewards { - const enabled: boolean; - namespace rub { - const min: number; - const max: number; - } - namespace usd { - const min_1: number; - export { min_1 as min }; - const max_1: number; - export { max_1 as max }; - } - namespace eur { - const min_2: number; - export { min_2 as min }; - const max_2: number; - export { max_2 as max }; - } - } -} diff --git a/TypeScript/5ReplaceMethod/types/configs/HttpConfig.d.ts b/TypeScript/5ReplaceMethod/types/configs/HttpConfig.d.ts deleted file mode 100644 index d7572a0..0000000 --- a/TypeScript/5ReplaceMethod/types/configs/HttpConfig.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export const ip: string; -export const port: number; diff --git a/TypeScript/5ReplaceMethod/types/configs/InraidConfig.d.ts b/TypeScript/5ReplaceMethod/types/configs/InraidConfig.d.ts deleted file mode 100644 index 7ac112c..0000000 --- a/TypeScript/5ReplaceMethod/types/configs/InraidConfig.d.ts +++ /dev/null @@ -1,15 +0,0 @@ -export const MIAOnRaidEnd: boolean; -export namespace raidMenuSettings { - const aiAmount: string; - const aiDifficulty: string; - const bossEnabled: boolean; - const scavWars: boolean; - const taggedAndCursed: boolean; -} -export namespace save { - const loot: boolean; - const durability: boolean; -} -export const carExtracts: string[]; -export const carExtractBaseStandingGain: number; -export const scavExtractGain: number; diff --git a/TypeScript/5ReplaceMethod/types/configs/InsuranceConfig.d.ts b/TypeScript/5ReplaceMethod/types/configs/InsuranceConfig.d.ts deleted file mode 100644 index 441319e..0000000 --- a/TypeScript/5ReplaceMethod/types/configs/InsuranceConfig.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -export const insuranceMultiplier: { - "54cb50c76803fa8b248b4571": number; - "54cb57776803fa99248b456e": number; -}; -export const returnChancePercent: { - "54cb50c76803fa8b248b4571": number; - "54cb57776803fa99248b456e": number; -}; -export const runIntervalSeconds: number; diff --git a/TypeScript/5ReplaceMethod/types/configs/InventoryConfig.d.ts b/TypeScript/5ReplaceMethod/types/configs/InventoryConfig.d.ts deleted file mode 100644 index 8d0b82f..0000000 --- a/TypeScript/5ReplaceMethod/types/configs/InventoryConfig.d.ts +++ /dev/null @@ -1 +0,0 @@ -export const newItemsMarkedFound: boolean; diff --git a/TypeScript/5ReplaceMethod/types/configs/LocationConfig.d.ts b/TypeScript/5ReplaceMethod/types/configs/LocationConfig.d.ts deleted file mode 100644 index 848096a..0000000 --- a/TypeScript/5ReplaceMethod/types/configs/LocationConfig.d.ts +++ /dev/null @@ -1,52 +0,0 @@ -export namespace looseLootMultiplier { - const bigmap: number; - const develop: number; - const factory4_day: number; - const factory4_night: number; - const interchange: number; - const laboratory: number; - const rezervbase: number; - const shoreline: number; - const woods: number; - const hideout: number; - const lighthouse: number; - const privatearea: number; - const suburbs: number; - const tarkovstreets: number; - const terminal: number; - const town: number; -} -export namespace staticLootMultiplier { - const bigmap_1: number; - export { bigmap_1 as bigmap }; - const develop_1: number; - export { develop_1 as develop }; - const factory4_day_1: number; - export { factory4_day_1 as factory4_day }; - const factory4_night_1: number; - export { factory4_night_1 as factory4_night }; - const interchange_1: number; - export { interchange_1 as interchange }; - const laboratory_1: number; - export { laboratory_1 as laboratory }; - const rezervbase_1: number; - export { rezervbase_1 as rezervbase }; - const shoreline_1: number; - export { shoreline_1 as shoreline }; - const woods_1: number; - export { woods_1 as woods }; - const hideout_1: number; - export { hideout_1 as hideout }; - const lighthouse_1: number; - export { lighthouse_1 as lighthouse }; - const privatearea_1: number; - export { privatearea_1 as privatearea }; - const suburbs_1: number; - export { suburbs_1 as suburbs }; - const tarkovstreets_1: number; - export { tarkovstreets_1 as tarkovstreets }; - const terminal_1: number; - export { terminal_1 as terminal }; - const town_1: number; - export { town_1 as town }; -} diff --git a/TypeScript/5ReplaceMethod/types/configs/MatchConfig.d.ts b/TypeScript/5ReplaceMethod/types/configs/MatchConfig.d.ts deleted file mode 100644 index 59524e0..0000000 --- a/TypeScript/5ReplaceMethod/types/configs/MatchConfig.d.ts +++ /dev/null @@ -1 +0,0 @@ -export const enabled: boolean; diff --git a/TypeScript/5ReplaceMethod/types/configs/QuestConfig.d.ts b/TypeScript/5ReplaceMethod/types/configs/QuestConfig.d.ts deleted file mode 100644 index 069e0ac..0000000 --- a/TypeScript/5ReplaceMethod/types/configs/QuestConfig.d.ts +++ /dev/null @@ -1,70 +0,0 @@ -export const redeemTime: number; -export const repeatableQuests: { - name: string; - types: string[]; - resetTime: number; - numQuests: number; - minPlayerLevel: number; - rewardScaling: { - levels: number[]; - experience: number[]; - roubles: number[]; - items: number[]; - reputation: number[]; - rewardSpread: number; - }; - locations: { - any: string[]; - factory4_day: string[]; - bigmap: string[]; - Woods: string[]; - Shoreline: string[]; - Interchange: string[]; - Lighthouse: string[]; - laboratory: string[]; - RezervBase: string[]; - }; - traderWhitelist: { - traderId: any; - questTypes: string[]; - }[]; - questConfig: { - Exploration: { - maxExtracts: number; - specificExits: { - probability: number; - passageRequirementWhitelist: string[]; - }; - }; - Completion: { - minRequestedAmount: number; - maxRequestedAmount: number; - minRequestedBulletAmount: number; - maxRequestedBulletAmount: number; - useWhitelist: boolean; - useBlacklist: boolean; - }; - Elimination: { - targets: { - key: string; - relativeProbability: number; - data: { - isBoss: boolean; - }; - }[]; - bodyPartProb: number; - bodyParts: { - key: string; - relativeProbability: number; - data: string[]; - }[]; - specificLocationProb: number; - distLocationBlacklist: string[]; - distProb: number; - maxDist: number; - minDist: number; - maxKills: number; - minKills: number; - }; - }; -}[]; diff --git a/TypeScript/5ReplaceMethod/types/configs/RagfairConfig.d.ts b/TypeScript/5ReplaceMethod/types/configs/RagfairConfig.d.ts deleted file mode 100644 index 4a0f68c..0000000 --- a/TypeScript/5ReplaceMethod/types/configs/RagfairConfig.d.ts +++ /dev/null @@ -1,87 +0,0 @@ -export const runIntervalSeconds: number; -export namespace sell { - const fees: boolean; - namespace chance { - const base: number; - const overprices: number; - const underpriced: number; - } - namespace time { - const base_1: number; - export { base_1 as base }; - export const min: number; - export const max: number; - } - namespace reputation { - const gain: number; - const loss: number; - } -} -export const traders: { - "54cb50c76803fa8b248b4571": boolean; - "54cb57776803fa99248b456e": boolean; - "579dc571d53a0658a154fbec": boolean; - "58330581ace78e27b8b10cee": boolean; - "5935c25fb3acc3127c3d8cd9": boolean; - "5a7c2eca46aef81a7ca2145d": boolean; - "5ac3b934156ae10c4430e83c": boolean; - "5c0647fdd443bc2504c2d371": boolean; - ragfair: boolean; -}; -export namespace dynamic { - const expiredOfferThreshold: number; - namespace offerItemCount { - const min_1: number; - export { min_1 as min }; - const max_1: number; - export { max_1 as max }; - } - namespace price { - const min_2: number; - export { min_2 as min }; - const max_2: number; - export { max_2 as max }; - } - namespace endTimeSeconds { - const min_3: number; - export { min_3 as min }; - const max_3: number; - export { max_3 as max }; - } - namespace condition { - export const conditionChance: number; - const min_4: number; - export { min_4 as min }; - const max_4: number; - export { max_4 as max }; - } - namespace stackablePercent { - const min_5: number; - export { min_5 as min }; - const max_5: number; - export { max_5 as max }; - } - namespace nonStackableCount { - const min_6: number; - export { min_6 as min }; - const max_6: number; - export { max_6 as max }; - } - namespace rating { - const min_7: number; - export { min_7 as min }; - const max_7: number; - export { max_7 as max }; - } - const currencies: { - "5449016a4bdc2d6f028b456f": number; - "5696686a4bdc2da3298b456a": number; - "569668774bdc2da2298b4568": number; - }; - const showAsSingleStack: any[]; - namespace blacklist { - const custom: string[]; - const enableBsgList: boolean; - const enableQuestList: boolean; - } -} diff --git a/TypeScript/5ReplaceMethod/types/configs/RepairConfig.d.ts b/TypeScript/5ReplaceMethod/types/configs/RepairConfig.d.ts deleted file mode 100644 index d2bec52..0000000 --- a/TypeScript/5ReplaceMethod/types/configs/RepairConfig.d.ts +++ /dev/null @@ -1 +0,0 @@ -export const priceMultiplier: number; diff --git a/TypeScript/5ReplaceMethod/types/configs/TraderConfig.d.ts b/TypeScript/5ReplaceMethod/types/configs/TraderConfig.d.ts deleted file mode 100644 index c7fc65d..0000000 --- a/TypeScript/5ReplaceMethod/types/configs/TraderConfig.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -export const updateTime: { - traderId: any; - seconds: number; -}[]; -export const updateTimeDefault: number; -export const fenceAssortSize: number; -export const fenceMaxPresetsCount: number; -export const fencePresetPriceMult: number; -export const minDurabilityForSale: number; -export const fenceItemIgnoreList: string[]; diff --git a/TypeScript/5ReplaceMethod/types/configs/WeatherConfig.d.ts b/TypeScript/5ReplaceMethod/types/configs/WeatherConfig.d.ts deleted file mode 100644 index ca37604..0000000 --- a/TypeScript/5ReplaceMethod/types/configs/WeatherConfig.d.ts +++ /dev/null @@ -1,55 +0,0 @@ -export const acceleration: number; -export namespace weather { - namespace clouds { - const min: number; - const max: number; - } - namespace windSpeed { - const min_1: number; - export { min_1 as min }; - const max_1: number; - export { max_1 as max }; - } - namespace windDirection { - const min_2: number; - export { min_2 as min }; - const max_2: number; - export { max_2 as max }; - } - namespace windGustiness { - const min_3: number; - export { min_3 as min }; - const max_3: number; - export { max_3 as max }; - } - namespace rain { - const min_4: number; - export { min_4 as min }; - const max_4: number; - export { max_4 as max }; - } - namespace rainIntensity { - const min_5: number; - export { min_5 as min }; - const max_5: number; - export { max_5 as max }; - } - namespace fog { - const min_6: number; - export { min_6 as min }; - const max_6: number; - export { max_6 as max }; - } - namespace temp { - const min_7: number; - export { min_7 as min }; - const max_7: number; - export { max_7 as max }; - } - namespace pressure { - const min_8: number; - export { min_8 as min }; - const max_8: number; - export { max_8 as max }; - } -} diff --git a/TypeScript/5ReplaceMethod/types/controllers/BotController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/BotController.d.ts index 1fc8fc4..d7dc36d 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/BotController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/BotController.d.ts @@ -1,8 +1,8 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { Difficulty } from "../@types/eft/common/tables/IBotType"; -import { IGenerateBotsRequestData } from "../@types/eft/bot/IGenerateBotsRequestData"; -import { IBotBase } from "../@types/eft/common/tables/IBotBase"; -import { IBotCore } from "../@types/eft/common/tables/IBotCore"; +import { Difficulty } from "../models/eft/common/tables/IBotType"; +import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; +import { IBotBase } from "../models/eft/common/tables/IBotBase"; +import { IBotCore } from "../models/eft/common/tables/IBotCore"; import { ConfigServer } from "../servers/ConfigServer"; import { BotHelper } from "../helpers/BotHelper"; import { BotGenerator } from "../generators/BotGenerator"; diff --git a/TypeScript/5ReplaceMethod/types/controllers/CustomizationController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/CustomizationController.d.ts index 4255154..6fd3b12 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/CustomizationController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/CustomizationController.d.ts @@ -1,13 +1,13 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IWearClothingRequestData } from "../@types/eft/customization/IWearClothingRequestData"; -import { IBuyClothingRequestData } from "../@types/eft/customization/IBuyClothingRequestData"; -import { ISuit } from "../@types/eft/common/tables/ITrader"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IWearClothingRequestData } from "../models/eft/customization/IWearClothingRequestData"; +import { IBuyClothingRequestData } from "../models/eft/customization/IBuyClothingRequestData"; +import { ISuit } from "../models/eft/common/tables/ITrader"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class CustomizationController { private logger; private itemEventRouter; diff --git a/TypeScript/5ReplaceMethod/types/controllers/DialogueController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/DialogueController.d.ts index a855ad1..8095666 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/DialogueController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/DialogueController.d.ts @@ -1,16 +1,16 @@ import { SaveServer } from "../servers/SaveServer"; import { DialogueHelper } from "../helpers/DialogueHelper"; -import { DialogueInfo } from "../@types/eft/profile/IAkiProfile"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IGetFriendListDataResponse } from "../@types/eft/dialog/IGetFriendListDataResponse"; -import { IGetMailDialogViewResponseData } from "../@types/eft/dialog/IGetMailDialogViewResponseData"; -import { IGetAllAttachmentsResponse } from "../@types/eft/dialog/IGetAllAttachmentsResponse"; -import { HttpResponse } from "../utils/HttpResponse"; +import { DialogueInfo } from "../models/eft/profile/IAkiProfile"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse"; +import { IGetMailDialogViewResponseData } from "../models/eft/dialog/IGetMailDialogViewResponseData"; +import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachmentsResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class DialogueController { private httpResponse; private saveServer; private dialogueHelper; - constructor(httpResponse: HttpResponse, saveServer: SaveServer, dialogueHelper: DialogueHelper); + constructor(httpResponse: HttpResponseUtil, saveServer: SaveServer, dialogueHelper: DialogueHelper); getFriendList(sessionID: string): IGetFriendListDataResponse; generateDialogueList(sessionID: string): IGetBodyResponseData; getDialogueInfo(dialogueID: string, sessionID: string): DialogueInfo; diff --git a/TypeScript/5ReplaceMethod/types/controllers/GameController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/GameController.d.ts index 883bed3..614d270 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/GameController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/GameController.d.ts @@ -1,9 +1,9 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGameConfigResponse } from "../@types/eft/game/IGameConfigResponse"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from "../@types/spt/utils/ILogger"; -import { IWatermark } from "../@types/spt/utils/IWatermark"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { IWatermark } from "../models/spt/utils/IWatermark"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; export declare class GameController { private logger; diff --git a/TypeScript/5ReplaceMethod/types/controllers/HealthController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/HealthController.d.ts index 3d2120b..ca049f6 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/HealthController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/HealthController.d.ts @@ -2,14 +2,14 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { PaymentService } from "../services/PaymentService"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { HealthHelper } from "../helpers/HealthHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IHealthTreatmentRequestData } from "../@types/eft/health/IHealthTreatmentRequestData"; -import { IOffraidEatRequestData } from "../@types/eft/health/IOffraidEatRequestData"; -import { IOffraidHealRequestData } from "../@types/eft/health/IOffraidHealRequestData"; -import { ISyncHealthRequestData } from "../@types/eft/health/ISyncHealthRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IHealthTreatmentRequestData } from "../models/eft/health/IHealthTreatmentRequestData"; +import { IOffraidEatRequestData } from "../models/eft/health/IOffraidEatRequestData"; +import { IOffraidHealRequestData } from "../models/eft/health/IOffraidHealRequestData"; +import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class HealthController { private logger; private itemEventRouter; diff --git a/TypeScript/5ReplaceMethod/types/controllers/HideoutController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/HideoutController.d.ts index 59e05d9..22b7040 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/HideoutController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/HideoutController.d.ts @@ -10,20 +10,20 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { PaymentHelper } from "../helpers/PaymentHelper"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { HideoutHelper } from "../helpers/HideoutHelper"; -import { IHideoutUpgradeRequestData } from "../@types/eft/hideout/IHideoutUpgradeRequestData"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { HideoutUpgradeCompleteRequestData } from "../@types/eft/hideout/HideoutUpgradeCompleteRequestData"; -import { IHideoutPutItemInRequestData } from "../@types/eft/hideout/IHideoutPutItemInRequestData"; -import { IHideoutTakeItemOutRequestData } from "../@types/eft/hideout/IHideoutTakeItemOutRequestData"; -import { IHideoutToggleAreaRequestData } from "../@types/eft/hideout/IHideoutToggleAreaRequestData"; -import { IHideoutSingleProductionStartRequestData } from "../@types/eft/hideout/IHideoutSingleProductionStartRequestData"; -import { IHideoutScavCaseStartRequestData } from "../@types/eft/hideout/IHideoutScavCaseStartRequestData"; -import { IHideoutTakeProductionRequestData } from "../@types/eft/hideout/IHideoutTakeProductionRequestData"; -import { IHideoutContinousProductionStartRequestData } from "../@types/eft/hideout/IHideoutContinousProductionStartRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { HideoutUpgradeCompleteRequestData } from "../models/eft/hideout/HideoutUpgradeCompleteRequestData"; +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 { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; +import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; +import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HttpResponse } from "../utils/HttpResponse"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class HideoutController { private logger; private hashUtil; @@ -41,7 +41,7 @@ export declare class HideoutController { private hideoutHelper; private configServer; private hideoutConfig; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponse, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, configServer: ConfigServer); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, configServer: ConfigServer); upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; upgradeComplete(pmcData: IPmcData, body: HideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse; putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/TypeScript/5ReplaceMethod/types/controllers/InraidController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/InraidController.d.ts index e0be58a..1033e5f 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/InraidController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/InraidController.d.ts @@ -2,31 +2,29 @@ import { SaveServer } from "../servers/SaveServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "../helpers/ItemHelper"; import { TraderHelper } from "../helpers/TraderHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; import { HealthHelper } from "../helpers/HealthHelper"; -import { IRegisterPlayerRequestData } from "../@types/eft/inRaid/IRegisterPlayerRequestData"; -import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData"; +import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; +import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ConfigServer } from "../servers/ConfigServer"; import { JsonUtil } from "../utils/JsonUtil"; import { QuestHelper } from "../helpers/QuestHelper"; import { InRaidHelper } from "../helpers/InRaidHelper"; import { InsuranceService } from "../services/InsuranceService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; export declare class InraidController { - private logger; private saveServer; private jsonUtil; private databaseServer; private questHelper; private itemHelper; - private profileHelper; + private extendedProfileHelper; private healthHelper; private traderHelper; private insuranceService; private inRaidHelper; private configServer; private inraidConfig; - constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, profileHelper: ProfileHelper, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); + constructor(saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, extendedProfileHelper: ExtendedProfileHelper, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); addPlayer(sessionID: string, info: IRegisterPlayerRequestData): void; saveProgress(offraidData: ISaveProgressRequestData, sessionID: string): void; } diff --git a/TypeScript/5ReplaceMethod/types/controllers/InsuranceController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/InsuranceController.d.ts index 5e43c2b..44c61fa 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/InsuranceController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/InsuranceController.d.ts @@ -8,12 +8,12 @@ import { PaymentService } from "../services/PaymentService"; import { DialogueHelper } from "../helpers/DialogueHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { ItemHelper } from "../helpers/ItemHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IGetInsuranceCostRequestData } from "../@types/eft/insurance/IGetInsuranceCostRequestData"; -import { IInsureRequestData } from "../@types/eft/insurance/IInsureRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData"; +import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { InsuranceService } from "../services/InsuranceService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class InsuranceController { private logger; private randomUtil; diff --git a/TypeScript/5ReplaceMethod/types/controllers/InventoryController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/InventoryController.d.ts index a29fd1a..4ff07b8 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/InventoryController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/InventoryController.d.ts @@ -6,25 +6,25 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { PaymentHelper } from "../helpers/PaymentHelper"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IInventoryMoveRequestData } from "../@types/eft/inventory/IInventoryMoveRequestData"; -import { IInventoryRemoveRequestData } from "../@types/eft/inventory/IInventoryRemoveRequestData"; -import { IInventorySplitRequestData } from "../@types/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMergeRequestData } from "../@types/eft/inventory/IInventoryMergeRequestData"; -import { IInventoryTransferRequestData } from "../@types/eft/inventory/IInventoryTransferRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IInventorySwapRequestData } from "../@types/eft/inventory/IInventorySwapRequestData"; -import { IInventoryFoldRequestData } from "../@types/eft/inventory/IInventoryFoldRequestData"; -import { IInventoryToggleRequestData } from "../@types/eft/inventory/IInventoryToggleRequestData"; -import { IInventoryTagRequestData } from "../@types/eft/inventory/IInventoryTagRequestData"; -import { IInventoryBindRequestData } from "../@types/eft/inventory/IInventoryBindRequestData"; -import { IInventoryExamineRequestData } from "../@types/eft/inventory/IInventoryExamineRequestData"; -import { IInventoryReadEncyclopediaRequestData } from "../@types/eft/inventory/IInventoryReadEncyclopediaRequestData"; -import { IInventorySortRequestData } from "../@types/eft/inventory/IInventorySortRequestData"; -import { IInventoryCreateMarkerRequestData } from "../@types/eft/inventory/IInventoryCreateMarkerRequestData"; -import { IInventoryDeleteMarkerRequestData } from "../@types/eft/inventory/IInventoryDeleteMarkerRequestData"; -import { IInventoryEditMarkerRequestData } from "../@types/eft/inventory/IInventoryEditMarkerRequestData"; -import { ILogger } from "../@types/spt/utils/ILogger"; +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 { 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 { ILogger } from "../models/spt/utils/ILogger"; export declare class InventoryController { private logger; private hashUtil; diff --git a/TypeScript/5ReplaceMethod/types/controllers/LauncherController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/LauncherController.d.ts index 687c295..d3d8e6a 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/LauncherController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/LauncherController.d.ts @@ -2,11 +2,10 @@ import { HashUtil } from "../utils/HashUtil"; import { SaveServer } from "../servers/SaveServer"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { IRegisterData } from "../@types/eft/launcher/IRegisterData"; -import { ILoginRequestData } from "../@types/eft/launcher/ILoginRequestData"; -import { IChangeRequestData } from "../@types/eft/launcher/IChangeRequestData"; -import { Info } from "../@types/eft/profile/IAkiProfile"; -import { ICoreConfig } from "../@types/spt/config/ICoreConfig"; +import { IRegisterData } from "../models/eft/launcher/IRegisterData"; +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 { private hashUtil; @@ -14,7 +13,7 @@ export declare class LauncherController { private httpServerHelper; private databaseServer; private configServer; - coreConfig: ICoreConfig; + private coreConfig; constructor(hashUtil: HashUtil, saveServer: SaveServer, httpServerHelper: HttpServerHelper, databaseServer: DatabaseServer, configServer: ConfigServer); connect(): any; find(sessionIdKey: string): Info; diff --git a/TypeScript/5ReplaceMethod/types/controllers/LocationController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/LocationController.d.ts index 64168b4..dde270c 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/LocationController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/LocationController.d.ts @@ -1,10 +1,10 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { LocationGenerator } from "../generators/LocationGenerator"; -import { ILocationBase } from "../@types/eft/common/ILocationBase"; -import { ILocationsGenerateAllResponse } from "../@types/eft/common/ILocationsSourceDestinationBase"; +import { ILocationBase } from "../models/eft/common/ILocationBase"; +import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSourceDestinationBase"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class LocationController { private jsonUtil; private logger; diff --git a/TypeScript/5ReplaceMethod/types/controllers/MatchController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/MatchController.d.ts index 6ab5759..229b884 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/MatchController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/MatchController.d.ts @@ -1,11 +1,9 @@ import { TraderHelper } from "../helpers/TraderHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IEndOfflineRaidRequestData } from "../@types/eft/match/IEndOfflineRaidRequestData"; -import { IStartOfflineRaidRequestData } from "../@types/eft/match/IStartOffineRaidRequestData"; -import { IPmcData } from "../@types/eft/common/IPmcData"; +import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; +import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { ConfigServer } from "../servers/ConfigServer"; -import { IMatchConfig } from "../@types/spt/config/IMatchConfig"; -import { IInRaidConfig } from "../@types/spt/config/IInRaidConfig"; import { SaveServer } from "../servers/SaveServer"; import { MatchLocationService } from "../services/MatchLocationService"; export declare class MatchController { @@ -14,8 +12,8 @@ export declare class MatchController { private matchLocationService; private traderHelper; private configServer; - matchConfig: IMatchConfig; - inraidConfig: IInRaidConfig; + private matchConfig; + private inraidConfig; constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, configServer: ConfigServer); getEnabled(): boolean; getProfile(info: any): IPmcData[]; diff --git a/TypeScript/5ReplaceMethod/types/controllers/NoteController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/NoteController.d.ts index bb02d23..ecd8001 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/NoteController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/NoteController.d.ts @@ -1,6 +1,6 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { INoteActionData } from "../@types/eft/notes/INoteActionData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { private itemEventRouter; diff --git a/TypeScript/5ReplaceMethod/types/controllers/NotifierController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/NotifierController.d.ts index 3366add..36fef66 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/NotifierController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/NotifierController.d.ts @@ -1,6 +1,6 @@ import { NotifierHelper } from "../helpers/NotifierHelper"; import { NotificationService } from "../services/NotificationService"; -import { INotifierChannel } from "../@types/eft/notifier/INotifier"; +import { INotifierChannel } from "../models/eft/notifier/INotifier"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; export declare class NotifierController { private notifierHelper; diff --git a/TypeScript/5ReplaceMethod/types/controllers/PaymentController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/PaymentController.d.ts deleted file mode 100644 index a9a4235..0000000 --- a/TypeScript/5ReplaceMethod/types/controllers/PaymentController.d.ts +++ /dev/null @@ -1,56 +0,0 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IProcessBuyTradeRequestData } from "../@types/eft/trade/IProcessBuyTradeRequestData"; -import { IProcessSellTradeRequestData } from "../@types/eft/trade/IProcessSellTradeRequestData"; -export declare class PaymentController { - /** - * Check whether tpl is Money - * @param {string} tpl - * @returns void - */ - static isMoneyTpl(tpl: string): boolean; - /** - * Gets currency TPL from TAG - * @param {string} currency - * @returns string - */ - static getCurrency(currency: string): string; - /** - * Gets currency TAG from TPL - * @param {string} currency - * @returns string - */ - static getCurrencyTag(currency: string): string; - /** - * Gets Currency to Ruble conversion Value - * @param {number} value - * @param {string} currencyFrom - * @returns number - */ - static inRUB(value: number, currencyFrom: string): number; - /** - * Gets Ruble to Currency conversion Value - * @param {number} value - * @param {string} currencyTo - * @returns number - */ - static fromRUB(value: number, currencyTo: string): number; - /** - * Take money and insert items into return to server request - * @param {Object} pmcData - * @param {Object} body - * @param {string} sessionID - * @returns Object - */ - static payMoney(pmcData: IPmcData, body: IProcessBuyTradeRequestData, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse; - /** - * Receive money back after selling - * @param {IPmcData} pmcData - * @param {number} amount - * @param {IProcessSellTradeRequestData} body - * @param {IItemEventRouterResponse} output - * @param {string} sessionID - * @returns IItemEventRouterResponse - */ - static getMoney(pmcData: IPmcData, amount: number, body: IProcessSellTradeRequestData, output: IItemEventRouterResponse, sessionID: string): IItemEventRouterResponse; -} diff --git a/TypeScript/5ReplaceMethod/types/controllers/PlayerController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/PlayerController.d.ts deleted file mode 100644 index b33606d..0000000 --- a/TypeScript/5ReplaceMethod/types/controllers/PlayerController.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IPlayerIncrementSkillLevelRequestData } from "../@types/eft/player/IPlayerIncrementSkillLevelRequestData"; -export declare class PlayerController { - /** - * increases the profile skill and updates any output - * @param {Object} pmcData - * @param {Object} output - * @param {String} skillName - * @param {Number} amount - */ - static incrementSkillLevel(pmcData: IPmcData, output: IPlayerIncrementSkillLevelRequestData, skillName: string, amount: number): void; - /** - * @param {Object} pmcData - * @returns number - */ - static calculateLevel(pmcData: IPmcData): number; - /** - * @returns number - */ - static getRandomExperience(): number; - /** - * Made a 2d array table with 0 - free slot and 1 - used slot - * @param {Object} pmcData - * @param {string} sessionID - * @returns Array - */ - static getStashSlotMap(pmcData: IPmcData, sessionID: string): any[][]; -} diff --git a/TypeScript/5ReplaceMethod/types/controllers/PresetBuildController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/PresetBuildController.d.ts index e0702f4..a15b181 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/PresetBuildController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/PresetBuildController.d.ts @@ -1,9 +1,9 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { SaveServer } from "../servers/SaveServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IPresetBuildActionRequestData } from "../@types/eft/presetBuild/IPresetBuildActionRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { WeaponBuild } from "../@types/eft/profile/IAkiProfile"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IPresetBuildActionRequestData } from "../models/eft/presetBuild/IPresetBuildActionRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { WeaponBuild } from "../models/eft/profile/IAkiProfile"; import { HashUtil } from "../utils/HashUtil"; import { ItemEventRouter } from "../routers/ItemEventRouter"; export declare class PresetBuildController { diff --git a/TypeScript/5ReplaceMethod/types/controllers/ProfileController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/ProfileController.d.ts index 938a866..46b66d8 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/ProfileController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/ProfileController.d.ts @@ -1,18 +1,18 @@ import { SaveServer } from "../servers/SaveServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "../helpers/ItemHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; import { TraderHelper } from "../helpers/TraderHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IProfileChangeNicknameRequestData } from "../@types/eft/profile/IProfileChangeNicknameRequestData"; -import { IProfileChangeVoiceRequestData } from "../@types/eft/profile/IProfileChangeVoiceRequestData"; -import { IProfileCreateRequestData } from "../@types/eft/profile/IProfileCreateRequestData"; -import { IValidateNicknameRequestData } from "../@types/eft/profile/IValidateNicknameRequestData"; -import { ISearchFriendRequestData } from "../@types/eft/profile/ISearchFriendRequestData"; -import { ISearchFriendResponse } from "../@types/eft/profile/ISearchFriendResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +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 { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; -import { IMiniProfile } from "../@types/eft/launcher/IMiniProfile"; +import { IMiniProfile } from "../models/eft/launcher/IMiniProfile"; +import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; export declare class ProfileController { private hashUtil; private timeUtil; @@ -20,8 +20,8 @@ export declare class ProfileController { private databaseServer; private itemHelper; private traderHelper; - private profileHelper; - constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, traderHelper: TraderHelper, profileHelper: ProfileHelper); + private extendedProfileHelper; + constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, traderHelper: TraderHelper, extendedProfileHelper: ExtendedProfileHelper); getMiniProfiles(): IMiniProfile[]; getMiniProfile(sessionID: string): any; getCompleteProfile(sessionID: string): IPmcData[]; diff --git a/TypeScript/5ReplaceMethod/types/controllers/QuestController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/QuestController.d.ts index bb89a3b..a964c32 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/QuestController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/QuestController.d.ts @@ -8,13 +8,13 @@ import { QuestConditionHelper } from "../helpers/QuestConditionHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; import { PlayerService } from "../services/PlayerService"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IQuest } from "../@types/eft/common/tables/IQuest"; -import { IAcceptQuestRequestData } from "../@types/eft/quests/IAcceptQuestRequestData"; -import { ICompleteQuestRequestData } from "../@types/eft/quests/ICompleteQuestRequestData"; -import { IHandoverQuestRequestData } from "../@types/eft/quests/IHandoverQuestRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IQuest } from "../models/eft/common/tables/IQuest"; +import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; +import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; +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 { private logger; private timeUtil; diff --git a/TypeScript/5ReplaceMethod/types/controllers/RagfairController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/RagfairController.d.ts index 0b6757e..6e71edd 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/RagfairController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/RagfairController.d.ts @@ -1,5 +1,5 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { RagfairServer } from "../servers/RagfairServer"; import { SaveServer } from "../servers/SaveServer"; @@ -14,24 +14,24 @@ import { PaymentHelper } from "../helpers/PaymentHelper"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { RagfairHelper } from "../helpers/RagfairHelper"; import { RagfairSellHelper } from "../helpers/RagfairSellHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IAddOfferRequestData, Requirement } from "../@types/eft/ragfair/IAddOfferRequestData"; -import { IExtendOfferRequestData } from "../@types/eft/ragfair/IExtendOfferRequestData"; -import { IGetMarketPriceRequestData } from "../@types/eft/ragfair/IGetMarketPriceRequestData"; -import { ISearchRequestData } from "../@types/eft/ragfair/ISearchRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { IGetItemPriceResult } from "../@types/eft/ragfair/IGetItemPriceResult"; -import { IGetOffersResult } from "../@types/eft/ragfair/IGetOffersResult"; +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 "../@types/eft/profile/IAkiProfile"; -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; import { RagfairSortHelper } from "../helpers/RagfairSortHelper"; import { RagfairTaxHelper } from "../helpers/RagfairTaxHelper"; import { RagfairOfferHelper } from "../helpers/RagfairOfferHelper"; import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairController { private logger; private timeUtil; @@ -57,7 +57,7 @@ export declare class RagfairController { private ragfairOfferGenerator; private configServer; private ragfairConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, httpResponse: HttpResponse, itemEventRouter: ItemEventRouter, ragfairServer: RagfairServer, ragfairPriceService: RagfairPriceService, databaseServer: DatabaseServer, itemHelper: ItemHelper, saveServer: SaveServer, ragfairSellHelper: RagfairSellHelper, ragfairTaxHelper: RagfairTaxHelper, ragfairSortHelper: RagfairSortHelper, ragfairOfferHelper: RagfairOfferHelper, profileHelper: ProfileHelper, paymentService: PaymentService, handbookHelper: HandbookHelper, paymentHelper: PaymentHelper, inventoryHelper: InventoryHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, ragfairOfferGenerator: RagfairOfferGenerator, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter, ragfairServer: RagfairServer, ragfairPriceService: RagfairPriceService, databaseServer: DatabaseServer, itemHelper: ItemHelper, saveServer: SaveServer, ragfairSellHelper: RagfairSellHelper, ragfairTaxHelper: RagfairTaxHelper, ragfairSortHelper: RagfairSortHelper, ragfairOfferHelper: RagfairOfferHelper, profileHelper: ProfileHelper, paymentService: PaymentService, handbookHelper: HandbookHelper, paymentHelper: PaymentHelper, inventoryHelper: InventoryHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, ragfairOfferGenerator: RagfairOfferGenerator, configServer: ConfigServer); getOffers(sessionID: string, info: ISearchRequestData): IGetOffersResult; update(): void; getItemPrice(info: IGetMarketPriceRequestData): IGetItemPriceResult; diff --git a/TypeScript/5ReplaceMethod/types/controllers/RepairController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/RepairController.d.ts index 86ab1e1..3a9f3a2 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/RepairController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/RepairController.d.ts @@ -2,15 +2,14 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { QuestHelper } from "../helpers/QuestHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { PaymentService } from "../services/PaymentService"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IRepairActionDataRequest } from "../@types/eft/repair/IRepairActionDataRequest"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { ITraderRepairActionDataRequest } from "../@types/eft/repair/ITraderRepairActionDataRequest"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepairActionDataRequest"; import { ConfigServer } from "../servers/ConfigServer"; -import { IRepairConfig } from "../@types/spt/config/IRepairConfig"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { RepairHelper } from "../helpers/RepairHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RepairController { private logger; private itemEventRouter; @@ -20,7 +19,7 @@ export declare class RepairController { private paymentService; private repairHelper; private configServer; - repairConfig: IRepairConfig; + private repairConfig; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, questHelper: QuestHelper, traderHelper: TraderHelper, paymentService: PaymentService, repairHelper: RepairHelper, configServer: ConfigServer); /** * Repair with trader diff --git a/TypeScript/5ReplaceMethod/types/controllers/RepeatableQuestController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/RepeatableQuestController.d.ts index 23d56e5..d2de5df 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/RepeatableQuestController.d.ts @@ -5,20 +5,20 @@ import { JsonUtil } from "../utils/JsonUtil"; import { MathUtil } from "../utils/MathUtil"; import { ItemHelper } from "../helpers/ItemHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IPmcData, TraderInfo } from "../@types/eft/common/IPmcData"; -import { IRepeatableQuestConfig, ELocationName, IQuestConfig } from "../@types/spt/config/IQuestConfig"; -import { IExploration, IRepeatableQuest, IReward, IRewards, IExplorationCondition, ICompletionAvailableFor, IEliminationCondition, ICompletion, IElimination, IPmcDataRepeatableQuest } from "../@types/eft/common/tables/IRepeatableQuests"; -import { Exit } from "../@types/eft/common/ILocationBase"; -import { IRepeatableQuestChangeRequest } from "../@types/eft/quests/IRepeatableQuestChangeRequest"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export interface IQuestTypePool { types: string[]; pool: IQuestPool; @@ -61,7 +61,7 @@ export declare class RepeatableQuestController { private paymentService; private objectId; private configServer; - questConfig: IQuestConfig; + private questConfig; constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, itemEventRouter: ItemEventRouter, paymentService: PaymentService, objectId: ObjectId, configServer: ConfigServer); /** * This is the method reached by the /client/repeatalbeQuests/activityPeriods endpoint diff --git a/TypeScript/5ReplaceMethod/types/controllers/TradeController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/TradeController.d.ts index 916ed9c..f0a177b 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/TradeController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/TradeController.d.ts @@ -1,13 +1,13 @@ import { RagfairServer } from "../servers/RagfairServer"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { TradeHelper } from "../helpers/TradeHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IProcessRagfairTradeRequestData } from "../@types/eft/trade/IProcessRagfairTradeRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { Upd } from "../@types/eft/common/tables/IItem"; -import { IProcessBaseTradeRequestData } from "../@types/eft/trade/IProcessBaseTradeRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { Upd } from "../models/eft/common/tables/IItem"; +import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; declare class TradeController { private logger; private itemEventRouter; diff --git a/TypeScript/5ReplaceMethod/types/controllers/TraderController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/TraderController.d.ts index e125cf1..5cd85c9 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/TraderController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/TraderController.d.ts @@ -2,12 +2,11 @@ import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { DatabaseServer } from "../servers/DatabaseServer"; import { TraderAssortService } from "../services/TraderAssortService"; -import { IBarterScheme, ITraderAssort, ITraderBase } from "../@types/eft/common/tables/ITrader"; +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 { ITraderConfig } from "../@types/spt/config/ITraderConfig"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; import { TraderAssortHelper } from "../helpers/TraderAssortHelper"; export declare class TraderController { private logger; @@ -19,7 +18,7 @@ export declare class TraderController { private traderAssortService; private jsonUtil; private configServer; - traderConfig: ITraderConfig; + private traderConfig; constructor(logger: ILogger, databaseServer: DatabaseServer, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, timeUtil: TimeUtil, traderAssortService: TraderAssortService, jsonUtil: JsonUtil, configServer: ConfigServer); load(): void; getTrader(traderID: string, sessionID: string): ITraderBase; diff --git a/TypeScript/5ReplaceMethod/types/controllers/WeatherController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/WeatherController.d.ts index 2d17179..4f8bcf1 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/WeatherController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/WeatherController.d.ts @@ -1,11 +1,10 @@ import { ConfigServer } from "../servers/ConfigServer"; -import { IWeatherConfig } from "../@types/spt/config/IWeatherConfig"; import { WeatherGenerator } from "../generators/WeatherGenerator"; -import { IWeatherData } from "../@types/eft/weather/IWeatherData"; +import { IWeatherData } from "../models/eft/weather/IWeatherData"; export declare class WeatherController { private weatherGenerator; private configServer; - weatherConfig: IWeatherConfig; + private weatherConfig; constructor(weatherGenerator: WeatherGenerator, configServer: ConfigServer); generate(): IWeatherData; } diff --git a/TypeScript/5ReplaceMethod/types/controllers/WishlistController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/WishlistController.d.ts index c935452..5ef8df3 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/WishlistController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/WishlistController.d.ts @@ -1,7 +1,7 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IWishlistActionData } from "../@types/eft/wishlist/IWishlistActionData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { private itemEvenRouter; constructor(itemEvenRouter: ItemEventRouter); diff --git a/TypeScript/5ReplaceMethod/types/di/Container.d.ts b/TypeScript/5ReplaceMethod/types/di/Container.d.ts index bd40dbd..b67523f 100644 --- a/TypeScript/5ReplaceMethod/types/di/Container.d.ts +++ b/TypeScript/5ReplaceMethod/types/di/Container.d.ts @@ -1,7 +1,6 @@ import { DependencyContainer } from "tsyringe"; export declare class Container { static registerTypes(depContainer: DependencyContainer): void; - static registerServerSpecificClasses(depContainer: DependencyContainer): void; private static registerUtils; private static registerRouters; private static registerGenerators; diff --git a/TypeScript/5ReplaceMethod/types/di/Router.d.ts b/TypeScript/5ReplaceMethod/types/di/Router.d.ts index d27ac97..ac48587 100644 --- a/TypeScript/5ReplaceMethod/types/di/Router.d.ts +++ b/TypeScript/5ReplaceMethod/types/di/Router.d.ts @@ -1,5 +1,6 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IAkiProfile } from "../@types/eft/profile/IAkiProfile"; +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 { private handledRoutes; constructor(); @@ -17,7 +18,7 @@ export declare class DynamicRouter extends Router { } export declare class ItemEventRouterDefinition extends Router { constructor(); - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } export declare class SaveLoadRouter extends Router { constructor(); diff --git a/TypeScript/5ReplaceMethod/types/di/Serializer.d.ts b/TypeScript/5ReplaceMethod/types/di/Serializer.d.ts index 076407d..70aa7c5 100644 --- a/TypeScript/5ReplaceMethod/types/di/Serializer.d.ts +++ b/TypeScript/5ReplaceMethod/types/di/Serializer.d.ts @@ -1,4 +1,4 @@ -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; 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/BotEquipmentGenerator.d.ts b/TypeScript/5ReplaceMethod/types/generators/BotEquipmentGenerator.d.ts deleted file mode 100644 index 2cc98b8..0000000 --- a/TypeScript/5ReplaceMethod/types/generators/BotEquipmentGenerator.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; -import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData"; -import { Chances, Mods } from "../@types/eft/common/tables/IBotType"; -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { HashUtil } from "../utils/HashUtil"; -import { Logger } from "../utils/Logger"; -import { RandomUtil } from "../utils/RandomUtil"; -import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -export declare class BotEquipmentGenerator { - private logger; - private hashUtil; - private randomUtil; - private databaseServer; - private botGeneratorHelper; - private weightedRandomHelper; - constructor(logger: Logger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, botGeneratorHelper: BotGeneratorHelper, weightedRandomHelper: WeightedRandomHelper); - generateEquipment(equipmentSlot: string, equipmentPool: Record, modPool: Mods, spawnChances: Chances, botRole: string, inventory: PmcInventory): void; -} diff --git a/TypeScript/5ReplaceMethod/types/generators/BotGenerator.d.ts b/TypeScript/5ReplaceMethod/types/generators/BotGenerator.d.ts index 4a1b8a3..af7d7d4 100644 --- a/TypeScript/5ReplaceMethod/types/generators/BotGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/generators/BotGenerator.d.ts @@ -1,20 +1,14 @@ import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; -import { IGenerateBotsRequestData } from "../@types/eft/bot/IGenerateBotsRequestData"; -import { IBotBase } from "../@types/eft/common/tables/IBotBase"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; +import { IBotBase } from "../models/eft/common/tables/IBotBase"; import { DatabaseServer } from "../servers/DatabaseServer"; import { JsonUtil } from "../utils/JsonUtil"; import { ConfigServer } from "../servers/ConfigServer"; import { GameEventHelper } from "../helpers/GameEventHelper"; import { BotInventoryGenerator } from "./BotInventoryGenerator"; import { BotHelper } from "../helpers/BotHelper"; -declare namespace BotGenerator { - interface IRandomisedBotLevelResult { - level: number; - exp: number; - } -} export declare class BotGenerator { private logger; private hashUtil; @@ -28,8 +22,8 @@ export declare class BotGenerator { private botConfig; constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; - generateBot(bot: IBotBase, role: string, isPmc: boolean): IBotBase; - generateRandomLevel(min: number, max: number): BotGenerator.IRandomisedBotLevelResult; + private generateBot; + private generateRandomLevel; /** Converts health object to the required format */ private generateHealth; private generateSkills; @@ -40,4 +34,3 @@ export declare class BotGenerator { private getPMCDifficulty; private generateDogtag; } -export {}; diff --git a/TypeScript/5ReplaceMethod/types/generators/BotInventoryGenerator.d.ts b/TypeScript/5ReplaceMethod/types/generators/BotInventoryGenerator.d.ts index c151b83..e9f09de 100644 --- a/TypeScript/5ReplaceMethod/types/generators/BotInventoryGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/generators/BotInventoryGenerator.d.ts @@ -1,11 +1,11 @@ -import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData"; -import { Inventory, Chances, Generation, Mods } from "../@types/eft/common/tables/IBotType"; +import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { Inventory, Chances, Generation } from "../models/eft/common/tables/IBotType"; import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; import { BotWeaponGenerator } from "./BotWeaponGenerator"; import { BotLootGenerator } from "./BotLootGenerator"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; export declare class BotInventoryGenerator { @@ -20,6 +20,6 @@ export declare class BotInventoryGenerator { 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; - generateEquipment(equipmentSlot: string, equipmentPool: Record, modPool: Mods, spawnChances: Chances, botRole: string, inventory: PmcInventory): void; + private generateEquipment; private generateInventoryBase; } diff --git a/TypeScript/5ReplaceMethod/types/generators/BotLootGenerator.d.ts b/TypeScript/5ReplaceMethod/types/generators/BotLootGenerator.d.ts index 0ec991e..3bf1b36 100644 --- a/TypeScript/5ReplaceMethod/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/generators/BotLootGenerator.d.ts @@ -1,17 +1,14 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; -import { IBotConfig } from "../@types/spt/config/IBotConfig"; import { HandbookHelper } from "../helpers/HandbookHelper"; import { PMCLootGenerator } from "../generators/PMCLootGenerator"; -import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData"; -import { ItemMinMax, Items } from "../@types/eft/common/tables/IBotType"; +import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { ItemMinMax, Items } from "../models/eft/common/tables/IBotType"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; export declare class BotLootGenerator { - private logger; private jsonUtil; private hashUtil; private randomUtil; @@ -20,8 +17,8 @@ export declare class BotLootGenerator { private botGeneratorHelper; private pmcLootGenerator; private configServer; - botConfig: IBotConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, pmcLootGenerator: PMCLootGenerator, configServer: ConfigServer); + private botConfig; + constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, pmcLootGenerator: PMCLootGenerator, configServer: ConfigServer); generateLoot(lootPool: Items, itemCounts: ItemMinMax, isPmc: boolean, inventory: PmcInventory): void; private getRandomisedCount; private addLootFromPool; diff --git a/TypeScript/5ReplaceMethod/types/generators/BotWeaponGenerator.d.ts b/TypeScript/5ReplaceMethod/types/generators/BotWeaponGenerator.d.ts index 8eb643c..3e9d59c 100644 --- a/TypeScript/5ReplaceMethod/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/generators/BotWeaponGenerator.d.ts @@ -1,11 +1,12 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "../helpers/ItemHelper"; -import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData"; -import { MinMax, ModsChances, Mods } from "../@types/eft/common/tables/IBotType"; +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 { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { RandomUtil } from "../utils/RandomUtil"; export declare class BotWeaponGenerator { private logger; private hashUtil; @@ -13,7 +14,8 @@ export declare class BotWeaponGenerator { private itemHelper; private weightedRandomHelper; private botGeneratorHelper; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper); + private randomUtil; + constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil); generateWeapon(equipmentSlot: string, weaponPool: Record, modPool: Mods, modChances: ModsChances, magCounts: MinMax, botRole: string, isPmc: boolean, inventory: PmcInventory): void; /** Checks if all required slots are occupied on a weapon and all it's mods */ private isWeaponValid; diff --git a/TypeScript/5ReplaceMethod/types/generators/LocationGenerator.d.ts b/TypeScript/5ReplaceMethod/types/generators/LocationGenerator.d.ts index c37814f..b7ba7c5 100644 --- a/TypeScript/5ReplaceMethod/types/generators/LocationGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/generators/LocationGenerator.d.ts @@ -1,18 +1,17 @@ import { RandomUtil } from "../utils/RandomUtil"; -import { IStaticContainerProps, IStaticLootDetails, IStaticAmmoDetails, IStaticForcedProps } from "../@types/eft/common/tables/ILootBase"; -import { ILooseLoot, SpawnpointTemplate } from "../@types/eft/common/ILooseLoot"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { IStaticContainerProps, IStaticLootDetails, IStaticAmmoDetails, IStaticForcedProps } from "../models/eft/common/tables/ILootBase"; +import { ILooseLoot, SpawnpointTemplate } from "../models/eft/common/ILooseLoot"; +import { Item } from "../models/eft/common/tables/IItem"; import { ItemHelper } from "../helpers/ItemHelper"; import { GameEventHelper } from "../helpers/GameEventHelper"; import { ContainerHelper } from "../helpers/ContainerHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILocationConfig } from "../@types/spt/config/ILocationConfig"; import { JsonUtil } from "../utils/JsonUtil"; import { MathUtil } from "../utils/MathUtil"; import { ObjectId } from "../utils/ObjectId"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export interface IContainerItem { items: Item[]; width: number; @@ -30,7 +29,7 @@ export declare class LocationGenerator { private containerHelper; private presetHelper; private configServer; - locationConfig: ILocationConfig; + private locationConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, objectId: ObjectId, randomUtil: RandomUtil, ragfairServerHelper: RagfairServerHelper, itemHelper: ItemHelper, mathUtil: MathUtil, gameEventHelper: GameEventHelper, containerHelper: ContainerHelper, presetHelper: PresetHelper, configServer: ConfigServer); generateContainerLoot(containerIn: IStaticContainerProps, staticForced: IStaticForcedProps[], staticLootDist: Record, staticAmmoDist: Record, locationName: string): IStaticContainerProps; private getLooseLootMultiplerForLocation; diff --git a/TypeScript/5ReplaceMethod/types/generators/PMCLootGenerator.d.ts b/TypeScript/5ReplaceMethod/types/generators/PMCLootGenerator.d.ts index 1ac7ffe..601431b 100644 --- a/TypeScript/5ReplaceMethod/types/generators/PMCLootGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/generators/PMCLootGenerator.d.ts @@ -1,14 +1,13 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; -import { IBotConfig } from "../@types/spt/config/IBotConfig"; export declare class PMCLootGenerator { private itemHelper; private databaseServer; private configServer; private pocketLootPool; private backpackLootPool; - botConfig: IBotConfig; + private botConfig; constructor(itemHelper: ItemHelper, databaseServer: DatabaseServer, configServer: ConfigServer); generatePMCPocketLootPool(): string[]; generatePMCBackpackLootPool(): string[]; diff --git a/TypeScript/5ReplaceMethod/types/generators/RagfairAssortGenerator.d.ts b/TypeScript/5ReplaceMethod/types/generators/RagfairAssortGenerator.d.ts index dcdb057..8b52a90 100644 --- a/TypeScript/5ReplaceMethod/types/generators/RagfairAssortGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/generators/RagfairAssortGenerator.d.ts @@ -1,4 +1,4 @@ -import { Item } from "../@types/eft/common/tables/IItem"; +import { Item } from "../models/eft/common/tables/IItem"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "../helpers/ItemHelper"; import { HashUtil } from "../utils/HashUtil"; diff --git a/TypeScript/5ReplaceMethod/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/5ReplaceMethod/types/generators/RagfairOfferGenerator.d.ts index d28d3af..cb2566c 100644 --- a/TypeScript/5ReplaceMethod/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/generators/RagfairOfferGenerator.d.ts @@ -2,9 +2,9 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; import { SaveServer } from "../servers/SaveServer"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; -import { IBarterScheme } from "../@types/eft/common/tables/ITrader"; -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { IBarterScheme } from "../models/eft/common/tables/ITrader"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { Item } from "../models/eft/common/tables/IItem"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; @@ -15,7 +15,7 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { RagfairPriceService } from "../services/RagfairPriceService"; import { FenceService } from "../services/FenceService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairOfferGenerator { private logger; private jsonUtil; diff --git a/TypeScript/5ReplaceMethod/types/generators/WeatherGenerator.d.ts b/TypeScript/5ReplaceMethod/types/generators/WeatherGenerator.d.ts index 5c340e2..b9faa3a 100644 --- a/TypeScript/5ReplaceMethod/types/generators/WeatherGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/generators/WeatherGenerator.d.ts @@ -1,7 +1,6 @@ import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; import { ConfigServer } from "../servers/ConfigServer"; -import { IWeatherData } from "../@types/eft/weather/IWeatherData"; -import { IWeatherConfig } from "../@types/spt/config/IWeatherConfig"; +import { IWeatherData } from "../models/eft/weather/IWeatherData"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class WeatherGenerator { @@ -9,7 +8,7 @@ export declare class WeatherGenerator { private randomUtil; private timeUtil; private configServer; - weatherConfig: IWeatherConfig; + private weatherConfig; constructor(weightedRandomHelper: WeightedRandomHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer); calculateTime(data: IWeatherData): IWeatherData; generateWeather(data: IWeatherData): IWeatherData; diff --git a/TypeScript/5ReplaceMethod/types/helpers/AssortHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/AssortHelper.d.ts index 95b7bf2..33cb5c6 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/AssortHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/AssortHelper.d.ts @@ -1,6 +1,6 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "./ItemHelper"; import { QuestHelper } from "./QuestHelper"; diff --git a/TypeScript/5ReplaceMethod/types/helpers/BotGeneratorHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/BotGeneratorHelper.d.ts index 83f7068..c3cf4d3 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/BotGeneratorHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/BotGeneratorHelper.d.ts @@ -1,10 +1,9 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; -import { IBotConfig } from "../@types/spt/config/IBotConfig"; -import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData"; -import { ModsChances, Mods } from "../@types/eft/common/tables/IBotType"; -import { Item, Upd } from "../@types/eft/common/tables/IItem"; -import { ITemplateItem } from "../@types/eft/common/tables/ITemplateItem"; +import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { ModsChances, Mods } 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 { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; @@ -12,7 +11,7 @@ import { RandomUtil } from "../utils/RandomUtil"; import { InventoryHelper } from "./InventoryHelper"; import { ContainerHelper } from "./ContainerHelper"; import { ItemHelper } from "./ItemHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; declare class BotGeneratorHelper { private logger; private jsonUtil; @@ -24,7 +23,7 @@ declare class BotGeneratorHelper { private inventoryHelper; private containerHelper; private configServer; - botConfig: IBotConfig; + private botConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer); generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances, isPmc?: boolean): Item[]; /** @@ -44,7 +43,6 @@ declare class BotGeneratorHelper { }; private getModTplFromItemDb; isItemIncompatibleWithCurrentItems(items: Item[], tplToCheck: string, equipmentSlot: string): boolean; - getBiasedRandomNumber(min: number, max: number, shift: number, n: number): number; /** Adds an item with all its childern into specified equipmentSlots, wherever it fits. * Returns a `boolean` indicating success. */ addItemWithChildrenToEquipmentSlot(equipmentSlots: string[], parentId: string, parentTpl: string, itemWithChildren: Item[], inventory: PmcInventory): boolean; diff --git a/TypeScript/5ReplaceMethod/types/helpers/BotHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/BotHelper.d.ts index 231e114..032218b 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/BotHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/BotHelper.d.ts @@ -1,9 +1,9 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { Difficulty } from "../@types/eft/common/tables/IBotType"; +import { Difficulty } from "../models/eft/common/tables/IBotType"; import { ConfigServer } from "../servers/ConfigServer"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class BotHelper { private logger; private jsonUtil; diff --git a/TypeScript/5ReplaceMethod/types/helpers/DialogueHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/DialogueHelper.d.ts index abe13de..d8082e4 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/DialogueHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/DialogueHelper.d.ts @@ -1,7 +1,7 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { ItemHelper } from "./ItemHelper"; -import { Dialogue, MessageContent, MessagePreview, MessageType } from "../@types/eft/profile/IAkiProfile"; +import { Dialogue, MessageContent, MessagePreview, MessageType } from "../models/eft/profile/IAkiProfile"; import { HashUtil } from "../utils/HashUtil"; import { NotifierHelper } from "./NotifierHelper"; import { NotificationSendHelper } from "./NotificationSendHelper"; diff --git a/TypeScript/5ReplaceMethod/types/helpers/DurabilityLimitsHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/DurabilityLimitsHelper.d.ts index 70f545b..ee8c887 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/DurabilityLimitsHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/DurabilityLimitsHelper.d.ts @@ -1,13 +1,12 @@ import { ConfigServer } from "../servers/ConfigServer"; -import { IBotConfig } from "../@types/spt/config/IBotConfig"; -import { ITemplateItem } from "../@types/eft/common/tables/ITemplateItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { RandomUtil } from "../utils/RandomUtil"; import { BotHelper } from "./BotHelper"; export declare class DurabilityLimitsHelper { private randomUtil; private botHelper; private configServer; - botConfig: IBotConfig; + private botConfig; constructor(randomUtil: RandomUtil, botHelper: BotHelper, configServer: ConfigServer); getRandomisedMaxWeaponDurability(itemTemplate: ITemplateItem, botRole: string): number; getRandomisedMaxArmorDurability(itemTemplate: ITemplateItem, botRole: string): number; diff --git a/TypeScript/5ReplaceMethod/types/helpers/ExtendedProfileHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/ExtendedProfileHelper.d.ts new file mode 100644 index 0000000..22ead31 --- /dev/null +++ b/TypeScript/5ReplaceMethod/types/helpers/ExtendedProfileHelper.d.ts @@ -0,0 +1,22 @@ +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 { 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); + generatePlayerScav(sessionID: string): IPmcData; + private getScavSkills; + private removeSecureContainer; + private getDefaultScavSkills; + private getScavStats; + private getScavLevel; + private getScavExperience; + private setScavCooldownTimer; +} diff --git a/TypeScript/5ReplaceMethod/types/helpers/HealthHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/HealthHelper.d.ts index 6cbbe45..fb5bed7 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/HealthHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/HealthHelper.d.ts @@ -1,19 +1,18 @@ import { SaveServer } from "../servers/SaveServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IAkiProfile } from "../@types/eft/profile/IAkiProfile"; -import { ISyncHealthRequestData } from "../@types/eft/health/ISyncHealthRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; import { ConfigServer } from "../servers/ConfigServer"; -import { IHealthConfig } from "../@types/spt/config/IHealthConfig"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class HealthHelper { private jsonUtil; private logger; private timeUtil; private saveServer; private configServer; - healthConfig: IHealthConfig; + private healthConfig; constructor(jsonUtil: JsonUtil, logger: ILogger, timeUtil: TimeUtil, saveServer: SaveServer, configServer: ConfigServer); resetVitality(sessionID: string): IAkiProfile; saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string): void; diff --git a/TypeScript/5ReplaceMethod/types/helpers/HideoutHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/HideoutHelper.d.ts index 08f30e6..d60e370 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/HideoutHelper.d.ts @@ -1,21 +1,21 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { IPmcData, Production, Productive } from "../@types/eft/common/IPmcData"; -import { IHideoutSingleProductionStartRequestData } from "../@types/eft/hideout/IHideoutSingleProductionStartRequestData"; -import { StageBonus } from "../@types/eft/hideout/IHideoutArea"; +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 "../@types/eft/hideout/IHideoutContinousProductionStartRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { PlayerService } from "../services/PlayerService"; -import { IHideoutTakeProductionRequestData } from "../@types/eft/hideout/IHideoutTakeProductionRequestData"; +import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; import { InventoryHelper } from "./InventoryHelper"; -import { ITemplateItem } from "../@types/eft/common/tables/ITemplateItem"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class HideoutHelper { private logger; private hashUtil; @@ -29,15 +29,15 @@ export declare class HideoutHelper { private playerService; private configServer; static BITCOIN_FARM: string; - static WATER_COLLECTOR: string; - static BITCOIN: string; - static EXPEDITIONARY_FUEL_TANK: string; + private WATER_COLLECTOR; + private BITCOIN; + private EXPEDITIONARY_FUEL_TANK; static NAME_BACKENDCOUNTERS_CRAFTING: string; static SKILL_NAME_HIDEOUT: string; static HOUR_FOR_SKILL_CRAFTING: number; static SKILL_NAME_CRAFITING: string; private hideoutConfig; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, itemEventRouter: ItemEventRouter, httpResponse: HttpResponse, profileHelper: ProfileHelper, inventoryHelper: InventoryHelper, playerService: PlayerService, configServer: ConfigServer); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, inventoryHelper: InventoryHelper, playerService: PlayerService, configServer: ConfigServer); registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; /** * This convinience function intialies new Production Object diff --git a/TypeScript/5ReplaceMethod/types/helpers/InRaidHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/InRaidHelper.d.ts index 24e5f54..e79d384 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/InRaidHelper.d.ts @@ -1,7 +1,7 @@ -import { IPmcData, Victim } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { IPmcData, Victim } 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 { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { JsonUtil } from "../utils/JsonUtil"; diff --git a/TypeScript/5ReplaceMethod/types/helpers/InsuranceHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/InsuranceHelper.d.ts deleted file mode 100644 index 0bfa37b..0000000 --- a/TypeScript/5ReplaceMethod/types/helpers/InsuranceHelper.d.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData"; -import { IInsuranceConfig } from "../@types/spt/config/IInsuranceConfig"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { InsuranceService } from "../services/InsuranceService"; -import { Logger } from "../utils/Logger"; -import { RandomUtil } from "../utils/RandomUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { DialogueHelper } from "./DialogueHelper"; -import { InventoryHelper } from "./InventoryHelper"; -import { TraderHelper } from "./TraderHelper"; -export declare class InsuranceHelper { - private logger; - private insuranceService; - private inventoryHelper; - private randomUtil; - private timeUtil; - private saveServer; - private databaseServer; - private traderHelper; - private dialogueHelper; - private configServer; - insuranceConfig: IInsuranceConfig; - constructor(logger: Logger, insuranceService: InsuranceService, inventoryHelper: InventoryHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, configServer: ConfigServer); - storeLostGear(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; - addGearToSend(pmcData: IPmcData, insuredItem: any, actualItem: any, sessionID: string): any; - storeInsuredItemsForReturn(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; - sendInsuredItems(pmcData: IPmcData, sessionID: string): void; - getPremium(pmcData: IPmcData, inventoryItem: Item, traderId: string): number; -} diff --git a/TypeScript/5ReplaceMethod/types/helpers/InventoryHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/InventoryHelper.d.ts index 5d17048..4b3460c 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/InventoryHelper.d.ts @@ -1,6 +1,6 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { FenceService } from "../services/FenceService"; @@ -10,12 +10,12 @@ import { PaymentHelper } from "./PaymentHelper"; import { ProfileHelper } from "./ProfileHelper"; import { DialogueHelper } from "./DialogueHelper"; import { HashUtil } from "../utils/HashUtil"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; -import { IInventoryMoveRequestData } from "../@types/eft/inventory/IInventoryMoveRequestData"; -import { IInventorySplitRequestData } from "../@types/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMergeRequestData } from "../@types/eft/inventory/IInventoryMergeRequestData"; -import { ILogger } from "../@types/spt/utils/ILogger"; +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 { TraderAssortHelper } from "./TraderAssortHelper"; export interface OwnerInventoryItems { from: Item[]; @@ -38,19 +38,12 @@ export declare class InventoryHelper { private profileHelper; private configServer; private inventoryConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, httpResponse: HttpResponse, fenceService: FenceService, databaseServer: DatabaseServer, paymentHelper: PaymentHelper, traderAssortHelper: TraderAssortHelper, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, containerHelper: ContainerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); + 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; removeItem(pmcData: IPmcData, itemId: string, sessionID: string, output?: IItemEventRouterResponse): IItemEventRouterResponse; - getSecureContainerItems(items: Item[]): string[]; getItemSize(itemTpl: string, itemID: string, inventoryItem: Item[]): Record; private getSizeByInventoryItemHash; private getInventoryItemHash; - /** - * Recursively checks if the given item is - * inside the stash, that is it has the stash as - * ancestor with slotId=hideout - */ - isItemInStash(pmcData: IPmcData, item: Item): boolean; getContainerMap(containerW: number, containerH: number, itemList: Item[], containerId: string): number[][]; /** * Based on the item action, determine whose inventories we should be looking at for from and to. diff --git a/TypeScript/5ReplaceMethod/types/helpers/ItemHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/ItemHelper.d.ts index 2c894e6..8c1175a 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/ItemHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/ItemHelper.d.ts @@ -1,10 +1,10 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { InsuredItem, IPmcData } from "../@types/eft/common/IPmcData"; -import { ITemplateItem, StackSlot } from "../@types/eft/common/tables/ITemplateItem"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { InsuredItem, IPmcData } from "../models/eft/common/IPmcData"; +import { ITemplateItem, StackSlot } from "../models/eft/common/tables/ITemplateItem"; +import { Item } from "../models/eft/common/tables/IItem"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; declare class ItemHelper { private logger; private hashUtil; diff --git a/TypeScript/5ReplaceMethod/types/helpers/NotificationSendHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/NotificationSendHelper.d.ts index 40b6dec..b9298da 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/NotificationSendHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/NotificationSendHelper.d.ts @@ -1,5 +1,5 @@ -import { INotification } from "../@types/eft/notifier/INotifier"; -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +import { INotification } from "../models/eft/notifier/INotifier"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; import { NotificationService } from "../services/NotificationService"; export declare class NotificationSendHelper { private httpServer; diff --git a/TypeScript/5ReplaceMethod/types/helpers/NotifierHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/NotifierHelper.d.ts index 9998054..0d524e9 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/NotifierHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/NotifierHelper.d.ts @@ -1,5 +1,5 @@ -import { INotification } from "../@types/eft/notifier/INotifier"; -import { Message, MessageContentRagfair } from "../@types/eft/profile/IAkiProfile"; +import { INotification } from "../models/eft/notifier/INotifier"; +import { Message, MessageContentRagfair } from "../models/eft/profile/IAkiProfile"; import { HttpServerHelper } from "./HttpServerHelper"; export declare class NotifierHelper { private httpServerHelper; diff --git a/TypeScript/5ReplaceMethod/types/helpers/PresetHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/PresetHelper.d.ts index 7695248..0a24128 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/PresetHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/PresetHelper.d.ts @@ -1,4 +1,4 @@ -import { Preset } from "../@types/eft/common/IGlobals"; +import { Preset } from "../models/eft/common/IGlobals"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class PresetHelper { private databaseServer; diff --git a/TypeScript/5ReplaceMethod/types/helpers/ProfileHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/ProfileHelper.d.ts index 1d868b1..515e55e 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/ProfileHelper.d.ts @@ -1,44 +1,33 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { FenceService } from "../services/FenceService"; -import { IPmcData, Skills, Stats } from "../@types/eft/common/IPmcData"; -import { IAkiProfile } from "../@types/eft/profile/IAkiProfile"; -import { IValidateNicknameRequestData } from "../@types/eft/profile/IValidateNicknameRequestData"; +import { IPmcData, Stats } from "../models/eft/common/IPmcData"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { ItemHelper } from "./ItemHelper"; -import { IWatermark } from "../@types/spt/utils/IWatermark"; -import { BotGenerator } from "../generators/BotGenerator"; +import { IWatermark } from "../models/spt/utils/IWatermark"; export declare class ProfileHelper { - private jsonUtil; - private watermark; - private timeUtil; - private saveServer; - private databaseServer; - private botGenerator; - private itemHelper; - private fenceService; - constructor(jsonUtil: JsonUtil, watermark: IWatermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, botGenerator: BotGenerator, itemHelper: ItemHelper, fenceService: FenceService); + protected jsonUtil: JsonUtil; + protected watermark: IWatermark; + 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); resetProfileQuestCondition(sessionID: string, conditionId: string): void; getCompleteProfile(sessionID: string): IPmcData[]; - private isWiped; - getFullProfile(sessionID: string): IAkiProfile; - getPmcProfile(sessionID: string): IPmcData; - getScavProfile(sessionID: string): IPmcData; - setScavProfile(sessionID: string, scavData: IPmcData): void; - getScavSkills(sessionID: string): Skills; - generatePlayerScav(sessionID: string): IPmcData; - private removeSecureContainer; - private getDefaultScavSkills; - getScavStats(sessionID: string): Stats; - getDefaultCounters(): Stats; - getServerVersion(): string; - getScavLevel(sessionID: string): number; - getScavExperience(sessionID: string): number; - setScavCooldownTimer(profile: IPmcData, pmcData: IPmcData): IPmcData; isNicknameTaken(info: IValidateNicknameRequestData, sessionID: string): boolean; getProfileByPmcId(pmcId: string): IPmcData; getExperience(level: number): number; getMaxLevel(): number; getDefaultAkiDataObject(): any; + getFullProfile(sessionID: string): IAkiProfile; + getPmcProfile(sessionID: string): IPmcData; + getScavProfile(sessionID: string): IPmcData; + getDefaultCounters(): Stats; + private isWiped; + private getServerVersion; } diff --git a/TypeScript/5ReplaceMethod/types/helpers/QuestConditionHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/QuestConditionHelper.d.ts index 8f7b706..2a0ee94 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/QuestConditionHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/QuestConditionHelper.d.ts @@ -1,4 +1,4 @@ -import { AvailableForConditions } from "../@types/eft/common/tables/IQuest"; +import { AvailableForConditions } from "../models/eft/common/tables/IQuest"; export declare class QuestConditionHelper { getQuestConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; getLevelConditions(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 c29158b..3474884 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/QuestHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/QuestHelper.d.ts @@ -8,15 +8,14 @@ import { ProfileHelper } from "./ProfileHelper"; import { DialogueHelper } from "./DialogueHelper"; import { PaymentHelper } from "./PaymentHelper"; import { TraderHelper } from "./TraderHelper"; -import { IPmcData, Quest } from "../@types/eft/common/IPmcData"; -import { AvailableForConditions, AvailableForProps, IQuest, Reward } from "../@types/eft/common/tables/IQuest"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IAcceptQuestRequestData } from "../@types/eft/quests/IAcceptQuestRequestData"; -import { ICompleteQuestRequestData } from "../@types/eft/quests/ICompleteQuestRequestData"; +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 { IQuestConfig } from "../@types/spt/config/IQuestConfig"; import { RagfairServerHelper } from "./RagfairServerHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class QuestHelper { private logger; private jsonUtil; @@ -31,7 +30,7 @@ export declare class QuestHelper { private paymentHelper; private traderHelper; private configServer; - questConfig: IQuestConfig; + private questConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer); static get STATUS(): Record; questStatus(pmcData: IPmcData, questID: string): string; diff --git a/TypeScript/5ReplaceMethod/types/helpers/RagfairHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/RagfairHelper.d.ts index 7d867bb..2bce4a6 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/RagfairHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/RagfairHelper.d.ts @@ -1,15 +1,15 @@ import { JsonUtil } from "../utils/JsonUtil"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; -import { IGetOffersResult } from "../@types/eft/ragfair/IGetOffersResult"; -import { ISearchRequestData } from "../@types/eft/ragfair/ISearchRequestData"; +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 { DatabaseServer } from "../servers/DatabaseServer"; 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 "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; import { TraderAssortHelper } from "./TraderAssortHelper"; export declare class RagfairHelper { private logger; diff --git a/TypeScript/5ReplaceMethod/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/RagfairOfferHelper.d.ts index 873271f..da3ceb8 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/RagfairOfferHelper.d.ts @@ -1,9 +1,9 @@ import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; -import { ISearchRequestData } from "../@types/eft/ragfair/ISearchRequestData"; +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 { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { RagfairOfferService } from "../services/RagfairOfferService"; @@ -17,7 +17,7 @@ import { ConfigServer } from "../servers/ConfigServer"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { RagfairSortHelper } from "./RagfairSortHelper"; import { RagfairHelper } from "./RagfairHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairOfferHelper { private logger; private timeUtil; diff --git a/TypeScript/5ReplaceMethod/types/helpers/RagfairSellHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/RagfairSellHelper.d.ts index 2e21589..929d112 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/RagfairSellHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/RagfairSellHelper.d.ts @@ -1,6 +1,5 @@ -import { SellResult } from "../@types/eft/ragfair/IRagfairOffer"; -import { IRagfairConfig } from "../@types/spt/config/IRagfairConfig"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { SellResult } from "../models/eft/ragfair/IRagfairOffer"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; @@ -9,7 +8,7 @@ export declare class RagfairSellHelper { private randomUtil; private timeUtil; private configServer; - ragfairConfig: IRagfairConfig; + private ragfairConfig; constructor(logger: ILogger, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer); calculateSellChance(baseChance: number, offerPrice: number, requirementsPriceInRub: number): number; rollForSale(sellChance: number, count: number): SellResult[]; diff --git a/TypeScript/5ReplaceMethod/types/helpers/RagfairServerHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/RagfairServerHelper.d.ts index 51b02cb..9a26261 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/RagfairServerHelper.d.ts @@ -1,13 +1,13 @@ import { SaveServer } from "../servers/SaveServer"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { ITemplateItem } from "../@types/eft/common/tables/ITemplateItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { ItemHelper } from "./ItemHelper"; import { ProfileHelper } from "./ProfileHelper"; -import { MemberCategory } from "../@types/eft/common/MemberCategory"; +import { MemberCategory } from "../models/eft/common/MemberCategory"; import { ConfigServer } from "../servers/ConfigServer"; import { RandomUtil } from "../utils/RandomUtil"; import { DialogueHelper } from "./DialogueHelper"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { Item } from "../models/eft/common/tables/IItem"; import { JsonUtil } from "../utils/JsonUtil"; import { HashUtil } from "../utils/HashUtil"; export declare class RagfairServerHelper { diff --git a/TypeScript/5ReplaceMethod/types/helpers/RagfairSortHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/RagfairSortHelper.d.ts index fbd4b78..e9d8069 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/RagfairSortHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/RagfairSortHelper.d.ts @@ -1,4 +1,4 @@ -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class RagfairSortHelper { private databaseServer; diff --git a/TypeScript/5ReplaceMethod/types/helpers/RagfairTaxHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/RagfairTaxHelper.d.ts index bb78afd..e87334f 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/RagfairTaxHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/RagfairTaxHelper.d.ts @@ -1,9 +1,9 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; import { DatabaseServer } from "../servers/DatabaseServer"; import { RagfairPriceService } from "../services/RagfairPriceService"; import { ItemHelper } from "./ItemHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairTaxHelper { private logger; private databaseServer; diff --git a/TypeScript/5ReplaceMethod/types/helpers/RepairHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/RepairHelper.d.ts index f2852d7..d11d0d2 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/RepairHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/RepairHelper.d.ts @@ -1,18 +1,17 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; import { ConfigServer } from "../servers/ConfigServer"; -import { IRepairConfig } from "../@types/spt/config/IRepairConfig"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RepairHelper { private logger; private jsonUtil; private randomUtil; private databaseServer; private configServer; - repairConfig: IRepairConfig; + private repairConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); updateItemDurability(itemToRepairId: string, amountToRepair: number, pmcData: IPmcData, useRepairKit?: boolean): Item; private getRandomisedArmorRepairDegredationValue; diff --git a/TypeScript/5ReplaceMethod/types/helpers/SecureContainerHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/SecureContainerHelper.d.ts new file mode 100644 index 0000000..8f246b6 --- /dev/null +++ b/TypeScript/5ReplaceMethod/types/helpers/SecureContainerHelper.d.ts @@ -0,0 +1,13 @@ +import { Item } from "../models/eft/common/tables/IItem"; +import { ItemHelper } from "./ItemHelper"; +export interface OwnerInventoryItems { + from: Item[]; + to: Item[]; + sameInventory: boolean; + isMail: boolean; +} +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 f3d9a50..0712ff4 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/TradeHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/TradeHelper.d.ts @@ -3,14 +3,14 @@ import { InventoryHelper } from "../helpers/InventoryHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { FenceService } from "../services/FenceService"; import { PaymentService } from "../services/PaymentService"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IProcessBuyTradeRequestData } from "../@types/eft/trade/IProcessBuyTradeRequestData"; -import { IProcessSellTradeRequestData } from "../@types/eft/trade/IProcessSellTradeRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { Upd } from "../@types/eft/common/tables/IItem"; +import { IPmcData } from "../models/eft/common/IPmcData"; +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 "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class TradeHelper { private logger; private itemEventRouter; diff --git a/TypeScript/5ReplaceMethod/types/helpers/TraderAssortHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/TraderAssortHelper.d.ts index 7dfed48..d95879c 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/TraderAssortHelper.d.ts @@ -1,5 +1,5 @@ -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { ILogger } from "../models/spt/utils/ILogger"; import { RagfairAssortGenerator } from "../generators/RagfairAssortGenerator"; import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; import { DatabaseServer } from "../servers/DatabaseServer"; diff --git a/TypeScript/5ReplaceMethod/types/helpers/TraderHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/TraderHelper.d.ts index d9f37a7..5440afe 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/TraderHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/TraderHelper.d.ts @@ -6,10 +6,10 @@ import { ItemHelper } from "./ItemHelper"; import { ProfileHelper } from "./ProfileHelper"; import { PaymentHelper } from "./PaymentHelper"; import { FenceService } from "../services/FenceService"; -import { IBarterScheme, ITraderAssort, ITraderBase, LoyaltyLevel } from "../@types/eft/common/tables/ITrader"; -import { IPmcData } from "../@types/eft/common/IPmcData"; +import { IBarterScheme, ITraderAssort, ITraderBase, LoyaltyLevel } from "../models/eft/common/tables/ITrader"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class TraderHelper { private logger; private databaseServer; diff --git a/TypeScript/5ReplaceMethod/types/ide/CheckVersion.d.ts b/TypeScript/5ReplaceMethod/types/ide/CheckVersion.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/5ReplaceMethod/types/ide/CheckVersion.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/5ReplaceMethod/types/ide/Compiler.d.ts b/TypeScript/5ReplaceMethod/types/ide/Compiler.d.ts index cb0ff5c..fded23a 100644 --- a/TypeScript/5ReplaceMethod/types/ide/Compiler.d.ts +++ b/TypeScript/5ReplaceMethod/types/ide/Compiler.d.ts @@ -1 +1 @@ -export {}; +import "reflect-metadata"; diff --git a/TypeScript/5ReplaceMethod/types/loaders/DelayedModLoader.d.ts b/TypeScript/5ReplaceMethod/types/loaders/DelayedModLoader.d.ts index ed6d3f8..db86c75 100644 --- a/TypeScript/5ReplaceMethod/types/loaders/DelayedModLoader.d.ts +++ b/TypeScript/5ReplaceMethod/types/loaders/DelayedModLoader.d.ts @@ -3,13 +3,15 @@ import { VFS } from "../utils/VFS"; import { InitialModLoader } from "./InitialModLoader"; import { BundleLoader } from "./BundleLoader"; import { HandbookController } from "../controllers/HandbookController"; -import { IModLoader } from "../@types/spt/mod/IModLoader"; +import { IModLoader } from "../models/spt/mod/IModLoader"; +import { ModCompilerService } from "../services/ModCompilerService"; export declare class DelayedModLoader implements IModLoader { private bundleLoader; private handbookController; private vfs; + private modCompilerService; private initialModLoader; - constructor(bundleLoader: BundleLoader, handbookController: HandbookController, vfs: VFS, initialModLoader: InitialModLoader); + constructor(bundleLoader: BundleLoader, handbookController: HandbookController, vfs: VFS, modCompilerService: ModCompilerService, initialModLoader: InitialModLoader); getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; getImportedModsNames(): string[]; diff --git a/TypeScript/5ReplaceMethod/types/loaders/IMod.d.ts b/TypeScript/5ReplaceMethod/types/loaders/IMod.d.ts deleted file mode 100644 index 20813f9..0000000 --- a/TypeScript/5ReplaceMethod/types/loaders/IMod.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export interface IMod { - onload(): any; -} -export interface IContainerMod extends IMod { - onContainerLoad(): any; -} diff --git a/TypeScript/5ReplaceMethod/types/loaders/InitialModLoader.d.ts b/TypeScript/5ReplaceMethod/types/loaders/InitialModLoader.d.ts index 612c821..35503c8 100644 --- a/TypeScript/5ReplaceMethod/types/loaders/InitialModLoader.d.ts +++ b/TypeScript/5ReplaceMethod/types/loaders/InitialModLoader.d.ts @@ -1,20 +1,24 @@ -import { DependencyContainer } from 'tsyringe'; +import { DependencyContainer } from "tsyringe"; import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; -import { IModLoader } from "../@types/spt/mod/IModLoader"; -import { ILogger } from '../@types/spt/utils/ILogger'; +import { ModCompilerService } from "../services/ModCompilerService"; +import { HashCacheService } from "../services/HashCacheService"; +import { IModLoader } from "../models/spt/mod/IModLoader"; export declare class InitialModLoader implements IModLoader { private logger; private vfs; private jsonUtil; + private modCompilerService; + private hashCacheService; private configServer; - private basepath; + private readonly basepath; private imported; private onLoad; private akiConfig; - constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, configServer: ConfigServer); - load(container: DependencyContainer): void; + constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, hashCacheService: HashCacheService, configServer: ConfigServer); + load(container: DependencyContainer): Promise; getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; getImportedModsNames(): string[]; @@ -23,7 +27,9 @@ export declare class InitialModLoader implements IModLoader { private importMods; private isModCombatibleWithAki; private executeMods; + private sortModsLoadOrder; private addMod; + private compileModIfNeeded; private areModDependenciesFulfilled; private isModCompatible; private validMod; diff --git a/TypeScript/5ReplaceMethod/types/loaders/ModLoader.d.ts b/TypeScript/5ReplaceMethod/types/loaders/ModLoader.d.ts deleted file mode 100644 index eed6d69..0000000 --- a/TypeScript/5ReplaceMethod/types/loaders/ModLoader.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { IPackageJsonData } from "../@types/spt/mod/IPackageJsonData"; -export declare class ModLoader { - static basepath: string; - static imported: {}; - static onLoad: {}; - static load(): void; - static getBundles(local: any): string; - static getBundle(key: any, arg1: any): void; - static importClass(name: string, filepath: string): void; - static importMods(): void; - static isModCombatibleWithAki(mod: IPackageJsonData): boolean; - static executeMods(): void; - static getModPath(mod: string): string; - static addMod(mod: string): void; - static areModDependenciesFulfilled(mod: IPackageJsonData, loadedMods: any): boolean; - static isModCompatible(mod: any, loadedMods: any): boolean; - static validMod(mod: any): boolean; - static getLoadOrderRecursive(mod: any, result: any, visited: any): void; - static getLoadOrder(mods: any): {}; -} diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/bot/IGenerateBotsRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/bot/IGenerateBotsRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/bot/IGenerateBotsRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/bot/IGenerateBotsRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/common/IEmptyRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/IEmptyRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/common/IEmptyRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/common/IEmptyRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/common/IGlobals.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/IGlobals.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/common/IGlobals.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/common/IGlobals.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/common/ILocation.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/ILocation.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/common/ILocation.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/common/ILocation.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/common/ILocationBase.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/ILocationBase.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/common/ILocationBase.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/common/ILocationBase.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/common/ILocationsSourceDestinationBase.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/ILocationsSourceDestinationBase.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/common/ILocationsSourceDestinationBase.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/common/ILocationsSourceDestinationBase.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/common/ILooseLoot.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/ILooseLoot.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/common/ILooseLoot.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/common/ILooseLoot.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/common/IMetricsTableData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/IMetricsTableData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/common/IMetricsTableData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/common/IMetricsTableData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/common/IPmcData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/IPmcData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/common/IPmcData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/common/IPmcData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/common/MemberCategory.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/MemberCategory.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/common/MemberCategory.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/common/MemberCategory.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/common/request/IBaseInteractionRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/request/IBaseInteractionRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/common/request/IBaseInteractionRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/common/request/IBaseInteractionRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/common/tables/IBotBase.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IBotBase.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/common/tables/IBotBase.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/common/tables/IBotBase.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/common/tables/IBotCore.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IBotCore.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/common/tables/IBotCore.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/common/tables/IBotCore.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/common/tables/IBotType.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IBotType.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/common/tables/IBotType.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/common/tables/IBotType.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/common/tables/ICustomizationItem.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ICustomizationItem.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/common/tables/ICustomizationItem.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/common/tables/ICustomizationItem.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/common/tables/IHandbookBase.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IHandbookBase.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/common/tables/IHandbookBase.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/common/tables/IHandbookBase.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/common/tables/IItem.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IItem.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/common/tables/IItem.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/common/tables/IItem.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/common/tables/ILocationsBase.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ILocationsBase.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/common/tables/ILocationsBase.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/common/tables/ILocationsBase.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/common/tables/ILootBase.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ILootBase.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/common/tables/ILootBase.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/common/tables/ILootBase.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/common/tables/IQuest.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IQuest.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/common/tables/IQuest.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/common/tables/IQuest.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IRepeatableQuests.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/common/tables/IRepeatableQuests.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/common/tables/IRepeatableQuests.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/common/tables/ITemplateItem.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ITemplateItem.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/common/tables/ITemplateItem.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/common/tables/ITemplateItem.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/common/tables/ITrader.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ITrader.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/common/tables/ITrader.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/common/tables/ITrader.d.ts diff --git a/TypeScript/5ReplaceMethod/types/models/eft/customization/IBuyClothingRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/customization/IBuyClothingRequestData.d.ts new file mode 100644 index 0000000..d19b70d --- /dev/null +++ b/TypeScript/5ReplaceMethod/types/models/eft/customization/IBuyClothingRequestData.d.ts @@ -0,0 +1,10 @@ +export interface IBuyClothingRequestData { + Action: "CustomizationBuy"; + offer: string; + items: ClothingItem[]; +} +export interface ClothingItem { + del: boolean; + id: string; + count: number; +} diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/customization/IWearClothingRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/customization/IWearClothingRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/customization/IWearClothingRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/customization/IWearClothingRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/dialog/IFriendRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IFriendRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/dialog/IFriendRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/dialog/IFriendRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/dialog/IGetAllAttachmentsRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/dialog/IGetAllAttachmentsRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/dialog/IGetAllAttachmentsResponse.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/dialog/IGetAllAttachmentsResponse.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/dialog/IGetChatServerListRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetChatServerListRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/dialog/IGetChatServerListRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetChatServerListRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/dialog/IGetFriendListDataResponse.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetFriendListDataResponse.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/dialog/IGetFriendListDataResponse.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetFriendListDataResponse.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/dialog/IGetMailDialogInfoRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/dialog/IGetMailDialogInfoRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/dialog/IGetMailDialogListRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/dialog/IGetMailDialogListRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/dialog/IGetMailDialogViewRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/dialog/IGetMailDialogViewRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/dialog/IGetMailDialogViewResponseData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/dialog/IGetMailDialogViewResponseData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/dialog/IPinDialogRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IPinDialogRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/dialog/IPinDialogRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/dialog/IPinDialogRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/dialog/IRemoveDialogRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/dialog/IRemoveDialogRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/dialog/IRemoveDialogRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/dialog/IRemoveDialogRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/dialog/ISendMessageRequest.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/dialog/ISendMessageRequest.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/dialog/ISendMessageRequest.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/dialog/ISendMessageRequest.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/dialog/ISetDialogReadRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/dialog/ISetDialogReadRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/dialog/ISetDialogReadRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/dialog/ISetDialogReadRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/game/IGameConfigResponse.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/game/IGameConfigResponse.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/game/IGameConfigResponse.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/game/IGameConfigResponse.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/game/IGameEmptyCrcRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/game/IGameEmptyCrcRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/game/IGameEmptyCrcRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/game/IGameEmptyCrcRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/game/IVersionValidateRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/game/IVersionValidateRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/game/IVersionValidateRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/game/IVersionValidateRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/health/IHealthTreatmentRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/health/IHealthTreatmentRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/health/IHealthTreatmentRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/health/IHealthTreatmentRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/health/IOffraidEatRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/health/IOffraidEatRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/health/IOffraidEatRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/health/IOffraidEatRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/health/IOffraidHealRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/health/IOffraidHealRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/health/IOffraidHealRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/health/IOffraidHealRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/health/ISyncHealthRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/health/ISyncHealthRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/health/ISyncHealthRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/health/ISyncHealthRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/hideout/HideoutAreasEnum.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/HideoutAreasEnum.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/hideout/HideoutAreasEnum.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/hideout/HideoutAreasEnum.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/hideout/IHideoutArea.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutArea.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/hideout/IHideoutArea.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutArea.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/hideout/IHideoutProduction.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutProduction.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/hideout/IHideoutProduction.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutProduction.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/hideout/IHideoutPutItemInRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/hideout/IHideoutPutItemInRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/hideout/IHideoutScavCase.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutScavCase.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/hideout/IHideoutScavCase.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutScavCase.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/hideout/IHideoutScavCaseStartRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/hideout/IHideoutScavCaseStartRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/hideout/IHideoutSettingsBase.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutSettingsBase.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/hideout/IHideoutSettingsBase.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutSettingsBase.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/hideout/IHideoutTakeItemOutRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/hideout/IHideoutTakeItemOutRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/hideout/IHideoutTakeProductionRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/hideout/IHideoutTakeProductionRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/hideout/IHideoutToggleAreaRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/hideout/IHideoutToggleAreaRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/hideout/IHideoutUpgradeRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/hideout/IHideoutUpgradeRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/httpResponse/IGetBodyResponseData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/httpResponse/IGetBodyResponseData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/httpResponse/IGetBodyResponseData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/httpResponse/IGetBodyResponseData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/httpResponse/INullResponseData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/httpResponse/INullResponseData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/httpResponse/INullResponseData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/httpResponse/INullResponseData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/inRaid/IRegisterPlayerRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/inRaid/IRegisterPlayerRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/inRaid/ISaveProgressRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inRaid/ISaveProgressRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/inRaid/ISaveProgressRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/inRaid/ISaveProgressRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/insurance/IGetInsuranceCostRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/insurance/IGetInsuranceCostRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/insurance/IInsureRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/insurance/IInsureRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/insurance/IInsureRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/insurance/IInsureRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventoryAddRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryAddRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventoryAddRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryAddRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventoryBaseActionRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventoryBaseActionRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventoryBindRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryBindRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventoryBindRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryBindRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventoryCreateMarkerRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventoryCreateMarkerRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventoryEditMarkerRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventoryEditMarkerRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventoryExamineRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryExamineRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventoryExamineRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryExamineRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventoryFoldRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryFoldRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventoryFoldRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryFoldRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventoryMergeRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryMergeRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventoryMergeRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryMergeRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventoryMoveRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryMoveRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventoryMoveRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryMoveRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventoryRemoveRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventoryRemoveRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventorySortRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventorySortRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventorySortRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventorySortRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventorySplitRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventorySplitRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventorySplitRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventorySplitRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventorySwapRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventorySwapRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventorySwapRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventorySwapRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventoryTagRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryTagRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventoryTagRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryTagRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventoryToggleRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryToggleRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventoryToggleRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryToggleRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventoryTransferRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryTransferRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/inventory/IInventoryTransferRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/inventory/IInventoryTransferRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts diff --git a/TypeScript/5ReplaceMethod/types/models/eft/itemEvent/IItemEventRouterBase.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/itemEvent/IItemEventRouterBase.d.ts new file mode 100644 index 0000000..31e62fe --- /dev/null +++ b/TypeScript/5ReplaceMethod/types/models/eft/itemEvent/IItemEventRouterBase.d.ts @@ -0,0 +1,67 @@ +import { Skills } from "../common/IPmcData"; +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 { + warnings: Warning[]; + profileChanges: TProfileChanges | ""; +} +export declare type TProfileChanges = Record; +export interface Warning { + index: number; + err: string; + errmsg: string; +} +export interface ProfileChange { + _id: string; + experience: number; + quests: IQuest[]; + ragFairOffers: IRagfairOffer[]; + builds: BuildChange[]; + items: ItemChanges; + production: Record; + skills: Skills; + traderRelations: Record; + repeatableQuests?: IPmcDataRepeatableQuest[]; +} +export interface BuildChange { + id: string; + name: string; + root: string; + items: Item[]; +} +export interface ItemChanges { + new: Product[]; + change: Product[]; + del: Product[]; +} +export interface Production { + Progress: number; + StartTimestamp: number; + ProductionTime: number; + inProgress: boolean; + RecipeId: string; + Products: Product[]; +} +export interface Product { + _id: string; + _tpl?: string; + parentId?: string; + slotId?: string; + location?: ItemChangeLocation; + upd?: Upd; +} +export interface ItemChangeLocation { + x: number; + y: number; + r: number; + isSearched?: boolean; +} +export interface TraderRelations { + salesSum?: number; + standing?: number; + loyalty?: number; + unlocked?: boolean; + disabled?: boolean; +} diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/itemEvent/IItemEventRouterRequest.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/itemEvent/IItemEventRouterRequest.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/itemEvent/IItemEventRouterResponse.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/itemEvent/IItemEventRouterResponse.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/launcher/IChangeRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/launcher/IChangeRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/launcher/IChangeRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/launcher/IChangeRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/launcher/IGetMiniProfileRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/launcher/IGetMiniProfileRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/launcher/ILoginRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/launcher/ILoginRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/launcher/ILoginRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/launcher/ILoginRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/launcher/IMiniProfile.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/launcher/IMiniProfile.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/launcher/IMiniProfile.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/launcher/IMiniProfile.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/launcher/IRegisterData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/launcher/IRegisterData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/launcher/IRegisterData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/launcher/IRegisterData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/launcher/IRemoveProfileData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/launcher/IRemoveProfileData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/launcher/IRemoveProfileData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/launcher/IRemoveProfileData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/location/IGetLocationRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/location/IGetLocationRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/location/IGetLocationRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/location/IGetLocationRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/match/IEndOfflineRaidRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/match/IEndOfflineRaidRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/match/IEndOfflineRaidRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/match/IEndOfflineRaidRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/match/IStartOffineRaidRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/match/IStartOffineRaidRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/match/IStartOffineRaidRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/match/IStartOffineRaidRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/notes/INoteActionData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/notes/INoteActionData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/notes/INoteActionData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/notes/INoteActionData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/notifier/INotifier.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/notifier/INotifier.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/notifier/INotifier.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/notifier/INotifier.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/notifier/ISelectProfileRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/notifier/ISelectProfileRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/notifier/ISelectProfileRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/notifier/ISelectProfileRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/presetBuild/IPresetBuildActionRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/presetBuild/IPresetBuildActionRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/profile/IAkiProfile.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/profile/IAkiProfile.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/profile/IAkiProfile.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/profile/IAkiProfile.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/profile/IProfileChangeNicknameRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/profile/IProfileChangeNicknameRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/profile/IProfileChangeVoiceRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/profile/IProfileChangeVoiceRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/profile/IProfileCreateRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/profile/IProfileCreateRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/profile/IProfileCreateRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/profile/IProfileCreateRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/profile/ISearchFriendRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/profile/ISearchFriendRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/profile/ISearchFriendRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/profile/ISearchFriendRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/profile/ISearchFriendResponse.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/profile/ISearchFriendResponse.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/profile/ISearchFriendResponse.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/profile/ISearchFriendResponse.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/profile/IValidateNicknameRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/profile/IValidateNicknameRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/profile/IValidateNicknameRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/profile/IValidateNicknameRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/quests/IAcceptQuestRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/quests/IAcceptQuestRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/quests/IAcceptQuestRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/quests/IAcceptQuestRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/quests/ICompleteQuestRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/quests/ICompleteQuestRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/quests/ICompleteQuestRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/quests/ICompleteQuestRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/quests/IHandoverQuestRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/quests/IHandoverQuestRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/quests/IHandoverQuestRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/quests/IHandoverQuestRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/quests/IListQuestsRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/quests/IListQuestsRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/quests/IListQuestsRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/quests/IListQuestsRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/quests/IRepeatableQuestChangeRequest.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/quests/IRepeatableQuestChangeRequest.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/ragfair/IAddOfferRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IAddOfferRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/ragfair/IAddOfferRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/ragfair/IAddOfferRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/ragfair/IExtendOfferRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IExtendOfferRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/ragfair/IExtendOfferRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/ragfair/IExtendOfferRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/ragfair/IGetItemPriceResult.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IGetItemPriceResult.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/ragfair/IGetItemPriceResult.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/ragfair/IGetItemPriceResult.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/ragfair/IGetMarketPriceRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/ragfair/IGetMarketPriceRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/ragfair/IGetOffersResult.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IGetOffersResult.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/ragfair/IGetOffersResult.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/ragfair/IGetOffersResult.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IRagfairOffer.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/ragfair/IRagfairOffer.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/ragfair/IRagfairOffer.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/ragfair/IRemoveOfferRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/ragfair/IRemoveOfferRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/ragfair/ISearchRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/ragfair/ISearchRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/ragfair/ISearchRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/repair/IBaseRepairActionDataRequest.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/repair/IBaseRepairActionDataRequest.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/repair/IRepairActionDataRequest.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/repair/IRepairActionDataRequest.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/repair/IRepairActionDataRequest.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/repair/IRepairActionDataRequest.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/repair/ITraderRepairActionDataRequest.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/repair/ITraderRepairActionDataRequest.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/trade/IProcessBaseTradeRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/trade/IProcessBaseTradeRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/trade/IProcessBuyTradeRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/trade/IProcessBuyTradeRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/trade/IProcessRagfairTradeRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/trade/IProcessRagfairTradeRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/trade/IProcessSellTradeRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/trade/IProcessSellTradeRequestData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/trade/IProcessSellTradeRequestData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/trade/IProcessSellTradeRequestData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/eft/weather/IWeatherData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/weather/IWeatherData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/eft/weather/IWeatherData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/weather/IWeatherData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/eft/wishlist/IWishlistActionData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/wishlist/IWishlistActionData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/eft/wishlist/IWishlistActionData.d.ts rename to TypeScript/5ReplaceMethod/types/models/eft/wishlist/IWishlistActionData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/external/mod.d.ts b/TypeScript/5ReplaceMethod/types/models/external/mod.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/external/mod.d.ts rename to TypeScript/5ReplaceMethod/types/models/external/mod.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/external/tsyringe.d.ts b/TypeScript/5ReplaceMethod/types/models/external/tsyringe.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/external/tsyringe.d.ts rename to TypeScript/5ReplaceMethod/types/models/external/tsyringe.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/bindings/Route.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/bindings/Route.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/bindings/Route.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/bindings/Route.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IBotCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IBotCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IBotCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/IBotCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IBundleCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IBundleCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IBundleCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/IBundleCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/ICustomizationCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/ICustomizationCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/ICustomizationCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/ICustomizationCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IDataCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IDataCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IDataCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/IDataCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IDialogueCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IDialogueCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IDialogueCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/IDialogueCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IGameCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IGameCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IGameCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/IGameCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IHandbookCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IHandbookCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IHandbookCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/IHandbookCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IHealthCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IHealthCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IHealthCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/IHealthCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IHideoutCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IHideoutCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IHideoutCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/IHideoutCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IHttpCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IHttpCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IHttpCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/IHttpCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IInraidCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IInraidCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IInraidCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/IInraidCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IInsuranceCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IInsuranceCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IInsuranceCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/IInsuranceCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IInventoryCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IInventoryCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IInventoryCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/IInventoryCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IItemEventCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IItemEventCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IItemEventCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/IItemEventCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/ILauncherCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/ILauncherCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/ILauncherCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/ILauncherCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/ILocationCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/ILocationCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/ILocationCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/ILocationCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IMatchCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IMatchCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IMatchCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/IMatchCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IModCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IModCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IModCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/IModCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/INoteCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/INoteCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/INoteCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/INoteCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/INotifierCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/INotifierCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/INotifierCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/INotifierCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IPresetBuildCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IPresetBuildCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IPresetCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IPresetCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IPresetCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/IPresetCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IProfileCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IProfileCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IProfileCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/IProfileCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IQuestCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IQuestCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IQuestCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/IQuestCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IRagfairCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IRagfairCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IRagfairCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/IRagfairCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IRepairCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IRepairCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IRepairCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/IRepairCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/ISaveCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/ISaveCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/ISaveCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/ISaveCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/ITradeCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/ITradeCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/ITradeCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/ITradeCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/ITraderCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/ITraderCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/ITraderCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/ITraderCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IWeatherCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IWeatherCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IWeatherCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/IWeatherCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IWishlistCallbacks.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/callbacks/IWishlistCallbacks.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/callbacks/IWishlistCallbacks.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/callbacks/IWishlistCallbacks.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/config/IAirdropConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/IAirdropConfig.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/config/IAirdropConfig.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/config/IAirdropConfig.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/config/IBaseConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/IBaseConfig.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/config/IBaseConfig.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/config/IBaseConfig.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/config/IBotConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/IBotConfig.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/config/IBotConfig.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/config/IBotConfig.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/config/ICoreConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/ICoreConfig.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/config/ICoreConfig.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/config/ICoreConfig.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/config/IHealthConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/IHealthConfig.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/config/IHealthConfig.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/config/IHealthConfig.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/config/IHideoutConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/IHideoutConfig.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/config/IHideoutConfig.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/config/IHideoutConfig.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/config/IHttpConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/IHttpConfig.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/config/IHttpConfig.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/config/IHttpConfig.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/config/IInRaidConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/IInRaidConfig.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/config/IInRaidConfig.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/config/IInRaidConfig.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/config/IInsuranceConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/IInsuranceConfig.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/config/IInsuranceConfig.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/config/IInsuranceConfig.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/config/IInventoryConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/IInventoryConfig.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/config/IInventoryConfig.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/config/IInventoryConfig.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/config/ILocationConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/ILocationConfig.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/config/ILocationConfig.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/config/ILocationConfig.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/config/IMatchConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/IMatchConfig.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/config/IMatchConfig.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/config/IMatchConfig.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/config/IQuestConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/IQuestConfig.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/config/IQuestConfig.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/config/IQuestConfig.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/config/IRagfairConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/IRagfairConfig.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/config/IRagfairConfig.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/config/IRagfairConfig.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/config/IRepairConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/IRepairConfig.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/config/IRepairConfig.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/config/IRepairConfig.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/config/ITraderConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/ITraderConfig.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/config/ITraderConfig.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/config/ITraderConfig.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/config/IWeatherConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/IWeatherConfig.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/config/IWeatherConfig.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/config/IWeatherConfig.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/controllers/IBotController.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/controllers/IBotController.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/controllers/IBotController.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/controllers/IBotController.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/generators/IBotGenerator.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/generators/IBotGenerator.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/generators/IBotGenerator.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/generators/IBotGenerator.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/generators/ILocationGenerator.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/generators/ILocationGenerator.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/generators/ILocationGenerator.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/generators/ILocationGenerator.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/generators/IPMCLootGenerator.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/generators/IPMCLootGenerator.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/generators/IPMCLootGenerator.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/generators/IPMCLootGenerator.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/generators/IRagfairAssortGenerator.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/generators/IRagfairAssortGenerator.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/generators/IRagfairAssortGenerator.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/generators/IRagfairAssortGenerator.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/generators/IRagfairOfferGenerator.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/generators/IRagfairOfferGenerator.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/generators/IRagfairOfferGenerator.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/generators/IRagfairOfferGenerator.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/helpers/Traders.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/helpers/Traders.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/helpers/Traders.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/helpers/Traders.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/mod/IMod.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/mod/IMod.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/mod/IMod.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/mod/IMod.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/mod/IModLoader.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/mod/IModLoader.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/mod/IModLoader.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/mod/IModLoader.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/mod/IPackageJsonData.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/mod/IPackageJsonData.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/mod/IPackageJsonData.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/mod/IPackageJsonData.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/ragfair/IRagfairServerPrices.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/ragfair/IRagfairServerPrices.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/ragfair/IRagfairServerPrices.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/ragfair/IRagfairServerPrices.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/server/IDatabaseTables.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/server/IDatabaseTables.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/server/IDatabaseTables.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/server/IDatabaseTables.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/server/IHttpServer.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/server/IHttpServer.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/server/IHttpServer.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/server/IHttpServer.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/server/ILocaleBase.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/server/ILocaleBase.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/server/ILocaleBase.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/server/ILocaleBase.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/server/ILocations.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/server/ILocations.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/server/ILocations.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/server/ILocations.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/server/IServerBase.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/server/IServerBase.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/server/IServerBase.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/server/IServerBase.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/server/ISettingsBase.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/server/ISettingsBase.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/server/ISettingsBase.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/server/ISettingsBase.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/utils/IAsyncQueue.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/utils/IAsyncQueue.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/utils/IAsyncQueue.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/utils/IAsyncQueue.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/utils/ICommand.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/utils/ICommand.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/utils/ICommand.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/utils/ICommand.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/utils/ILogger.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/utils/ILogger.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/utils/ILogger.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/utils/ILogger.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/utils/IUuidGenerator.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/utils/IUuidGenerator.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/utils/IUuidGenerator.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/utils/IUuidGenerator.d.ts diff --git a/TypeScript/5ReplaceMethod/types/@types/spt/utils/IWatermark.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/utils/IWatermark.d.ts similarity index 100% rename from TypeScript/5ReplaceMethod/types/@types/spt/utils/IWatermark.d.ts rename to TypeScript/5ReplaceMethod/types/models/spt/utils/IWatermark.d.ts diff --git a/TypeScript/5ReplaceMethod/types/routers/ImageRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/ImageRouter.d.ts index 511d5b2..07a0606 100644 --- a/TypeScript/5ReplaceMethod/types/routers/ImageRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/ImageRouter.d.ts @@ -1,7 +1,7 @@ /// import { IncomingMessage, ServerResponse } from "http"; import { VFS } from "../utils/VFS"; -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class ImageRouter { private vfs; constructor(vfs: VFS); diff --git a/TypeScript/5ReplaceMethod/types/routers/ItemEventRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/ItemEventRouter.d.ts index bb5e843..bb20152 100644 --- a/TypeScript/5ReplaceMethod/types/routers/ItemEventRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/ItemEventRouter.d.ts @@ -1,9 +1,9 @@ import { JsonUtil } from "../utils/JsonUtil"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IItemEventRouterRequest } from "../@types/eft/itemEvent/IItemEventRouterRequest"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IItemEventRouterRequest } from "../models/eft/itemEvent/IItemEventRouterRequest"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { ItemEventRouterDefinition } from "../di/Router"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class ItemEventRouter { private logger; private jsonUtil; diff --git a/TypeScript/5ReplaceMethod/types/routers/item_events/CustomizationItemEventRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/item_events/CustomizationItemEventRouter.d.ts index eebc28c..3025e2c 100644 --- a/TypeScript/5ReplaceMethod/types/routers/item_events/CustomizationItemEventRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/item_events/CustomizationItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private customizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/5ReplaceMethod/types/routers/item_events/HealthItemEventRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/item_events/HealthItemEventRouter.d.ts index 333c18a..bad9af2 100644 --- a/TypeScript/5ReplaceMethod/types/routers/item_events/HealthItemEventRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/item_events/HealthItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private healthCallbacks; constructor(healthCallbacks: HealthCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/5ReplaceMethod/types/routers/item_events/HideoutItemEventRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/item_events/HideoutItemEventRouter.d.ts index f68b112..2cec18b 100644 --- a/TypeScript/5ReplaceMethod/types/routers/item_events/HideoutItemEventRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/item_events/HideoutItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private hideoutCallbacks; constructor(hideoutCallbacks: HideoutCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/5ReplaceMethod/types/routers/item_events/InsuranceItemEventRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/item_events/InsuranceItemEventRouter.d.ts index de185db..8efc2c2 100644 --- a/TypeScript/5ReplaceMethod/types/routers/item_events/InsuranceItemEventRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/item_events/InsuranceItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private insuranceCallbacks; constructor(insuranceCallbacks: InsuranceCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/5ReplaceMethod/types/routers/item_events/InventoryItemEventRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/item_events/InventoryItemEventRouter.d.ts index 40496f7..1d93e7b 100644 --- a/TypeScript/5ReplaceMethod/types/routers/item_events/InventoryItemEventRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/item_events/InventoryItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private inventoryCallbacks; constructor(inventoryCallbacks: InventoryCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/5ReplaceMethod/types/routers/item_events/NoteItemEventRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/item_events/NoteItemEventRouter.d.ts index 8b703a3..12af594 100644 --- a/TypeScript/5ReplaceMethod/types/routers/item_events/NoteItemEventRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/item_events/NoteItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private noteCallbacks; constructor(noteCallbacks: NoteCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/5ReplaceMethod/types/routers/item_events/PresetBuildItemEventRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/item_events/PresetBuildItemEventRouter.d.ts index 7a915b1..7298c52 100644 --- a/TypeScript/5ReplaceMethod/types/routers/item_events/PresetBuildItemEventRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/item_events/PresetBuildItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private presetBuildCallbacks; constructor(presetBuildCallbacks: PresetBuildCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/5ReplaceMethod/types/routers/item_events/QuestItemEventRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/item_events/QuestItemEventRouter.d.ts index 6f4d3f6..9944ae9 100644 --- a/TypeScript/5ReplaceMethod/types/routers/item_events/QuestItemEventRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/item_events/QuestItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private questCallbacks; constructor(questCallbacks: QuestCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/5ReplaceMethod/types/routers/item_events/RagfairItemEventRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/item_events/RagfairItemEventRouter.d.ts index 8361e1e..88e52ba 100644 --- a/TypeScript/5ReplaceMethod/types/routers/item_events/RagfairItemEventRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/item_events/RagfairItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private ragfairCallbacks; constructor(ragfairCallbacks: RagfairCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/5ReplaceMethod/types/routers/item_events/RepairItemEventRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/item_events/RepairItemEventRouter.d.ts index 544a656..b292ded 100644 --- a/TypeScript/5ReplaceMethod/types/routers/item_events/RepairItemEventRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/item_events/RepairItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private repairCallbacks; constructor(repairCallbacks: RepairCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/5ReplaceMethod/types/routers/item_events/TradeItemEventRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/item_events/TradeItemEventRouter.d.ts index eb5c294..1bca2b8 100644 --- a/TypeScript/5ReplaceMethod/types/routers/item_events/TradeItemEventRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/item_events/TradeItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private tradeCallbacks; constructor(tradeCallbacks: TradeCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/5ReplaceMethod/types/routers/item_events/WishlistItemEventRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/item_events/WishlistItemEventRouter.d.ts index e7fdc9b..38831f6 100644 --- a/TypeScript/5ReplaceMethod/types/routers/item_events/WishlistItemEventRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/item_events/WishlistItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private wishlistCallbacks; constructor(wishlistCallbacks: WishlistCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/5ReplaceMethod/types/routers/save_load/HealthSaveLoadRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/save_load/HealthSaveLoadRouter.d.ts index c068915..114f5b2 100644 --- a/TypeScript/5ReplaceMethod/types/routers/save_load/HealthSaveLoadRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/save_load/HealthSaveLoadRouter.d.ts @@ -1,4 +1,4 @@ -import { IAkiProfile } from "../../@types/eft/profile/IAkiProfile"; +import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; export declare class HealthSaveLoadRouter extends SaveLoadRouter { constructor(); diff --git a/TypeScript/5ReplaceMethod/types/routers/save_load/InraidSaveLoadRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/save_load/InraidSaveLoadRouter.d.ts index eb5cf5a..4c00b40 100644 --- a/TypeScript/5ReplaceMethod/types/routers/save_load/InraidSaveLoadRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/save_load/InraidSaveLoadRouter.d.ts @@ -1,4 +1,4 @@ -import { IAkiProfile } from "../../@types/eft/profile/IAkiProfile"; +import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; export declare class InraidSaveLoadRouter extends SaveLoadRouter { constructor(); diff --git a/TypeScript/5ReplaceMethod/types/routers/save_load/InsuranceSaveLoadRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/save_load/InsuranceSaveLoadRouter.d.ts index 07df122..30ce98e 100644 --- a/TypeScript/5ReplaceMethod/types/routers/save_load/InsuranceSaveLoadRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/save_load/InsuranceSaveLoadRouter.d.ts @@ -1,4 +1,4 @@ -import { IAkiProfile } from "../../@types/eft/profile/IAkiProfile"; +import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; export declare class InsuranceSaveLoadRouter extends SaveLoadRouter { constructor(); diff --git a/TypeScript/5ReplaceMethod/types/routers/save_load/ProfileSaveLoadRouter.d.ts b/TypeScript/5ReplaceMethod/types/routers/save_load/ProfileSaveLoadRouter.d.ts index 51b4cb5..16c7619 100644 --- a/TypeScript/5ReplaceMethod/types/routers/save_load/ProfileSaveLoadRouter.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/save_load/ProfileSaveLoadRouter.d.ts @@ -1,4 +1,4 @@ -import { IAkiProfile } from "../../@types/eft/profile/IAkiProfile"; +import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; export declare class ProfileSaveLoadRouter extends SaveLoadRouter { constructor(); diff --git a/TypeScript/5ReplaceMethod/types/routers/serializers/BundleSerializer.d.ts b/TypeScript/5ReplaceMethod/types/routers/serializers/BundleSerializer.d.ts index cf09797..5f275c4 100644 --- a/TypeScript/5ReplaceMethod/types/routers/serializers/BundleSerializer.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/serializers/BundleSerializer.d.ts @@ -1,5 +1,5 @@ -import { IHttpServer } from "../../@types/spt/server/IHttpServer"; -import { ILogger } from "../../@types/spt/utils/ILogger"; +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 { diff --git a/TypeScript/5ReplaceMethod/types/routers/serializers/ImageSerializer.d.ts b/TypeScript/5ReplaceMethod/types/routers/serializers/ImageSerializer.d.ts index 1d0b9c4..29340d0 100644 --- a/TypeScript/5ReplaceMethod/types/routers/serializers/ImageSerializer.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/serializers/ImageSerializer.d.ts @@ -1,4 +1,4 @@ -import { IHttpServer } from "../../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { Serializer } from "../../di/Serializer"; import { ImageRouter } from "../ImageRouter"; export declare class ImageSerializer extends Serializer { diff --git a/TypeScript/5ReplaceMethod/types/routers/serializers/NotifySerializer.d.ts b/TypeScript/5ReplaceMethod/types/routers/serializers/NotifySerializer.d.ts index d97fc0a..7be87ef 100644 --- a/TypeScript/5ReplaceMethod/types/routers/serializers/NotifySerializer.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/serializers/NotifySerializer.d.ts @@ -1,4 +1,4 @@ -import { IHttpServer } from "../../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { NotifierController } from "../../controllers/NotifierController"; import { Serializer } from "../../di/Serializer"; import { HttpServerHelper } from "../../helpers/HttpServerHelper"; diff --git a/TypeScript/5ReplaceMethod/types/servers/ConfigServer.d.ts b/TypeScript/5ReplaceMethod/types/servers/ConfigServer.d.ts index d25d1a8..9c2e114 100644 --- a/TypeScript/5ReplaceMethod/types/servers/ConfigServer.d.ts +++ b/TypeScript/5ReplaceMethod/types/servers/ConfigServer.d.ts @@ -1,6 +1,6 @@ import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class ConfigServer { private logger; private vfs; diff --git a/TypeScript/5ReplaceMethod/types/servers/DatabaseServer.d.ts b/TypeScript/5ReplaceMethod/types/servers/DatabaseServer.d.ts index b66e847..521bcf9 100644 --- a/TypeScript/5ReplaceMethod/types/servers/DatabaseServer.d.ts +++ b/TypeScript/5ReplaceMethod/types/servers/DatabaseServer.d.ts @@ -1,4 +1,4 @@ -import { IDatabaseTables } from "../@types/spt/server/IDatabaseTables"; +import { IDatabaseTables } from "../models/spt/server/IDatabaseTables"; export declare class DatabaseServer { private tableData; getTables(): IDatabaseTables; diff --git a/TypeScript/5ReplaceMethod/types/servers/HttpServer.d.ts b/TypeScript/5ReplaceMethod/types/servers/HttpServer.d.ts index e38263d..0ba20c6 100644 --- a/TypeScript/5ReplaceMethod/types/servers/HttpServer.d.ts +++ b/TypeScript/5ReplaceMethod/types/servers/HttpServer.d.ts @@ -1,16 +1,16 @@ /// import { HttpRouter } from "../routers/HttpRouter"; import { JsonUtil } from "../utils/JsonUtil"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { DatabaseServer } from "./DatabaseServer"; import { Serializer } from "../di/Serializer"; import http, { ServerResponse } from "http"; -import { INotification } from "../@types/eft/notifier/INotifier"; +import { INotification } from "../models/eft/notifier/INotifier"; import { NotifierHelper } from "../helpers/NotifierHelper"; import { ConfigServer } from "./ConfigServer"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class HttpServer implements IHttpServer { private httpRouter; private logger; @@ -21,7 +21,7 @@ export declare class HttpServer implements IHttpServer { private httpServerHelper; private serializers; private configServer; - constructor(httpRouter: HttpRouter, logger: ILogger, jsonUtil: JsonUtil, httpResponse: HttpResponse, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); + constructor(httpRouter: HttpRouter, logger: ILogger, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); private buffers; private onReceive; private onRespond; diff --git a/TypeScript/5ReplaceMethod/types/servers/RagfairServer.d.ts b/TypeScript/5ReplaceMethod/types/servers/RagfairServer.d.ts index ef69106..d103625 100644 --- a/TypeScript/5ReplaceMethod/types/servers/RagfairServer.d.ts +++ b/TypeScript/5ReplaceMethod/types/servers/RagfairServer.d.ts @@ -1,4 +1,4 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; @@ -7,12 +7,12 @@ import { RagfairPriceService } from "../services/RagfairPriceService"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { RagfairCategoriesService } from "../services/RagfairCategoriesService"; import { RagfairLinkedItemService } from "../services/RagfairLinkedItemService"; -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ConfigServer } from "./ConfigServer"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairServer { private logger; private ragfairOfferGenerator; @@ -28,7 +28,7 @@ export declare class RagfairServer { private ragfairRequiredItemsService; private configServer; private ragfairConfig; - constructor(logger: ILogger, ragfairOfferGenerator: RagfairOfferGenerator, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponse, saveServer: SaveServer, ragfairPriceService: RagfairPriceService, ragfairOfferService: RagfairOfferService, ragfairLinkedItemService: RagfairLinkedItemService, ragfairCategoriesService: RagfairCategoriesService, ragfairRequiredItemsService: RagfairRequiredItemsService, configServer: ConfigServer); + constructor(logger: ILogger, ragfairOfferGenerator: RagfairOfferGenerator, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, saveServer: SaveServer, ragfairPriceService: RagfairPriceService, ragfairOfferService: RagfairOfferService, ragfairLinkedItemService: RagfairLinkedItemService, ragfairCategoriesService: RagfairCategoriesService, ragfairRequiredItemsService: RagfairRequiredItemsService, configServer: ConfigServer); load(): void; update(): void; private processExpiredOffer; diff --git a/TypeScript/5ReplaceMethod/types/servers/SaveServer.d.ts b/TypeScript/5ReplaceMethod/types/servers/SaveServer.d.ts index 23da9ea..fdf92e4 100644 --- a/TypeScript/5ReplaceMethod/types/servers/SaveServer.d.ts +++ b/TypeScript/5ReplaceMethod/types/servers/SaveServer.d.ts @@ -1,9 +1,9 @@ -import { IAkiProfile, Info } from "../@types/eft/profile/IAkiProfile"; +import { IAkiProfile, Info } from "../models/eft/profile/IAkiProfile"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; import { SaveLoadRouter } from "../di/Router"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class SaveServer { private vfs; private saveLoadRouters; diff --git a/TypeScript/5ReplaceMethod/types/services/FenceService.d.ts b/TypeScript/5ReplaceMethod/types/services/FenceService.d.ts index 4b80d50..eef87b3 100644 --- a/TypeScript/5ReplaceMethod/types/services/FenceService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/FenceService.d.ts @@ -2,14 +2,14 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { HandbookHelper } from "../helpers/HandbookHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { PresetHelper } from "../helpers/PresetHelper"; -import { FenceLevel } from "../@types/eft/common/IGlobals"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; +import { FenceLevel } from "../models/eft/common/IGlobals"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; import { ConfigServer } from "../servers/ConfigServer"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class FenceService { private logger; private hashUtil; diff --git a/TypeScript/5ReplaceMethod/types/services/HashCacheService.d.ts b/TypeScript/5ReplaceMethod/types/services/HashCacheService.d.ts new file mode 100644 index 0000000..c9b0170 --- /dev/null +++ b/TypeScript/5ReplaceMethod/types/services/HashCacheService.d.ts @@ -0,0 +1,19 @@ +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 { + private vfs; + private hashUtil; + private jsonUtil; + private logger; + private jsonHashes; + private modHashes; + private readonly modCachePath; + constructor(vfs: VFS, hashUtil: HashUtil, jsonUtil: JsonUtil, logger: ILogger); + getStoredModHash(modName: string): string; + modContentMatchesStoredHash(modName: string, modContent: string): boolean; + hashMatchesStoredHash(modName: string, modHash: string): boolean; + storeModContent(modName: string, modContent: string): void; + storeModHash(modName: string, modHash: string): void; +} diff --git a/TypeScript/5ReplaceMethod/types/services/InsuranceService.d.ts b/TypeScript/5ReplaceMethod/types/services/InsuranceService.d.ts index cd91136..35f0dbc 100644 --- a/TypeScript/5ReplaceMethod/types/services/InsuranceService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/InsuranceService.d.ts @@ -1,10 +1,9 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData"; -import { IInsuranceConfig } from "../@types/spt/config/IInsuranceConfig"; -import { ILogger } from "../@types/spt/utils/ILogger"; +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 { InventoryHelper } from "../helpers/InventoryHelper"; +import { SecureContainerHelper } from "../helpers/SecureContainerHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -14,7 +13,7 @@ import { TimeUtil } from "../utils/TimeUtil"; export declare class InsuranceService { private logger; private databaseServer; - private inventoryHelper; + private secureContainerHelper; private randomUtil; private timeUtil; private saveServer; @@ -23,8 +22,8 @@ export declare class InsuranceService { private configServer; private insured; private templatesById; - insuranceConfig: IInsuranceConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, inventoryHelper: InventoryHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, configServer: ConfigServer); + private insuranceConfig; + constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, configServer: ConfigServer); insuranceExists(sessionId: string): boolean; insuranceTraderArrayExists(sessionId: string, traderId: string): boolean; getInsurance(sessionId: string): Record; diff --git a/TypeScript/5ReplaceMethod/types/services/ModCompilerService.d.ts b/TypeScript/5ReplaceMethod/types/services/ModCompilerService.d.ts new file mode 100644 index 0000000..7e750c3 --- /dev/null +++ b/TypeScript/5ReplaceMethod/types/services/ModCompilerService.d.ts @@ -0,0 +1,11 @@ +import { ILogger } from "../models/spt/utils/ILogger"; +import { VFS } from "../utils/VFS"; +export declare class ModCompilerService { + private logger; + private vfs; + constructor(logger: ILogger, vfs: VFS); + compileMod(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 5c0e0ec..9c6c143 100644 --- a/TypeScript/5ReplaceMethod/types/services/NotificationService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/NotificationService.d.ts @@ -1,4 +1,4 @@ -import { INotification } from "../@types/eft/notifier/INotifier"; +import { INotification } from "../models/eft/notifier/INotifier"; export declare class NotificationService { private messageQueue; getMessageQueue(): {}; diff --git a/TypeScript/5ReplaceMethod/types/services/PaymentService.d.ts b/TypeScript/5ReplaceMethod/types/services/PaymentService.d.ts index 245bb34..20cee50 100644 --- a/TypeScript/5ReplaceMethod/types/services/PaymentService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/PaymentService.d.ts @@ -1,15 +1,15 @@ import { InventoryHelper } from "../helpers/InventoryHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IProcessBuyTradeRequestData } from "../@types/eft/trade/IProcessBuyTradeRequestData"; -import { IProcessSellTradeRequestData } from "../@types/eft/trade/IProcessSellTradeRequestData"; +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 { HttpResponse } from "../utils/HttpResponse"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class PaymentService { private logger; private httpResponse; @@ -19,7 +19,7 @@ export declare class PaymentService { private itemHelper; private inventoryHelper; private paymentHelper; - constructor(logger: ILogger, httpResponse: HttpResponse, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); + constructor(logger: ILogger, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request * @param {Object} pmcData @@ -38,5 +38,11 @@ export declare class PaymentService { * @returns IItemEventRouterResponse */ getMoney(pmcData: IPmcData, amount: number, body: IProcessSellTradeRequestData, output: IItemEventRouterResponse, sessionID: string): IItemEventRouterResponse; + /** + * Recursively checks if the given item is + * inside the stash, that is it has the stash as + * ancestor with slotId=hideout + */ + private isItemInStash; addPaymentToOutput(pmcData: IPmcData, currencyTpl: string, amountToPay: number, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse; } diff --git a/TypeScript/5ReplaceMethod/types/services/PlayerService.d.ts b/TypeScript/5ReplaceMethod/types/services/PlayerService.d.ts index ec6e32c..4a74b4a 100644 --- a/TypeScript/5ReplaceMethod/types/services/PlayerService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/PlayerService.d.ts @@ -1,7 +1,7 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IPlayerIncrementSkillLevelRequestData } from "../@types/eft/player/IPlayerIncrementSkillLevelRequestData"; -import { ILogger } from "../@types/spt/utils/ILogger"; +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 { private logger; private databaseServer; diff --git a/TypeScript/5ReplaceMethod/types/services/RagfairCategoriesService.d.ts b/TypeScript/5ReplaceMethod/types/services/RagfairCategoriesService.d.ts index 370886e..fb9efa2 100644 --- a/TypeScript/5ReplaceMethod/types/services/RagfairCategoriesService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/RagfairCategoriesService.d.ts @@ -1,4 +1,4 @@ -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; export declare class RagfairCategoriesService { updateCategories(offers: IRagfairOffer[]): void; private categories; diff --git a/TypeScript/5ReplaceMethod/types/services/RagfairOfferService.d.ts b/TypeScript/5ReplaceMethod/types/services/RagfairOfferService.d.ts index 1b7682d..4e4ae26 100644 --- a/TypeScript/5ReplaceMethod/types/services/RagfairOfferService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/RagfairOfferService.d.ts @@ -2,9 +2,8 @@ import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { TimeUtil } from "../utils/TimeUtil"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; -import { IRagfairConfig } from "../@types/spt/config/IRagfairConfig"; +import { Item } from "../models/eft/common/tables/IItem"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; export declare class RagfairOfferService { private timeUtil; private databaseServer; @@ -14,7 +13,7 @@ export declare class RagfairOfferService { private toUpdate; private expiredOffers; private offers; - ragfairConfig: IRagfairConfig; + private ragfairConfig; constructor(timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, configServer: ConfigServer); getOffers(): IRagfairOffer[]; getOfferByOfferId(offerId: string): IRagfairOffer; diff --git a/TypeScript/5ReplaceMethod/types/services/RagfairPriceService.d.ts b/TypeScript/5ReplaceMethod/types/services/RagfairPriceService.d.ts index d91df24..7cc42f9 100644 --- a/TypeScript/5ReplaceMethod/types/services/RagfairPriceService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/RagfairPriceService.d.ts @@ -4,9 +4,9 @@ import { ConfigServer } from "../servers/ConfigServer"; import { HandbookHelper } from "../helpers/HandbookHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { PresetHelper } from "../helpers/PresetHelper"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { IBarterScheme } from "../@types/eft/common/tables/ITrader"; -import { ILogger } from "../@types/spt/utils/ILogger"; +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 { private handbookHelper; private databaseServer; diff --git a/TypeScript/5ReplaceMethod/types/services/RagfairRequiredItemsService.d.ts b/TypeScript/5ReplaceMethod/types/services/RagfairRequiredItemsService.d.ts index 3908cb9..e4582d0 100644 --- a/TypeScript/5ReplaceMethod/types/services/RagfairRequiredItemsService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/RagfairRequiredItemsService.d.ts @@ -1,6 +1,6 @@ import { PaymentHelper } from "../helpers/PaymentHelper"; import { RagfairOfferService } from "../services/RagfairOfferService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairRequiredItemsService { private logger; private paymentHelper; diff --git a/TypeScript/5ReplaceMethod/types/services/TraderAssortService.d.ts b/TypeScript/5ReplaceMethod/types/services/TraderAssortService.d.ts index 99b23f1..ccb9e45 100644 --- a/TypeScript/5ReplaceMethod/types/services/TraderAssortService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/TraderAssortService.d.ts @@ -1,4 +1,4 @@ -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; export declare class TraderAssortService { private pristineTraderAssorts; getPristineTraderAssort(traderId: string): ITraderAssort; diff --git a/TypeScript/5ReplaceMethod/types/utils/App.d.ts b/TypeScript/5ReplaceMethod/types/utils/App.d.ts index 4b082a0..a11f576 100644 --- a/TypeScript/5ReplaceMethod/types/utils/App.d.ts +++ b/TypeScript/5ReplaceMethod/types/utils/App.d.ts @@ -1,7 +1,7 @@ import { TimeUtil } from "./TimeUtil"; import { OnLoad } from "../di/OnLoad"; import { OnUpdate } from "../di/OnUpdate"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class App { private logger; private timeUtil; diff --git a/TypeScript/5ReplaceMethod/types/utils/AyncQueue.d.ts b/TypeScript/5ReplaceMethod/types/utils/AyncQueue.d.ts index 773a5e4..8f1559b 100644 --- a/TypeScript/5ReplaceMethod/types/utils/AyncQueue.d.ts +++ b/TypeScript/5ReplaceMethod/types/utils/AyncQueue.d.ts @@ -1,5 +1,5 @@ -import { IAsyncQueue } from "../@types/spt/utils/IAsyncQueue"; -import { ICommand } from "../@types/spt/utils/ICommand"; +import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; +import { ICommand } from "../models/spt/utils/ICommand"; export declare class AsyncQueue implements IAsyncQueue { commandsQueue: ICommand[]; constructor(); diff --git a/TypeScript/5ReplaceMethod/types/utils/DatabaseImporter.d.ts b/TypeScript/5ReplaceMethod/types/utils/DatabaseImporter.d.ts index 41b3e5f..97dda30 100644 --- a/TypeScript/5ReplaceMethod/types/utils/DatabaseImporter.d.ts +++ b/TypeScript/5ReplaceMethod/types/utils/DatabaseImporter.d.ts @@ -3,7 +3,7 @@ import { JsonUtil } from "./JsonUtil"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ImageRouter } from "../routers/ImageRouter"; import { OnLoad } from "../di/OnLoad"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class DatabaseImporter extends OnLoad { private logger; private vfs; diff --git a/TypeScript/5ReplaceMethod/types/utils/HttpResponse.d.ts b/TypeScript/5ReplaceMethod/types/utils/HttpResponse.d.ts deleted file mode 100644 index d5a90d7..0000000 --- a/TypeScript/5ReplaceMethod/types/utils/HttpResponse.d.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { JsonUtil } from "./JsonUtil"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -export declare class HttpResponse { - private jsonUtil; - constructor(jsonUtil: JsonUtil); - private clearString; - noBody(data: any): any; - getBody(data: T, err?: number, errmsg?: any): IGetBodyResponseData; - getUnclearedBody(data: any, err?: number, errmsg?: any): string; - emptyResponse(): IGetBodyResponseData; - nullResponse(): INullResponseData; - emptyArrayResponse(): IGetBodyResponseData; - appendErrorToOutput(output: IItemEventRouterResponse, message?: string, title?: string): IItemEventRouterResponse; -} diff --git a/TypeScript/5ReplaceMethod/types/utils/HttpResponseUtil.d.ts b/TypeScript/5ReplaceMethod/types/utils/HttpResponseUtil.d.ts new file mode 100644 index 0000000..85c28bd --- /dev/null +++ b/TypeScript/5ReplaceMethod/types/utils/HttpResponseUtil.d.ts @@ -0,0 +1,16 @@ +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 { + private jsonUtil; + constructor(jsonUtil: JsonUtil); + private clearString; + noBody(data: any): any; + getBody(data: T, err?: number, errmsg?: any): IGetBodyResponseData; + getUnclearedBody(data: any, err?: number, errmsg?: any): string; + emptyResponse(): IGetBodyResponseData; + nullResponse(): INullResponseData; + emptyArrayResponse(): IGetBodyResponseData; + appendErrorToOutput(output: IItemEventRouterResponse, message?: string, title?: string): IItemEventRouterResponse; +} diff --git a/TypeScript/5ReplaceMethod/types/utils/JsonUtil.d.ts b/TypeScript/5ReplaceMethod/types/utils/JsonUtil.d.ts index 69cf8f1..20b7448 100644 --- a/TypeScript/5ReplaceMethod/types/utils/JsonUtil.d.ts +++ b/TypeScript/5ReplaceMethod/types/utils/JsonUtil.d.ts @@ -1,12 +1,12 @@ -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; import { HashUtil } from "./HashUtil"; import { VFS } from "./VFS"; export declare class JsonUtil { private vfs; - private hashutil; + private hashUtil; private logger; private fileHashes; - constructor(vfs: VFS, hashutil: HashUtil, logger: ILogger); + constructor(vfs: VFS, hashUtil: HashUtil, logger: ILogger); /** * From object to string * @param data object to turn into JSON diff --git a/TypeScript/5ReplaceMethod/types/utils/Logger.d.ts b/TypeScript/5ReplaceMethod/types/utils/Logger.d.ts index 57da5ae..9d5b32a 100644 --- a/TypeScript/5ReplaceMethod/types/utils/Logger.d.ts +++ b/TypeScript/5ReplaceMethod/types/utils/Logger.d.ts @@ -1,14 +1,16 @@ /// -import { Daum } from "../@types/eft/itemEvent/IItemEventRouterRequest"; -import { ILogger } from "../@types/spt/utils/ILogger"; -import { IAsyncQueue } from "../@types/spt/utils/IAsyncQueue"; -import { IUUidGenerator } from "../@types/spt/utils/IUuidGenerator"; +import { Daum } from "../models/eft/itemEvent/IItemEventRouterRequest"; +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 { private asyncQueue; private uuidGenerator; private showDebugInConsole; - private filepath; + private folderPath; + private file; + private filePath; private logLevels; private logger; writeFilePromisify: (path: fs.PathLike, data: string, options?: any) => Promise; diff --git a/TypeScript/5ReplaceMethod/types/utils/RandomUtil.d.ts b/TypeScript/5ReplaceMethod/types/utils/RandomUtil.d.ts index a1bac79..3a3ecb6 100644 --- a/TypeScript/5ReplaceMethod/types/utils/RandomUtil.d.ts +++ b/TypeScript/5ReplaceMethod/types/utils/RandomUtil.d.ts @@ -1,3 +1,4 @@ +import { ILogger } from "../models/spt/utils/ILogger"; import { JsonUtil } from "./JsonUtil"; import { MathUtil } from "./MathUtil"; /** @@ -103,7 +104,8 @@ export declare class ProbabilityObject { } export declare class RandomUtil { private jsonUtil; - constructor(jsonUtil: JsonUtil); + private logger; + constructor(jsonUtil: JsonUtil, logger: ILogger); getInt(min: number, max: number): number; getIntEx(max: number): number; getFloat(min: number, max: number): number; @@ -147,4 +149,5 @@ export declare class RandomUtil { * @return {array} Array consisting of N random keys of the dictionary */ drawRandomFromDict(dict: any, count?: number, replacement?: boolean): any[]; + getBiasedRandomNumber(min: number, max: number, shift: number, n: number): number; } diff --git a/TypeScript/5ReplaceMethod/types/utils/UUidGenerator.d.ts b/TypeScript/5ReplaceMethod/types/utils/UUidGenerator.d.ts index 763424a..000b719 100644 --- a/TypeScript/5ReplaceMethod/types/utils/UUidGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/utils/UUidGenerator.d.ts @@ -1,4 +1,4 @@ -import { IUUidGenerator } from "../@types/spt/utils/IUuidGenerator"; +import { IUUidGenerator } from "../models/spt/utils/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 c8d32f1..b064cf4 100644 --- a/TypeScript/5ReplaceMethod/types/utils/VFS.d.ts +++ b/TypeScript/5ReplaceMethod/types/utils/VFS.d.ts @@ -1,8 +1,8 @@ /// import "reflect-metadata"; import fs from "fs"; -import { IAsyncQueue } from "../@types/spt/utils/IAsyncQueue"; -import { IUUidGenerator } from "../@types/spt/utils/IUuidGenerator"; +import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; +import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; export declare class VFS { private asyncQueue; private uuidGenerator; @@ -50,4 +50,5 @@ export declare class VFS { stripExtension(filepath: string): string; minifyAllJsonInDirRecursive(filepath: string): Promise; minifyAllJsonInDirRecursiveAsync(filepath: string): Promise; + getFilesOfType(directory: string, fileType: string, files?: string[]): string[]; } diff --git a/TypeScript/5ReplaceMethod/types/utils/Watermark.d.ts b/TypeScript/5ReplaceMethod/types/utils/Watermark.d.ts index e7765e1..598d5a6 100644 --- a/TypeScript/5ReplaceMethod/types/utils/Watermark.d.ts +++ b/TypeScript/5ReplaceMethod/types/utils/Watermark.d.ts @@ -1,6 +1,6 @@ -import { IWatermark, IWatermarkLocale } from "../@types/spt/utils/IWatermark"; +import { IWatermark, IWatermarkLocale } from "../models/spt/utils/IWatermark"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class WatermarkLocale implements IWatermarkLocale { private locales; getLocale(): string; diff --git a/TypeScript/6ReferenceAnotherClass/package.json b/TypeScript/6ReferenceAnotherClass/package.json index 87a132f..c1f5ba5 100644 --- a/TypeScript/6ReferenceAnotherClass/package.json +++ b/TypeScript/6ReferenceAnotherClass/package.json @@ -1,10 +1,10 @@ { - "name": "EditDatabase", + "name": "ReferenceAnotherClass", "version": "1.0.0", "main": "src/mod.js", "license": "MIT", "author": "Chomp", - "akiVersion": "2.4.0", + "akiVersion": "3.0.0", "scripts": { "install": "npx handpick --target=devDependencies", "build": "tsc" diff --git a/TypeScript/6ReferenceAnotherClass/src/MoreCode.js b/TypeScript/6ReferenceAnotherClass/src/MoreCode.js new file mode 100644 index 0000000..b5c35de --- /dev/null +++ b/TypeScript/6ReferenceAnotherClass/src/MoreCode.js @@ -0,0 +1,9 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.MoreCode = void 0; +class MoreCode { + getTheWordFlub() { + return "flub"; + } +} +exports.MoreCode = MoreCode; diff --git a/TypeScript/6ReferenceAnotherClass/src/mod.js b/TypeScript/6ReferenceAnotherClass/src/mod.js new file mode 100644 index 0000000..9b79ec8 --- /dev/null +++ b/TypeScript/6ReferenceAnotherClass/src/mod.js @@ -0,0 +1,18 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +const MoreCode_1 = require("./MoreCode"); +class Mod { + // not used for this example + load(container) { return; } + delayedLoad(container) { + // get logger + const logger = container.resolve("WinstonLogger"); + // Make a new instance of the 'MoreCode' class + const moreCode = new MoreCode_1.MoreCode(); + // call the function 'getTheWordFlub()' and assign the result to 'result' + const result = moreCode.getTheWordFlub(); + // log the 'myProperty' property to the console + logger.info(`Here is the value from my second class: ${result}`); + } +} +module.exports = { mod: new Mod() }; diff --git a/TypeScript/6ReferenceAnotherClass/src/mod.ts b/TypeScript/6ReferenceAnotherClass/src/mod.ts index 51e863d..bdc2e58 100644 --- a/TypeScript/6ReferenceAnotherClass/src/mod.ts +++ b/TypeScript/6ReferenceAnotherClass/src/mod.ts @@ -1,7 +1,7 @@ import type { DependencyContainer } from "tsyringe"; -import { IMod } from "../types/@types/external/mod"; -import type { ILogger } from "../types/@types/spt/utils/ILogger"; +import { IMod } from "../types/models/external/mod"; +import type { ILogger } from "../types/models/spt/utils/ILogger"; import {MoreCode } from "./MoreCode"; class Mod implements IMod diff --git a/TypeScript/6ReferenceAnotherClass/tsconfig.json b/TypeScript/6ReferenceAnotherClass/tsconfig.json index 4204c72..8ba3117 100644 --- a/TypeScript/6ReferenceAnotherClass/tsconfig.json +++ b/TypeScript/6ReferenceAnotherClass/tsconfig.json @@ -9,7 +9,6 @@ "experimentalDecorators": true, "emitDecoratorMetadata": true, "resolveJsonModule": true, - "esModuleInterop": true, "outDir": "out" }, "lib": [ diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/common/IItemEventResponseData.d.ts b/TypeScript/6ReferenceAnotherClass/types/@types/eft/common/IItemEventResponseData.d.ts deleted file mode 100644 index 08fb8a7..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/@types/eft/common/IItemEventResponseData.d.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { Skills } from "./IPmcData"; -export interface IItemEventResponseData { - warnings: any[]; - profileChanges: Record; -} -export interface ProfileChange { - _id: string; - experience: number; - quests: any[]; - ragFairOffers: any[]; - builds: any[]; - items: Items; - production: Production; - skills: Skills; - traderRelations: TraderRelations; -} -export interface Items { - new: any[]; - change: any[]; - del: any[]; -} -export interface Production { -} -export interface TraderRelations { -} diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/common/IPmcDataRepeatableQuest.d.ts b/TypeScript/6ReferenceAnotherClass/types/@types/eft/common/IPmcDataRepeatableQuest.d.ts deleted file mode 100644 index 15a1c09..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/@types/eft/common/IPmcDataRepeatableQuest.d.ts +++ /dev/null @@ -1,71 +0,0 @@ -export interface IPmcDataRepeatableQuest { - name: string; - activeQuests: Quest[]; - inactiveQuests: Quest[]; - endTime: number; -} -export interface Quest { - _id: string; - traderId: string; - location: string; - image: string; - type: string; - isKey: boolean; - restartable: boolean; - instantComplete: boolean; - secretQuest: boolean; - canShowNotificationsInGame: boolean; - rewards: Rewards; - conditions: Conditions; - name: string; - note: string; - description: string; - successMessageText: string; - failMessageText: string; - startedMessageText: string; - templateId: string; -} -export interface Rewards { - Started: Reward[]; - Success: Reward[]; - Fail: Reward[]; -} -export interface Reward { - value: number; - type: string; - index: number; - target?: string; - items?: Item[]; -} -export interface Item { - _id: string; - _tpl: string; - upd: Upd; -} -export interface Conditions { - AvailableForStart: any[]; - AvailableForFinish: AvailableForFinish[]; - Fail: any[]; -} -export interface AvailableForFinish { - _props: Props; - _parent: string; - dynamicLocale: boolean; -} -export interface Props { - id: string; - parentId: string; - dynamicLocale: boolean; - index: number; - visibilityConditions: any[]; - target: string[]; - value: number; - minDurability: number; - maxDurability: number; - dogtagLevel: number; - onlyFoundInRaid: boolean; -} -export interface Upd { - StackObjectsCount: number; - SpawnedInSession?: boolean; -} diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/customization/IBuyClothingRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/@types/eft/customization/IBuyClothingRequestData.d.ts deleted file mode 100644 index be5d930..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/@types/eft/customization/IBuyClothingRequestData.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -export interface IBuyClothingRequestData { - Action: "CustomizationBuy"; - offer: string; - items: Item[]; -} -export interface Item { - del: boolean; - id: string; - count: number; -} diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/IHideoutRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/IHideoutRequestData.d.ts deleted file mode 100644 index 77c0665..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/IHideoutRequestData.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -export interface IHideoutRequestData { - Action: "HideoutUpgrade"; - areaType: number; - items: HideoutItem[]; - timestamp: number; -} -export interface HideoutItem { - count: number; - id: string; -} diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/itemEvent/IHandleEventRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/@types/eft/itemEvent/IHandleEventRequestData.d.ts deleted file mode 100644 index a7ae306..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/@types/eft/itemEvent/IHandleEventRequestData.d.ts +++ /dev/null @@ -1,21 +0,0 @@ -export interface IHandleEventRequestData { - data: Daum[]; - tm: number; - reload: number; -} -export interface Daum { - Action: string; - item: string; - to?: To; -} -export interface To { - id: string; - container: string; - location: Location; -} -export interface Location { - x: number; - y: number; - r: string; - isSearched: boolean; -} diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/itemEvent/IItemEventRouterBase.d.ts b/TypeScript/6ReferenceAnotherClass/types/@types/eft/itemEvent/IItemEventRouterBase.d.ts deleted file mode 100644 index 0e12850..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/@types/eft/itemEvent/IItemEventRouterBase.d.ts +++ /dev/null @@ -1,61 +0,0 @@ -import { Skills } from "../common/IPmcData"; -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 { - warnings: Warning[]; - profileChanges: TProfileChanges | ""; -} -export declare type TProfileChanges = Record; -export interface Warning { - index: number; - err: string; - errmsg: string; -} -export interface ProfileChange { - _id: string; - experience: number; - quests: IQuest[]; - ragFairOffers: IRagfairOffer[]; - builds: BuildChange[]; - items: ItemChanges; - production: Record; - skills: Skills; - traderRelations: Record; - repeatableQuests?: IPmcDataRepeatableQuest[]; -} -export interface BuildChange { - id: string; - name: string; - root: string; - items: Item[]; -} -export interface ItemChanges { - new: Product[]; - change: Product[]; - del: Product[]; -} -export interface Production { - Progress: number; - StartTimestamp: number; - ProductionTime: number; - inProgress: boolean; - RecipeId: string; - Products: Product[]; -} -export interface Product { - _id: string; - _tpl?: string; - parentId?: string; - slotId?: string; - location?: any; - upd?: Upd; -} -export interface TraderRelations { - salesSum?: number; - standing?: number; - loyalty?: number; - unlocked?: boolean; - disabled?: boolean; -} diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/notes/INoteData.d.ts b/TypeScript/6ReferenceAnotherClass/types/@types/eft/notes/INoteData.d.ts deleted file mode 100644 index 4021bb7..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/@types/eft/notes/INoteData.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface INote { - Time: number; - Text: string; -} diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/presetBuild/IPresetBuildActionData.d.ts b/TypeScript/6ReferenceAnotherClass/types/@types/eft/presetBuild/IPresetBuildActionData.d.ts deleted file mode 100644 index 13ec722..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/@types/eft/presetBuild/IPresetBuildActionData.d.ts +++ /dev/null @@ -1,25 +0,0 @@ -export interface IPresetBuildActionData { - Action: string; - id: string; - name: string; - root: string; - items: Item[]; -} -export interface Item { - _id: string; - _tpl: string; - upd?: Upd; - parentId?: string; - slotId?: string; -} -export interface Upd { - Repairable: Repairable; - FireMode: FireMode; -} -export interface Repairable { - MaxDurability: number; - Durability: number; -} -export interface FireMode { - FireMode: string; -} diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/ragfair/ISaleChance.d.ts b/TypeScript/6ReferenceAnotherClass/types/@types/eft/ragfair/ISaleChance.d.ts deleted file mode 100644 index 14b434a..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/@types/eft/ragfair/ISaleChance.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface ISaleChance { - sellTime: number; - amount: number; -} diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/repair/IRepairActionData.d.ts b/TypeScript/6ReferenceAnotherClass/types/@types/eft/repair/IRepairActionData.d.ts deleted file mode 100644 index e6f90c8..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/@types/eft/repair/IRepairActionData.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -export interface IRepairActionData { - Action: string; - tid: string; - repairItems: RepairItem[]; -} -export interface RepairItem { - _id: string; - count: number; -} diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/wishlist/IWishlistActionData.d.ts b/TypeScript/6ReferenceAnotherClass/types/@types/eft/wishlist/IWishlistActionData.d.ts deleted file mode 100644 index 9217864..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/@types/eft/wishlist/IWishlistActionData.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface IWishlistActionData { - Action: string; - templateId: string; -} diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/notes/INoteActionData.d.ts b/TypeScript/6ReferenceAnotherClass/types/@types/notes/INoteActionData.d.ts deleted file mode 100644 index 7d07cdd..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/@types/notes/INoteActionData.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { INote } from "../eft/notes/INoteData"; -export interface INoteActionData { - Action: string; - index: number; - note: INote; -} diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/helpers/IGetItemResponse.d.ts b/TypeScript/6ReferenceAnotherClass/types/@types/spt/helpers/IGetItemResponse.d.ts deleted file mode 100644 index e6f3783..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/@types/spt/helpers/IGetItemResponse.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export interface IGetItemResponse { -} diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/wishlist/IWishlistActionData.d.ts b/TypeScript/6ReferenceAnotherClass/types/@types/wishlist/IWishlistActionData.d.ts deleted file mode 100644 index 9217864..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/@types/wishlist/IWishlistActionData.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface IWishlistActionData { - Action: string; - templateId: string; -} diff --git a/TypeScript/6ReferenceAnotherClass/types/Lib.d.ts b/TypeScript/6ReferenceAnotherClass/types/Lib.d.ts deleted file mode 100644 index 5c77c26..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/Lib.d.ts +++ /dev/null @@ -1,94 +0,0 @@ -import { BundleLoader } from "./loaders/BundleLoader"; -export { BundleLoader }; -import { ModLoader } from "./loaders/ModLoader"; -export { ModLoader }; -import { ContainerHelper } from "./helpers/ContainerHelper.js"; -export { ContainerHelper }; -import { InventoryHelper } from "./helpers/InventoryHelper.js"; -export { InventoryHelper }; -import { ItemHelper } from "./helpers/ItemHelper.js"; -export { ItemHelper }; -import { GameEventHelper } from "./helpers/GameEventHelper.js"; -export { GameEventHelper }; -import { QuestHelper } from "./helpers/QuestHelper.js"; -export { QuestHelper }; -import { UtilityHelper } from "./helpers/UtilityHelper.js"; -export { UtilityHelper }; -import { TraderHelper } from "./helpers/TraderHelper.js"; -export { TraderHelper }; -import { RagfairServerHelper } from "./helpers/RagfairServerHelper.js"; -export { RagfairServerHelper }; -import { DurabilityLimitsHelper } from "./helpers/DurabilityLimitsHelper.js"; -export { DurabilityLimitsHelper }; -import { WeightedRandomHelper } from "./helpers/WeightedRandomHelper.js"; -export { WeightedRandomHelper }; -import { BotCallbacks } from "./callbacks/BotCallbacks.js"; -export { BotCallbacks }; -import { DataCallbacks } from "./callbacks/DataCallbacks.js"; -export { DataCallbacks }; -import { DialogueCallbacks } from "./callbacks/DialogueCallbacks.js"; -export { DialogueCallbacks }; -import { GameCallbacks } from "./callbacks/GameCallbacks.js"; -export { GameCallbacks }; -import { HideoutCallbacks } from "./callbacks/HideoutCallbacks"; -export { HideoutCallbacks }; -import { HttpCallbacks } from "./callbacks/HttpCallbacks.js"; -export { HttpCallbacks }; -import { InraidCallbacks } from "./callbacks/InraidCallbacks.js"; -export { InraidCallbacks }; -import { InventoryCallbacks } from "./callbacks/InventoryCallbacks.js"; -export { InventoryCallbacks }; -import { NotifierCallbacks } from "./callbacks/NotifierCallbacks.js"; -export { NotifierCallbacks }; -import { ProfileCallbacks } from "./callbacks/ProfileCallbacks.js"; -export { ProfileCallbacks }; -import { QuestCallbacks } from "./callbacks/QuestCallbacks.js"; -export { QuestCallbacks }; -import { RagfairCallbacks } from "./callbacks/RagfairCallbacks.js"; -export { RagfairCallbacks }; -import { TraderCallbacks } from "./callbacks/TraderCallbacks.js"; -export { TraderCallbacks }; -import { BotController } from "./controllers/BotController.js"; -export { BotController }; -import { DialogueController } from "./controllers/DialogueController.js"; -export { DialogueController }; -import { GameController } from "./controllers/GameController.js"; -export { GameController }; -import { HealthController } from "./controllers/HealthController.js"; -export { HealthController }; -import { HideoutController } from "./controllers/HideoutController.js"; -export { HideoutController }; -import { InsuranceController } from "./controllers/InsuranceController.js"; -export { InsuranceController }; -import { InventoryController } from "./controllers/InventoryController.js"; -export { InventoryController }; -import { LocationController } from "./controllers/LocationController.js"; -export { LocationController }; -import { NotifierController } from "./controllers/NotifierController.js"; -export { NotifierController }; -import { PresetController } from "./controllers/PresetController.js"; -export { PresetController }; -import { ProfileController } from "./controllers/ProfileController.js"; -export { ProfileController }; -import { QuestController } from "./controllers/QuestController.js"; -export { QuestController }; -import { RepeatableQuestController } from "./controllers/RepeatableQuestController.js"; -export { RepeatableQuestController }; -import { RagfairController } from "./controllers/RagfairController.js"; -export { RagfairController }; -import { TraderController } from "./controllers/TraderController.js"; -export { TraderController }; -import { PaymentController } from "./controllers/PaymentController"; -export { PaymentController }; -import { PlayerController } from "./controllers/PlayerController.js"; -export { PlayerController }; -import { HandbookController } from "./controllers/HandbookController.js"; -export { HandbookController }; -import { DatabaseServer } from "./servers/DatabaseServer"; -export { DatabaseServer }; -import { HttpServer } from "./servers/HttpServer.js"; -export { HttpServer }; -import { RagfairServer } from "./servers/RagfairServer.js"; -export { RagfairServer }; -import { SaveServer } from "./servers/SaveServer"; -export { SaveServer }; diff --git a/TypeScript/6ReferenceAnotherClass/types/Program.d.ts b/TypeScript/6ReferenceAnotherClass/types/Program.d.ts index fe57d08..d4b71b9 100644 --- a/TypeScript/6ReferenceAnotherClass/types/Program.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/Program.d.ts @@ -1,8 +1,4 @@ -import "reflect-metadata"; -import { App } from "./utils/App"; -export interface IProgram { -} -export declare class Program implements IProgram { - private app; - constructor(app: App); +export declare class Program { + constructor(); + start(): void; } diff --git a/TypeScript/6ReferenceAnotherClass/types/bindings/AppLoad.d.ts b/TypeScript/6ReferenceAnotherClass/types/bindings/AppLoad.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/bindings/AppLoad.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/6ReferenceAnotherClass/types/bindings/AppUpdate.d.ts b/TypeScript/6ReferenceAnotherClass/types/bindings/AppUpdate.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/bindings/AppUpdate.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/6ReferenceAnotherClass/types/bindings/DynamicRoutes.d.ts b/TypeScript/6ReferenceAnotherClass/types/bindings/DynamicRoutes.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/bindings/DynamicRoutes.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/6ReferenceAnotherClass/types/bindings/ItemEvents.d.ts b/TypeScript/6ReferenceAnotherClass/types/bindings/ItemEvents.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/bindings/ItemEvents.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/6ReferenceAnotherClass/types/bindings/SaveLoad.d.ts b/TypeScript/6ReferenceAnotherClass/types/bindings/SaveLoad.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/bindings/SaveLoad.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/6ReferenceAnotherClass/types/bindings/ServerRespond.d.ts b/TypeScript/6ReferenceAnotherClass/types/bindings/ServerRespond.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/bindings/ServerRespond.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/6ReferenceAnotherClass/types/bindings/StaticRoutes.d.ts b/TypeScript/6ReferenceAnotherClass/types/bindings/StaticRoutes.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/bindings/StaticRoutes.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 511c545..358d5e3 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/BotCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/BotCallbacks.d.ts @@ -1,13 +1,13 @@ import { BotController } from "../controllers/BotController"; -import { IGenerateBotsRequestData } from "../@types/eft/bot/IGenerateBotsRequestData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IBotBase } from "../@types/eft/common/tables/IBotBase"; -import { HttpResponse } from "../utils/HttpResponse"; +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 { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class BotCallbacks { private botController; private httpResponse; - constructor(botController: BotController, httpResponse: HttpResponse); + constructor(botController: BotController, httpResponse: HttpResponseUtil); 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/6ReferenceAnotherClass/types/callbacks/BundleCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/BundleCallbacks.d.ts index 1fb6275..08c33c0 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/BundleCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/BundleCallbacks.d.ts @@ -1,17 +1,16 @@ import { BundleLoader } from "../loaders/BundleLoader"; import { ConfigServer } from "../servers/ConfigServer"; -import { IHttpConfig } from "../@types/spt/config/IHttpConfig"; -import { HttpResponse } from "../utils/HttpResponse"; -import { ILogger } from "../@types/spt/utils/ILogger"; -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +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; private httpServer; private bundleLoader; private configServer; - httpConfig: IHttpConfig; - constructor(logger: ILogger, httpResponse: HttpResponse, httpServer: IHttpServer, bundleLoader: BundleLoader, configServer: ConfigServer); + private httpConfig; + constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, bundleLoader: BundleLoader, configServer: ConfigServer); 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/6ReferenceAnotherClass/types/callbacks/CustomizationCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/CustomizationCallbacks.d.ts index 4c27712..0a4265b 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/CustomizationCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/CustomizationCallbacks.d.ts @@ -1,17 +1,17 @@ import { SaveServer } from "../servers/SaveServer"; import { CustomizationController } from "../controllers/CustomizationController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IBuyClothingRequestData } from "../@types/eft/customization/IBuyClothingRequestData"; -import { IWearClothingRequestData } from "../@types/eft/customization/IWearClothingRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { ISuit } from "../@types/eft/common/tables/ITrader"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { HttpResponse } from "../utils/HttpResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +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 { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class CustomizationCallbacks { private customizationController; private saveServer; private httpResponse; - constructor(customizationController: CustomizationController, saveServer: SaveServer, httpResponse: HttpResponse); + constructor(customizationController: CustomizationController, saveServer: SaveServer, httpResponse: HttpResponseUtil); getSuits(url: string, info: any, sessionID: string): IGetBodyResponseData<{ _id: string; suites: string[]; diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/DataCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/DataCallbacks.d.ts index add55b5..ac9cab7 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/DataCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/DataCallbacks.d.ts @@ -1,20 +1,20 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGlobals } from "../@types/eft/common/IGlobals"; -import { ICustomizationItem } from "../@types/eft/common/tables/ICustomizationItem"; -import { IQuest } from "../@types/eft/common/tables/IQuest"; -import { IHideoutArea } from "../@types/eft/hideout/IHideoutArea"; -import { IHideoutProduction } from "../@types/eft/hideout/IHideoutProduction"; -import { IHideoutScavCase } from "../@types/eft/hideout/IHideoutScavCase"; -import { IHideoutSettingsBase } from "../@types/eft/hideout/IHideoutSettingsBase"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { ILanguageBase } from "../@types/spt/server/ILocaleBase"; -import { ISettingsBase } from "../@types/spt/server/ISettingsBase"; -import { HttpResponse } from "../utils/HttpResponse"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IGlobals } from "../models/eft/common/IGlobals"; +import { ICustomizationItem } from "../models/eft/common/tables/ICustomizationItem"; +import { IQuest } from "../models/eft/common/tables/IQuest"; +import { IHideoutArea } from "../models/eft/hideout/IHideoutArea"; +import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction"; +import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; +import { IHideoutSettingsBase } from "../models/eft/hideout/IHideoutSettingsBase"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { ILanguageBase } from "../models/spt/server/ILocaleBase"; +import { ISettingsBase } from "../models/spt/server/ISettingsBase"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class DataCallbacks { private httpResponse; private databaseServer; - constructor(httpResponse: HttpResponse, databaseServer: DatabaseServer); + constructor(httpResponse: HttpResponseUtil, databaseServer: DatabaseServer); 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/6ReferenceAnotherClass/types/callbacks/DialogueCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/DialogueCallbacks.d.ts index ccc074b..e81255c 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/DialogueCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/DialogueCallbacks.d.ts @@ -1,31 +1,31 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { DialogueController } from "../controllers/DialogueController"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { DialogueInfo } from "../@types/eft/profile/IAkiProfile"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IGetMailDialogViewRequestData } from "../@types/eft/dialog/IGetMailDialogViewRequestData"; -import { IGetMailDialogInfoRequestData } from "../@types/eft/dialog/IGetMailDialogInfoRequestData"; -import { IRemoveDialogRequestData } from "../@types/eft/dialog/IRemoveDialogRequestData"; -import { IGetMailDialogListRequestData } from "../@types/eft/dialog/IGetMailDialogListRequestData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IFriendRequestData } from "../@types/eft/dialog/IFriendRequestData"; -import { IPinDialogRequestData } from "../@types/eft/dialog/IPinDialogRequestData"; -import { ISetDialogReadRequestData } from "../@types/eft/dialog/ISetDialogReadRequestData"; -import { IGetAllAttachmentsRequestData } from "../@types/eft/dialog/IGetAllAttachmentsRequestData"; -import { IGetChatServerListRequestData } from "../@types/eft/dialog/IGetChatServerListRequestData"; -import { IGetFriendListDataResponse } from "../@types/eft/dialog/IGetFriendListDataResponse"; -import { ISendMessageRequest } from "../@types/eft/dialog/ISendMessageRequest"; -import { IGetMailDialogViewResponseData } from "../@types/eft/dialog/IGetMailDialogViewResponseData"; -import { IGetAllAttachmentsResponse } from "../@types/eft/dialog/IGetAllAttachmentsResponse"; +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 { 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 { IGetChatServerListRequestData } from "../models/eft/dialog/IGetChatServerListRequestData"; +import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse"; +import { ISendMessageRequest } from "../models/eft/dialog/ISendMessageRequest"; +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 { private hashUtil; private timeUtil; private httpResponse; private dialogueController; - constructor(hashUtil: HashUtil, timeUtil: TimeUtil, httpResponse: HttpResponse, dialogueController: DialogueController); + constructor(hashUtil: HashUtil, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, dialogueController: DialogueController); 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/6ReferenceAnotherClass/types/callbacks/GameCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/GameCallbacks.d.ts index 25912c1..9481129 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 "../@types/eft/common/IEmptyRequestData"; -import { IGameEmptyCrcRequestData } from "../@types/eft/game/IGameEmptyCrcRequestData"; -import { IVersionValidateRequestData } from "../@types/eft/game/IVersionValidateRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IGameConfigResponse } from "../@types/eft/game/IGameConfigResponse"; -import { HttpResponse } from "../utils/HttpResponse"; -import { IWatermark } from "../@types/spt/utils/IWatermark"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +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 { private httpResponse; private watermark; private gameController; - constructor(httpResponse: HttpResponse, watermark: IWatermark, gameController: GameController); + constructor(httpResponse: HttpResponseUtil, watermark: IWatermark, 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 50ec0b6..b223bb3 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/HealthCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/HealthCallbacks.d.ts @@ -1,19 +1,20 @@ import { HealthController } from "../controllers/HealthController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { ISyncHealthRequestData } from "../@types/eft/health/ISyncHealthRequestData"; -import { IOffraidEatRequestData } from "../@types/eft/health/IOffraidEatRequestData"; -import { IOffraidHealRequestData } from "../@types/eft/health/IOffraidHealRequestData"; -import { IHealthTreatmentRequestData } from "../@types/eft/health/IHealthTreatmentRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; +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 { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { HttpResponse } from "../utils/HttpResponse"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class HealthCallbacks { private httpResponse; private profileHelper; private healthController; - constructor(httpResponse: HttpResponse, profileHelper: ProfileHelper, healthController: HealthController); + constructor(httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, healthController: HealthController); syncHealth(url: string, info: ISyncHealthRequestData, sessionID: string): IGetBodyResponseData; - offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): any; - offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): any; - healthTreatment(pmcData: IPmcData, info: IHealthTreatmentRequestData, sessionID: string): any; + offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): IItemEventRouterResponse; + offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse; + healthTreatment(pmcData: IPmcData, info: IHealthTreatmentRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/HideoutCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/HideoutCallbacks.d.ts index 3ef61bc..b574232 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/HideoutCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/HideoutCallbacks.d.ts @@ -1,15 +1,15 @@ import { HideoutController } from "../controllers/HideoutController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IHideoutUpgradeRequestData } from "../@types/eft/hideout/IHideoutUpgradeRequestData"; -import { IHideoutUpgradeCompleteRequestData } from "../@types/eft/hideout/IHideoutUpgradeCompleteRequestData"; -import { IHideoutScavCaseStartRequestData } from "../@types/eft/hideout/IHideoutScavCaseStartRequestData"; -import { IHideoutPutItemInRequestData } from "../@types/eft/hideout/IHideoutPutItemInRequestData"; -import { IHideoutTakeItemOutRequestData } from "../@types/eft/hideout/IHideoutTakeItemOutRequestData"; -import { IHideoutToggleAreaRequestData } from "../@types/eft/hideout/IHideoutToggleAreaRequestData"; -import { IHideoutSingleProductionStartRequestData } from "../@types/eft/hideout/IHideoutSingleProductionStartRequestData"; -import { IHideoutContinousProductionStartRequestData } from "../@types/eft/hideout/IHideoutContinousProductionStartRequestData"; -import { IHideoutTakeProductionRequestData } from "../@types/eft/hideout/IHideoutTakeProductionRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ConfigServer } from "../servers/ConfigServer"; import { OnUpdate } from "../di/OnUpdate"; export declare class HideoutCallbacks extends OnUpdate { diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/HttpCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/HttpCallbacks.d.ts index 9bb00bf..7072297 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/HttpCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/HttpCallbacks.d.ts @@ -1,4 +1,4 @@ -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; import { OnLoad } from "../di/OnLoad"; export declare class HttpCallbacks extends OnLoad { private httpServer; diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/InraidCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/InraidCallbacks.d.ts index 2ccaa0a..1948d01 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/InraidCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/InraidCallbacks.d.ts @@ -1,17 +1,17 @@ import { InraidController } from "../controllers/InraidController"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IRegisterPlayerRequestData } from "../@types/eft/inRaid/IRegisterPlayerRequestData"; -import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; +import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ConfigServer } from "../servers/ConfigServer"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class InraidCallbacks { private inraidController; private httpResponse; private configServer; private airdropConfig; private inraidConfig; - constructor(inraidController: InraidController, httpResponse: HttpResponse, configServer: ConfigServer); + constructor(inraidController: InraidController, httpResponse: HttpResponseUtil, configServer: ConfigServer); registerPlayer(url: string, info: IRegisterPlayerRequestData, sessionID: string): INullResponseData; saveProgress(url: string, info: ISaveProgressRequestData, sessionID: string): INullResponseData; getRaidEndState(): string; diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/InsuranceCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/InsuranceCallbacks.d.ts index f3d9832..73b7bd9 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/InsuranceCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/InsuranceCallbacks.d.ts @@ -1,22 +1,23 @@ import { InsuranceController } from "../controllers/InsuranceController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IGetInsuranceCostRequestData } from "../@types/eft/insurance/IGetInsuranceCostRequestData"; -import { IInsureRequestData } from "../@types/eft/insurance/IInsureRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +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 { HttpResponse } from "../utils/HttpResponse"; +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 { private insuranceController; private insuranceService; private httpResponse; private configServer; private insuranceConfig; - constructor(insuranceController: InsuranceController, insuranceService: InsuranceService, httpResponse: HttpResponse, configServer: ConfigServer); + constructor(insuranceController: InsuranceController, insuranceService: InsuranceService, httpResponse: HttpResponseUtil, configServer: ConfigServer); onLoad(): void; getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): IGetBodyResponseData; - insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): any; + insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse; onUpdate(secondsSinceLastRun: number): boolean; getRoute(): string; } diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/InventoryCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/InventoryCallbacks.d.ts index 1807e4b..90d6936 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/InventoryCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/InventoryCallbacks.d.ts @@ -1,22 +1,22 @@ import { InventoryController } from "../controllers/InventoryController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IInventoryFoldRequestData } from "../@types/eft/inventory/IInventoryFoldRequestData"; -import { IInventorySplitRequestData } from "../@types/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMoveRequestData } from "../@types/eft/inventory/IInventoryMoveRequestData"; -import { IInventoryMergeRequestData } from "../@types/eft/inventory/IInventoryMergeRequestData"; -import { IInventoryRemoveRequestData } from "../@types/eft/inventory/IInventoryRemoveRequestData"; -import { IInventoryTransferRequestData } from "../@types/eft/inventory/IInventoryTransferRequestData"; -import { IInventorySwapRequestData } from "../@types/eft/inventory/IInventorySwapRequestData"; -import { IInventoryToggleRequestData } from "../@types/eft/inventory/IInventoryToggleRequestData"; -import { IInventoryTagRequestData } from "../@types/eft/inventory/IInventoryTagRequestData"; -import { IInventoryBindRequestData } from "../@types/eft/inventory/IInventoryBindRequestData"; -import { IInventoryExamineRequestData } from "../@types/eft/inventory/IInventoryExamineRequestData"; -import { IInventoryReadEncyclopediaRequestData } from "../@types/eft/inventory/IInventoryReadEncyclopediaRequestData"; -import { IInventorySortRequestData } from "../@types/eft/inventory/IInventorySortRequestData"; -import { IInventoryCreateMarkerRequestData } from "../@types/eft/inventory/IInventoryCreateMarkerRequestData"; -import { IInventoryDeleteMarkerRequestData } from "../@types/eft/inventory/IInventoryDeleteMarkerRequestData"; -import { IInventoryEditMarkerRequestData } from "../@types/eft/inventory/IInventoryEditMarkerRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class InventoryCallbacks { private inventoryController; constructor(inventoryController: InventoryController); diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/ItemEventCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/ItemEventCallbacks.d.ts index ca069ad..74e79c4 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/ItemEventCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/ItemEventCallbacks.d.ts @@ -1,11 +1,11 @@ -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IItemEventRouterRequest } from "../@types/eft/itemEvent/IItemEventRouterRequest"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterRequest } from "../models/eft/itemEvent/IItemEventRouterRequest"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class ItemEventCallbacks { private httpResponse; private itemEventRouter; - constructor(httpResponse: HttpResponse, itemEventRouter: ItemEventRouter); + constructor(httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter); handleEvents(url: string, info: IItemEventRouterRequest, sessionID: string): IGetBodyResponseData; } diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/LauncherCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/LauncherCallbacks.d.ts index 5e3ec40..addf76b 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/LauncherCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/LauncherCallbacks.d.ts @@ -1,17 +1,17 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { SaveServer } from "../servers/SaveServer"; import { LauncherController } from "../controllers/LauncherController"; -import { IRegisterData } from "../@types/eft/launcher/IRegisterData"; -import { IRemoveProfileData } from "../@types/eft/launcher/IRemoveProfileData"; -import { ILoginRequestData } from "../@types/eft/launcher/ILoginRequestData"; -import { IChangeRequestData } from "../@types/eft/launcher/IChangeRequestData"; -import { IWatermark } from "../@types/spt/utils/IWatermark"; +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 { private httpResponse; private launcherController; private saveServer; private watermark; - constructor(httpResponse: HttpResponse, launcherController: LauncherController, saveServer: SaveServer, watermark: IWatermark); + constructor(httpResponse: HttpResponseUtil, launcherController: LauncherController, saveServer: SaveServer, watermark: IWatermark); connect(): string; login(url: string, info: ILoginRequestData, sessionID: string): string; register(url: string, info: IRegisterData, sessionID: string): "FAILED" | "OK"; diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/LocationCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/LocationCallbacks.d.ts index 6142ad5..346893b 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/LocationCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/LocationCallbacks.d.ts @@ -1,13 +1,13 @@ import { LocationController } from "../controllers/LocationController"; -import { IGetLocationRequestData } from "../@types/eft/location/IGetLocationRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { ILocationsGenerateAllResponse } from "../@types/eft/common/ILocationsSourceDestinationBase"; -import { ILocationBase } from "../@types/eft/common/ILocationBase"; -import { HttpResponse } from "../utils/HttpResponse"; +import { IGetLocationRequestData } from "../models/eft/location/IGetLocationRequestData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSourceDestinationBase"; +import { ILocationBase } from "../models/eft/common/ILocationBase"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class LocationCallbacks { private httpResponse; private locationController; - constructor(httpResponse: HttpResponse, locationController: LocationController); + constructor(httpResponse: HttpResponseUtil, locationController: LocationController); getLocationData(url: string, info: any, 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 373566b..9364a2f 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/MatchCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/MatchCallbacks.d.ts @@ -1,18 +1,18 @@ import { MatchController } from "../controllers/MatchController"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { IStartOfflineRaidRequestData } from "../@types/eft/match/IStartOffineRaidRequestData"; -import { IEndOfflineRaidRequestData } from "../@types/eft/match/IEndOfflineRaidRequestData"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { HttpResponse } from "../utils/HttpResponse"; +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 { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class MatchCallbacks { private httpResponse; private jsonUtil; private matchController; private databaseServer; - constructor(httpResponse: HttpResponse, jsonUtil: JsonUtil, matchController: MatchController, databaseServer: DatabaseServer); + constructor(httpResponse: HttpResponseUtil, jsonUtil: JsonUtil, matchController: MatchController, databaseServer: DatabaseServer); updatePing(url: string, info: any, sessionID: string): INullResponseData; exitMatch(url: string, info: any, sessionID: string): INullResponseData; exitToMenu(url: string, info: any, sessionID: string): INullResponseData; diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/ModCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/ModCallbacks.d.ts index 18ebfce..b4c18c2 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/ModCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/ModCallbacks.d.ts @@ -1,9 +1,9 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { OnLoad } from "../di/OnLoad"; import { DelayedModLoader } from "../loaders/DelayedModLoader"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from '../@types/spt/utils/ILogger'; -import { IHttpServer } from '../@types/spt/server/IHttpServer'; +import { ILogger } from '../models/spt/utils/ILogger'; +import { IHttpServer } from '../models/spt/server/IHttpServer'; declare class ModCallbacks extends OnLoad { private logger; private httpResponse; @@ -11,7 +11,7 @@ declare class ModCallbacks extends OnLoad { private modLoader; private configServer; private httpConfig; - constructor(logger: ILogger, httpResponse: HttpResponse, httpServer: IHttpServer, modLoader: DelayedModLoader, configServer: ConfigServer); + constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, modLoader: DelayedModLoader, configServer: ConfigServer); onLoad(): void; getRoute(): string; sendBundle(sessionID: string, req: any, resp: any, body: any): void; diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/NoteCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/NoteCallbacks.d.ts index ed30fcd..36cbd44 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 "../@types/eft/common/IPmcData"; -import { INoteActionData } from "../@types/eft/notes/INoteActionData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { private noteController; constructor(noteController: NoteController); diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/NotifierCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/NotifierCallbacks.d.ts index d982db5..f47dcc9 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/NotifierCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/NotifierCallbacks.d.ts @@ -1,15 +1,15 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { INotifierChannel } from "../@types/eft/notifier/INotifier"; -import { ISelectProfileRequestData } from "../@types/eft/notifier/ISelectProfileRequestData"; +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 { private httpServerHelper; private httpResponse; private notifierController; - constructor(httpServerHelper: HttpServerHelper, httpResponse: HttpResponse, notifierController: NotifierController); + constructor(httpServerHelper: HttpServerHelper, httpResponse: HttpResponseUtil, notifierController: NotifierController); /** * If we don't have anything to send, it's ok to not send anything back * because notification requests can be long-polling. In fact, we SHOULD wait diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/PresetBuildCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/PresetBuildCallbacks.d.ts index ee1b592..fd22c8f 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/PresetBuildCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/PresetBuildCallbacks.d.ts @@ -1,14 +1,14 @@ import { PresetBuildController } from "../controllers/PresetBuildController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IPresetBuildActionRequestData } from "../@types/eft/presetBuild/IPresetBuildActionRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { WeaponBuild } from "../@types/eft/profile/IAkiProfile"; -import { HttpResponse } from "../utils/HttpResponse"; +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 { WeaponBuild } from "../models/eft/profile/IAkiProfile"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class PresetBuildCallbacks { private httpResponse; private presetBuildController; - constructor(httpResponse: HttpResponse, presetBuildController: PresetBuildController); + constructor(httpResponse: HttpResponseUtil, presetBuildController: PresetBuildController); 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/6ReferenceAnotherClass/types/callbacks/ProfileCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/ProfileCallbacks.d.ts index 94e05b8..e50c130 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/ProfileCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/ProfileCallbacks.d.ts @@ -1,21 +1,21 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { ProfileController } from "../controllers/ProfileController"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IProfileChangeNicknameRequestData } from "../@types/eft/profile/IProfileChangeNicknameRequestData"; -import { IProfileChangeVoiceRequestData } from "../@types/eft/profile/IProfileChangeVoiceRequestData"; -import { IProfileCreateRequestData } from "../@types/eft/profile/IProfileCreateRequestData"; -import { IValidateNicknameRequestData } from "../@types/eft/profile/IValidateNicknameRequestData"; -import { ISearchFriendRequestData } from "../@types/eft/profile/ISearchFriendRequestData"; -import { ISearchFriendResponse } from "../@types/eft/profile/ISearchFriendResponse"; -import { IGetMiniProfileRequestData } from "../@types/eft/launcher/IGetMiniProfileRequestData"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +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 { private httpResponse; private timeUtil; private profileController; - constructor(httpResponse: HttpResponse, timeUtil: TimeUtil, profileController: ProfileController); + constructor(httpResponse: HttpResponseUtil, timeUtil: TimeUtil, profileController: ProfileController); createProfile(url: string, info: IProfileCreateRequestData, sessionID: string): IGetBodyResponseData; getProfileData(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; regenerateScav(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/QuestCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/QuestCallbacks.d.ts index 589682b..1f3964b 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/QuestCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/QuestCallbacks.d.ts @@ -1,22 +1,22 @@ import { QuestController } from "../controllers/QuestController"; import { RepeatableQuestController } from "../controllers/RepeatableQuestController"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IAcceptQuestRequestData } from "../@types/eft/quests/IAcceptQuestRequestData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IListQuestsRequestData } from "../@types/eft/quests/IListQuestsRequestData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { ICompleteQuestRequestData } from "../@types/eft/quests/ICompleteQuestRequestData"; -import { IHandoverQuestRequestData } from "../@types/eft/quests/IHandoverQuestRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IQuest } from "../@types/eft/common/tables/IQuest"; -import { IPmcDataRepeatableQuest } from "../@types/eft/common/tables/IRepeatableQuests"; -import { IRepeatableQuestChangeRequest } from "../@types/eft/quests/IRepeatableQuestChangeRequest"; -import { HttpResponse } from "../utils/HttpResponse"; +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 { IQuest } from "../models/eft/common/tables/IQuest"; +import { IPmcDataRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; +import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class QuestCallbacks { private httpResponse; private questController; private repeatableQuestController; - constructor(httpResponse: HttpResponse, questController: QuestController, repeatableQuestController: RepeatableQuestController); + constructor(httpResponse: HttpResponseUtil, questController: QuestController, repeatableQuestController: RepeatableQuestController); 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/6ReferenceAnotherClass/types/callbacks/RagfairCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/RagfairCallbacks.d.ts index 31af479..260fd13 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 { IPmcData } from "../@types/eft/common/IPmcData"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { ISearchRequestData } from "../@types/eft/ragfair/ISearchRequestData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGetMarketPriceRequestData } from "../@types/eft/ragfair/IGetMarketPriceRequestData"; -import { IAddOfferRequestData } from "../@types/eft/ragfair/IAddOfferRequestData"; -import { IRemoveOfferRequestData } from "../@types/eft/ragfair/IRemoveOfferRequestData"; -import { IExtendOfferRequestData } from "../@types/eft/ragfair/IExtendOfferRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IGetItemPriceResult } from "../@types/eft/ragfair/IGetItemPriceResult"; +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 { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult"; import { ConfigServer } from "../servers/ConfigServer"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairCallbacks extends OnLoadOnUpdate { private httpResponse; private logger; @@ -23,7 +23,7 @@ export declare class RagfairCallbacks extends OnLoadOnUpdate { private ragfairController; private configServer; private ragfairConfig; - constructor(httpResponse: HttpResponse, logger: ILogger, jsonUtil: JsonUtil, ragfairServer: RagfairServer, ragfairController: RagfairController, configServer: ConfigServer); + constructor(httpResponse: HttpResponseUtil, logger: ILogger, jsonUtil: JsonUtil, ragfairServer: RagfairServer, ragfairController: RagfairController, configServer: ConfigServer); onLoad(): void; getRoute(): string; search(url: string, info: ISearchRequestData, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/RepairCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/RepairCallbacks.d.ts index e28e48b..4acd364 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 "../@types/eft/common/IPmcData"; -import { IRepairActionDataRequest } from "../@types/eft/repair/IRepairActionDataRequest"; -import { ITraderRepairActionDataRequest } from "../@types/eft/repair/ITraderRepairActionDataRequest"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +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/TradeCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/TradeCallbacks.d.ts index 5117a82..4cf8497 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 "../@types/eft/common/IPmcData"; -import { IProcessRagfairTradeRequestData } from "../@types/eft/trade/IProcessRagfairTradeRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IProcessBaseTradeRequestData } from "../@types/eft/trade/IProcessBaseTradeRequestData"; +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 { private tradeController; constructor(tradeController: TradeController); diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/TraderCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/TraderCallbacks.d.ts index 3f72e2b..264ef94 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/TraderCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/TraderCallbacks.d.ts @@ -1,13 +1,13 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TraderController } from "../controllers/TraderController"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IBarterScheme, ITraderAssort, ITraderBase } from "../@types/eft/common/tables/ITrader"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; +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 { private httpResponse; private traderController; - constructor(httpResponse: HttpResponse, traderController: TraderController); + constructor(httpResponse: HttpResponseUtil, traderController: TraderController); onLoad(): void; getRoute(): string; getTraderSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/WeatherCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/WeatherCallbacks.d.ts index 99d5c1f..2474417 100644 --- a/TypeScript/6ReferenceAnotherClass/types/callbacks/WeatherCallbacks.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/callbacks/WeatherCallbacks.d.ts @@ -1,10 +1,10 @@ import { WeatherController } from "../controllers/WeatherController"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { HttpResponse } from "../utils/HttpResponse"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class WeatherCallbacks { private httpResponse; private weatherController; - constructor(httpResponse: HttpResponse, weatherController: WeatherController); + constructor(httpResponse: HttpResponseUtil, weatherController: WeatherController); getWeather(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; } diff --git a/TypeScript/6ReferenceAnotherClass/types/callbacks/WishlistCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/callbacks/WishlistCallbacks.d.ts index 870f049..1816600 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 "../@types/eft/common/IPmcData"; -import { IWishlistActionData } from "../@types/eft/wishlist/IWishlistActionData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { private wishlistController; constructor(wishlistController: WishlistController); diff --git a/TypeScript/6ReferenceAnotherClass/types/configs/AkiConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/configs/AkiConfig.d.ts deleted file mode 100644 index f9b9e31..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/configs/AkiConfig.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -export const akiVersion: string; -export const projectName: string; -export const compatibleTarkovVersion: string; diff --git a/TypeScript/6ReferenceAnotherClass/types/configs/BotConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/configs/BotConfig.d.ts deleted file mode 100644 index 6c7ea7b..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/configs/BotConfig.d.ts +++ /dev/null @@ -1,309 +0,0 @@ -export declare namespace presetBatch { - const assault: number; - const bossBully: number; - const bossGluhar: number; - const bossKilla: number; - const bossKojaniy: number; - const bossSanitar: number; - const bossTagilla: number; - const bossTest: number; - const cursedAssault: number; - const followerBully: number; - const followerGluharAssault: number; - const followerGluharScout: number; - const followerGluharSecurity: number; - const followerGluharSnipe: number; - const followerKojaniy: number; - const followerSanitar: number; - const followerTagilla: number; - const followerTest: number; - const marksman: number; - const pmcBot: number; - const sectantPriest: number; - const sectantWarrior: number; - const gifter: number; - const test: number; - const exUsec: number; -} -export declare const bosses: string[]; -export declare namespace durability { - namespace _default { - namespace armor { - const maxDelta: number; - const minDelta: number; - } - namespace weapon { - export const lowestMax: number; - export const highestMax: number; - const maxDelta_1: number; - export { maxDelta_1 as maxDelta }; - const minDelta_1: number; - export { minDelta_1 as minDelta }; - } - } - export { _default as default }; - export namespace pmc { - export namespace armor_1 { - export const lowestMaxPercent: number; - export const highestMaxPercent: number; - const maxDelta_2: number; - export { maxDelta_2 as maxDelta }; - const minDelta_2: number; - export { minDelta_2 as minDelta }; - } - export { armor_1 as armor }; - export namespace weapon_1 { - const lowestMax_1: number; - export { lowestMax_1 as lowestMax }; - const highestMax_1: number; - export { highestMax_1 as highestMax }; - const maxDelta_3: number; - export { maxDelta_3 as maxDelta }; - const minDelta_3: number; - export { minDelta_3 as minDelta }; - } - export { weapon_1 as weapon }; - } - export namespace boss { - export namespace armor_2 { - const maxDelta_4: number; - export { maxDelta_4 as maxDelta }; - const minDelta_4: number; - export { minDelta_4 as minDelta }; - } - export { armor_2 as armor }; - export namespace weapon_2 { - const lowestMax_2: number; - export { lowestMax_2 as lowestMax }; - const highestMax_2: number; - export { highestMax_2 as highestMax }; - const maxDelta_5: number; - export { maxDelta_5 as maxDelta }; - const minDelta_5: number; - export { minDelta_5 as minDelta }; - } - export { weapon_2 as weapon }; - } - export namespace follower { - export namespace armor_3 { - const maxDelta_6: number; - export { maxDelta_6 as maxDelta }; - const minDelta_6: number; - export { minDelta_6 as minDelta }; - } - export { armor_3 as armor }; - export namespace weapon_3 { - const lowestMax_3: number; - export { lowestMax_3 as lowestMax }; - const highestMax_3: number; - export { highestMax_3 as highestMax }; - const maxDelta_7: number; - export { maxDelta_7 as maxDelta }; - const minDelta_7: number; - export { minDelta_7 as minDelta }; - } - export { weapon_3 as weapon }; - } - export namespace assault_1 { - export namespace armor_4 { - const maxDelta_8: number; - export { maxDelta_8 as maxDelta }; - const minDelta_8: number; - export { minDelta_8 as minDelta }; - } - export { armor_4 as armor }; - export namespace weapon_4 { - const lowestMax_4: number; - export { lowestMax_4 as lowestMax }; - const highestMax_4: number; - export { highestMax_4 as highestMax }; - const maxDelta_9: number; - export { maxDelta_9 as maxDelta }; - const minDelta_9: number; - export { minDelta_9 as minDelta }; - } - export { weapon_4 as weapon }; - } - export { assault_1 as assault }; - export namespace cursedassault { - export namespace armor_5 { - const maxDelta_10: number; - export { maxDelta_10 as maxDelta }; - const minDelta_10: number; - export { minDelta_10 as minDelta }; - } - export { armor_5 as armor }; - export namespace weapon_5 { - const lowestMax_5: number; - export { lowestMax_5 as lowestMax }; - const highestMax_5: number; - export { highestMax_5 as highestMax }; - const maxDelta_11: number; - export { maxDelta_11 as maxDelta }; - const minDelta_11: number; - export { minDelta_11 as minDelta }; - } - export { weapon_5 as weapon }; - } - export namespace marksman_1 { - export namespace armor_6 { - const maxDelta_12: number; - export { maxDelta_12 as maxDelta }; - const minDelta_12: number; - export { minDelta_12 as minDelta }; - } - export { armor_6 as armor }; - export namespace weapon_6 { - const lowestMax_6: number; - export { lowestMax_6 as lowestMax }; - const highestMax_6: number; - export { highestMax_6 as highestMax }; - const maxDelta_13: number; - export { maxDelta_13 as maxDelta }; - const minDelta_13: number; - export { minDelta_13 as minDelta }; - } - export { weapon_6 as weapon }; - } - export { marksman_1 as marksman }; - export namespace pmcbot { - export namespace armor_7 { - const maxDelta_14: number; - export { maxDelta_14 as maxDelta }; - const minDelta_14: number; - export { minDelta_14 as minDelta }; - } - export { armor_7 as armor }; - export namespace weapon_7 { - const lowestMax_7: number; - export { lowestMax_7 as lowestMax }; - const highestMax_7: number; - export { highestMax_7 as highestMax }; - const maxDelta_15: number; - export { maxDelta_15 as maxDelta }; - const minDelta_15: number; - export { minDelta_15 as minDelta }; - } - export { weapon_7 as weapon }; - } - export namespace exusec { - export namespace armor_8 { - const maxDelta_16: number; - export { maxDelta_16 as maxDelta }; - const minDelta_16: number; - export { minDelta_16 as minDelta }; - } - export { armor_8 as armor }; - export namespace weapon_8 { - const lowestMax_8: number; - export { lowestMax_8 as lowestMax }; - const highestMax_8: number; - export { highestMax_8 as highestMax }; - const maxDelta_17: number; - export { maxDelta_17 as maxDelta }; - const minDelta_17: number; - export { minDelta_17 as minDelta }; - } - export { weapon_8 as weapon }; - } - export namespace sectantpriest { - export namespace armor_9 { - const maxDelta_18: number; - export { maxDelta_18 as maxDelta }; - const minDelta_18: number; - export { minDelta_18 as minDelta }; - } - export { armor_9 as armor }; - export namespace weapon_9 { - const lowestMax_9: number; - export { lowestMax_9 as lowestMax }; - const highestMax_9: number; - export { highestMax_9 as highestMax }; - const maxDelta_19: number; - export { maxDelta_19 as maxDelta }; - const minDelta_19: number; - export { minDelta_19 as minDelta }; - } - export { weapon_9 as weapon }; - } - export namespace sectantwarrior { - export namespace armor_10 { - const maxDelta_20: number; - export { maxDelta_20 as maxDelta }; - const minDelta_20: number; - export { minDelta_20 as minDelta }; - } - export { armor_10 as armor }; - export namespace weapon_10 { - const lowestMax_10: number; - export { lowestMax_10 as lowestMax }; - const highestMax_10: number; - export { highestMax_10 as highestMax }; - const maxDelta_21: number; - export { maxDelta_21 as maxDelta }; - const minDelta_21: number; - export { minDelta_21 as minDelta }; - } - export { weapon_10 as weapon }; - } -} -export declare namespace lootNValue { - export const scav: number; - const pmc_1: number; - export { pmc_1 as pmc }; -} -export declare namespace pmc_2 { - namespace dynamicLoot { - const whitelist: any[]; - const blacklist: string[]; - const spawnLimits: { - "5c99f98d86f7745c314214b3": number; - "5c164d2286f774194c5e69fa": number; - "550aa4cd4bdc2dd8348b456c": number; - "55818add4bdc2d5b648b456f": number; - "55818ad54bdc2ddc698b4569": number; - "55818aeb4bdc2ddc698b456a": number; - "55818ae44bdc2dde698b456c": number; - "55818af64bdc2d5b648b4570": number; - "5448e54d4bdc2dcc718b4568": number; - "5448f3a64bdc2d60728b456a": number; - "5447e1d04bdc2dff2f8b4567": number; - "5a341c4686f77469e155819e": number; - "55818b164bdc2ddc698b456c": number; - "5448bc234bdc2d3c308b4569": number; - "543be5dd4bdc2deb348b4569": number; - "543be5cb4bdc2deb348b4568": number; - "5485a8684bdc2da71d8b4567": number; - "5d650c3e815116009f6201d2": number; - "5448f39d4bdc2d0a728b4568": number; - "543be6564bdc2df4348b4568": number; - }; - const moneyStackLimits: { - "5449016a4bdc2d6f028b456f": number; - "5696686a4bdc2da3298b456a": number; - "569668774bdc2da2298b4568": number; - }; - } - const cartridgeBlacklist: string[]; - const difficulty: string; - const isUsec: number; - const chanceSameSideIsHostilePercent: number; - const usecType: string; - const bearType: string; - const maxBackpackLootTotalRub: number; - const maxPocketLootTotalRub: number; - const maxVestLootTotalRub: number; - namespace types { - const assault_2: number; - export { assault_2 as assault }; - const cursedAssault_1: number; - export { cursedAssault_1 as cursedAssault }; - const pmcBot_1: number; - export { pmcBot_1 as pmcBot }; - const exUsec_1: number; - export { exUsec_1 as exUsec }; - } -} -export { pmc_2 as pmc }; -export declare const showTypeInNickname: boolean; -export declare const maxBotCap: number; diff --git a/TypeScript/6ReferenceAnotherClass/types/configs/HealthConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/configs/HealthConfig.d.ts deleted file mode 100644 index 49bef94..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/configs/HealthConfig.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -export namespace healthMultipliers { - const death: number; - const blacked: number; -} -export namespace save { - const health: boolean; - const effects: boolean; -} diff --git a/TypeScript/6ReferenceAnotherClass/types/configs/HideoutConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/configs/HideoutConfig.d.ts deleted file mode 100644 index 3894576..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/configs/HideoutConfig.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -export const runIntervalSeconds: number; -export namespace scavCase { - const rewardParentBlacklist: any[]; - const rewardItemBlacklist: any[]; - namespace ammoRewards { - const giveMultipleOfTen: boolean; - const minAmount: number; - } - namespace moneyRewards { - const enabled: boolean; - namespace rub { - const min: number; - const max: number; - } - namespace usd { - const min_1: number; - export { min_1 as min }; - const max_1: number; - export { max_1 as max }; - } - namespace eur { - const min_2: number; - export { min_2 as min }; - const max_2: number; - export { max_2 as max }; - } - } -} diff --git a/TypeScript/6ReferenceAnotherClass/types/configs/HttpConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/configs/HttpConfig.d.ts deleted file mode 100644 index d7572a0..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/configs/HttpConfig.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export const ip: string; -export const port: number; diff --git a/TypeScript/6ReferenceAnotherClass/types/configs/InraidConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/configs/InraidConfig.d.ts deleted file mode 100644 index 7ac112c..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/configs/InraidConfig.d.ts +++ /dev/null @@ -1,15 +0,0 @@ -export const MIAOnRaidEnd: boolean; -export namespace raidMenuSettings { - const aiAmount: string; - const aiDifficulty: string; - const bossEnabled: boolean; - const scavWars: boolean; - const taggedAndCursed: boolean; -} -export namespace save { - const loot: boolean; - const durability: boolean; -} -export const carExtracts: string[]; -export const carExtractBaseStandingGain: number; -export const scavExtractGain: number; diff --git a/TypeScript/6ReferenceAnotherClass/types/configs/InsuranceConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/configs/InsuranceConfig.d.ts deleted file mode 100644 index 441319e..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/configs/InsuranceConfig.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -export const insuranceMultiplier: { - "54cb50c76803fa8b248b4571": number; - "54cb57776803fa99248b456e": number; -}; -export const returnChancePercent: { - "54cb50c76803fa8b248b4571": number; - "54cb57776803fa99248b456e": number; -}; -export const runIntervalSeconds: number; diff --git a/TypeScript/6ReferenceAnotherClass/types/configs/InventoryConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/configs/InventoryConfig.d.ts deleted file mode 100644 index 8d0b82f..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/configs/InventoryConfig.d.ts +++ /dev/null @@ -1 +0,0 @@ -export const newItemsMarkedFound: boolean; diff --git a/TypeScript/6ReferenceAnotherClass/types/configs/LocationConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/configs/LocationConfig.d.ts deleted file mode 100644 index 848096a..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/configs/LocationConfig.d.ts +++ /dev/null @@ -1,52 +0,0 @@ -export namespace looseLootMultiplier { - const bigmap: number; - const develop: number; - const factory4_day: number; - const factory4_night: number; - const interchange: number; - const laboratory: number; - const rezervbase: number; - const shoreline: number; - const woods: number; - const hideout: number; - const lighthouse: number; - const privatearea: number; - const suburbs: number; - const tarkovstreets: number; - const terminal: number; - const town: number; -} -export namespace staticLootMultiplier { - const bigmap_1: number; - export { bigmap_1 as bigmap }; - const develop_1: number; - export { develop_1 as develop }; - const factory4_day_1: number; - export { factory4_day_1 as factory4_day }; - const factory4_night_1: number; - export { factory4_night_1 as factory4_night }; - const interchange_1: number; - export { interchange_1 as interchange }; - const laboratory_1: number; - export { laboratory_1 as laboratory }; - const rezervbase_1: number; - export { rezervbase_1 as rezervbase }; - const shoreline_1: number; - export { shoreline_1 as shoreline }; - const woods_1: number; - export { woods_1 as woods }; - const hideout_1: number; - export { hideout_1 as hideout }; - const lighthouse_1: number; - export { lighthouse_1 as lighthouse }; - const privatearea_1: number; - export { privatearea_1 as privatearea }; - const suburbs_1: number; - export { suburbs_1 as suburbs }; - const tarkovstreets_1: number; - export { tarkovstreets_1 as tarkovstreets }; - const terminal_1: number; - export { terminal_1 as terminal }; - const town_1: number; - export { town_1 as town }; -} diff --git a/TypeScript/6ReferenceAnotherClass/types/configs/MatchConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/configs/MatchConfig.d.ts deleted file mode 100644 index 59524e0..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/configs/MatchConfig.d.ts +++ /dev/null @@ -1 +0,0 @@ -export const enabled: boolean; diff --git a/TypeScript/6ReferenceAnotherClass/types/configs/QuestConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/configs/QuestConfig.d.ts deleted file mode 100644 index 069e0ac..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/configs/QuestConfig.d.ts +++ /dev/null @@ -1,70 +0,0 @@ -export const redeemTime: number; -export const repeatableQuests: { - name: string; - types: string[]; - resetTime: number; - numQuests: number; - minPlayerLevel: number; - rewardScaling: { - levels: number[]; - experience: number[]; - roubles: number[]; - items: number[]; - reputation: number[]; - rewardSpread: number; - }; - locations: { - any: string[]; - factory4_day: string[]; - bigmap: string[]; - Woods: string[]; - Shoreline: string[]; - Interchange: string[]; - Lighthouse: string[]; - laboratory: string[]; - RezervBase: string[]; - }; - traderWhitelist: { - traderId: any; - questTypes: string[]; - }[]; - questConfig: { - Exploration: { - maxExtracts: number; - specificExits: { - probability: number; - passageRequirementWhitelist: string[]; - }; - }; - Completion: { - minRequestedAmount: number; - maxRequestedAmount: number; - minRequestedBulletAmount: number; - maxRequestedBulletAmount: number; - useWhitelist: boolean; - useBlacklist: boolean; - }; - Elimination: { - targets: { - key: string; - relativeProbability: number; - data: { - isBoss: boolean; - }; - }[]; - bodyPartProb: number; - bodyParts: { - key: string; - relativeProbability: number; - data: string[]; - }[]; - specificLocationProb: number; - distLocationBlacklist: string[]; - distProb: number; - maxDist: number; - minDist: number; - maxKills: number; - minKills: number; - }; - }; -}[]; diff --git a/TypeScript/6ReferenceAnotherClass/types/configs/RagfairConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/configs/RagfairConfig.d.ts deleted file mode 100644 index 4a0f68c..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/configs/RagfairConfig.d.ts +++ /dev/null @@ -1,87 +0,0 @@ -export const runIntervalSeconds: number; -export namespace sell { - const fees: boolean; - namespace chance { - const base: number; - const overprices: number; - const underpriced: number; - } - namespace time { - const base_1: number; - export { base_1 as base }; - export const min: number; - export const max: number; - } - namespace reputation { - const gain: number; - const loss: number; - } -} -export const traders: { - "54cb50c76803fa8b248b4571": boolean; - "54cb57776803fa99248b456e": boolean; - "579dc571d53a0658a154fbec": boolean; - "58330581ace78e27b8b10cee": boolean; - "5935c25fb3acc3127c3d8cd9": boolean; - "5a7c2eca46aef81a7ca2145d": boolean; - "5ac3b934156ae10c4430e83c": boolean; - "5c0647fdd443bc2504c2d371": boolean; - ragfair: boolean; -}; -export namespace dynamic { - const expiredOfferThreshold: number; - namespace offerItemCount { - const min_1: number; - export { min_1 as min }; - const max_1: number; - export { max_1 as max }; - } - namespace price { - const min_2: number; - export { min_2 as min }; - const max_2: number; - export { max_2 as max }; - } - namespace endTimeSeconds { - const min_3: number; - export { min_3 as min }; - const max_3: number; - export { max_3 as max }; - } - namespace condition { - export const conditionChance: number; - const min_4: number; - export { min_4 as min }; - const max_4: number; - export { max_4 as max }; - } - namespace stackablePercent { - const min_5: number; - export { min_5 as min }; - const max_5: number; - export { max_5 as max }; - } - namespace nonStackableCount { - const min_6: number; - export { min_6 as min }; - const max_6: number; - export { max_6 as max }; - } - namespace rating { - const min_7: number; - export { min_7 as min }; - const max_7: number; - export { max_7 as max }; - } - const currencies: { - "5449016a4bdc2d6f028b456f": number; - "5696686a4bdc2da3298b456a": number; - "569668774bdc2da2298b4568": number; - }; - const showAsSingleStack: any[]; - namespace blacklist { - const custom: string[]; - const enableBsgList: boolean; - const enableQuestList: boolean; - } -} diff --git a/TypeScript/6ReferenceAnotherClass/types/configs/RepairConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/configs/RepairConfig.d.ts deleted file mode 100644 index d2bec52..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/configs/RepairConfig.d.ts +++ /dev/null @@ -1 +0,0 @@ -export const priceMultiplier: number; diff --git a/TypeScript/6ReferenceAnotherClass/types/configs/TraderConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/configs/TraderConfig.d.ts deleted file mode 100644 index c7fc65d..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/configs/TraderConfig.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -export const updateTime: { - traderId: any; - seconds: number; -}[]; -export const updateTimeDefault: number; -export const fenceAssortSize: number; -export const fenceMaxPresetsCount: number; -export const fencePresetPriceMult: number; -export const minDurabilityForSale: number; -export const fenceItemIgnoreList: string[]; diff --git a/TypeScript/6ReferenceAnotherClass/types/configs/WeatherConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/configs/WeatherConfig.d.ts deleted file mode 100644 index ca37604..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/configs/WeatherConfig.d.ts +++ /dev/null @@ -1,55 +0,0 @@ -export const acceleration: number; -export namespace weather { - namespace clouds { - const min: number; - const max: number; - } - namespace windSpeed { - const min_1: number; - export { min_1 as min }; - const max_1: number; - export { max_1 as max }; - } - namespace windDirection { - const min_2: number; - export { min_2 as min }; - const max_2: number; - export { max_2 as max }; - } - namespace windGustiness { - const min_3: number; - export { min_3 as min }; - const max_3: number; - export { max_3 as max }; - } - namespace rain { - const min_4: number; - export { min_4 as min }; - const max_4: number; - export { max_4 as max }; - } - namespace rainIntensity { - const min_5: number; - export { min_5 as min }; - const max_5: number; - export { max_5 as max }; - } - namespace fog { - const min_6: number; - export { min_6 as min }; - const max_6: number; - export { max_6 as max }; - } - namespace temp { - const min_7: number; - export { min_7 as min }; - const max_7: number; - export { max_7 as max }; - } - namespace pressure { - const min_8: number; - export { min_8 as min }; - const max_8: number; - export { max_8 as max }; - } -} diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/BotController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/BotController.d.ts index 1fc8fc4..d7dc36d 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/BotController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/BotController.d.ts @@ -1,8 +1,8 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { Difficulty } from "../@types/eft/common/tables/IBotType"; -import { IGenerateBotsRequestData } from "../@types/eft/bot/IGenerateBotsRequestData"; -import { IBotBase } from "../@types/eft/common/tables/IBotBase"; -import { IBotCore } from "../@types/eft/common/tables/IBotCore"; +import { Difficulty } from "../models/eft/common/tables/IBotType"; +import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; +import { IBotBase } from "../models/eft/common/tables/IBotBase"; +import { IBotCore } from "../models/eft/common/tables/IBotCore"; import { ConfigServer } from "../servers/ConfigServer"; import { BotHelper } from "../helpers/BotHelper"; import { BotGenerator } from "../generators/BotGenerator"; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/CustomizationController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/CustomizationController.d.ts index 4255154..6fd3b12 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/CustomizationController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/CustomizationController.d.ts @@ -1,13 +1,13 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IWearClothingRequestData } from "../@types/eft/customization/IWearClothingRequestData"; -import { IBuyClothingRequestData } from "../@types/eft/customization/IBuyClothingRequestData"; -import { ISuit } from "../@types/eft/common/tables/ITrader"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IWearClothingRequestData } from "../models/eft/customization/IWearClothingRequestData"; +import { IBuyClothingRequestData } from "../models/eft/customization/IBuyClothingRequestData"; +import { ISuit } from "../models/eft/common/tables/ITrader"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class CustomizationController { private logger; private itemEventRouter; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/DialogueController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/DialogueController.d.ts index a855ad1..8095666 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/DialogueController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/DialogueController.d.ts @@ -1,16 +1,16 @@ import { SaveServer } from "../servers/SaveServer"; import { DialogueHelper } from "../helpers/DialogueHelper"; -import { DialogueInfo } from "../@types/eft/profile/IAkiProfile"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { IGetFriendListDataResponse } from "../@types/eft/dialog/IGetFriendListDataResponse"; -import { IGetMailDialogViewResponseData } from "../@types/eft/dialog/IGetMailDialogViewResponseData"; -import { IGetAllAttachmentsResponse } from "../@types/eft/dialog/IGetAllAttachmentsResponse"; -import { HttpResponse } from "../utils/HttpResponse"; +import { DialogueInfo } from "../models/eft/profile/IAkiProfile"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse"; +import { IGetMailDialogViewResponseData } from "../models/eft/dialog/IGetMailDialogViewResponseData"; +import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachmentsResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class DialogueController { private httpResponse; private saveServer; private dialogueHelper; - constructor(httpResponse: HttpResponse, saveServer: SaveServer, dialogueHelper: DialogueHelper); + constructor(httpResponse: HttpResponseUtil, saveServer: SaveServer, dialogueHelper: DialogueHelper); getFriendList(sessionID: string): IGetFriendListDataResponse; generateDialogueList(sessionID: string): IGetBodyResponseData; getDialogueInfo(dialogueID: string, sessionID: string): DialogueInfo; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/GameController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/GameController.d.ts index 883bed3..614d270 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/GameController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/GameController.d.ts @@ -1,9 +1,9 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IGameConfigResponse } from "../@types/eft/game/IGameConfigResponse"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from "../@types/spt/utils/ILogger"; -import { IWatermark } from "../@types/spt/utils/IWatermark"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { IWatermark } from "../models/spt/utils/IWatermark"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; export declare class GameController { private logger; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/HealthController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/HealthController.d.ts index 3d2120b..ca049f6 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/HealthController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/HealthController.d.ts @@ -2,14 +2,14 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { PaymentService } from "../services/PaymentService"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { HealthHelper } from "../helpers/HealthHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IHealthTreatmentRequestData } from "../@types/eft/health/IHealthTreatmentRequestData"; -import { IOffraidEatRequestData } from "../@types/eft/health/IOffraidEatRequestData"; -import { IOffraidHealRequestData } from "../@types/eft/health/IOffraidHealRequestData"; -import { ISyncHealthRequestData } from "../@types/eft/health/ISyncHealthRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IHealthTreatmentRequestData } from "../models/eft/health/IHealthTreatmentRequestData"; +import { IOffraidEatRequestData } from "../models/eft/health/IOffraidEatRequestData"; +import { IOffraidHealRequestData } from "../models/eft/health/IOffraidHealRequestData"; +import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class HealthController { private logger; private itemEventRouter; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/HideoutController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/HideoutController.d.ts index 59e05d9..22b7040 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/HideoutController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/HideoutController.d.ts @@ -10,20 +10,20 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { PaymentHelper } from "../helpers/PaymentHelper"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { HideoutHelper } from "../helpers/HideoutHelper"; -import { IHideoutUpgradeRequestData } from "../@types/eft/hideout/IHideoutUpgradeRequestData"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { HideoutUpgradeCompleteRequestData } from "../@types/eft/hideout/HideoutUpgradeCompleteRequestData"; -import { IHideoutPutItemInRequestData } from "../@types/eft/hideout/IHideoutPutItemInRequestData"; -import { IHideoutTakeItemOutRequestData } from "../@types/eft/hideout/IHideoutTakeItemOutRequestData"; -import { IHideoutToggleAreaRequestData } from "../@types/eft/hideout/IHideoutToggleAreaRequestData"; -import { IHideoutSingleProductionStartRequestData } from "../@types/eft/hideout/IHideoutSingleProductionStartRequestData"; -import { IHideoutScavCaseStartRequestData } from "../@types/eft/hideout/IHideoutScavCaseStartRequestData"; -import { IHideoutTakeProductionRequestData } from "../@types/eft/hideout/IHideoutTakeProductionRequestData"; -import { IHideoutContinousProductionStartRequestData } from "../@types/eft/hideout/IHideoutContinousProductionStartRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { HideoutUpgradeCompleteRequestData } from "../models/eft/hideout/HideoutUpgradeCompleteRequestData"; +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 { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; +import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; +import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HttpResponse } from "../utils/HttpResponse"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class HideoutController { private logger; private hashUtil; @@ -41,7 +41,7 @@ export declare class HideoutController { private hideoutHelper; private configServer; private hideoutConfig; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponse, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, configServer: ConfigServer); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, configServer: ConfigServer); upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; upgradeComplete(pmcData: IPmcData, body: HideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse; putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/InraidController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/InraidController.d.ts index e0be58a..1033e5f 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/InraidController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/InraidController.d.ts @@ -2,31 +2,29 @@ import { SaveServer } from "../servers/SaveServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "../helpers/ItemHelper"; import { TraderHelper } from "../helpers/TraderHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; import { HealthHelper } from "../helpers/HealthHelper"; -import { IRegisterPlayerRequestData } from "../@types/eft/inRaid/IRegisterPlayerRequestData"; -import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData"; +import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; +import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ConfigServer } from "../servers/ConfigServer"; import { JsonUtil } from "../utils/JsonUtil"; import { QuestHelper } from "../helpers/QuestHelper"; import { InRaidHelper } from "../helpers/InRaidHelper"; import { InsuranceService } from "../services/InsuranceService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; export declare class InraidController { - private logger; private saveServer; private jsonUtil; private databaseServer; private questHelper; private itemHelper; - private profileHelper; + private extendedProfileHelper; private healthHelper; private traderHelper; private insuranceService; private inRaidHelper; private configServer; private inraidConfig; - constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, profileHelper: ProfileHelper, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); + constructor(saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, extendedProfileHelper: ExtendedProfileHelper, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); addPlayer(sessionID: string, info: IRegisterPlayerRequestData): void; saveProgress(offraidData: ISaveProgressRequestData, sessionID: string): void; } diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/InsuranceController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/InsuranceController.d.ts index 5e43c2b..44c61fa 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/InsuranceController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/InsuranceController.d.ts @@ -8,12 +8,12 @@ import { PaymentService } from "../services/PaymentService"; import { DialogueHelper } from "../helpers/DialogueHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { ItemHelper } from "../helpers/ItemHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IGetInsuranceCostRequestData } from "../@types/eft/insurance/IGetInsuranceCostRequestData"; -import { IInsureRequestData } from "../@types/eft/insurance/IInsureRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData"; +import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { InsuranceService } from "../services/InsuranceService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class InsuranceController { private logger; private randomUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/InventoryController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/InventoryController.d.ts index a29fd1a..4ff07b8 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/InventoryController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/InventoryController.d.ts @@ -6,25 +6,25 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { PaymentHelper } from "../helpers/PaymentHelper"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IInventoryMoveRequestData } from "../@types/eft/inventory/IInventoryMoveRequestData"; -import { IInventoryRemoveRequestData } from "../@types/eft/inventory/IInventoryRemoveRequestData"; -import { IInventorySplitRequestData } from "../@types/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMergeRequestData } from "../@types/eft/inventory/IInventoryMergeRequestData"; -import { IInventoryTransferRequestData } from "../@types/eft/inventory/IInventoryTransferRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IInventorySwapRequestData } from "../@types/eft/inventory/IInventorySwapRequestData"; -import { IInventoryFoldRequestData } from "../@types/eft/inventory/IInventoryFoldRequestData"; -import { IInventoryToggleRequestData } from "../@types/eft/inventory/IInventoryToggleRequestData"; -import { IInventoryTagRequestData } from "../@types/eft/inventory/IInventoryTagRequestData"; -import { IInventoryBindRequestData } from "../@types/eft/inventory/IInventoryBindRequestData"; -import { IInventoryExamineRequestData } from "../@types/eft/inventory/IInventoryExamineRequestData"; -import { IInventoryReadEncyclopediaRequestData } from "../@types/eft/inventory/IInventoryReadEncyclopediaRequestData"; -import { IInventorySortRequestData } from "../@types/eft/inventory/IInventorySortRequestData"; -import { IInventoryCreateMarkerRequestData } from "../@types/eft/inventory/IInventoryCreateMarkerRequestData"; -import { IInventoryDeleteMarkerRequestData } from "../@types/eft/inventory/IInventoryDeleteMarkerRequestData"; -import { IInventoryEditMarkerRequestData } from "../@types/eft/inventory/IInventoryEditMarkerRequestData"; -import { ILogger } from "../@types/spt/utils/ILogger"; +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 { 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 { ILogger } from "../models/spt/utils/ILogger"; export declare class InventoryController { private logger; private hashUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/LauncherController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/LauncherController.d.ts index 687c295..d3d8e6a 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/LauncherController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/LauncherController.d.ts @@ -2,11 +2,10 @@ import { HashUtil } from "../utils/HashUtil"; import { SaveServer } from "../servers/SaveServer"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { IRegisterData } from "../@types/eft/launcher/IRegisterData"; -import { ILoginRequestData } from "../@types/eft/launcher/ILoginRequestData"; -import { IChangeRequestData } from "../@types/eft/launcher/IChangeRequestData"; -import { Info } from "../@types/eft/profile/IAkiProfile"; -import { ICoreConfig } from "../@types/spt/config/ICoreConfig"; +import { IRegisterData } from "../models/eft/launcher/IRegisterData"; +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 { private hashUtil; @@ -14,7 +13,7 @@ export declare class LauncherController { private httpServerHelper; private databaseServer; private configServer; - coreConfig: ICoreConfig; + private coreConfig; constructor(hashUtil: HashUtil, saveServer: SaveServer, httpServerHelper: HttpServerHelper, databaseServer: DatabaseServer, configServer: ConfigServer); connect(): any; find(sessionIdKey: string): Info; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/LocationController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/LocationController.d.ts index 64168b4..dde270c 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/LocationController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/LocationController.d.ts @@ -1,10 +1,10 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { LocationGenerator } from "../generators/LocationGenerator"; -import { ILocationBase } from "../@types/eft/common/ILocationBase"; -import { ILocationsGenerateAllResponse } from "../@types/eft/common/ILocationsSourceDestinationBase"; +import { ILocationBase } from "../models/eft/common/ILocationBase"; +import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSourceDestinationBase"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class LocationController { private jsonUtil; private logger; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/MatchController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/MatchController.d.ts index 6ab5759..229b884 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/MatchController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/MatchController.d.ts @@ -1,11 +1,9 @@ import { TraderHelper } from "../helpers/TraderHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IEndOfflineRaidRequestData } from "../@types/eft/match/IEndOfflineRaidRequestData"; -import { IStartOfflineRaidRequestData } from "../@types/eft/match/IStartOffineRaidRequestData"; -import { IPmcData } from "../@types/eft/common/IPmcData"; +import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; +import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { ConfigServer } from "../servers/ConfigServer"; -import { IMatchConfig } from "../@types/spt/config/IMatchConfig"; -import { IInRaidConfig } from "../@types/spt/config/IInRaidConfig"; import { SaveServer } from "../servers/SaveServer"; import { MatchLocationService } from "../services/MatchLocationService"; export declare class MatchController { @@ -14,8 +12,8 @@ export declare class MatchController { private matchLocationService; private traderHelper; private configServer; - matchConfig: IMatchConfig; - inraidConfig: IInRaidConfig; + private matchConfig; + private inraidConfig; constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, configServer: ConfigServer); getEnabled(): boolean; getProfile(info: any): IPmcData[]; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/NoteController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/NoteController.d.ts index bb02d23..ecd8001 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/NoteController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/NoteController.d.ts @@ -1,6 +1,6 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { INoteActionData } from "../@types/eft/notes/INoteActionData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { private itemEventRouter; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/NotifierController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/NotifierController.d.ts index 3366add..36fef66 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/NotifierController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/NotifierController.d.ts @@ -1,6 +1,6 @@ import { NotifierHelper } from "../helpers/NotifierHelper"; import { NotificationService } from "../services/NotificationService"; -import { INotifierChannel } from "../@types/eft/notifier/INotifier"; +import { INotifierChannel } from "../models/eft/notifier/INotifier"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; export declare class NotifierController { private notifierHelper; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/PaymentController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/PaymentController.d.ts deleted file mode 100644 index a9a4235..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/PaymentController.d.ts +++ /dev/null @@ -1,56 +0,0 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IProcessBuyTradeRequestData } from "../@types/eft/trade/IProcessBuyTradeRequestData"; -import { IProcessSellTradeRequestData } from "../@types/eft/trade/IProcessSellTradeRequestData"; -export declare class PaymentController { - /** - * Check whether tpl is Money - * @param {string} tpl - * @returns void - */ - static isMoneyTpl(tpl: string): boolean; - /** - * Gets currency TPL from TAG - * @param {string} currency - * @returns string - */ - static getCurrency(currency: string): string; - /** - * Gets currency TAG from TPL - * @param {string} currency - * @returns string - */ - static getCurrencyTag(currency: string): string; - /** - * Gets Currency to Ruble conversion Value - * @param {number} value - * @param {string} currencyFrom - * @returns number - */ - static inRUB(value: number, currencyFrom: string): number; - /** - * Gets Ruble to Currency conversion Value - * @param {number} value - * @param {string} currencyTo - * @returns number - */ - static fromRUB(value: number, currencyTo: string): number; - /** - * Take money and insert items into return to server request - * @param {Object} pmcData - * @param {Object} body - * @param {string} sessionID - * @returns Object - */ - static payMoney(pmcData: IPmcData, body: IProcessBuyTradeRequestData, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse; - /** - * Receive money back after selling - * @param {IPmcData} pmcData - * @param {number} amount - * @param {IProcessSellTradeRequestData} body - * @param {IItemEventRouterResponse} output - * @param {string} sessionID - * @returns IItemEventRouterResponse - */ - static getMoney(pmcData: IPmcData, amount: number, body: IProcessSellTradeRequestData, output: IItemEventRouterResponse, sessionID: string): IItemEventRouterResponse; -} diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/PlayerController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/PlayerController.d.ts deleted file mode 100644 index b33606d..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/PlayerController.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IPlayerIncrementSkillLevelRequestData } from "../@types/eft/player/IPlayerIncrementSkillLevelRequestData"; -export declare class PlayerController { - /** - * increases the profile skill and updates any output - * @param {Object} pmcData - * @param {Object} output - * @param {String} skillName - * @param {Number} amount - */ - static incrementSkillLevel(pmcData: IPmcData, output: IPlayerIncrementSkillLevelRequestData, skillName: string, amount: number): void; - /** - * @param {Object} pmcData - * @returns number - */ - static calculateLevel(pmcData: IPmcData): number; - /** - * @returns number - */ - static getRandomExperience(): number; - /** - * Made a 2d array table with 0 - free slot and 1 - used slot - * @param {Object} pmcData - * @param {string} sessionID - * @returns Array - */ - static getStashSlotMap(pmcData: IPmcData, sessionID: string): any[][]; -} diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/PresetBuildController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/PresetBuildController.d.ts index e0702f4..a15b181 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/PresetBuildController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/PresetBuildController.d.ts @@ -1,9 +1,9 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { SaveServer } from "../servers/SaveServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IPresetBuildActionRequestData } from "../@types/eft/presetBuild/IPresetBuildActionRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { WeaponBuild } from "../@types/eft/profile/IAkiProfile"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IPresetBuildActionRequestData } from "../models/eft/presetBuild/IPresetBuildActionRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { WeaponBuild } from "../models/eft/profile/IAkiProfile"; import { HashUtil } from "../utils/HashUtil"; import { ItemEventRouter } from "../routers/ItemEventRouter"; export declare class PresetBuildController { diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/ProfileController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/ProfileController.d.ts index 938a866..46b66d8 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/ProfileController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/ProfileController.d.ts @@ -1,18 +1,18 @@ import { SaveServer } from "../servers/SaveServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "../helpers/ItemHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; import { TraderHelper } from "../helpers/TraderHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IProfileChangeNicknameRequestData } from "../@types/eft/profile/IProfileChangeNicknameRequestData"; -import { IProfileChangeVoiceRequestData } from "../@types/eft/profile/IProfileChangeVoiceRequestData"; -import { IProfileCreateRequestData } from "../@types/eft/profile/IProfileCreateRequestData"; -import { IValidateNicknameRequestData } from "../@types/eft/profile/IValidateNicknameRequestData"; -import { ISearchFriendRequestData } from "../@types/eft/profile/ISearchFriendRequestData"; -import { ISearchFriendResponse } from "../@types/eft/profile/ISearchFriendResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +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 { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; -import { IMiniProfile } from "../@types/eft/launcher/IMiniProfile"; +import { IMiniProfile } from "../models/eft/launcher/IMiniProfile"; +import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; export declare class ProfileController { private hashUtil; private timeUtil; @@ -20,8 +20,8 @@ export declare class ProfileController { private databaseServer; private itemHelper; private traderHelper; - private profileHelper; - constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, traderHelper: TraderHelper, profileHelper: ProfileHelper); + private extendedProfileHelper; + constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, traderHelper: TraderHelper, extendedProfileHelper: ExtendedProfileHelper); getMiniProfiles(): IMiniProfile[]; getMiniProfile(sessionID: string): any; getCompleteProfile(sessionID: string): IPmcData[]; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/QuestController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/QuestController.d.ts index bb89a3b..a964c32 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/QuestController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/QuestController.d.ts @@ -8,13 +8,13 @@ import { QuestConditionHelper } from "../helpers/QuestConditionHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; import { PlayerService } from "../services/PlayerService"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IQuest } from "../@types/eft/common/tables/IQuest"; -import { IAcceptQuestRequestData } from "../@types/eft/quests/IAcceptQuestRequestData"; -import { ICompleteQuestRequestData } from "../@types/eft/quests/ICompleteQuestRequestData"; -import { IHandoverQuestRequestData } from "../@types/eft/quests/IHandoverQuestRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IQuest } from "../models/eft/common/tables/IQuest"; +import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; +import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; +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 { private logger; private timeUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/RagfairController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/RagfairController.d.ts index 0b6757e..6e71edd 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/RagfairController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/RagfairController.d.ts @@ -1,5 +1,5 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { RagfairServer } from "../servers/RagfairServer"; import { SaveServer } from "../servers/SaveServer"; @@ -14,24 +14,24 @@ import { PaymentHelper } from "../helpers/PaymentHelper"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { RagfairHelper } from "../helpers/RagfairHelper"; import { RagfairSellHelper } from "../helpers/RagfairSellHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IAddOfferRequestData, Requirement } from "../@types/eft/ragfair/IAddOfferRequestData"; -import { IExtendOfferRequestData } from "../@types/eft/ragfair/IExtendOfferRequestData"; -import { IGetMarketPriceRequestData } from "../@types/eft/ragfair/IGetMarketPriceRequestData"; -import { ISearchRequestData } from "../@types/eft/ragfair/ISearchRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { IGetItemPriceResult } from "../@types/eft/ragfair/IGetItemPriceResult"; -import { IGetOffersResult } from "../@types/eft/ragfair/IGetOffersResult"; +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 "../@types/eft/profile/IAkiProfile"; -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; import { RagfairSortHelper } from "../helpers/RagfairSortHelper"; import { RagfairTaxHelper } from "../helpers/RagfairTaxHelper"; import { RagfairOfferHelper } from "../helpers/RagfairOfferHelper"; import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairController { private logger; private timeUtil; @@ -57,7 +57,7 @@ export declare class RagfairController { private ragfairOfferGenerator; private configServer; private ragfairConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, httpResponse: HttpResponse, itemEventRouter: ItemEventRouter, ragfairServer: RagfairServer, ragfairPriceService: RagfairPriceService, databaseServer: DatabaseServer, itemHelper: ItemHelper, saveServer: SaveServer, ragfairSellHelper: RagfairSellHelper, ragfairTaxHelper: RagfairTaxHelper, ragfairSortHelper: RagfairSortHelper, ragfairOfferHelper: RagfairOfferHelper, profileHelper: ProfileHelper, paymentService: PaymentService, handbookHelper: HandbookHelper, paymentHelper: PaymentHelper, inventoryHelper: InventoryHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, ragfairOfferGenerator: RagfairOfferGenerator, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter, ragfairServer: RagfairServer, ragfairPriceService: RagfairPriceService, databaseServer: DatabaseServer, itemHelper: ItemHelper, saveServer: SaveServer, ragfairSellHelper: RagfairSellHelper, ragfairTaxHelper: RagfairTaxHelper, ragfairSortHelper: RagfairSortHelper, ragfairOfferHelper: RagfairOfferHelper, profileHelper: ProfileHelper, paymentService: PaymentService, handbookHelper: HandbookHelper, paymentHelper: PaymentHelper, inventoryHelper: InventoryHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, ragfairOfferGenerator: RagfairOfferGenerator, configServer: ConfigServer); getOffers(sessionID: string, info: ISearchRequestData): IGetOffersResult; update(): void; getItemPrice(info: IGetMarketPriceRequestData): IGetItemPriceResult; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/RepairController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/RepairController.d.ts index 86ab1e1..3a9f3a2 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/RepairController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/RepairController.d.ts @@ -2,15 +2,14 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { QuestHelper } from "../helpers/QuestHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { PaymentService } from "../services/PaymentService"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IRepairActionDataRequest } from "../@types/eft/repair/IRepairActionDataRequest"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { ITraderRepairActionDataRequest } from "../@types/eft/repair/ITraderRepairActionDataRequest"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepairActionDataRequest"; import { ConfigServer } from "../servers/ConfigServer"; -import { IRepairConfig } from "../@types/spt/config/IRepairConfig"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { RepairHelper } from "../helpers/RepairHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RepairController { private logger; private itemEventRouter; @@ -20,7 +19,7 @@ export declare class RepairController { private paymentService; private repairHelper; private configServer; - repairConfig: IRepairConfig; + private repairConfig; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, questHelper: QuestHelper, traderHelper: TraderHelper, paymentService: PaymentService, repairHelper: RepairHelper, configServer: ConfigServer); /** * Repair with trader diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/RepeatableQuestController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/RepeatableQuestController.d.ts index 23d56e5..d2de5df 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/RepeatableQuestController.d.ts @@ -5,20 +5,20 @@ import { JsonUtil } from "../utils/JsonUtil"; import { MathUtil } from "../utils/MathUtil"; import { ItemHelper } from "../helpers/ItemHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData"; -import { IPmcData, TraderInfo } from "../@types/eft/common/IPmcData"; -import { IRepeatableQuestConfig, ELocationName, IQuestConfig } from "../@types/spt/config/IQuestConfig"; -import { IExploration, IRepeatableQuest, IReward, IRewards, IExplorationCondition, ICompletionAvailableFor, IEliminationCondition, ICompletion, IElimination, IPmcDataRepeatableQuest } from "../@types/eft/common/tables/IRepeatableQuests"; -import { Exit } from "../@types/eft/common/ILocationBase"; -import { IRepeatableQuestChangeRequest } from "../@types/eft/quests/IRepeatableQuestChangeRequest"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export interface IQuestTypePool { types: string[]; pool: IQuestPool; @@ -61,7 +61,7 @@ export declare class RepeatableQuestController { private paymentService; private objectId; private configServer; - questConfig: IQuestConfig; + private questConfig; constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, itemEventRouter: ItemEventRouter, paymentService: PaymentService, objectId: ObjectId, configServer: ConfigServer); /** * This is the method reached by the /client/repeatalbeQuests/activityPeriods endpoint diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/TradeController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/TradeController.d.ts index 916ed9c..f0a177b 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/TradeController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/TradeController.d.ts @@ -1,13 +1,13 @@ import { RagfairServer } from "../servers/RagfairServer"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { TradeHelper } from "../helpers/TradeHelper"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IProcessRagfairTradeRequestData } from "../@types/eft/trade/IProcessRagfairTradeRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { Upd } from "../@types/eft/common/tables/IItem"; -import { IProcessBaseTradeRequestData } from "../@types/eft/trade/IProcessBaseTradeRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { Upd } from "../models/eft/common/tables/IItem"; +import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; declare class TradeController { private logger; private itemEventRouter; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/TraderController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/TraderController.d.ts index e125cf1..5cd85c9 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/TraderController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/TraderController.d.ts @@ -2,12 +2,11 @@ import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { DatabaseServer } from "../servers/DatabaseServer"; import { TraderAssortService } from "../services/TraderAssortService"; -import { IBarterScheme, ITraderAssort, ITraderBase } from "../@types/eft/common/tables/ITrader"; +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 { ITraderConfig } from "../@types/spt/config/ITraderConfig"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; import { TraderAssortHelper } from "../helpers/TraderAssortHelper"; export declare class TraderController { private logger; @@ -19,7 +18,7 @@ export declare class TraderController { private traderAssortService; private jsonUtil; private configServer; - traderConfig: ITraderConfig; + private traderConfig; constructor(logger: ILogger, databaseServer: DatabaseServer, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, timeUtil: TimeUtil, traderAssortService: TraderAssortService, jsonUtil: JsonUtil, configServer: ConfigServer); load(): void; getTrader(traderID: string, sessionID: string): ITraderBase; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/WeatherController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/WeatherController.d.ts index 2d17179..4f8bcf1 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/WeatherController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/WeatherController.d.ts @@ -1,11 +1,10 @@ import { ConfigServer } from "../servers/ConfigServer"; -import { IWeatherConfig } from "../@types/spt/config/IWeatherConfig"; import { WeatherGenerator } from "../generators/WeatherGenerator"; -import { IWeatherData } from "../@types/eft/weather/IWeatherData"; +import { IWeatherData } from "../models/eft/weather/IWeatherData"; export declare class WeatherController { private weatherGenerator; private configServer; - weatherConfig: IWeatherConfig; + private weatherConfig; constructor(weatherGenerator: WeatherGenerator, configServer: ConfigServer); generate(): IWeatherData; } diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/WishlistController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/WishlistController.d.ts index c935452..5ef8df3 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/WishlistController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/WishlistController.d.ts @@ -1,7 +1,7 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IWishlistActionData } from "../@types/eft/wishlist/IWishlistActionData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { private itemEvenRouter; constructor(itemEvenRouter: ItemEventRouter); diff --git a/TypeScript/6ReferenceAnotherClass/types/di/Container.d.ts b/TypeScript/6ReferenceAnotherClass/types/di/Container.d.ts index bd40dbd..b67523f 100644 --- a/TypeScript/6ReferenceAnotherClass/types/di/Container.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/di/Container.d.ts @@ -1,7 +1,6 @@ import { DependencyContainer } from "tsyringe"; export declare class Container { static registerTypes(depContainer: DependencyContainer): void; - static registerServerSpecificClasses(depContainer: DependencyContainer): void; private static registerUtils; private static registerRouters; private static registerGenerators; diff --git a/TypeScript/6ReferenceAnotherClass/types/di/Router.d.ts b/TypeScript/6ReferenceAnotherClass/types/di/Router.d.ts index d27ac97..ac48587 100644 --- a/TypeScript/6ReferenceAnotherClass/types/di/Router.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/di/Router.d.ts @@ -1,5 +1,6 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IAkiProfile } from "../@types/eft/profile/IAkiProfile"; +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 { private handledRoutes; constructor(); @@ -17,7 +18,7 @@ export declare class DynamicRouter extends Router { } export declare class ItemEventRouterDefinition extends Router { constructor(); - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } export declare class SaveLoadRouter extends Router { constructor(); diff --git a/TypeScript/6ReferenceAnotherClass/types/di/Serializer.d.ts b/TypeScript/6ReferenceAnotherClass/types/di/Serializer.d.ts index 076407d..70aa7c5 100644 --- a/TypeScript/6ReferenceAnotherClass/types/di/Serializer.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/di/Serializer.d.ts @@ -1,4 +1,4 @@ -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class Serializer { serialize(sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; canHandle(something: string): boolean; diff --git a/TypeScript/6ReferenceAnotherClass/types/generators/BotEquipmentGenerator.d.ts b/TypeScript/6ReferenceAnotherClass/types/generators/BotEquipmentGenerator.d.ts deleted file mode 100644 index 2cc98b8..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/generators/BotEquipmentGenerator.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; -import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData"; -import { Chances, Mods } from "../@types/eft/common/tables/IBotType"; -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { HashUtil } from "../utils/HashUtil"; -import { Logger } from "../utils/Logger"; -import { RandomUtil } from "../utils/RandomUtil"; -import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -export declare class BotEquipmentGenerator { - private logger; - private hashUtil; - private randomUtil; - private databaseServer; - private botGeneratorHelper; - private weightedRandomHelper; - constructor(logger: Logger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, botGeneratorHelper: BotGeneratorHelper, weightedRandomHelper: WeightedRandomHelper); - generateEquipment(equipmentSlot: string, equipmentPool: Record, modPool: Mods, spawnChances: Chances, botRole: string, inventory: PmcInventory): void; -} diff --git a/TypeScript/6ReferenceAnotherClass/types/generators/BotGenerator.d.ts b/TypeScript/6ReferenceAnotherClass/types/generators/BotGenerator.d.ts index 4a1b8a3..af7d7d4 100644 --- a/TypeScript/6ReferenceAnotherClass/types/generators/BotGenerator.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/generators/BotGenerator.d.ts @@ -1,20 +1,14 @@ import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; -import { IGenerateBotsRequestData } from "../@types/eft/bot/IGenerateBotsRequestData"; -import { IBotBase } from "../@types/eft/common/tables/IBotBase"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; +import { IBotBase } from "../models/eft/common/tables/IBotBase"; import { DatabaseServer } from "../servers/DatabaseServer"; import { JsonUtil } from "../utils/JsonUtil"; import { ConfigServer } from "../servers/ConfigServer"; import { GameEventHelper } from "../helpers/GameEventHelper"; import { BotInventoryGenerator } from "./BotInventoryGenerator"; import { BotHelper } from "../helpers/BotHelper"; -declare namespace BotGenerator { - interface IRandomisedBotLevelResult { - level: number; - exp: number; - } -} export declare class BotGenerator { private logger; private hashUtil; @@ -28,8 +22,8 @@ export declare class BotGenerator { private botConfig; constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; - generateBot(bot: IBotBase, role: string, isPmc: boolean): IBotBase; - generateRandomLevel(min: number, max: number): BotGenerator.IRandomisedBotLevelResult; + private generateBot; + private generateRandomLevel; /** Converts health object to the required format */ private generateHealth; private generateSkills; @@ -40,4 +34,3 @@ export declare class BotGenerator { private getPMCDifficulty; private generateDogtag; } -export {}; diff --git a/TypeScript/6ReferenceAnotherClass/types/generators/BotInventoryGenerator.d.ts b/TypeScript/6ReferenceAnotherClass/types/generators/BotInventoryGenerator.d.ts index c151b83..e9f09de 100644 --- a/TypeScript/6ReferenceAnotherClass/types/generators/BotInventoryGenerator.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/generators/BotInventoryGenerator.d.ts @@ -1,11 +1,11 @@ -import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData"; -import { Inventory, Chances, Generation, Mods } from "../@types/eft/common/tables/IBotType"; +import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { Inventory, Chances, Generation } from "../models/eft/common/tables/IBotType"; import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; import { BotWeaponGenerator } from "./BotWeaponGenerator"; import { BotLootGenerator } from "./BotLootGenerator"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; export declare class BotInventoryGenerator { @@ -20,6 +20,6 @@ export declare class BotInventoryGenerator { 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; - generateEquipment(equipmentSlot: string, equipmentPool: Record, modPool: Mods, spawnChances: Chances, botRole: string, inventory: PmcInventory): void; + private generateEquipment; private generateInventoryBase; } diff --git a/TypeScript/6ReferenceAnotherClass/types/generators/BotLootGenerator.d.ts b/TypeScript/6ReferenceAnotherClass/types/generators/BotLootGenerator.d.ts index 0ec991e..3bf1b36 100644 --- a/TypeScript/6ReferenceAnotherClass/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/generators/BotLootGenerator.d.ts @@ -1,17 +1,14 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; -import { IBotConfig } from "../@types/spt/config/IBotConfig"; import { HandbookHelper } from "../helpers/HandbookHelper"; import { PMCLootGenerator } from "../generators/PMCLootGenerator"; -import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData"; -import { ItemMinMax, Items } from "../@types/eft/common/tables/IBotType"; +import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { ItemMinMax, Items } from "../models/eft/common/tables/IBotType"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; export declare class BotLootGenerator { - private logger; private jsonUtil; private hashUtil; private randomUtil; @@ -20,8 +17,8 @@ export declare class BotLootGenerator { private botGeneratorHelper; private pmcLootGenerator; private configServer; - botConfig: IBotConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, pmcLootGenerator: PMCLootGenerator, configServer: ConfigServer); + private botConfig; + constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, pmcLootGenerator: PMCLootGenerator, configServer: ConfigServer); generateLoot(lootPool: Items, itemCounts: ItemMinMax, isPmc: boolean, inventory: PmcInventory): void; private getRandomisedCount; private addLootFromPool; diff --git a/TypeScript/6ReferenceAnotherClass/types/generators/BotWeaponGenerator.d.ts b/TypeScript/6ReferenceAnotherClass/types/generators/BotWeaponGenerator.d.ts index 8eb643c..3e9d59c 100644 --- a/TypeScript/6ReferenceAnotherClass/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/generators/BotWeaponGenerator.d.ts @@ -1,11 +1,12 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "../helpers/ItemHelper"; -import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData"; -import { MinMax, ModsChances, Mods } from "../@types/eft/common/tables/IBotType"; +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 { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { RandomUtil } from "../utils/RandomUtil"; export declare class BotWeaponGenerator { private logger; private hashUtil; @@ -13,7 +14,8 @@ export declare class BotWeaponGenerator { private itemHelper; private weightedRandomHelper; private botGeneratorHelper; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper); + private randomUtil; + constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil); generateWeapon(equipmentSlot: string, weaponPool: Record, modPool: Mods, modChances: ModsChances, magCounts: MinMax, botRole: string, isPmc: boolean, inventory: PmcInventory): void; /** Checks if all required slots are occupied on a weapon and all it's mods */ private isWeaponValid; diff --git a/TypeScript/6ReferenceAnotherClass/types/generators/LocationGenerator.d.ts b/TypeScript/6ReferenceAnotherClass/types/generators/LocationGenerator.d.ts index c37814f..b7ba7c5 100644 --- a/TypeScript/6ReferenceAnotherClass/types/generators/LocationGenerator.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/generators/LocationGenerator.d.ts @@ -1,18 +1,17 @@ import { RandomUtil } from "../utils/RandomUtil"; -import { IStaticContainerProps, IStaticLootDetails, IStaticAmmoDetails, IStaticForcedProps } from "../@types/eft/common/tables/ILootBase"; -import { ILooseLoot, SpawnpointTemplate } from "../@types/eft/common/ILooseLoot"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { IStaticContainerProps, IStaticLootDetails, IStaticAmmoDetails, IStaticForcedProps } from "../models/eft/common/tables/ILootBase"; +import { ILooseLoot, SpawnpointTemplate } from "../models/eft/common/ILooseLoot"; +import { Item } from "../models/eft/common/tables/IItem"; import { ItemHelper } from "../helpers/ItemHelper"; import { GameEventHelper } from "../helpers/GameEventHelper"; import { ContainerHelper } from "../helpers/ContainerHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILocationConfig } from "../@types/spt/config/ILocationConfig"; import { JsonUtil } from "../utils/JsonUtil"; import { MathUtil } from "../utils/MathUtil"; import { ObjectId } from "../utils/ObjectId"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export interface IContainerItem { items: Item[]; width: number; @@ -30,7 +29,7 @@ export declare class LocationGenerator { private containerHelper; private presetHelper; private configServer; - locationConfig: ILocationConfig; + private locationConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, objectId: ObjectId, randomUtil: RandomUtil, ragfairServerHelper: RagfairServerHelper, itemHelper: ItemHelper, mathUtil: MathUtil, gameEventHelper: GameEventHelper, containerHelper: ContainerHelper, presetHelper: PresetHelper, configServer: ConfigServer); generateContainerLoot(containerIn: IStaticContainerProps, staticForced: IStaticForcedProps[], staticLootDist: Record, staticAmmoDist: Record, locationName: string): IStaticContainerProps; private getLooseLootMultiplerForLocation; diff --git a/TypeScript/6ReferenceAnotherClass/types/generators/PMCLootGenerator.d.ts b/TypeScript/6ReferenceAnotherClass/types/generators/PMCLootGenerator.d.ts index 1ac7ffe..601431b 100644 --- a/TypeScript/6ReferenceAnotherClass/types/generators/PMCLootGenerator.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/generators/PMCLootGenerator.d.ts @@ -1,14 +1,13 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; -import { IBotConfig } from "../@types/spt/config/IBotConfig"; export declare class PMCLootGenerator { private itemHelper; private databaseServer; private configServer; private pocketLootPool; private backpackLootPool; - botConfig: IBotConfig; + private botConfig; constructor(itemHelper: ItemHelper, databaseServer: DatabaseServer, configServer: ConfigServer); generatePMCPocketLootPool(): string[]; generatePMCBackpackLootPool(): string[]; diff --git a/TypeScript/6ReferenceAnotherClass/types/generators/RagfairAssortGenerator.d.ts b/TypeScript/6ReferenceAnotherClass/types/generators/RagfairAssortGenerator.d.ts index dcdb057..8b52a90 100644 --- a/TypeScript/6ReferenceAnotherClass/types/generators/RagfairAssortGenerator.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/generators/RagfairAssortGenerator.d.ts @@ -1,4 +1,4 @@ -import { Item } from "../@types/eft/common/tables/IItem"; +import { Item } from "../models/eft/common/tables/IItem"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "../helpers/ItemHelper"; import { HashUtil } from "../utils/HashUtil"; diff --git a/TypeScript/6ReferenceAnotherClass/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/6ReferenceAnotherClass/types/generators/RagfairOfferGenerator.d.ts index d28d3af..cb2566c 100644 --- a/TypeScript/6ReferenceAnotherClass/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/generators/RagfairOfferGenerator.d.ts @@ -2,9 +2,9 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; import { SaveServer } from "../servers/SaveServer"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; -import { IBarterScheme } from "../@types/eft/common/tables/ITrader"; -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { IBarterScheme } from "../models/eft/common/tables/ITrader"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { Item } from "../models/eft/common/tables/IItem"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; @@ -15,7 +15,7 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { RagfairPriceService } from "../services/RagfairPriceService"; import { FenceService } from "../services/FenceService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairOfferGenerator { private logger; private jsonUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/generators/WeatherGenerator.d.ts b/TypeScript/6ReferenceAnotherClass/types/generators/WeatherGenerator.d.ts index 5c340e2..b9faa3a 100644 --- a/TypeScript/6ReferenceAnotherClass/types/generators/WeatherGenerator.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/generators/WeatherGenerator.d.ts @@ -1,7 +1,6 @@ import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; import { ConfigServer } from "../servers/ConfigServer"; -import { IWeatherData } from "../@types/eft/weather/IWeatherData"; -import { IWeatherConfig } from "../@types/spt/config/IWeatherConfig"; +import { IWeatherData } from "../models/eft/weather/IWeatherData"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class WeatherGenerator { @@ -9,7 +8,7 @@ export declare class WeatherGenerator { private randomUtil; private timeUtil; private configServer; - weatherConfig: IWeatherConfig; + private weatherConfig; constructor(weightedRandomHelper: WeightedRandomHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer); calculateTime(data: IWeatherData): IWeatherData; generateWeather(data: IWeatherData): IWeatherData; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/AssortHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/AssortHelper.d.ts index 95b7bf2..33cb5c6 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/AssortHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/AssortHelper.d.ts @@ -1,6 +1,6 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "./ItemHelper"; import { QuestHelper } from "./QuestHelper"; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/BotGeneratorHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/BotGeneratorHelper.d.ts index 83f7068..c3cf4d3 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/BotGeneratorHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/BotGeneratorHelper.d.ts @@ -1,10 +1,9 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; -import { IBotConfig } from "../@types/spt/config/IBotConfig"; -import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData"; -import { ModsChances, Mods } from "../@types/eft/common/tables/IBotType"; -import { Item, Upd } from "../@types/eft/common/tables/IItem"; -import { ITemplateItem } from "../@types/eft/common/tables/ITemplateItem"; +import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { ModsChances, Mods } 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 { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; @@ -12,7 +11,7 @@ import { RandomUtil } from "../utils/RandomUtil"; import { InventoryHelper } from "./InventoryHelper"; import { ContainerHelper } from "./ContainerHelper"; import { ItemHelper } from "./ItemHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; declare class BotGeneratorHelper { private logger; private jsonUtil; @@ -24,7 +23,7 @@ declare class BotGeneratorHelper { private inventoryHelper; private containerHelper; private configServer; - botConfig: IBotConfig; + private botConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer); generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances, isPmc?: boolean): Item[]; /** @@ -44,7 +43,6 @@ declare class BotGeneratorHelper { }; private getModTplFromItemDb; isItemIncompatibleWithCurrentItems(items: Item[], tplToCheck: string, equipmentSlot: string): boolean; - getBiasedRandomNumber(min: number, max: number, shift: number, n: number): number; /** Adds an item with all its childern into specified equipmentSlots, wherever it fits. * Returns a `boolean` indicating success. */ addItemWithChildrenToEquipmentSlot(equipmentSlots: string[], parentId: string, parentTpl: string, itemWithChildren: Item[], inventory: PmcInventory): boolean; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/BotHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/BotHelper.d.ts index 231e114..032218b 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/BotHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/BotHelper.d.ts @@ -1,9 +1,9 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { Difficulty } from "../@types/eft/common/tables/IBotType"; +import { Difficulty } from "../models/eft/common/tables/IBotType"; import { ConfigServer } from "../servers/ConfigServer"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class BotHelper { private logger; private jsonUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/DialogueHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/DialogueHelper.d.ts index abe13de..d8082e4 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/DialogueHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/DialogueHelper.d.ts @@ -1,7 +1,7 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { ItemHelper } from "./ItemHelper"; -import { Dialogue, MessageContent, MessagePreview, MessageType } from "../@types/eft/profile/IAkiProfile"; +import { Dialogue, MessageContent, MessagePreview, MessageType } from "../models/eft/profile/IAkiProfile"; import { HashUtil } from "../utils/HashUtil"; import { NotifierHelper } from "./NotifierHelper"; import { NotificationSendHelper } from "./NotificationSendHelper"; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/DurabilityLimitsHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/DurabilityLimitsHelper.d.ts index 70f545b..ee8c887 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/DurabilityLimitsHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/DurabilityLimitsHelper.d.ts @@ -1,13 +1,12 @@ import { ConfigServer } from "../servers/ConfigServer"; -import { IBotConfig } from "../@types/spt/config/IBotConfig"; -import { ITemplateItem } from "../@types/eft/common/tables/ITemplateItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { RandomUtil } from "../utils/RandomUtil"; import { BotHelper } from "./BotHelper"; export declare class DurabilityLimitsHelper { private randomUtil; private botHelper; private configServer; - botConfig: IBotConfig; + private botConfig; constructor(randomUtil: RandomUtil, botHelper: BotHelper, configServer: ConfigServer); getRandomisedMaxWeaponDurability(itemTemplate: ITemplateItem, botRole: string): number; getRandomisedMaxArmorDurability(itemTemplate: ITemplateItem, botRole: string): number; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/ExtendedProfileHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/ExtendedProfileHelper.d.ts new file mode 100644 index 0000000..22ead31 --- /dev/null +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/ExtendedProfileHelper.d.ts @@ -0,0 +1,22 @@ +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 { 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); + generatePlayerScav(sessionID: string): IPmcData; + private getScavSkills; + private removeSecureContainer; + private getDefaultScavSkills; + private getScavStats; + private getScavLevel; + private getScavExperience; + private setScavCooldownTimer; +} diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/HealthHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/HealthHelper.d.ts index 6cbbe45..fb5bed7 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/HealthHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/HealthHelper.d.ts @@ -1,19 +1,18 @@ import { SaveServer } from "../servers/SaveServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IAkiProfile } from "../@types/eft/profile/IAkiProfile"; -import { ISyncHealthRequestData } from "../@types/eft/health/ISyncHealthRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; import { ConfigServer } from "../servers/ConfigServer"; -import { IHealthConfig } from "../@types/spt/config/IHealthConfig"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class HealthHelper { private jsonUtil; private logger; private timeUtil; private saveServer; private configServer; - healthConfig: IHealthConfig; + private healthConfig; constructor(jsonUtil: JsonUtil, logger: ILogger, timeUtil: TimeUtil, saveServer: SaveServer, configServer: ConfigServer); resetVitality(sessionID: string): IAkiProfile; saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string): void; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/HideoutHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/HideoutHelper.d.ts index 08f30e6..d60e370 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 "../@types/eft/common/IPmcData"; -import { IHideoutSingleProductionStartRequestData } from "../@types/eft/hideout/IHideoutSingleProductionStartRequestData"; -import { StageBonus } from "../@types/eft/hideout/IHideoutArea"; +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 "../@types/eft/hideout/IHideoutContinousProductionStartRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +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 { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { PlayerService } from "../services/PlayerService"; -import { IHideoutTakeProductionRequestData } from "../@types/eft/hideout/IHideoutTakeProductionRequestData"; +import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; import { InventoryHelper } from "./InventoryHelper"; -import { ITemplateItem } from "../@types/eft/common/tables/ITemplateItem"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class HideoutHelper { private logger; private hashUtil; @@ -29,15 +29,15 @@ export declare class HideoutHelper { private playerService; private configServer; static BITCOIN_FARM: string; - static WATER_COLLECTOR: string; - static BITCOIN: string; - static EXPEDITIONARY_FUEL_TANK: string; + private WATER_COLLECTOR; + private BITCOIN; + private EXPEDITIONARY_FUEL_TANK; static NAME_BACKENDCOUNTERS_CRAFTING: string; static SKILL_NAME_HIDEOUT: string; static HOUR_FOR_SKILL_CRAFTING: number; static SKILL_NAME_CRAFITING: string; private hideoutConfig; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, itemEventRouter: ItemEventRouter, httpResponse: HttpResponse, profileHelper: ProfileHelper, inventoryHelper: InventoryHelper, playerService: PlayerService, configServer: ConfigServer); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, inventoryHelper: InventoryHelper, playerService: PlayerService, configServer: ConfigServer); registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; /** * This convinience function intialies new Production Object diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/InRaidHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/InRaidHelper.d.ts index 24e5f54..e79d384 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/InRaidHelper.d.ts @@ -1,7 +1,7 @@ -import { IPmcData, Victim } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { IPmcData, Victim } 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 { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { JsonUtil } from "../utils/JsonUtil"; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/InsuranceHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/InsuranceHelper.d.ts deleted file mode 100644 index 0bfa37b..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/InsuranceHelper.d.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData"; -import { IInsuranceConfig } from "../@types/spt/config/IInsuranceConfig"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { InsuranceService } from "../services/InsuranceService"; -import { Logger } from "../utils/Logger"; -import { RandomUtil } from "../utils/RandomUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { DialogueHelper } from "./DialogueHelper"; -import { InventoryHelper } from "./InventoryHelper"; -import { TraderHelper } from "./TraderHelper"; -export declare class InsuranceHelper { - private logger; - private insuranceService; - private inventoryHelper; - private randomUtil; - private timeUtil; - private saveServer; - private databaseServer; - private traderHelper; - private dialogueHelper; - private configServer; - insuranceConfig: IInsuranceConfig; - constructor(logger: Logger, insuranceService: InsuranceService, inventoryHelper: InventoryHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, configServer: ConfigServer); - storeLostGear(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; - addGearToSend(pmcData: IPmcData, insuredItem: any, actualItem: any, sessionID: string): any; - storeInsuredItemsForReturn(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; - sendInsuredItems(pmcData: IPmcData, sessionID: string): void; - getPremium(pmcData: IPmcData, inventoryItem: Item, traderId: string): number; -} diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/InventoryHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/InventoryHelper.d.ts index 5d17048..4b3460c 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/InventoryHelper.d.ts @@ -1,6 +1,6 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { FenceService } from "../services/FenceService"; @@ -10,12 +10,12 @@ import { PaymentHelper } from "./PaymentHelper"; import { ProfileHelper } from "./ProfileHelper"; import { DialogueHelper } from "./DialogueHelper"; import { HashUtil } from "../utils/HashUtil"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; -import { IInventoryMoveRequestData } from "../@types/eft/inventory/IInventoryMoveRequestData"; -import { IInventorySplitRequestData } from "../@types/eft/inventory/IInventorySplitRequestData"; -import { IInventoryMergeRequestData } from "../@types/eft/inventory/IInventoryMergeRequestData"; -import { ILogger } from "../@types/spt/utils/ILogger"; +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 { TraderAssortHelper } from "./TraderAssortHelper"; export interface OwnerInventoryItems { from: Item[]; @@ -38,19 +38,12 @@ export declare class InventoryHelper { private profileHelper; private configServer; private inventoryConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, httpResponse: HttpResponse, fenceService: FenceService, databaseServer: DatabaseServer, paymentHelper: PaymentHelper, traderAssortHelper: TraderAssortHelper, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, containerHelper: ContainerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); + 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; removeItem(pmcData: IPmcData, itemId: string, sessionID: string, output?: IItemEventRouterResponse): IItemEventRouterResponse; - getSecureContainerItems(items: Item[]): string[]; getItemSize(itemTpl: string, itemID: string, inventoryItem: Item[]): Record; private getSizeByInventoryItemHash; private getInventoryItemHash; - /** - * Recursively checks if the given item is - * inside the stash, that is it has the stash as - * ancestor with slotId=hideout - */ - isItemInStash(pmcData: IPmcData, item: Item): boolean; getContainerMap(containerW: number, containerH: number, itemList: Item[], containerId: string): number[][]; /** * Based on the item action, determine whose inventories we should be looking at for from and to. diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/ItemHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/ItemHelper.d.ts index 2c894e6..8c1175a 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/ItemHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/ItemHelper.d.ts @@ -1,10 +1,10 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { InsuredItem, IPmcData } from "../@types/eft/common/IPmcData"; -import { ITemplateItem, StackSlot } from "../@types/eft/common/tables/ITemplateItem"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { InsuredItem, IPmcData } from "../models/eft/common/IPmcData"; +import { ITemplateItem, StackSlot } from "../models/eft/common/tables/ITemplateItem"; +import { Item } from "../models/eft/common/tables/IItem"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; declare class ItemHelper { private logger; private hashUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/NotificationSendHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/NotificationSendHelper.d.ts index 40b6dec..b9298da 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/NotificationSendHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/NotificationSendHelper.d.ts @@ -1,5 +1,5 @@ -import { INotification } from "../@types/eft/notifier/INotifier"; -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +import { INotification } from "../models/eft/notifier/INotifier"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; import { NotificationService } from "../services/NotificationService"; export declare class NotificationSendHelper { private httpServer; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/NotifierHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/NotifierHelper.d.ts index 9998054..0d524e9 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/NotifierHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/NotifierHelper.d.ts @@ -1,5 +1,5 @@ -import { INotification } from "../@types/eft/notifier/INotifier"; -import { Message, MessageContentRagfair } from "../@types/eft/profile/IAkiProfile"; +import { INotification } from "../models/eft/notifier/INotifier"; +import { Message, MessageContentRagfair } from "../models/eft/profile/IAkiProfile"; import { HttpServerHelper } from "./HttpServerHelper"; export declare class NotifierHelper { private httpServerHelper; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/PresetHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/PresetHelper.d.ts index 7695248..0a24128 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/PresetHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/PresetHelper.d.ts @@ -1,4 +1,4 @@ -import { Preset } from "../@types/eft/common/IGlobals"; +import { Preset } from "../models/eft/common/IGlobals"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class PresetHelper { private databaseServer; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/ProfileHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/ProfileHelper.d.ts index 1d868b1..515e55e 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/ProfileHelper.d.ts @@ -1,44 +1,33 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { FenceService } from "../services/FenceService"; -import { IPmcData, Skills, Stats } from "../@types/eft/common/IPmcData"; -import { IAkiProfile } from "../@types/eft/profile/IAkiProfile"; -import { IValidateNicknameRequestData } from "../@types/eft/profile/IValidateNicknameRequestData"; +import { IPmcData, Stats } from "../models/eft/common/IPmcData"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { ItemHelper } from "./ItemHelper"; -import { IWatermark } from "../@types/spt/utils/IWatermark"; -import { BotGenerator } from "../generators/BotGenerator"; +import { IWatermark } from "../models/spt/utils/IWatermark"; export declare class ProfileHelper { - private jsonUtil; - private watermark; - private timeUtil; - private saveServer; - private databaseServer; - private botGenerator; - private itemHelper; - private fenceService; - constructor(jsonUtil: JsonUtil, watermark: IWatermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, botGenerator: BotGenerator, itemHelper: ItemHelper, fenceService: FenceService); + protected jsonUtil: JsonUtil; + protected watermark: IWatermark; + 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); resetProfileQuestCondition(sessionID: string, conditionId: string): void; getCompleteProfile(sessionID: string): IPmcData[]; - private isWiped; - getFullProfile(sessionID: string): IAkiProfile; - getPmcProfile(sessionID: string): IPmcData; - getScavProfile(sessionID: string): IPmcData; - setScavProfile(sessionID: string, scavData: IPmcData): void; - getScavSkills(sessionID: string): Skills; - generatePlayerScav(sessionID: string): IPmcData; - private removeSecureContainer; - private getDefaultScavSkills; - getScavStats(sessionID: string): Stats; - getDefaultCounters(): Stats; - getServerVersion(): string; - getScavLevel(sessionID: string): number; - getScavExperience(sessionID: string): number; - setScavCooldownTimer(profile: IPmcData, pmcData: IPmcData): IPmcData; isNicknameTaken(info: IValidateNicknameRequestData, sessionID: string): boolean; getProfileByPmcId(pmcId: string): IPmcData; getExperience(level: number): number; getMaxLevel(): number; getDefaultAkiDataObject(): any; + getFullProfile(sessionID: string): IAkiProfile; + getPmcProfile(sessionID: string): IPmcData; + getScavProfile(sessionID: string): IPmcData; + getDefaultCounters(): Stats; + private isWiped; + private getServerVersion; } diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/QuestConditionHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/QuestConditionHelper.d.ts index 8f7b706..2a0ee94 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/QuestConditionHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/QuestConditionHelper.d.ts @@ -1,4 +1,4 @@ -import { AvailableForConditions } from "../@types/eft/common/tables/IQuest"; +import { AvailableForConditions } from "../models/eft/common/tables/IQuest"; export declare class QuestConditionHelper { getQuestConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; getLevelConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/QuestHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/QuestHelper.d.ts index c29158b..3474884 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/QuestHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/QuestHelper.d.ts @@ -8,15 +8,14 @@ import { ProfileHelper } from "./ProfileHelper"; import { DialogueHelper } from "./DialogueHelper"; import { PaymentHelper } from "./PaymentHelper"; import { TraderHelper } from "./TraderHelper"; -import { IPmcData, Quest } from "../@types/eft/common/IPmcData"; -import { AvailableForConditions, AvailableForProps, IQuest, Reward } from "../@types/eft/common/tables/IQuest"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IAcceptQuestRequestData } from "../@types/eft/quests/IAcceptQuestRequestData"; -import { ICompleteQuestRequestData } from "../@types/eft/quests/ICompleteQuestRequestData"; +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 { IQuestConfig } from "../@types/spt/config/IQuestConfig"; import { RagfairServerHelper } from "./RagfairServerHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class QuestHelper { private logger; private jsonUtil; @@ -31,7 +30,7 @@ export declare class QuestHelper { private paymentHelper; private traderHelper; private configServer; - questConfig: IQuestConfig; + private questConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer); static get STATUS(): Record; questStatus(pmcData: IPmcData, questID: string): string; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairHelper.d.ts index 7d867bb..2bce4a6 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairHelper.d.ts @@ -1,15 +1,15 @@ import { JsonUtil } from "../utils/JsonUtil"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; -import { IGetOffersResult } from "../@types/eft/ragfair/IGetOffersResult"; -import { ISearchRequestData } from "../@types/eft/ragfair/ISearchRequestData"; +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 { DatabaseServer } from "../servers/DatabaseServer"; 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 "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; import { TraderAssortHelper } from "./TraderAssortHelper"; export declare class RagfairHelper { private logger; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairOfferHelper.d.ts index 873271f..da3ceb8 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairOfferHelper.d.ts @@ -1,9 +1,9 @@ import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; -import { ISearchRequestData } from "../@types/eft/ragfair/ISearchRequestData"; +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 { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { RagfairOfferService } from "../services/RagfairOfferService"; @@ -17,7 +17,7 @@ import { ConfigServer } from "../servers/ConfigServer"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { RagfairSortHelper } from "./RagfairSortHelper"; import { RagfairHelper } from "./RagfairHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairOfferHelper { private logger; private timeUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairSellHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairSellHelper.d.ts index 2e21589..929d112 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairSellHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairSellHelper.d.ts @@ -1,6 +1,5 @@ -import { SellResult } from "../@types/eft/ragfair/IRagfairOffer"; -import { IRagfairConfig } from "../@types/spt/config/IRagfairConfig"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { SellResult } from "../models/eft/ragfair/IRagfairOffer"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; @@ -9,7 +8,7 @@ export declare class RagfairSellHelper { private randomUtil; private timeUtil; private configServer; - ragfairConfig: IRagfairConfig; + private ragfairConfig; constructor(logger: ILogger, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer); calculateSellChance(baseChance: number, offerPrice: number, requirementsPriceInRub: number): number; rollForSale(sellChance: number, count: number): SellResult[]; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairServerHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairServerHelper.d.ts index 51b02cb..9a26261 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairServerHelper.d.ts @@ -1,13 +1,13 @@ import { SaveServer } from "../servers/SaveServer"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { ITemplateItem } from "../@types/eft/common/tables/ITemplateItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { ItemHelper } from "./ItemHelper"; import { ProfileHelper } from "./ProfileHelper"; -import { MemberCategory } from "../@types/eft/common/MemberCategory"; +import { MemberCategory } from "../models/eft/common/MemberCategory"; import { ConfigServer } from "../servers/ConfigServer"; import { RandomUtil } from "../utils/RandomUtil"; import { DialogueHelper } from "./DialogueHelper"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { Item } from "../models/eft/common/tables/IItem"; import { JsonUtil } from "../utils/JsonUtil"; import { HashUtil } from "../utils/HashUtil"; export declare class RagfairServerHelper { diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairSortHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairSortHelper.d.ts index fbd4b78..e9d8069 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairSortHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairSortHelper.d.ts @@ -1,4 +1,4 @@ -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class RagfairSortHelper { private databaseServer; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairTaxHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairTaxHelper.d.ts index bb78afd..e87334f 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairTaxHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairTaxHelper.d.ts @@ -1,9 +1,9 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; import { DatabaseServer } from "../servers/DatabaseServer"; import { RagfairPriceService } from "../services/RagfairPriceService"; import { ItemHelper } from "./ItemHelper"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairTaxHelper { private logger; private databaseServer; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/RepairHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/RepairHelper.d.ts index f2852d7..d11d0d2 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/RepairHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/RepairHelper.d.ts @@ -1,18 +1,17 @@ import { DatabaseServer } from "../servers/DatabaseServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; import { ConfigServer } from "../servers/ConfigServer"; -import { IRepairConfig } from "../@types/spt/config/IRepairConfig"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RepairHelper { private logger; private jsonUtil; private randomUtil; private databaseServer; private configServer; - repairConfig: IRepairConfig; + private repairConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); updateItemDurability(itemToRepairId: string, amountToRepair: number, pmcData: IPmcData, useRepairKit?: boolean): Item; private getRandomisedArmorRepairDegredationValue; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/SecureContainerHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/SecureContainerHelper.d.ts new file mode 100644 index 0000000..8f246b6 --- /dev/null +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/SecureContainerHelper.d.ts @@ -0,0 +1,13 @@ +import { Item } from "../models/eft/common/tables/IItem"; +import { ItemHelper } from "./ItemHelper"; +export interface OwnerInventoryItems { + from: Item[]; + to: Item[]; + sameInventory: boolean; + isMail: boolean; +} +export declare class SecureContainerHelper { + private itemHelper; + constructor(itemHelper: ItemHelper); + getSecureContainerItems(items: Item[]): string[]; +} diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/TradeHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/TradeHelper.d.ts index f3d9a50..0712ff4 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/TradeHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/TradeHelper.d.ts @@ -3,14 +3,14 @@ import { InventoryHelper } from "../helpers/InventoryHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { FenceService } from "../services/FenceService"; import { PaymentService } from "../services/PaymentService"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IProcessBuyTradeRequestData } from "../@types/eft/trade/IProcessBuyTradeRequestData"; -import { IProcessSellTradeRequestData } from "../@types/eft/trade/IProcessSellTradeRequestData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { Upd } from "../@types/eft/common/tables/IItem"; +import { IPmcData } from "../models/eft/common/IPmcData"; +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 "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class TradeHelper { private logger; private itemEventRouter; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/TraderAssortHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/TraderAssortHelper.d.ts index 7dfed48..d95879c 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/TraderAssortHelper.d.ts @@ -1,5 +1,5 @@ -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { ILogger } from "../models/spt/utils/ILogger"; import { RagfairAssortGenerator } from "../generators/RagfairAssortGenerator"; import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; import { DatabaseServer } from "../servers/DatabaseServer"; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/TraderHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/TraderHelper.d.ts index d9f37a7..5440afe 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/TraderHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/TraderHelper.d.ts @@ -6,10 +6,10 @@ import { ItemHelper } from "./ItemHelper"; import { ProfileHelper } from "./ProfileHelper"; import { PaymentHelper } from "./PaymentHelper"; import { FenceService } from "../services/FenceService"; -import { IBarterScheme, ITraderAssort, ITraderBase, LoyaltyLevel } from "../@types/eft/common/tables/ITrader"; -import { IPmcData } from "../@types/eft/common/IPmcData"; +import { IBarterScheme, ITraderAssort, ITraderBase, LoyaltyLevel } from "../models/eft/common/tables/ITrader"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class TraderHelper { private logger; private databaseServer; diff --git a/TypeScript/6ReferenceAnotherClass/types/ide/CheckVersion.d.ts b/TypeScript/6ReferenceAnotherClass/types/ide/CheckVersion.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/ide/CheckVersion.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/TypeScript/6ReferenceAnotherClass/types/ide/Compiler.d.ts b/TypeScript/6ReferenceAnotherClass/types/ide/Compiler.d.ts index cb0ff5c..fded23a 100644 --- a/TypeScript/6ReferenceAnotherClass/types/ide/Compiler.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/ide/Compiler.d.ts @@ -1 +1 @@ -export {}; +import "reflect-metadata"; diff --git a/TypeScript/6ReferenceAnotherClass/types/loaders/DelayedModLoader.d.ts b/TypeScript/6ReferenceAnotherClass/types/loaders/DelayedModLoader.d.ts index ed6d3f8..db86c75 100644 --- a/TypeScript/6ReferenceAnotherClass/types/loaders/DelayedModLoader.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/loaders/DelayedModLoader.d.ts @@ -3,13 +3,15 @@ import { VFS } from "../utils/VFS"; import { InitialModLoader } from "./InitialModLoader"; import { BundleLoader } from "./BundleLoader"; import { HandbookController } from "../controllers/HandbookController"; -import { IModLoader } from "../@types/spt/mod/IModLoader"; +import { IModLoader } from "../models/spt/mod/IModLoader"; +import { ModCompilerService } from "../services/ModCompilerService"; export declare class DelayedModLoader implements IModLoader { private bundleLoader; private handbookController; private vfs; + private modCompilerService; private initialModLoader; - constructor(bundleLoader: BundleLoader, handbookController: HandbookController, vfs: VFS, initialModLoader: InitialModLoader); + constructor(bundleLoader: BundleLoader, handbookController: HandbookController, vfs: VFS, modCompilerService: ModCompilerService, initialModLoader: InitialModLoader); getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; getImportedModsNames(): string[]; diff --git a/TypeScript/6ReferenceAnotherClass/types/loaders/IMod.d.ts b/TypeScript/6ReferenceAnotherClass/types/loaders/IMod.d.ts deleted file mode 100644 index 20813f9..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/loaders/IMod.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export interface IMod { - onload(): any; -} -export interface IContainerMod extends IMod { - onContainerLoad(): any; -} diff --git a/TypeScript/6ReferenceAnotherClass/types/loaders/InitialModLoader.d.ts b/TypeScript/6ReferenceAnotherClass/types/loaders/InitialModLoader.d.ts index 612c821..35503c8 100644 --- a/TypeScript/6ReferenceAnotherClass/types/loaders/InitialModLoader.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/loaders/InitialModLoader.d.ts @@ -1,20 +1,24 @@ -import { DependencyContainer } from 'tsyringe'; +import { DependencyContainer } from "tsyringe"; import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; -import { IModLoader } from "../@types/spt/mod/IModLoader"; -import { ILogger } from '../@types/spt/utils/ILogger'; +import { ModCompilerService } from "../services/ModCompilerService"; +import { HashCacheService } from "../services/HashCacheService"; +import { IModLoader } from "../models/spt/mod/IModLoader"; export declare class InitialModLoader implements IModLoader { private logger; private vfs; private jsonUtil; + private modCompilerService; + private hashCacheService; private configServer; - private basepath; + private readonly basepath; private imported; private onLoad; private akiConfig; - constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, configServer: ConfigServer); - load(container: DependencyContainer): void; + constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, hashCacheService: HashCacheService, configServer: ConfigServer); + load(container: DependencyContainer): Promise; getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; getImportedModsNames(): string[]; @@ -23,7 +27,9 @@ export declare class InitialModLoader implements IModLoader { private importMods; private isModCombatibleWithAki; private executeMods; + private sortModsLoadOrder; private addMod; + private compileModIfNeeded; private areModDependenciesFulfilled; private isModCompatible; private validMod; diff --git a/TypeScript/6ReferenceAnotherClass/types/loaders/ModLoader.d.ts b/TypeScript/6ReferenceAnotherClass/types/loaders/ModLoader.d.ts deleted file mode 100644 index eed6d69..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/loaders/ModLoader.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { IPackageJsonData } from "../@types/spt/mod/IPackageJsonData"; -export declare class ModLoader { - static basepath: string; - static imported: {}; - static onLoad: {}; - static load(): void; - static getBundles(local: any): string; - static getBundle(key: any, arg1: any): void; - static importClass(name: string, filepath: string): void; - static importMods(): void; - static isModCombatibleWithAki(mod: IPackageJsonData): boolean; - static executeMods(): void; - static getModPath(mod: string): string; - static addMod(mod: string): void; - static areModDependenciesFulfilled(mod: IPackageJsonData, loadedMods: any): boolean; - static isModCompatible(mod: any, loadedMods: any): boolean; - static validMod(mod: any): boolean; - static getLoadOrderRecursive(mod: any, result: any, visited: any): void; - static getLoadOrder(mods: any): {}; -} diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/bot/IGenerateBotsRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/bot/IGenerateBotsRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/bot/IGenerateBotsRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/bot/IGenerateBotsRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/common/IEmptyRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/IEmptyRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/common/IEmptyRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/common/IEmptyRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/common/IGlobals.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/IGlobals.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/common/IGlobals.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/common/IGlobals.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/common/ILocation.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/ILocation.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/common/ILocation.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/common/ILocation.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/common/ILocationBase.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/ILocationBase.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/common/ILocationBase.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/common/ILocationBase.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/common/ILocationsSourceDestinationBase.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/ILocationsSourceDestinationBase.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/common/ILocationsSourceDestinationBase.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/common/ILocationsSourceDestinationBase.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/common/ILooseLoot.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/ILooseLoot.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/common/ILooseLoot.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/common/ILooseLoot.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/common/IMetricsTableData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/IMetricsTableData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/common/IMetricsTableData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/common/IMetricsTableData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/common/IPmcData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/IPmcData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/common/IPmcData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/common/IPmcData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/common/MemberCategory.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/MemberCategory.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/common/MemberCategory.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/common/MemberCategory.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/common/request/IBaseInteractionRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/request/IBaseInteractionRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/common/request/IBaseInteractionRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/common/request/IBaseInteractionRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/common/tables/IBotBase.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IBotBase.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/common/tables/IBotBase.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IBotBase.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/common/tables/IBotCore.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IBotCore.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/common/tables/IBotCore.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IBotCore.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/common/tables/IBotType.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IBotType.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/common/tables/IBotType.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IBotType.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/common/tables/ICustomizationItem.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/ICustomizationItem.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/common/tables/ICustomizationItem.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/ICustomizationItem.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/common/tables/IHandbookBase.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IHandbookBase.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/common/tables/IHandbookBase.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IHandbookBase.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/common/tables/IItem.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IItem.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/common/tables/IItem.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IItem.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/common/tables/ILocationsBase.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/ILocationsBase.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/common/tables/ILocationsBase.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/ILocationsBase.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/common/tables/ILootBase.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/ILootBase.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/common/tables/ILootBase.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/ILootBase.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/common/tables/IQuest.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IQuest.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/common/tables/IQuest.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IQuest.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IRepeatableQuests.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/common/tables/IRepeatableQuests.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IRepeatableQuests.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/common/tables/ITemplateItem.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/ITemplateItem.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/common/tables/ITemplateItem.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/ITemplateItem.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/common/tables/ITrader.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/ITrader.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/common/tables/ITrader.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/ITrader.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/models/eft/customization/IBuyClothingRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/customization/IBuyClothingRequestData.d.ts new file mode 100644 index 0000000..d19b70d --- /dev/null +++ b/TypeScript/6ReferenceAnotherClass/types/models/eft/customization/IBuyClothingRequestData.d.ts @@ -0,0 +1,10 @@ +export interface IBuyClothingRequestData { + Action: "CustomizationBuy"; + offer: string; + items: ClothingItem[]; +} +export interface ClothingItem { + del: boolean; + id: string; + count: number; +} diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/customization/IWearClothingRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/customization/IWearClothingRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/customization/IWearClothingRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/customization/IWearClothingRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/dialog/IFriendRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/dialog/IFriendRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/dialog/IFriendRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/dialog/IFriendRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/dialog/IGetAllAttachmentsRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/dialog/IGetAllAttachmentsRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/dialog/IGetAllAttachmentsResponse.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/dialog/IGetAllAttachmentsResponse.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/dialog/IGetChatServerListRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/dialog/IGetChatServerListRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/dialog/IGetChatServerListRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/dialog/IGetChatServerListRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/dialog/IGetFriendListDataResponse.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/dialog/IGetFriendListDataResponse.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/dialog/IGetFriendListDataResponse.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/dialog/IGetFriendListDataResponse.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/dialog/IGetMailDialogInfoRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/dialog/IGetMailDialogInfoRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/dialog/IGetMailDialogListRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/dialog/IGetMailDialogListRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/dialog/IGetMailDialogViewRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/dialog/IGetMailDialogViewRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/dialog/IGetMailDialogViewResponseData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/dialog/IGetMailDialogViewResponseData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/dialog/IPinDialogRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/dialog/IPinDialogRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/dialog/IPinDialogRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/dialog/IPinDialogRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/dialog/IRemoveDialogRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/dialog/IRemoveDialogRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/dialog/IRemoveDialogRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/dialog/IRemoveDialogRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/dialog/ISendMessageRequest.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/dialog/ISendMessageRequest.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/dialog/ISendMessageRequest.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/dialog/ISendMessageRequest.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/dialog/ISetDialogReadRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/dialog/ISetDialogReadRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/dialog/ISetDialogReadRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/dialog/ISetDialogReadRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/game/IGameConfigResponse.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/game/IGameConfigResponse.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/game/IGameConfigResponse.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/game/IGameConfigResponse.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/game/IGameEmptyCrcRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/game/IGameEmptyCrcRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/game/IGameEmptyCrcRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/game/IGameEmptyCrcRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/game/IVersionValidateRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/game/IVersionValidateRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/game/IVersionValidateRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/game/IVersionValidateRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/health/IHealthTreatmentRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/health/IHealthTreatmentRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/health/IHealthTreatmentRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/health/IHealthTreatmentRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/health/IOffraidEatRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/health/IOffraidEatRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/health/IOffraidEatRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/health/IOffraidEatRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/health/IOffraidHealRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/health/IOffraidHealRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/health/IOffraidHealRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/health/IOffraidHealRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/health/ISyncHealthRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/health/ISyncHealthRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/health/ISyncHealthRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/health/ISyncHealthRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/HideoutAreasEnum.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/HideoutAreasEnum.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/HideoutAreasEnum.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/HideoutAreasEnum.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/IHideoutArea.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/IHideoutArea.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/IHideoutArea.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/IHideoutArea.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/IHideoutProduction.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/IHideoutProduction.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/IHideoutProduction.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/IHideoutProduction.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/IHideoutPutItemInRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/IHideoutPutItemInRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/IHideoutScavCase.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/IHideoutScavCase.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/IHideoutScavCase.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/IHideoutScavCase.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/IHideoutScavCaseStartRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/IHideoutScavCaseStartRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/IHideoutSettingsBase.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/IHideoutSettingsBase.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/IHideoutSettingsBase.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/IHideoutSettingsBase.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/IHideoutTakeItemOutRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/IHideoutTakeItemOutRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/IHideoutTakeProductionRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/IHideoutTakeProductionRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/IHideoutToggleAreaRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/IHideoutToggleAreaRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/IHideoutUpgradeRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/hideout/IHideoutUpgradeRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/httpResponse/IGetBodyResponseData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/httpResponse/IGetBodyResponseData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/httpResponse/IGetBodyResponseData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/httpResponse/IGetBodyResponseData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/httpResponse/INullResponseData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/httpResponse/INullResponseData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/httpResponse/INullResponseData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/httpResponse/INullResponseData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/inRaid/IRegisterPlayerRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/inRaid/IRegisterPlayerRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/inRaid/ISaveProgressRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/inRaid/ISaveProgressRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/inRaid/ISaveProgressRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/inRaid/ISaveProgressRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/insurance/IGetInsuranceCostRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/insurance/IGetInsuranceCostRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/insurance/IInsureRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/insurance/IInsureRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/insurance/IInsureRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/insurance/IInsureRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventoryAddRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventoryAddRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventoryAddRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventoryAddRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventoryBaseActionRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventoryBaseActionRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventoryBindRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventoryBindRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventoryBindRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventoryBindRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventoryCreateMarkerRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventoryCreateMarkerRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventoryEditMarkerRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventoryEditMarkerRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventoryExamineRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventoryExamineRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventoryExamineRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventoryExamineRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventoryFoldRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventoryFoldRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventoryFoldRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventoryFoldRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventoryMergeRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventoryMergeRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventoryMergeRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventoryMergeRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventoryMoveRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventoryMoveRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventoryMoveRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventoryMoveRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventoryRemoveRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventoryRemoveRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventorySortRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventorySortRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventorySortRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventorySortRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventorySplitRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventorySplitRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventorySplitRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventorySplitRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventorySwapRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventorySwapRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventorySwapRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventorySwapRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventoryTagRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventoryTagRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventoryTagRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventoryTagRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventoryToggleRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventoryToggleRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventoryToggleRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventoryToggleRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventoryTransferRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventoryTransferRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/inventory/IInventoryTransferRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/inventory/IInventoryTransferRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/models/eft/itemEvent/IItemEventRouterBase.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/itemEvent/IItemEventRouterBase.d.ts new file mode 100644 index 0000000..31e62fe --- /dev/null +++ b/TypeScript/6ReferenceAnotherClass/types/models/eft/itemEvent/IItemEventRouterBase.d.ts @@ -0,0 +1,67 @@ +import { Skills } from "../common/IPmcData"; +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 { + warnings: Warning[]; + profileChanges: TProfileChanges | ""; +} +export declare type TProfileChanges = Record; +export interface Warning { + index: number; + err: string; + errmsg: string; +} +export interface ProfileChange { + _id: string; + experience: number; + quests: IQuest[]; + ragFairOffers: IRagfairOffer[]; + builds: BuildChange[]; + items: ItemChanges; + production: Record; + skills: Skills; + traderRelations: Record; + repeatableQuests?: IPmcDataRepeatableQuest[]; +} +export interface BuildChange { + id: string; + name: string; + root: string; + items: Item[]; +} +export interface ItemChanges { + new: Product[]; + change: Product[]; + del: Product[]; +} +export interface Production { + Progress: number; + StartTimestamp: number; + ProductionTime: number; + inProgress: boolean; + RecipeId: string; + Products: Product[]; +} +export interface Product { + _id: string; + _tpl?: string; + parentId?: string; + slotId?: string; + location?: ItemChangeLocation; + upd?: Upd; +} +export interface ItemChangeLocation { + x: number; + y: number; + r: number; + isSearched?: boolean; +} +export interface TraderRelations { + salesSum?: number; + standing?: number; + loyalty?: number; + unlocked?: boolean; + disabled?: boolean; +} diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/itemEvent/IItemEventRouterRequest.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/itemEvent/IItemEventRouterRequest.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/itemEvent/IItemEventRouterResponse.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/itemEvent/IItemEventRouterResponse.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/launcher/IChangeRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/launcher/IChangeRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/launcher/IChangeRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/launcher/IChangeRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/launcher/IGetMiniProfileRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/launcher/IGetMiniProfileRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/launcher/ILoginRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/launcher/ILoginRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/launcher/ILoginRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/launcher/ILoginRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/launcher/IMiniProfile.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/launcher/IMiniProfile.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/launcher/IMiniProfile.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/launcher/IMiniProfile.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/launcher/IRegisterData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/launcher/IRegisterData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/launcher/IRegisterData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/launcher/IRegisterData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/launcher/IRemoveProfileData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/launcher/IRemoveProfileData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/launcher/IRemoveProfileData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/launcher/IRemoveProfileData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/location/IGetLocationRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/location/IGetLocationRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/location/IGetLocationRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/location/IGetLocationRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/match/IEndOfflineRaidRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/match/IEndOfflineRaidRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/match/IEndOfflineRaidRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/match/IEndOfflineRaidRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/match/IStartOffineRaidRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/match/IStartOffineRaidRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/match/IStartOffineRaidRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/match/IStartOffineRaidRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/notes/INoteActionData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/notes/INoteActionData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/notes/INoteActionData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/notes/INoteActionData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/notifier/INotifier.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/notifier/INotifier.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/notifier/INotifier.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/notifier/INotifier.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/notifier/ISelectProfileRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/notifier/ISelectProfileRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/notifier/ISelectProfileRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/notifier/ISelectProfileRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/presetBuild/IPresetBuildActionRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/presetBuild/IPresetBuildActionRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/profile/IAkiProfile.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/profile/IAkiProfile.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/profile/IAkiProfile.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/profile/IAkiProfile.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/profile/IProfileChangeNicknameRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/profile/IProfileChangeNicknameRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/profile/IProfileChangeVoiceRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/profile/IProfileChangeVoiceRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/profile/IProfileCreateRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/profile/IProfileCreateRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/profile/IProfileCreateRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/profile/IProfileCreateRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/profile/ISearchFriendRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/profile/ISearchFriendRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/profile/ISearchFriendRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/profile/ISearchFriendRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/profile/ISearchFriendResponse.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/profile/ISearchFriendResponse.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/profile/ISearchFriendResponse.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/profile/ISearchFriendResponse.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/profile/IValidateNicknameRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/profile/IValidateNicknameRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/profile/IValidateNicknameRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/profile/IValidateNicknameRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/quests/IAcceptQuestRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/quests/IAcceptQuestRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/quests/IAcceptQuestRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/quests/IAcceptQuestRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/quests/ICompleteQuestRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/quests/ICompleteQuestRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/quests/ICompleteQuestRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/quests/ICompleteQuestRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/quests/IHandoverQuestRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/quests/IHandoverQuestRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/quests/IHandoverQuestRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/quests/IHandoverQuestRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/quests/IListQuestsRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/quests/IListQuestsRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/quests/IListQuestsRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/quests/IListQuestsRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/quests/IRepeatableQuestChangeRequest.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/quests/IRepeatableQuestChangeRequest.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/ragfair/IAddOfferRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/ragfair/IAddOfferRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/ragfair/IAddOfferRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/ragfair/IAddOfferRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/ragfair/IExtendOfferRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/ragfair/IExtendOfferRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/ragfair/IExtendOfferRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/ragfair/IExtendOfferRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/ragfair/IGetItemPriceResult.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/ragfair/IGetItemPriceResult.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/ragfair/IGetItemPriceResult.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/ragfair/IGetItemPriceResult.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/ragfair/IGetMarketPriceRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/ragfair/IGetMarketPriceRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/ragfair/IGetOffersResult.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/ragfair/IGetOffersResult.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/ragfair/IGetOffersResult.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/ragfair/IGetOffersResult.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/ragfair/IRagfairOffer.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/ragfair/IRagfairOffer.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/ragfair/IRagfairOffer.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/ragfair/IRemoveOfferRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/ragfair/IRemoveOfferRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/ragfair/ISearchRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/ragfair/ISearchRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/ragfair/ISearchRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/repair/IBaseRepairActionDataRequest.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/repair/IBaseRepairActionDataRequest.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/repair/IRepairActionDataRequest.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/repair/IRepairActionDataRequest.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/repair/IRepairActionDataRequest.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/repair/IRepairActionDataRequest.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/repair/ITraderRepairActionDataRequest.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/repair/ITraderRepairActionDataRequest.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/trade/IProcessBaseTradeRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/trade/IProcessBaseTradeRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/trade/IProcessBuyTradeRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/trade/IProcessBuyTradeRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/trade/IProcessRagfairTradeRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/trade/IProcessRagfairTradeRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/trade/IProcessSellTradeRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/trade/IProcessSellTradeRequestData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/trade/IProcessSellTradeRequestData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/trade/IProcessSellTradeRequestData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/eft/weather/IWeatherData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/weather/IWeatherData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/eft/weather/IWeatherData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/weather/IWeatherData.d.ts diff --git a/TypeScript/3.0GetSptConfigFile/types/@types/wishlist/IWishlistActionData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/wishlist/IWishlistActionData.d.ts similarity index 100% rename from TypeScript/3.0GetSptConfigFile/types/@types/wishlist/IWishlistActionData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/eft/wishlist/IWishlistActionData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/external/mod.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/external/mod.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/external/mod.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/external/mod.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/external/tsyringe.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/external/tsyringe.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/external/tsyringe.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/external/tsyringe.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/bindings/Route.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/bindings/Route.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/bindings/Route.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/bindings/Route.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IBotCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IBotCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IBotCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IBotCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IBundleCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IBundleCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IBundleCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IBundleCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/ICustomizationCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/ICustomizationCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/ICustomizationCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/ICustomizationCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IDataCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IDataCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IDataCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IDataCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IDialogueCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IDialogueCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IDialogueCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IDialogueCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IGameCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IGameCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IGameCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IGameCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IHandbookCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IHandbookCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IHandbookCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IHandbookCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IHealthCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IHealthCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IHealthCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IHealthCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IHideoutCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IHideoutCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IHideoutCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IHideoutCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IHttpCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IHttpCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IHttpCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IHttpCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IInraidCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IInraidCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IInraidCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IInraidCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IInsuranceCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IInsuranceCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IInsuranceCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IInsuranceCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IInventoryCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IInventoryCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IInventoryCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IInventoryCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IItemEventCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IItemEventCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IItemEventCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IItemEventCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/ILauncherCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/ILauncherCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/ILauncherCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/ILauncherCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/ILocationCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/ILocationCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/ILocationCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/ILocationCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IMatchCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IMatchCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IMatchCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IMatchCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IModCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IModCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IModCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IModCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/INoteCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/INoteCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/INoteCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/INoteCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/INotifierCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/INotifierCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/INotifierCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/INotifierCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IPresetBuildCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IPresetBuildCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IPresetCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IPresetCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IPresetCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IPresetCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IProfileCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IProfileCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IProfileCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IProfileCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IQuestCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IQuestCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IQuestCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IQuestCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IRagfairCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IRagfairCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IRagfairCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IRagfairCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IRepairCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IRepairCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IRepairCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IRepairCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/ISaveCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/ISaveCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/ISaveCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/ISaveCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/ITradeCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/ITradeCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/ITradeCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/ITradeCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/ITraderCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/ITraderCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/ITraderCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/ITraderCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IWeatherCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IWeatherCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IWeatherCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IWeatherCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IWishlistCallbacks.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IWishlistCallbacks.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/callbacks/IWishlistCallbacks.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/callbacks/IWishlistCallbacks.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/config/IAirdropConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/config/IAirdropConfig.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/config/IAirdropConfig.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/config/IAirdropConfig.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/config/IBaseConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/config/IBaseConfig.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/config/IBaseConfig.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/config/IBaseConfig.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/config/IBotConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/config/IBotConfig.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/config/IBotConfig.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/config/IBotConfig.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/config/ICoreConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/config/ICoreConfig.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/config/ICoreConfig.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/config/ICoreConfig.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/config/IHealthConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/config/IHealthConfig.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/config/IHealthConfig.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/config/IHealthConfig.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/config/IHideoutConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/config/IHideoutConfig.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/config/IHideoutConfig.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/config/IHideoutConfig.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/config/IHttpConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/config/IHttpConfig.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/config/IHttpConfig.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/config/IHttpConfig.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/config/IInRaidConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/config/IInRaidConfig.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/config/IInRaidConfig.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/config/IInRaidConfig.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/config/IInsuranceConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/config/IInsuranceConfig.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/config/IInsuranceConfig.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/config/IInsuranceConfig.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/config/IInventoryConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/config/IInventoryConfig.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/config/IInventoryConfig.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/config/IInventoryConfig.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/config/ILocationConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/config/ILocationConfig.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/config/ILocationConfig.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/config/ILocationConfig.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/config/IMatchConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/config/IMatchConfig.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/config/IMatchConfig.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/config/IMatchConfig.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/config/IQuestConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/config/IQuestConfig.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/config/IQuestConfig.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/config/IQuestConfig.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/config/IRagfairConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/config/IRagfairConfig.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/config/IRagfairConfig.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/config/IRagfairConfig.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/config/IRepairConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/config/IRepairConfig.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/config/IRepairConfig.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/config/IRepairConfig.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/config/ITraderConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/config/ITraderConfig.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/config/ITraderConfig.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/config/ITraderConfig.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/config/IWeatherConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/config/IWeatherConfig.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/config/IWeatherConfig.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/config/IWeatherConfig.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/controllers/IBotController.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/controllers/IBotController.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/controllers/IBotController.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/controllers/IBotController.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/generators/IBotGenerator.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/generators/IBotGenerator.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/generators/IBotGenerator.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/generators/IBotGenerator.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/generators/ILocationGenerator.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/generators/ILocationGenerator.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/generators/ILocationGenerator.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/generators/ILocationGenerator.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/generators/IPMCLootGenerator.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/generators/IPMCLootGenerator.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/generators/IPMCLootGenerator.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/generators/IPMCLootGenerator.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/generators/IRagfairAssortGenerator.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/generators/IRagfairAssortGenerator.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/generators/IRagfairAssortGenerator.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/generators/IRagfairAssortGenerator.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/generators/IRagfairOfferGenerator.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/generators/IRagfairOfferGenerator.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/generators/IRagfairOfferGenerator.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/generators/IRagfairOfferGenerator.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/helpers/Traders.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/helpers/Traders.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/helpers/Traders.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/helpers/Traders.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/mod/IMod.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/mod/IMod.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/mod/IMod.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/mod/IMod.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/mod/IModLoader.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/mod/IModLoader.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/mod/IModLoader.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/mod/IModLoader.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/mod/IPackageJsonData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/mod/IPackageJsonData.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/mod/IPackageJsonData.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/mod/IPackageJsonData.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/ragfair/IRagfairServerPrices.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/ragfair/IRagfairServerPrices.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/ragfair/IRagfairServerPrices.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/ragfair/IRagfairServerPrices.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/server/IDatabaseTables.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/server/IDatabaseTables.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/server/IDatabaseTables.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/server/IDatabaseTables.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/server/IHttpServer.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/server/IHttpServer.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/server/IHttpServer.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/server/IHttpServer.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/server/ILocaleBase.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/server/ILocaleBase.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/server/ILocaleBase.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/server/ILocaleBase.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/server/ILocations.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/server/ILocations.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/server/ILocations.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/server/ILocations.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/server/IServerBase.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/server/IServerBase.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/server/IServerBase.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/server/IServerBase.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/server/ISettingsBase.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/server/ISettingsBase.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/server/ISettingsBase.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/server/ISettingsBase.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/utils/IAsyncQueue.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/utils/IAsyncQueue.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/utils/IAsyncQueue.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/utils/IAsyncQueue.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/utils/ICommand.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/utils/ICommand.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/utils/ICommand.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/utils/ICommand.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/utils/ILogger.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/utils/ILogger.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/utils/ILogger.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/utils/ILogger.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/utils/IUuidGenerator.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/utils/IUuidGenerator.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/utils/IUuidGenerator.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/utils/IUuidGenerator.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/@types/spt/utils/IWatermark.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/utils/IWatermark.d.ts similarity index 100% rename from TypeScript/6ReferenceAnotherClass/types/@types/spt/utils/IWatermark.d.ts rename to TypeScript/6ReferenceAnotherClass/types/models/spt/utils/IWatermark.d.ts diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/ImageRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/ImageRouter.d.ts index 511d5b2..07a0606 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/ImageRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/ImageRouter.d.ts @@ -1,7 +1,7 @@ /// import { IncomingMessage, ServerResponse } from "http"; import { VFS } from "../utils/VFS"; -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class ImageRouter { private vfs; constructor(vfs: VFS); diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/ItemEventRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/ItemEventRouter.d.ts index bb5e843..bb20152 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/ItemEventRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/ItemEventRouter.d.ts @@ -1,9 +1,9 @@ import { JsonUtil } from "../utils/JsonUtil"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IItemEventRouterRequest } from "../@types/eft/itemEvent/IItemEventRouterRequest"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IItemEventRouterRequest } from "../models/eft/itemEvent/IItemEventRouterRequest"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { ItemEventRouterDefinition } from "../di/Router"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class ItemEventRouter { private logger; private jsonUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/item_events/CustomizationItemEventRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/item_events/CustomizationItemEventRouter.d.ts index eebc28c..3025e2c 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/item_events/CustomizationItemEventRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/item_events/CustomizationItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private customizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/item_events/HealthItemEventRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/item_events/HealthItemEventRouter.d.ts index 333c18a..bad9af2 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/item_events/HealthItemEventRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/item_events/HealthItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private healthCallbacks; constructor(healthCallbacks: HealthCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/item_events/HideoutItemEventRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/item_events/HideoutItemEventRouter.d.ts index f68b112..2cec18b 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/item_events/HideoutItemEventRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/item_events/HideoutItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private hideoutCallbacks; constructor(hideoutCallbacks: HideoutCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/item_events/InsuranceItemEventRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/item_events/InsuranceItemEventRouter.d.ts index de185db..8efc2c2 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/item_events/InsuranceItemEventRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/item_events/InsuranceItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private insuranceCallbacks; constructor(insuranceCallbacks: InsuranceCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/item_events/InventoryItemEventRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/item_events/InventoryItemEventRouter.d.ts index 40496f7..1d93e7b 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/item_events/InventoryItemEventRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/item_events/InventoryItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private inventoryCallbacks; constructor(inventoryCallbacks: InventoryCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/item_events/NoteItemEventRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/item_events/NoteItemEventRouter.d.ts index 8b703a3..12af594 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/item_events/NoteItemEventRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/item_events/NoteItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private noteCallbacks; constructor(noteCallbacks: NoteCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/item_events/PresetBuildItemEventRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/item_events/PresetBuildItemEventRouter.d.ts index 7a915b1..7298c52 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/item_events/PresetBuildItemEventRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/item_events/PresetBuildItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private presetBuildCallbacks; constructor(presetBuildCallbacks: PresetBuildCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/item_events/QuestItemEventRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/item_events/QuestItemEventRouter.d.ts index 6f4d3f6..9944ae9 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/item_events/QuestItemEventRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/item_events/QuestItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private questCallbacks; constructor(questCallbacks: QuestCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/item_events/RagfairItemEventRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/item_events/RagfairItemEventRouter.d.ts index 8361e1e..88e52ba 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/item_events/RagfairItemEventRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/item_events/RagfairItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private ragfairCallbacks; constructor(ragfairCallbacks: RagfairCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/item_events/RepairItemEventRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/item_events/RepairItemEventRouter.d.ts index 544a656..b292ded 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/item_events/RepairItemEventRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/item_events/RepairItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private repairCallbacks; constructor(repairCallbacks: RepairCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/item_events/TradeItemEventRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/item_events/TradeItemEventRouter.d.ts index eb5c294..1bca2b8 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/item_events/TradeItemEventRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/item_events/TradeItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private tradeCallbacks; constructor(tradeCallbacks: TradeCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/item_events/WishlistItemEventRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/item_events/WishlistItemEventRouter.d.ts index e7fdc9b..38831f6 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/item_events/WishlistItemEventRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/item_events/WishlistItemEventRouter.d.ts @@ -1,9 +1,10 @@ -import { IPmcData } from "../../@types/eft/common/IPmcData"; +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 { private wishlistCallbacks; constructor(wishlistCallbacks: WishlistCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any; + handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/save_load/HealthSaveLoadRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/save_load/HealthSaveLoadRouter.d.ts index c068915..114f5b2 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/save_load/HealthSaveLoadRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/save_load/HealthSaveLoadRouter.d.ts @@ -1,4 +1,4 @@ -import { IAkiProfile } from "../../@types/eft/profile/IAkiProfile"; +import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; export declare class HealthSaveLoadRouter extends SaveLoadRouter { constructor(); diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/save_load/InraidSaveLoadRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/save_load/InraidSaveLoadRouter.d.ts index eb5cf5a..4c00b40 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/save_load/InraidSaveLoadRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/save_load/InraidSaveLoadRouter.d.ts @@ -1,4 +1,4 @@ -import { IAkiProfile } from "../../@types/eft/profile/IAkiProfile"; +import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; export declare class InraidSaveLoadRouter extends SaveLoadRouter { constructor(); diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/save_load/InsuranceSaveLoadRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/save_load/InsuranceSaveLoadRouter.d.ts index 07df122..30ce98e 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/save_load/InsuranceSaveLoadRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/save_load/InsuranceSaveLoadRouter.d.ts @@ -1,4 +1,4 @@ -import { IAkiProfile } from "../../@types/eft/profile/IAkiProfile"; +import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; export declare class InsuranceSaveLoadRouter extends SaveLoadRouter { constructor(); diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/save_load/ProfileSaveLoadRouter.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/save_load/ProfileSaveLoadRouter.d.ts index 51b4cb5..16c7619 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/save_load/ProfileSaveLoadRouter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/save_load/ProfileSaveLoadRouter.d.ts @@ -1,4 +1,4 @@ -import { IAkiProfile } from "../../@types/eft/profile/IAkiProfile"; +import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; import { HandledRoute, SaveLoadRouter } from "../../di/Router"; export declare class ProfileSaveLoadRouter extends SaveLoadRouter { constructor(); diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/serializers/BundleSerializer.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/serializers/BundleSerializer.d.ts index cf09797..5f275c4 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/serializers/BundleSerializer.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/serializers/BundleSerializer.d.ts @@ -1,5 +1,5 @@ -import { IHttpServer } from "../../@types/spt/server/IHttpServer"; -import { ILogger } from "../../@types/spt/utils/ILogger"; +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 { diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/serializers/ImageSerializer.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/serializers/ImageSerializer.d.ts index 1d0b9c4..29340d0 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/serializers/ImageSerializer.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/serializers/ImageSerializer.d.ts @@ -1,4 +1,4 @@ -import { IHttpServer } from "../../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { Serializer } from "../../di/Serializer"; import { ImageRouter } from "../ImageRouter"; export declare class ImageSerializer extends Serializer { diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/serializers/NotifySerializer.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/serializers/NotifySerializer.d.ts index d97fc0a..7be87ef 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/serializers/NotifySerializer.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/serializers/NotifySerializer.d.ts @@ -1,4 +1,4 @@ -import { IHttpServer } from "../../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { NotifierController } from "../../controllers/NotifierController"; import { Serializer } from "../../di/Serializer"; import { HttpServerHelper } from "../../helpers/HttpServerHelper"; diff --git a/TypeScript/6ReferenceAnotherClass/types/servers/ConfigServer.d.ts b/TypeScript/6ReferenceAnotherClass/types/servers/ConfigServer.d.ts index d25d1a8..9c2e114 100644 --- a/TypeScript/6ReferenceAnotherClass/types/servers/ConfigServer.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/servers/ConfigServer.d.ts @@ -1,6 +1,6 @@ import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class ConfigServer { private logger; private vfs; diff --git a/TypeScript/6ReferenceAnotherClass/types/servers/DatabaseServer.d.ts b/TypeScript/6ReferenceAnotherClass/types/servers/DatabaseServer.d.ts index b66e847..521bcf9 100644 --- a/TypeScript/6ReferenceAnotherClass/types/servers/DatabaseServer.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/servers/DatabaseServer.d.ts @@ -1,4 +1,4 @@ -import { IDatabaseTables } from "../@types/spt/server/IDatabaseTables"; +import { IDatabaseTables } from "../models/spt/server/IDatabaseTables"; export declare class DatabaseServer { private tableData; getTables(): IDatabaseTables; diff --git a/TypeScript/6ReferenceAnotherClass/types/servers/HttpServer.d.ts b/TypeScript/6ReferenceAnotherClass/types/servers/HttpServer.d.ts index e38263d..0ba20c6 100644 --- a/TypeScript/6ReferenceAnotherClass/types/servers/HttpServer.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/servers/HttpServer.d.ts @@ -1,16 +1,16 @@ /// import { HttpRouter } from "../routers/HttpRouter"; import { JsonUtil } from "../utils/JsonUtil"; -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { DatabaseServer } from "./DatabaseServer"; import { Serializer } from "../di/Serializer"; import http, { ServerResponse } from "http"; -import { INotification } from "../@types/eft/notifier/INotifier"; +import { INotification } from "../models/eft/notifier/INotifier"; import { NotifierHelper } from "../helpers/NotifierHelper"; import { ConfigServer } from "./ConfigServer"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; -import { IHttpServer } from "../@types/spt/server/IHttpServer"; +import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class HttpServer implements IHttpServer { private httpRouter; private logger; @@ -21,7 +21,7 @@ export declare class HttpServer implements IHttpServer { private httpServerHelper; private serializers; private configServer; - constructor(httpRouter: HttpRouter, logger: ILogger, jsonUtil: JsonUtil, httpResponse: HttpResponse, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); + constructor(httpRouter: HttpRouter, logger: ILogger, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); private buffers; private onReceive; private onRespond; diff --git a/TypeScript/6ReferenceAnotherClass/types/servers/RagfairServer.d.ts b/TypeScript/6ReferenceAnotherClass/types/servers/RagfairServer.d.ts index ef69106..d103625 100644 --- a/TypeScript/6ReferenceAnotherClass/types/servers/RagfairServer.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/servers/RagfairServer.d.ts @@ -1,4 +1,4 @@ -import { HttpResponse } from "../utils/HttpResponse"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; @@ -7,12 +7,12 @@ import { RagfairPriceService } from "../services/RagfairPriceService"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { RagfairCategoriesService } from "../services/RagfairCategoriesService"; import { RagfairLinkedItemService } from "../services/RagfairLinkedItemService"; -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { ConfigServer } from "./ConfigServer"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairServer { private logger; private ragfairOfferGenerator; @@ -28,7 +28,7 @@ export declare class RagfairServer { private ragfairRequiredItemsService; private configServer; private ragfairConfig; - constructor(logger: ILogger, ragfairOfferGenerator: RagfairOfferGenerator, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponse, saveServer: SaveServer, ragfairPriceService: RagfairPriceService, ragfairOfferService: RagfairOfferService, ragfairLinkedItemService: RagfairLinkedItemService, ragfairCategoriesService: RagfairCategoriesService, ragfairRequiredItemsService: RagfairRequiredItemsService, configServer: ConfigServer); + constructor(logger: ILogger, ragfairOfferGenerator: RagfairOfferGenerator, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, saveServer: SaveServer, ragfairPriceService: RagfairPriceService, ragfairOfferService: RagfairOfferService, ragfairLinkedItemService: RagfairLinkedItemService, ragfairCategoriesService: RagfairCategoriesService, ragfairRequiredItemsService: RagfairRequiredItemsService, configServer: ConfigServer); load(): void; update(): void; private processExpiredOffer; diff --git a/TypeScript/6ReferenceAnotherClass/types/servers/SaveServer.d.ts b/TypeScript/6ReferenceAnotherClass/types/servers/SaveServer.d.ts index 23da9ea..fdf92e4 100644 --- a/TypeScript/6ReferenceAnotherClass/types/servers/SaveServer.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/servers/SaveServer.d.ts @@ -1,9 +1,9 @@ -import { IAkiProfile, Info } from "../@types/eft/profile/IAkiProfile"; +import { IAkiProfile, Info } from "../models/eft/profile/IAkiProfile"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; import { SaveLoadRouter } from "../di/Router"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class SaveServer { private vfs; private saveLoadRouters; diff --git a/TypeScript/6ReferenceAnotherClass/types/services/FenceService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/FenceService.d.ts index 4b80d50..eef87b3 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/FenceService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/FenceService.d.ts @@ -2,14 +2,14 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { HandbookHelper } from "../helpers/HandbookHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { PresetHelper } from "../helpers/PresetHelper"; -import { FenceLevel } from "../@types/eft/common/IGlobals"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; +import { FenceLevel } from "../models/eft/common/IGlobals"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; import { ConfigServer } from "../servers/ConfigServer"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class FenceService { private logger; private hashUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/services/HashCacheService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/HashCacheService.d.ts new file mode 100644 index 0000000..c9b0170 --- /dev/null +++ b/TypeScript/6ReferenceAnotherClass/types/services/HashCacheService.d.ts @@ -0,0 +1,19 @@ +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 { + private vfs; + private hashUtil; + private jsonUtil; + private logger; + private jsonHashes; + private modHashes; + private readonly modCachePath; + constructor(vfs: VFS, hashUtil: HashUtil, jsonUtil: JsonUtil, logger: ILogger); + getStoredModHash(modName: string): string; + modContentMatchesStoredHash(modName: string, modContent: string): boolean; + hashMatchesStoredHash(modName: string, modHash: string): boolean; + storeModContent(modName: string, modContent: string): void; + storeModHash(modName: string, modHash: string): void; +} diff --git a/TypeScript/6ReferenceAnotherClass/types/services/InsuranceService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/InsuranceService.d.ts index cd91136..35f0dbc 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/InsuranceService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/InsuranceService.d.ts @@ -1,10 +1,9 @@ -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData"; -import { IInsuranceConfig } from "../@types/spt/config/IInsuranceConfig"; -import { ILogger } from "../@types/spt/utils/ILogger"; +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 { InventoryHelper } from "../helpers/InventoryHelper"; +import { SecureContainerHelper } from "../helpers/SecureContainerHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -14,7 +13,7 @@ import { TimeUtil } from "../utils/TimeUtil"; export declare class InsuranceService { private logger; private databaseServer; - private inventoryHelper; + private secureContainerHelper; private randomUtil; private timeUtil; private saveServer; @@ -23,8 +22,8 @@ export declare class InsuranceService { private configServer; private insured; private templatesById; - insuranceConfig: IInsuranceConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, inventoryHelper: InventoryHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, configServer: ConfigServer); + private insuranceConfig; + constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, configServer: ConfigServer); insuranceExists(sessionId: string): boolean; insuranceTraderArrayExists(sessionId: string, traderId: string): boolean; getInsurance(sessionId: string): Record; diff --git a/TypeScript/6ReferenceAnotherClass/types/services/ModCompilerService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/ModCompilerService.d.ts new file mode 100644 index 0000000..7e750c3 --- /dev/null +++ b/TypeScript/6ReferenceAnotherClass/types/services/ModCompilerService.d.ts @@ -0,0 +1,11 @@ +import { ILogger } from "../models/spt/utils/ILogger"; +import { VFS } from "../utils/VFS"; +export declare class ModCompilerService { + private logger; + private vfs; + constructor(logger: ILogger, vfs: VFS); + compileMod(path: string, modTypeScriptFiles: string[]): Promise; + private compile; + private areFilesReady; + private delay; +} diff --git a/TypeScript/6ReferenceAnotherClass/types/services/NotificationService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/NotificationService.d.ts index 5c0e0ec..9c6c143 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/NotificationService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/NotificationService.d.ts @@ -1,4 +1,4 @@ -import { INotification } from "../@types/eft/notifier/INotifier"; +import { INotification } from "../models/eft/notifier/INotifier"; export declare class NotificationService { private messageQueue; getMessageQueue(): {}; diff --git a/TypeScript/6ReferenceAnotherClass/types/services/PaymentService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/PaymentService.d.ts index 245bb34..20cee50 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/PaymentService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/PaymentService.d.ts @@ -1,15 +1,15 @@ import { InventoryHelper } from "../helpers/InventoryHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; -import { IPmcData } from "../@types/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -import { IProcessBuyTradeRequestData } from "../@types/eft/trade/IProcessBuyTradeRequestData"; -import { IProcessSellTradeRequestData } from "../@types/eft/trade/IProcessSellTradeRequestData"; +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 { HttpResponse } from "../utils/HttpResponse"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class PaymentService { private logger; private httpResponse; @@ -19,7 +19,7 @@ export declare class PaymentService { private itemHelper; private inventoryHelper; private paymentHelper; - constructor(logger: ILogger, httpResponse: HttpResponse, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); + constructor(logger: ILogger, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request * @param {Object} pmcData @@ -38,5 +38,11 @@ export declare class PaymentService { * @returns IItemEventRouterResponse */ getMoney(pmcData: IPmcData, amount: number, body: IProcessSellTradeRequestData, output: IItemEventRouterResponse, sessionID: string): IItemEventRouterResponse; + /** + * Recursively checks if the given item is + * inside the stash, that is it has the stash as + * ancestor with slotId=hideout + */ + private isItemInStash; addPaymentToOutput(pmcData: IPmcData, currencyTpl: string, amountToPay: number, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse; } diff --git a/TypeScript/6ReferenceAnotherClass/types/services/PlayerService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/PlayerService.d.ts index ec6e32c..4a74b4a 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 "../@types/eft/common/IPmcData"; -import { IPlayerIncrementSkillLevelRequestData } from "../@types/eft/player/IPlayerIncrementSkillLevelRequestData"; -import { ILogger } from "../@types/spt/utils/ILogger"; +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 { private logger; private databaseServer; diff --git a/TypeScript/6ReferenceAnotherClass/types/services/RagfairCategoriesService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/RagfairCategoriesService.d.ts index 370886e..fb9efa2 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/RagfairCategoriesService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/RagfairCategoriesService.d.ts @@ -1,4 +1,4 @@ -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; export declare class RagfairCategoriesService { updateCategories(offers: IRagfairOffer[]): void; private categories; diff --git a/TypeScript/6ReferenceAnotherClass/types/services/RagfairOfferService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/RagfairOfferService.d.ts index 1b7682d..4e4ae26 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/RagfairOfferService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/RagfairOfferService.d.ts @@ -2,9 +2,8 @@ import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { TimeUtil } from "../utils/TimeUtil"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer"; -import { IRagfairConfig } from "../@types/spt/config/IRagfairConfig"; +import { Item } from "../models/eft/common/tables/IItem"; +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; export declare class RagfairOfferService { private timeUtil; private databaseServer; @@ -14,7 +13,7 @@ export declare class RagfairOfferService { private toUpdate; private expiredOffers; private offers; - ragfairConfig: IRagfairConfig; + private ragfairConfig; constructor(timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, configServer: ConfigServer); getOffers(): IRagfairOffer[]; getOfferByOfferId(offerId: string): IRagfairOffer; diff --git a/TypeScript/6ReferenceAnotherClass/types/services/RagfairPriceService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/RagfairPriceService.d.ts index d91df24..7cc42f9 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/RagfairPriceService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/RagfairPriceService.d.ts @@ -4,9 +4,9 @@ import { ConfigServer } from "../servers/ConfigServer"; import { HandbookHelper } from "../helpers/HandbookHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { PresetHelper } from "../helpers/PresetHelper"; -import { Item } from "../@types/eft/common/tables/IItem"; -import { IBarterScheme } from "../@types/eft/common/tables/ITrader"; -import { ILogger } from "../@types/spt/utils/ILogger"; +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 { private handbookHelper; private databaseServer; diff --git a/TypeScript/6ReferenceAnotherClass/types/services/RagfairRequiredItemsService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/RagfairRequiredItemsService.d.ts index 3908cb9..e4582d0 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/RagfairRequiredItemsService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/RagfairRequiredItemsService.d.ts @@ -1,6 +1,6 @@ import { PaymentHelper } from "../helpers/PaymentHelper"; import { RagfairOfferService } from "../services/RagfairOfferService"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairRequiredItemsService { private logger; private paymentHelper; diff --git a/TypeScript/6ReferenceAnotherClass/types/services/TraderAssortService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/TraderAssortService.d.ts index 99b23f1..ccb9e45 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/TraderAssortService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/TraderAssortService.d.ts @@ -1,4 +1,4 @@ -import { ITraderAssort } from "../@types/eft/common/tables/ITrader"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; export declare class TraderAssortService { private pristineTraderAssorts; getPristineTraderAssort(traderId: string): ITraderAssort; diff --git a/TypeScript/6ReferenceAnotherClass/types/utils/App.d.ts b/TypeScript/6ReferenceAnotherClass/types/utils/App.d.ts index 4b082a0..a11f576 100644 --- a/TypeScript/6ReferenceAnotherClass/types/utils/App.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/utils/App.d.ts @@ -1,7 +1,7 @@ import { TimeUtil } from "./TimeUtil"; import { OnLoad } from "../di/OnLoad"; import { OnUpdate } from "../di/OnUpdate"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class App { private logger; private timeUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/utils/AyncQueue.d.ts b/TypeScript/6ReferenceAnotherClass/types/utils/AyncQueue.d.ts index 773a5e4..8f1559b 100644 --- a/TypeScript/6ReferenceAnotherClass/types/utils/AyncQueue.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/utils/AyncQueue.d.ts @@ -1,5 +1,5 @@ -import { IAsyncQueue } from "../@types/spt/utils/IAsyncQueue"; -import { ICommand } from "../@types/spt/utils/ICommand"; +import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; +import { ICommand } from "../models/spt/utils/ICommand"; export declare class AsyncQueue implements IAsyncQueue { commandsQueue: ICommand[]; constructor(); diff --git a/TypeScript/6ReferenceAnotherClass/types/utils/DatabaseImporter.d.ts b/TypeScript/6ReferenceAnotherClass/types/utils/DatabaseImporter.d.ts index 41b3e5f..97dda30 100644 --- a/TypeScript/6ReferenceAnotherClass/types/utils/DatabaseImporter.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/utils/DatabaseImporter.d.ts @@ -3,7 +3,7 @@ import { JsonUtil } from "./JsonUtil"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ImageRouter } from "../routers/ImageRouter"; import { OnLoad } from "../di/OnLoad"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class DatabaseImporter extends OnLoad { private logger; private vfs; diff --git a/TypeScript/6ReferenceAnotherClass/types/utils/HttpResponse.d.ts b/TypeScript/6ReferenceAnotherClass/types/utils/HttpResponse.d.ts deleted file mode 100644 index d5a90d7..0000000 --- a/TypeScript/6ReferenceAnotherClass/types/utils/HttpResponse.d.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { JsonUtil } from "./JsonUtil"; -import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData"; -import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse"; -export declare class HttpResponse { - private jsonUtil; - constructor(jsonUtil: JsonUtil); - private clearString; - noBody(data: any): any; - getBody(data: T, err?: number, errmsg?: any): IGetBodyResponseData; - getUnclearedBody(data: any, err?: number, errmsg?: any): string; - emptyResponse(): IGetBodyResponseData; - nullResponse(): INullResponseData; - emptyArrayResponse(): IGetBodyResponseData; - appendErrorToOutput(output: IItemEventRouterResponse, message?: string, title?: string): IItemEventRouterResponse; -} diff --git a/TypeScript/6ReferenceAnotherClass/types/utils/HttpResponseUtil.d.ts b/TypeScript/6ReferenceAnotherClass/types/utils/HttpResponseUtil.d.ts new file mode 100644 index 0000000..85c28bd --- /dev/null +++ b/TypeScript/6ReferenceAnotherClass/types/utils/HttpResponseUtil.d.ts @@ -0,0 +1,16 @@ +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 { + private jsonUtil; + constructor(jsonUtil: JsonUtil); + private clearString; + noBody(data: any): any; + getBody(data: T, err?: number, errmsg?: any): IGetBodyResponseData; + getUnclearedBody(data: any, err?: number, errmsg?: any): string; + emptyResponse(): IGetBodyResponseData; + nullResponse(): INullResponseData; + emptyArrayResponse(): IGetBodyResponseData; + appendErrorToOutput(output: IItemEventRouterResponse, message?: string, title?: string): IItemEventRouterResponse; +} diff --git a/TypeScript/6ReferenceAnotherClass/types/utils/JsonUtil.d.ts b/TypeScript/6ReferenceAnotherClass/types/utils/JsonUtil.d.ts index 69cf8f1..20b7448 100644 --- a/TypeScript/6ReferenceAnotherClass/types/utils/JsonUtil.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/utils/JsonUtil.d.ts @@ -1,12 +1,12 @@ -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; import { HashUtil } from "./HashUtil"; import { VFS } from "./VFS"; export declare class JsonUtil { private vfs; - private hashutil; + private hashUtil; private logger; private fileHashes; - constructor(vfs: VFS, hashutil: HashUtil, logger: ILogger); + constructor(vfs: VFS, hashUtil: HashUtil, logger: ILogger); /** * From object to string * @param data object to turn into JSON diff --git a/TypeScript/6ReferenceAnotherClass/types/utils/Logger.d.ts b/TypeScript/6ReferenceAnotherClass/types/utils/Logger.d.ts index 57da5ae..9d5b32a 100644 --- a/TypeScript/6ReferenceAnotherClass/types/utils/Logger.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/utils/Logger.d.ts @@ -1,14 +1,16 @@ /// -import { Daum } from "../@types/eft/itemEvent/IItemEventRouterRequest"; -import { ILogger } from "../@types/spt/utils/ILogger"; -import { IAsyncQueue } from "../@types/spt/utils/IAsyncQueue"; -import { IUUidGenerator } from "../@types/spt/utils/IUuidGenerator"; +import { Daum } from "../models/eft/itemEvent/IItemEventRouterRequest"; +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 { private asyncQueue; private uuidGenerator; private showDebugInConsole; - private filepath; + private folderPath; + private file; + private filePath; private logLevels; private logger; writeFilePromisify: (path: fs.PathLike, data: string, options?: any) => Promise; diff --git a/TypeScript/6ReferenceAnotherClass/types/utils/RandomUtil.d.ts b/TypeScript/6ReferenceAnotherClass/types/utils/RandomUtil.d.ts index a1bac79..3a3ecb6 100644 --- a/TypeScript/6ReferenceAnotherClass/types/utils/RandomUtil.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/utils/RandomUtil.d.ts @@ -1,3 +1,4 @@ +import { ILogger } from "../models/spt/utils/ILogger"; import { JsonUtil } from "./JsonUtil"; import { MathUtil } from "./MathUtil"; /** @@ -103,7 +104,8 @@ export declare class ProbabilityObject { } export declare class RandomUtil { private jsonUtil; - constructor(jsonUtil: JsonUtil); + private logger; + constructor(jsonUtil: JsonUtil, logger: ILogger); getInt(min: number, max: number): number; getIntEx(max: number): number; getFloat(min: number, max: number): number; @@ -147,4 +149,5 @@ export declare class RandomUtil { * @return {array} Array consisting of N random keys of the dictionary */ drawRandomFromDict(dict: any, count?: number, replacement?: boolean): any[]; + getBiasedRandomNumber(min: number, max: number, shift: number, n: number): number; } diff --git a/TypeScript/6ReferenceAnotherClass/types/utils/UUidGenerator.d.ts b/TypeScript/6ReferenceAnotherClass/types/utils/UUidGenerator.d.ts index 763424a..000b719 100644 --- a/TypeScript/6ReferenceAnotherClass/types/utils/UUidGenerator.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/utils/UUidGenerator.d.ts @@ -1,4 +1,4 @@ -import { IUUidGenerator } from "../@types/spt/utils/IUuidGenerator"; +import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; export declare class UUidGenerator implements IUUidGenerator { generate: () => string; } diff --git a/TypeScript/6ReferenceAnotherClass/types/utils/VFS.d.ts b/TypeScript/6ReferenceAnotherClass/types/utils/VFS.d.ts index c8d32f1..b064cf4 100644 --- a/TypeScript/6ReferenceAnotherClass/types/utils/VFS.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/utils/VFS.d.ts @@ -1,8 +1,8 @@ /// import "reflect-metadata"; import fs from "fs"; -import { IAsyncQueue } from "../@types/spt/utils/IAsyncQueue"; -import { IUUidGenerator } from "../@types/spt/utils/IUuidGenerator"; +import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; +import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; export declare class VFS { private asyncQueue; private uuidGenerator; @@ -50,4 +50,5 @@ export declare class VFS { stripExtension(filepath: string): string; minifyAllJsonInDirRecursive(filepath: string): Promise; minifyAllJsonInDirRecursiveAsync(filepath: string): Promise; + getFilesOfType(directory: string, fileType: string, files?: string[]): string[]; } diff --git a/TypeScript/6ReferenceAnotherClass/types/utils/Watermark.d.ts b/TypeScript/6ReferenceAnotherClass/types/utils/Watermark.d.ts index e7765e1..598d5a6 100644 --- a/TypeScript/6ReferenceAnotherClass/types/utils/Watermark.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/utils/Watermark.d.ts @@ -1,6 +1,6 @@ -import { IWatermark, IWatermarkLocale } from "../@types/spt/utils/IWatermark"; +import { IWatermark, IWatermarkLocale } from "../models/spt/utils/IWatermark"; import { ConfigServer } from "../servers/ConfigServer"; -import { ILogger } from "../@types/spt/utils/ILogger"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class WatermarkLocale implements IWatermarkLocale { private locales; getLocale(): string;