diff --git a/TypeScript/10ScopesAndTypes/types/controllers/BotController.d.ts b/TypeScript/10ScopesAndTypes/types/controllers/BotController.d.ts index 6431fca..475f51b 100644 --- a/TypeScript/10ScopesAndTypes/types/controllers/BotController.d.ts +++ b/TypeScript/10ScopesAndTypes/types/controllers/BotController.d.ts @@ -20,8 +20,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/10ScopesAndTypes/types/controllers/BuildController.d.ts b/TypeScript/10ScopesAndTypes/types/controllers/BuildController.d.ts index ed8adf6..2cb9c59 100644 --- a/TypeScript/10ScopesAndTypes/types/controllers/BuildController.d.ts +++ b/TypeScript/10ScopesAndTypes/types/controllers/BuildController.d.ts @@ -9,8 +9,8 @@ import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BuildController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/10ScopesAndTypes/types/controllers/GameController.d.ts b/TypeScript/10ScopesAndTypes/types/controllers/GameController.d.ts index 533a81c..e219c04 100644 --- a/TypeScript/10ScopesAndTypes/types/controllers/GameController.d.ts +++ b/TypeScript/10ScopesAndTypes/types/controllers/GameController.d.ts @@ -34,10 +34,10 @@ import { ProfileActivityService } from "@spt/services/ProfileActivityService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GameController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/10ScopesAndTypes/types/controllers/HealthController.d.ts b/TypeScript/10ScopesAndTypes/types/controllers/HealthController.d.ts index 5482283..5a0a0a6 100644 --- a/TypeScript/10ScopesAndTypes/types/controllers/HealthController.d.ts +++ b/TypeScript/10ScopesAndTypes/types/controllers/HealthController.d.ts @@ -12,8 +12,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthController { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/10ScopesAndTypes/types/controllers/HideoutController.d.ts b/TypeScript/10ScopesAndTypes/types/controllers/HideoutController.d.ts index e9d1ed9..89a428c 100644 --- a/TypeScript/10ScopesAndTypes/types/controllers/HideoutController.d.ts +++ b/TypeScript/10ScopesAndTypes/types/controllers/HideoutController.d.ts @@ -35,11 +35,11 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; import { ProfileActivityService } from "@spt/services/ProfileActivityService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/10ScopesAndTypes/types/controllers/InraidController.d.ts b/TypeScript/10ScopesAndTypes/types/controllers/InraidController.d.ts index 87f419b..9f0c409 100644 --- a/TypeScript/10ScopesAndTypes/types/controllers/InraidController.d.ts +++ b/TypeScript/10ScopesAndTypes/types/controllers/InraidController.d.ts @@ -13,6 +13,7 @@ import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRe import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState"; import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig"; import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; @@ -31,7 +32,6 @@ import { PmcChatResponseService } from "@spt/services/PmcChatResponseService"; import { TraderServicesService } from "@spt/services/TraderServicesService"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; -import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; /** * Logic for handling In Raid callbacks */ diff --git a/TypeScript/10ScopesAndTypes/types/controllers/InsuranceController.d.ts b/TypeScript/10ScopesAndTypes/types/controllers/InsuranceController.d.ts index f921b83..543e915 100644 --- a/TypeScript/10ScopesAndTypes/types/controllers/InsuranceController.d.ts +++ b/TypeScript/10ScopesAndTypes/types/controllers/InsuranceController.d.ts @@ -21,11 +21,11 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PaymentService } from "@spt/services/PaymentService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceController { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/10ScopesAndTypes/types/controllers/InventoryController.d.ts b/TypeScript/10ScopesAndTypes/types/controllers/InventoryController.d.ts index 40bb084..c986ce8 100644 --- a/TypeScript/10ScopesAndTypes/types/controllers/InventoryController.d.ts +++ b/TypeScript/10ScopesAndTypes/types/controllers/InventoryController.d.ts @@ -37,10 +37,10 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MapMarkerService } from "@spt/services/MapMarkerService"; import { PlayerService } from "@spt/services/PlayerService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/10ScopesAndTypes/types/controllers/LocationController.d.ts b/TypeScript/10ScopesAndTypes/types/controllers/LocationController.d.ts index 727a8c8..a541b9c 100644 --- a/TypeScript/10ScopesAndTypes/types/controllers/LocationController.d.ts +++ b/TypeScript/10ScopesAndTypes/types/controllers/LocationController.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class LocationController { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; diff --git a/TypeScript/10ScopesAndTypes/types/controllers/ProfileController.d.ts b/TypeScript/10ScopesAndTypes/types/controllers/ProfileController.d.ts index e8dae73..7e6d35c 100644 --- a/TypeScript/10ScopesAndTypes/types/controllers/ProfileController.d.ts +++ b/TypeScript/10ScopesAndTypes/types/controllers/ProfileController.d.ts @@ -26,9 +26,9 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/10ScopesAndTypes/types/controllers/QuestController.d.ts b/TypeScript/10ScopesAndTypes/types/controllers/QuestController.d.ts index 3cdce00..6a5b415 100644 --- a/TypeScript/10ScopesAndTypes/types/controllers/QuestController.d.ts +++ b/TypeScript/10ScopesAndTypes/types/controllers/QuestController.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/10ScopesAndTypes/types/controllers/RepeatableQuestController.d.ts b/TypeScript/10ScopesAndTypes/types/controllers/RepeatableQuestController.d.ts index 74f39eb..016f8c6 100644 --- a/TypeScript/10ScopesAndTypes/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/10ScopesAndTypes/types/controllers/RepeatableQuestController.d.ts @@ -18,11 +18,11 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/10ScopesAndTypes/types/controllers/TradeController.d.ts b/TypeScript/10ScopesAndTypes/types/controllers/TradeController.d.ts index bc72e92..842a97b 100644 --- a/TypeScript/10ScopesAndTypes/types/controllers/TradeController.d.ts +++ b/TypeScript/10ScopesAndTypes/types/controllers/TradeController.d.ts @@ -1,5 +1,6 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper"; import { TradeHelper } from "@spt/helpers/TradeHelper"; import { TraderHelper } from "@spt/helpers/TraderHelper"; import { IPmcData } from "@spt/models/eft/common/IPmcData"; @@ -35,6 +36,7 @@ export declare class TradeController { protected hashUtil: HashUtil; protected itemHelper: ItemHelper; protected profileHelper: ProfileHelper; + protected ragfairOfferHelper: RagfairOfferHelper; protected traderHelper: TraderHelper; protected ragfairServer: RagfairServer; protected httpResponse: HttpResponseUtil; @@ -44,7 +46,7 @@ export declare class TradeController { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairOfferHelper: RagfairOfferHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); /** Handle TradingConfirm event */ confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; /** Handle RagFairBuyOffer event */ @@ -67,10 +69,17 @@ export declare class TradeController { * @param output Output to send back to client */ protected buyPmcItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void; + /** + * Is the provided offerid and ownerid from a player made offer + * @param offerId Id of the offer + * @param offerOwnerId Owner id + * @returns true if offer was made by a player + */ + protected isPlayerOffer(offerId: string, offerOwnerId: string): boolean; /** * Does Player have necessary trader loyalty to purchase flea offer * @param sellerIsTrader is seller trader - * @param fleaOffer FLea offer being bought + * @param fleaOffer Flea offer being bought * @param pmcData Player profile * @returns True if player can buy offer */ diff --git a/TypeScript/10ScopesAndTypes/types/controllers/TraderController.d.ts b/TypeScript/10ScopesAndTypes/types/controllers/TraderController.d.ts index 7fc6d78..3592fc6 100644 --- a/TypeScript/10ScopesAndTypes/types/controllers/TraderController.d.ts +++ b/TypeScript/10ScopesAndTypes/types/controllers/TraderController.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/10ScopesAndTypes/types/generators/BotEquipmentModGenerator.d.ts b/TypeScript/10ScopesAndTypes/types/generators/BotEquipmentModGenerator.d.ts index 419120f..3952293 100644 --- a/TypeScript/10ScopesAndTypes/types/generators/BotEquipmentModGenerator.d.ts +++ b/TypeScript/10ScopesAndTypes/types/generators/BotEquipmentModGenerator.d.ts @@ -25,9 +25,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotEquipmentModGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -65,7 +65,7 @@ export declare class BotEquipmentModGenerator { * @param settings Bot equipment generation settings * @param modSlot Armor slot being filtered * @param existingPlateTplPool Plates tpls to choose from - * @param armorItem + * @param armorItem The armor items db template * @returns Array of plate tpls to choose from */ protected filterPlateModsForSlotByLevel(settings: IGenerateEquipmentProperties, modSlot: string, existingPlateTplPool: string[], armorItem: ITemplateItem): IFilterPlateModsForSlotByLevelResult; diff --git a/TypeScript/10ScopesAndTypes/types/generators/BotGenerator.d.ts b/TypeScript/10ScopesAndTypes/types/generators/BotGenerator.d.ts index 8ab4371..ebb8a59 100644 --- a/TypeScript/10ScopesAndTypes/types/generators/BotGenerator.d.ts +++ b/TypeScript/10ScopesAndTypes/types/generators/BotGenerator.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/10ScopesAndTypes/types/generators/BotLevelGenerator.d.ts b/TypeScript/10ScopesAndTypes/types/generators/BotLevelGenerator.d.ts index dee61e2..a8a8895 100644 --- a/TypeScript/10ScopesAndTypes/types/generators/BotLevelGenerator.d.ts +++ b/TypeScript/10ScopesAndTypes/types/generators/BotLevelGenerator.d.ts @@ -4,12 +4,14 @@ import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; +import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class BotLevelGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; protected databaseService: DatabaseService; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService); + protected mathUtil: MathUtil; + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, mathUtil: MathUtil); /** * Return a randomised bot level and exp value * @param levelDetails Min and max of level for bot @@ -18,6 +20,7 @@ export declare class BotLevelGenerator { * @returns IRandomisedBotLevelResult object */ generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult; + protected chooseBotLevel(min: number, max: number, shift: number, number: number): number; /** * Get the highest level a bot can be relative to the players level, but no further than the max size from globals.exp_table * @param botGenerationDetails Details to help generate a bot diff --git a/TypeScript/10ScopesAndTypes/types/generators/BotLootGenerator.d.ts b/TypeScript/10ScopesAndTypes/types/generators/BotLootGenerator.d.ts index fee56ce..c0583c6 100644 --- a/TypeScript/10ScopesAndTypes/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/10ScopesAndTypes/types/generators/BotLootGenerator.d.ts @@ -18,9 +18,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/10ScopesAndTypes/types/generators/BotWeaponGenerator.d.ts b/TypeScript/10ScopesAndTypes/types/generators/BotWeaponGenerator.d.ts index 5559bfa..8e03b35 100644 --- a/TypeScript/10ScopesAndTypes/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/10ScopesAndTypes/types/generators/BotWeaponGenerator.d.ts @@ -18,9 +18,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RepairService } from "@spt/services/RepairService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotWeaponGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/10ScopesAndTypes/types/generators/LocationGenerator.d.ts b/TypeScript/10ScopesAndTypes/types/generators/LocationGenerator.d.ts index 222b0ab..9a2b0c4 100644 --- a/TypeScript/10ScopesAndTypes/types/generators/LocationGenerator.d.ts +++ b/TypeScript/10ScopesAndTypes/types/generators/LocationGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export interface IContainerItem { items: Item[]; width: number; diff --git a/TypeScript/10ScopesAndTypes/types/generators/PlayerScavGenerator.d.ts b/TypeScript/10ScopesAndTypes/types/generators/PlayerScavGenerator.d.ts index 2414150..e317bf6 100644 --- a/TypeScript/10ScopesAndTypes/types/generators/PlayerScavGenerator.d.ts +++ b/TypeScript/10ScopesAndTypes/types/generators/PlayerScavGenerator.d.ts @@ -14,9 +14,9 @@ import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class PlayerScavGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/10ScopesAndTypes/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/10ScopesAndTypes/types/generators/RagfairOfferGenerator.d.ts index 9435390..ca09729 100644 --- a/TypeScript/10ScopesAndTypes/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/10ScopesAndTypes/types/generators/RagfairOfferGenerator.d.ts @@ -19,10 +19,10 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/10ScopesAndTypes/types/generators/RepeatableQuestGenerator.d.ts b/TypeScript/10ScopesAndTypes/types/generators/RepeatableQuestGenerator.d.ts index 77c4e79..339f322 100644 --- a/TypeScript/10ScopesAndTypes/types/generators/RepeatableQuestGenerator.d.ts +++ b/TypeScript/10ScopesAndTypes/types/generators/RepeatableQuestGenerator.d.ts @@ -11,10 +11,10 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/10ScopesAndTypes/types/generators/RepeatableQuestRewardGenerator.d.ts b/TypeScript/10ScopesAndTypes/types/generators/RepeatableQuestRewardGenerator.d.ts index 1e09994..713a394 100644 --- a/TypeScript/10ScopesAndTypes/types/generators/RepeatableQuestRewardGenerator.d.ts +++ b/TypeScript/10ScopesAndTypes/types/generators/RepeatableQuestRewardGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestRewardGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/10ScopesAndTypes/types/helpers/BotDifficultyHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/BotDifficultyHelper.d.ts index 63572a5..2348bd3 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/BotDifficultyHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/BotDifficultyHelper.d.ts @@ -5,8 +5,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotDifficultyHelper { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/10ScopesAndTypes/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index c51bf7e..c38f0a0 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GiveSptCommand implements ISptCommand { protected logger: ILogger; protected itemHelper: ItemHelper; diff --git a/TypeScript/10ScopesAndTypes/types/helpers/HealthHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/HealthHelper.d.ts index 650f633..a164285 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/HealthHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/HealthHelper.d.ts @@ -5,8 +5,8 @@ import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/10ScopesAndTypes/types/helpers/HideoutHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/HideoutHelper.d.ts index c4aaa4c..df0376b 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/HideoutHelper.d.ts @@ -18,10 +18,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/10ScopesAndTypes/types/helpers/InRaidHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/InRaidHelper.d.ts index 449be9f..987c9ec 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/InRaidHelper.d.ts @@ -15,9 +15,9 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InRaidHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/10ScopesAndTypes/types/helpers/InventoryHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/InventoryHelper.d.ts index f0ff69a..92bb49c 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/InventoryHelper.d.ts @@ -23,9 +23,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/10ScopesAndTypes/types/helpers/ItemHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/ItemHelper.d.ts index da5dd11..c304cee 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/ItemHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/ItemHelper.d.ts @@ -11,13 +11,13 @@ import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { CompareUtil } from "@spt/utils/CompareUtil"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ItemHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/10ScopesAndTypes/types/helpers/ProfileHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/ProfileHelper.d.ts index 0671179..cdab870 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/ProfileHelper.d.ts @@ -11,10 +11,10 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/10ScopesAndTypes/types/helpers/QuestHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/QuestHelper.d.ts index 2b84b8f..2d5730d 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/QuestHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/QuestHelper.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/10ScopesAndTypes/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/RagfairOfferHelper.d.ts index b526554..2386316 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/RagfairOfferHelper.d.ts @@ -151,7 +151,7 @@ export declare class RagfairOfferHelper { * @param boughtAmount Amount item was purchased for * @returns IItemEventRouterResponse */ - protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; + completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; /** * Get a localised message for when players offer has sold on flea * @param itemTpl Item sold diff --git a/TypeScript/10ScopesAndTypes/types/helpers/RagfairServerHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/RagfairServerHelper.d.ts index 927caf5..3e1fea9 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/RagfairServerHelper.d.ts @@ -12,9 +12,9 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Helper class for common ragfair server actions */ diff --git a/TypeScript/10ScopesAndTypes/types/helpers/RepairHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/RepairHelper.d.ts index 99a21da..63c78c9 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/RepairHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/RepairHelper.d.ts @@ -4,8 +4,8 @@ import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/10ScopesAndTypes/types/helpers/RepeatableQuestHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/RepeatableQuestHelper.d.ts index d92657e..8c65f40 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/RepeatableQuestHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/RepeatableQuestHelper.d.ts @@ -1,8 +1,8 @@ import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestHelper { protected mathUtil: MathUtil; protected configServer: ConfigServer; diff --git a/TypeScript/10ScopesAndTypes/types/helpers/TradeHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/TradeHelper.d.ts index f994fda..6e6f3a2 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/TradeHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/TradeHelper.d.ts @@ -17,8 +17,8 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TradeHelper { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/10ScopesAndTypes/types/helpers/TraderAssortHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/TraderAssortHelper.d.ts index 8f8f802..f1ecd3b 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/TraderAssortHelper.d.ts @@ -14,9 +14,9 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; diff --git a/TypeScript/10ScopesAndTypes/types/loaders/BundleLoader.d.ts b/TypeScript/10ScopesAndTypes/types/loaders/BundleLoader.d.ts index e270988..8c0ed4d 100644 --- a/TypeScript/10ScopesAndTypes/types/loaders/BundleLoader.d.ts +++ b/TypeScript/10ScopesAndTypes/types/loaders/BundleLoader.d.ts @@ -1,8 +1,8 @@ import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BundleInfo { modpath: string; filename: string; diff --git a/TypeScript/10ScopesAndTypes/types/loaders/PostDBModLoader.d.ts b/TypeScript/10ScopesAndTypes/types/loaders/PostDBModLoader.d.ts index b0c4bf4..a8bb6a9 100644 --- a/TypeScript/10ScopesAndTypes/types/loaders/PostDBModLoader.d.ts +++ b/TypeScript/10ScopesAndTypes/types/loaders/PostDBModLoader.d.ts @@ -1,10 +1,10 @@ -import { DependencyContainer } from "tsyringe"; import { OnLoad } from "@spt/di/OnLoad"; import { BundleLoader } from "@spt/loaders/BundleLoader"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostDBModLoader implements OnLoad { protected logger: ILogger; protected bundleLoader: BundleLoader; diff --git a/TypeScript/10ScopesAndTypes/types/loaders/PostSptModLoader.d.ts b/TypeScript/10ScopesAndTypes/types/loaders/PostSptModLoader.d.ts index fb54579..2603497 100644 --- a/TypeScript/10ScopesAndTypes/types/loaders/PostSptModLoader.d.ts +++ b/TypeScript/10ScopesAndTypes/types/loaders/PostSptModLoader.d.ts @@ -1,9 +1,9 @@ -import { DependencyContainer } from "tsyringe"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { IModLoader } from "@spt/models/spt/mod/IModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostSptModLoader implements IModLoader { protected logger: ILogger; protected preSptModLoader: PreSptModLoader; diff --git a/TypeScript/10ScopesAndTypes/types/loaders/PreSptModLoader.d.ts b/TypeScript/10ScopesAndTypes/types/loaders/PreSptModLoader.d.ts index bc846c8..8814525 100644 --- a/TypeScript/10ScopesAndTypes/types/loaders/PreSptModLoader.d.ts +++ b/TypeScript/10ScopesAndTypes/types/loaders/PreSptModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { ModDetails } from "@spt/models/eft/profile/ISptProfile"; @@ -11,6 +10,7 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { ModCompilerService } from "@spt/services/ModCompilerService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { DependencyContainer } from "tsyringe"; export declare class PreSptModLoader implements IModLoader { protected logger: ILogger; protected vfs: VFS; diff --git a/TypeScript/10ScopesAndTypes/types/models/eft/common/IEmptyRequestData.d.ts b/TypeScript/10ScopesAndTypes/types/models/eft/common/IEmptyRequestData.d.ts index 284d16e..52a7b12 100644 --- a/TypeScript/10ScopesAndTypes/types/models/eft/common/IEmptyRequestData.d.ts +++ b/TypeScript/10ScopesAndTypes/types/models/eft/common/IEmptyRequestData.d.ts @@ -1,2 +1 @@ -export interface IEmptyRequestData { -} +export type IEmptyRequestData = {}; diff --git a/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/IBotBase.d.ts b/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/IBotBase.d.ts index a7fe1ca..be37845 100644 --- a/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/IBotBase.d.ts +++ b/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/IBotBase.d.ts @@ -373,8 +373,7 @@ export interface LastCompleted { export interface Notes { Notes: Note[]; } -export interface CarExtractCounts { -} +export type CarExtractCounts = {}; export declare enum SurvivorClass { UNKNOWN = 0, NEUTRALIZER = 1, diff --git a/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/ILocationsBase.d.ts b/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/ILocationsBase.d.ts index 2c96af3..16bca24 100644 --- a/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/ILocationsBase.d.ts +++ b/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/ILocationsBase.d.ts @@ -2,8 +2,7 @@ export interface ILocationsBase { locations: Locations; paths: Path[]; } -export interface Locations { -} +export type Locations = {}; export interface Path { Source: string; Destination: string; diff --git a/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/IProfileTemplate.d.ts b/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/IProfileTemplate.d.ts index 20923bc..6ba9221 100644 --- a/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/IProfileTemplate.d.ts +++ b/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -1,12 +1,12 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { Dialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; export interface IProfileTemplates { - "Standard": IProfileSides; + Standard: IProfileSides; "Left Behind": IProfileSides; "Prepare To Escape": IProfileSides; "Edge Of Darkness": IProfileSides; - "Unheard": IProfileSides; - "Tournament": IProfileSides; + Unheard: IProfileSides; + Tournament: IProfileSides; "SPT Developer": IProfileSides; "SPT Easy start": IProfileSides; "SPT Zero to hero": IProfileSides; diff --git a/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/ITrader.d.ts b/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/ITrader.d.ts index 14ab409..40cf004 100644 --- a/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/ITrader.d.ts +++ b/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/ITrader.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; export interface ITrader { assort?: ITraderAssort; @@ -78,6 +79,8 @@ export interface IBarterScheme { _tpl: string; onlyFunctional?: boolean; sptQuestLocked?: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface ISuit { _id: string; diff --git a/TypeScript/10ScopesAndTypes/types/models/eft/hideout/IQteData.d.ts b/TypeScript/10ScopesAndTypes/types/models/eft/hideout/IQteData.d.ts index 7f507e1..fe6cce6 100644 --- a/TypeScript/10ScopesAndTypes/types/models/eft/hideout/IQteData.d.ts +++ b/TypeScript/10ScopesAndTypes/types/models/eft/hideout/IQteData.d.ts @@ -1,14 +1,14 @@ import { Effect } from "@spt/models/eft/health/Effect"; import { BodyPart } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; import { QteActivityType } from "@spt/models/enums/hideout/QteActivityType"; import { QteEffectType } from "@spt/models/enums/hideout/QteEffectType"; import { QteResultType } from "@spt/models/enums/hideout/QteResultType"; import { QteRewardType } from "@spt/models/enums/hideout/QteRewardType"; import { QteType } from "@spt/models/enums/hideout/QteType"; import { RequirementType } from "@spt/models/enums/hideout/RequirementType"; -import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt/models/enums/SkillTypes"; -import { Traders } from "@spt/models/enums/Traders"; export interface IQteData { id: string; type: QteActivityType; diff --git a/TypeScript/10ScopesAndTypes/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/10ScopesAndTypes/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index f1123c1..5971372 100644 --- a/TypeScript/10ScopesAndTypes/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/TypeScript/10ScopesAndTypes/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -15,7 +15,5 @@ export interface Items { change: any[]; del: any[]; } -export interface Production { -} -export interface TraderRelations { -} +export type Production = {}; +export type TraderRelations = {}; diff --git a/TypeScript/10ScopesAndTypes/types/models/eft/profile/ISptProfile.d.ts b/TypeScript/10ScopesAndTypes/types/models/eft/profile/ISptProfile.d.ts index a8e742a..dd7aea6 100644 --- a/TypeScript/10ScopesAndTypes/types/models/eft/profile/ISptProfile.d.ts +++ b/TypeScript/10ScopesAndTypes/types/models/eft/profile/ISptProfile.d.ts @@ -209,12 +209,9 @@ export interface Effects { LeftLeg: LeftLeg; RightLeg: RightLeg; } -export interface Head { -} -export interface Chest { -} -export interface Stomach { -} +export type Head = {}; +export type Chest = {}; +export type Stomach = {}; export interface LeftArm { Fracture?: number; } diff --git a/TypeScript/10ScopesAndTypes/types/models/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/10ScopesAndTypes/types/models/eft/ragfair/IRagfairOffer.d.ts index eeeb79d..f6c07fc 100644 --- a/TypeScript/10ScopesAndTypes/types/models/eft/ragfair/IRagfairOffer.d.ts +++ b/TypeScript/10ScopesAndTypes/types/models/eft/ragfair/IRagfairOffer.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface IRagfairOffer { sellResult?: SellResult[]; @@ -28,6 +29,8 @@ export interface OfferRequirement { _tpl: string; count: number; onlyFunctional: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface IRagfairOfferUser { id: string; diff --git a/TypeScript/10ScopesAndTypes/types/models/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/10ScopesAndTypes/types/models/eft/ragfair/ISearchRequestData.d.ts index 8261c5b..c631de8 100644 --- a/TypeScript/10ScopesAndTypes/types/models/eft/ragfair/ISearchRequestData.d.ts +++ b/TypeScript/10ScopesAndTypes/types/models/eft/ragfair/ISearchRequestData.d.ts @@ -29,5 +29,4 @@ export declare enum OfferOwnerType { TRADEROWNERTYPE = 1, PLAYEROWNERTYPE = 2 } -export interface BuildItems { -} +export type BuildItems = {}; diff --git a/TypeScript/10ScopesAndTypes/types/models/enums/BaseClasses.d.ts b/TypeScript/10ScopesAndTypes/types/models/enums/BaseClasses.d.ts index 65fc95e..32ebf7c 100644 --- a/TypeScript/10ScopesAndTypes/types/models/enums/BaseClasses.d.ts +++ b/TypeScript/10ScopesAndTypes/types/models/enums/BaseClasses.d.ts @@ -107,6 +107,6 @@ export declare enum BaseClasses { RECEIVER = "55818a304bdc2db5418b457d", BARREL = "555ef6e44bdc2de9068b457e", CHARGING_HANDLE = "55818a6f4bdc2db9688b456b", - COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569 ", + COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569", HIDEOUT_AREA_CONTAINER = "63da6da4784a55176c018dba" } diff --git a/TypeScript/10ScopesAndTypes/types/models/enums/DogtagExchangeSide.d.ts b/TypeScript/10ScopesAndTypes/types/models/enums/DogtagExchangeSide.d.ts new file mode 100644 index 0000000..de3d4df --- /dev/null +++ b/TypeScript/10ScopesAndTypes/types/models/enums/DogtagExchangeSide.d.ts @@ -0,0 +1,5 @@ +export declare enum DogtagExchangeSide { + USEC = "Usec", + BEAR = "Bear", + ANY = "Any" +} diff --git a/TypeScript/10ScopesAndTypes/types/models/spt/server/ExhaustableArray.d.ts b/TypeScript/10ScopesAndTypes/types/models/spt/server/ExhaustableArray.d.ts index c27f41f..50a6b68 100644 --- a/TypeScript/10ScopesAndTypes/types/models/spt/server/ExhaustableArray.d.ts +++ b/TypeScript/10ScopesAndTypes/types/models/spt/server/ExhaustableArray.d.ts @@ -1,5 +1,5 @@ -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ExhaustableArray implements IExhaustableArray { private itemPool; private randomUtil; diff --git a/TypeScript/10ScopesAndTypes/types/routers/EventOutputHolder.d.ts b/TypeScript/10ScopesAndTypes/types/routers/EventOutputHolder.d.ts index ef20706..148461a 100644 --- a/TypeScript/10ScopesAndTypes/types/routers/EventOutputHolder.d.ts +++ b/TypeScript/10ScopesAndTypes/types/routers/EventOutputHolder.d.ts @@ -3,8 +3,8 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IHideoutImprovement, Productive, TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; import { TraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class EventOutputHolder { protected profileHelper: ProfileHelper; protected timeUtil: TimeUtil; @@ -12,7 +12,7 @@ export declare class EventOutputHolder { /** * What has client been informed of this game session * Key = sessionId, then second key is prod id - */ + */ protected clientActiveSessionStorage: Record>; diff --git a/TypeScript/10ScopesAndTypes/types/servers/HttpServer.d.ts b/TypeScript/10ScopesAndTypes/types/servers/HttpServer.d.ts index b00fe68..0024ba3 100644 --- a/TypeScript/10ScopesAndTypes/types/servers/HttpServer.d.ts +++ b/TypeScript/10ScopesAndTypes/types/servers/HttpServer.d.ts @@ -6,8 +6,8 @@ import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; -import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { WebSocketServer } from "@spt/servers/WebSocketServer"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { LocalisationService } from "@spt/services/LocalisationService"; export declare class HttpServer { protected logger: ILogger; diff --git a/TypeScript/10ScopesAndTypes/types/servers/WebSocketServer.d.ts b/TypeScript/10ScopesAndTypes/types/servers/WebSocketServer.d.ts index f4e07bb..6121824 100644 --- a/TypeScript/10ScopesAndTypes/types/servers/WebSocketServer.d.ts +++ b/TypeScript/10ScopesAndTypes/types/servers/WebSocketServer.d.ts @@ -1,12 +1,12 @@ /// import http, { IncomingMessage } from "node:http"; -import { WebSocket, Server } from "ws"; import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { Server, WebSocket } from "ws"; export declare class WebSocketServer { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/10ScopesAndTypes/types/servers/ws/SptWebSocketConnectionHandler.d.ts b/TypeScript/10ScopesAndTypes/types/servers/ws/SptWebSocketConnectionHandler.d.ts index 98d0898..70fc96a 100644 --- a/TypeScript/10ScopesAndTypes/types/servers/ws/SptWebSocketConnectionHandler.d.ts +++ b/TypeScript/10ScopesAndTypes/types/servers/ws/SptWebSocketConnectionHandler.d.ts @@ -1,7 +1,6 @@ /// /// import { IncomingMessage } from "http"; -import { WebSocket } from "ws"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; @@ -11,6 +10,7 @@ import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectio import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; +import { WebSocket } from "ws"; export declare class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler { protected logger: ILogger; protected profileHelper: ProfileHelper; diff --git a/TypeScript/10ScopesAndTypes/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts b/TypeScript/10ScopesAndTypes/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts index d5247ec..5556129 100644 --- a/TypeScript/10ScopesAndTypes/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts +++ b/TypeScript/10ScopesAndTypes/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts @@ -1,6 +1,6 @@ -import { RawData, WebSocket } from "ws"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; +import { RawData, WebSocket } from "ws"; export declare class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler { protected logger: ILogger; constructor(logger: ILogger); diff --git a/TypeScript/10ScopesAndTypes/types/services/FenceService.d.ts b/TypeScript/10ScopesAndTypes/types/services/FenceService.d.ts index c156122..58dc076 100644 --- a/TypeScript/10ScopesAndTypes/types/services/FenceService.d.ts +++ b/TypeScript/10ScopesAndTypes/types/services/FenceService.d.ts @@ -13,9 +13,9 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Handle actions surrounding Fence * e.g. generating or refreshing assorts / get next refresh time diff --git a/TypeScript/10ScopesAndTypes/types/services/InsuranceService.d.ts b/TypeScript/10ScopesAndTypes/types/services/InsuranceService.d.ts index 0000e66..f799102 100644 --- a/TypeScript/10ScopesAndTypes/types/services/InsuranceService.d.ts +++ b/TypeScript/10ScopesAndTypes/types/services/InsuranceService.d.ts @@ -18,10 +18,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceService { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/10ScopesAndTypes/types/services/LocalisationService.d.ts b/TypeScript/10ScopesAndTypes/types/services/LocalisationService.d.ts index 42dfa4e..855c138 100644 --- a/TypeScript/10ScopesAndTypes/types/services/LocalisationService.d.ts +++ b/TypeScript/10ScopesAndTypes/types/services/LocalisationService.d.ts @@ -1,8 +1,8 @@ -import { I18n } from "i18n"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { LocaleService } from "@spt/services/LocaleService"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { I18n } from "i18n"; /** * Handles translating server text into different langauges */ diff --git a/TypeScript/10ScopesAndTypes/types/services/ProfileFixerService.d.ts b/TypeScript/10ScopesAndTypes/types/services/ProfileFixerService.d.ts index 525b867..91e4780 100644 --- a/TypeScript/10ScopesAndTypes/types/services/ProfileFixerService.d.ts +++ b/TypeScript/10ScopesAndTypes/types/services/ProfileFixerService.d.ts @@ -8,7 +8,7 @@ import { Bonus, HideoutSlot } from "@spt/models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea"; -import { ISptProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; +import { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; @@ -16,11 +16,11 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileFixerService { protected logger: ILogger; protected watermark: Watermark; @@ -73,6 +73,7 @@ export declare class ProfileFixerService { */ protected removeDanglingTaskConditionCounters(pmcProfile: IPmcData): void; protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullRagfairRatings(pmcProfile: IPmcData): void; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; /** diff --git a/TypeScript/10ScopesAndTypes/types/services/RagfairOfferService.d.ts b/TypeScript/10ScopesAndTypes/types/services/RagfairOfferService.d.ts index 6c13b1d..98dd179 100644 --- a/TypeScript/10ScopesAndTypes/types/services/RagfairOfferService.d.ts +++ b/TypeScript/10ScopesAndTypes/types/services/RagfairOfferService.d.ts @@ -10,10 +10,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/10ScopesAndTypes/types/services/mod/CustomItemService.d.ts b/TypeScript/10ScopesAndTypes/types/services/mod/CustomItemService.d.ts index 1926bed..f112872 100644 --- a/TypeScript/10ScopesAndTypes/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/10ScopesAndTypes/types/services/mod/CustomItemService.d.ts @@ -4,8 +4,8 @@ import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetail import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/10ScopesAndTypes/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/10ScopesAndTypes/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts index 3c9d955..91c84d9 100644 --- a/TypeScript/10ScopesAndTypes/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts +++ b/TypeScript/10ScopesAndTypes/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class DynamicRouterModService { private container; constructor(container: DependencyContainer); diff --git a/TypeScript/10ScopesAndTypes/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/10ScopesAndTypes/types/services/mod/staticRouter/StaticRouterModService.d.ts index f60432d..0c3d4d8 100644 --- a/TypeScript/10ScopesAndTypes/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/TypeScript/10ScopesAndTypes/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class StaticRouterModService { protected container: DependencyContainer; constructor(container: DependencyContainer); diff --git a/TypeScript/10ScopesAndTypes/types/utils/JsonUtil.d.ts b/TypeScript/10ScopesAndTypes/types/utils/JsonUtil.d.ts index b30822c..4419228 100644 --- a/TypeScript/10ScopesAndTypes/types/utils/JsonUtil.d.ts +++ b/TypeScript/10ScopesAndTypes/types/utils/JsonUtil.d.ts @@ -1,7 +1,7 @@ -import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { HashUtil } from "@spt/utils/HashUtil"; import { VFS } from "@spt/utils/VFS"; +import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; export declare class JsonUtil { protected vfs: VFS; protected hashUtil: HashUtil; diff --git a/TypeScript/10ScopesAndTypes/types/utils/RandomUtil.d.ts b/TypeScript/10ScopesAndTypes/types/utils/RandomUtil.d.ts index 49f242d..0da184f 100644 --- a/TypeScript/10ScopesAndTypes/types/utils/RandomUtil.d.ts +++ b/TypeScript/10ScopesAndTypes/types/utils/RandomUtil.d.ts @@ -1,6 +1,6 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects * based on the relative probability of each of its elements. diff --git a/TypeScript/10ScopesAndTypes/types/utils/logging/AbstractWinstonLogger.d.ts b/TypeScript/10ScopesAndTypes/types/utils/logging/AbstractWinstonLogger.d.ts index 7098f85..ef54434 100644 --- a/TypeScript/10ScopesAndTypes/types/utils/logging/AbstractWinstonLogger.d.ts +++ b/TypeScript/10ScopesAndTypes/types/utils/logging/AbstractWinstonLogger.d.ts @@ -1,12 +1,12 @@ /// import fs from "node:fs"; -import winston from "winston"; import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; import { SptLogger } from "@spt/models/spt/logging/SptLogger"; import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; import { ILogger } from "@spt/models/spt/utils/ILogger"; +import winston from "winston"; export declare abstract class AbstractWinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected showDebugInConsole: boolean; diff --git a/TypeScript/11BundleLoadingSample/types/controllers/BotController.d.ts b/TypeScript/11BundleLoadingSample/types/controllers/BotController.d.ts index 6431fca..475f51b 100644 --- a/TypeScript/11BundleLoadingSample/types/controllers/BotController.d.ts +++ b/TypeScript/11BundleLoadingSample/types/controllers/BotController.d.ts @@ -20,8 +20,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/11BundleLoadingSample/types/controllers/BuildController.d.ts b/TypeScript/11BundleLoadingSample/types/controllers/BuildController.d.ts index ed8adf6..2cb9c59 100644 --- a/TypeScript/11BundleLoadingSample/types/controllers/BuildController.d.ts +++ b/TypeScript/11BundleLoadingSample/types/controllers/BuildController.d.ts @@ -9,8 +9,8 @@ import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BuildController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/11BundleLoadingSample/types/controllers/GameController.d.ts b/TypeScript/11BundleLoadingSample/types/controllers/GameController.d.ts index 533a81c..e219c04 100644 --- a/TypeScript/11BundleLoadingSample/types/controllers/GameController.d.ts +++ b/TypeScript/11BundleLoadingSample/types/controllers/GameController.d.ts @@ -34,10 +34,10 @@ import { ProfileActivityService } from "@spt/services/ProfileActivityService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GameController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/11BundleLoadingSample/types/controllers/HealthController.d.ts b/TypeScript/11BundleLoadingSample/types/controllers/HealthController.d.ts index 5482283..5a0a0a6 100644 --- a/TypeScript/11BundleLoadingSample/types/controllers/HealthController.d.ts +++ b/TypeScript/11BundleLoadingSample/types/controllers/HealthController.d.ts @@ -12,8 +12,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthController { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/11BundleLoadingSample/types/controllers/HideoutController.d.ts b/TypeScript/11BundleLoadingSample/types/controllers/HideoutController.d.ts index e9d1ed9..89a428c 100644 --- a/TypeScript/11BundleLoadingSample/types/controllers/HideoutController.d.ts +++ b/TypeScript/11BundleLoadingSample/types/controllers/HideoutController.d.ts @@ -35,11 +35,11 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; import { ProfileActivityService } from "@spt/services/ProfileActivityService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/11BundleLoadingSample/types/controllers/InraidController.d.ts b/TypeScript/11BundleLoadingSample/types/controllers/InraidController.d.ts index 87f419b..9f0c409 100644 --- a/TypeScript/11BundleLoadingSample/types/controllers/InraidController.d.ts +++ b/TypeScript/11BundleLoadingSample/types/controllers/InraidController.d.ts @@ -13,6 +13,7 @@ import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRe import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState"; import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig"; import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; @@ -31,7 +32,6 @@ import { PmcChatResponseService } from "@spt/services/PmcChatResponseService"; import { TraderServicesService } from "@spt/services/TraderServicesService"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; -import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; /** * Logic for handling In Raid callbacks */ diff --git a/TypeScript/11BundleLoadingSample/types/controllers/InsuranceController.d.ts b/TypeScript/11BundleLoadingSample/types/controllers/InsuranceController.d.ts index f921b83..543e915 100644 --- a/TypeScript/11BundleLoadingSample/types/controllers/InsuranceController.d.ts +++ b/TypeScript/11BundleLoadingSample/types/controllers/InsuranceController.d.ts @@ -21,11 +21,11 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PaymentService } from "@spt/services/PaymentService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceController { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/11BundleLoadingSample/types/controllers/InventoryController.d.ts b/TypeScript/11BundleLoadingSample/types/controllers/InventoryController.d.ts index 40bb084..c986ce8 100644 --- a/TypeScript/11BundleLoadingSample/types/controllers/InventoryController.d.ts +++ b/TypeScript/11BundleLoadingSample/types/controllers/InventoryController.d.ts @@ -37,10 +37,10 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MapMarkerService } from "@spt/services/MapMarkerService"; import { PlayerService } from "@spt/services/PlayerService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/11BundleLoadingSample/types/controllers/LocationController.d.ts b/TypeScript/11BundleLoadingSample/types/controllers/LocationController.d.ts index 727a8c8..a541b9c 100644 --- a/TypeScript/11BundleLoadingSample/types/controllers/LocationController.d.ts +++ b/TypeScript/11BundleLoadingSample/types/controllers/LocationController.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class LocationController { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; diff --git a/TypeScript/11BundleLoadingSample/types/controllers/ProfileController.d.ts b/TypeScript/11BundleLoadingSample/types/controllers/ProfileController.d.ts index e8dae73..7e6d35c 100644 --- a/TypeScript/11BundleLoadingSample/types/controllers/ProfileController.d.ts +++ b/TypeScript/11BundleLoadingSample/types/controllers/ProfileController.d.ts @@ -26,9 +26,9 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/11BundleLoadingSample/types/controllers/QuestController.d.ts b/TypeScript/11BundleLoadingSample/types/controllers/QuestController.d.ts index 3cdce00..6a5b415 100644 --- a/TypeScript/11BundleLoadingSample/types/controllers/QuestController.d.ts +++ b/TypeScript/11BundleLoadingSample/types/controllers/QuestController.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/11BundleLoadingSample/types/controllers/RepeatableQuestController.d.ts b/TypeScript/11BundleLoadingSample/types/controllers/RepeatableQuestController.d.ts index 74f39eb..016f8c6 100644 --- a/TypeScript/11BundleLoadingSample/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/11BundleLoadingSample/types/controllers/RepeatableQuestController.d.ts @@ -18,11 +18,11 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/11BundleLoadingSample/types/controllers/TradeController.d.ts b/TypeScript/11BundleLoadingSample/types/controllers/TradeController.d.ts index bc72e92..842a97b 100644 --- a/TypeScript/11BundleLoadingSample/types/controllers/TradeController.d.ts +++ b/TypeScript/11BundleLoadingSample/types/controllers/TradeController.d.ts @@ -1,5 +1,6 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper"; import { TradeHelper } from "@spt/helpers/TradeHelper"; import { TraderHelper } from "@spt/helpers/TraderHelper"; import { IPmcData } from "@spt/models/eft/common/IPmcData"; @@ -35,6 +36,7 @@ export declare class TradeController { protected hashUtil: HashUtil; protected itemHelper: ItemHelper; protected profileHelper: ProfileHelper; + protected ragfairOfferHelper: RagfairOfferHelper; protected traderHelper: TraderHelper; protected ragfairServer: RagfairServer; protected httpResponse: HttpResponseUtil; @@ -44,7 +46,7 @@ export declare class TradeController { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairOfferHelper: RagfairOfferHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); /** Handle TradingConfirm event */ confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; /** Handle RagFairBuyOffer event */ @@ -67,10 +69,17 @@ export declare class TradeController { * @param output Output to send back to client */ protected buyPmcItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void; + /** + * Is the provided offerid and ownerid from a player made offer + * @param offerId Id of the offer + * @param offerOwnerId Owner id + * @returns true if offer was made by a player + */ + protected isPlayerOffer(offerId: string, offerOwnerId: string): boolean; /** * Does Player have necessary trader loyalty to purchase flea offer * @param sellerIsTrader is seller trader - * @param fleaOffer FLea offer being bought + * @param fleaOffer Flea offer being bought * @param pmcData Player profile * @returns True if player can buy offer */ diff --git a/TypeScript/11BundleLoadingSample/types/controllers/TraderController.d.ts b/TypeScript/11BundleLoadingSample/types/controllers/TraderController.d.ts index 7fc6d78..3592fc6 100644 --- a/TypeScript/11BundleLoadingSample/types/controllers/TraderController.d.ts +++ b/TypeScript/11BundleLoadingSample/types/controllers/TraderController.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/11BundleLoadingSample/types/generators/BotEquipmentModGenerator.d.ts b/TypeScript/11BundleLoadingSample/types/generators/BotEquipmentModGenerator.d.ts index 419120f..3952293 100644 --- a/TypeScript/11BundleLoadingSample/types/generators/BotEquipmentModGenerator.d.ts +++ b/TypeScript/11BundleLoadingSample/types/generators/BotEquipmentModGenerator.d.ts @@ -25,9 +25,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotEquipmentModGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -65,7 +65,7 @@ export declare class BotEquipmentModGenerator { * @param settings Bot equipment generation settings * @param modSlot Armor slot being filtered * @param existingPlateTplPool Plates tpls to choose from - * @param armorItem + * @param armorItem The armor items db template * @returns Array of plate tpls to choose from */ protected filterPlateModsForSlotByLevel(settings: IGenerateEquipmentProperties, modSlot: string, existingPlateTplPool: string[], armorItem: ITemplateItem): IFilterPlateModsForSlotByLevelResult; diff --git a/TypeScript/11BundleLoadingSample/types/generators/BotGenerator.d.ts b/TypeScript/11BundleLoadingSample/types/generators/BotGenerator.d.ts index 8ab4371..ebb8a59 100644 --- a/TypeScript/11BundleLoadingSample/types/generators/BotGenerator.d.ts +++ b/TypeScript/11BundleLoadingSample/types/generators/BotGenerator.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/11BundleLoadingSample/types/generators/BotLevelGenerator.d.ts b/TypeScript/11BundleLoadingSample/types/generators/BotLevelGenerator.d.ts index dee61e2..a8a8895 100644 --- a/TypeScript/11BundleLoadingSample/types/generators/BotLevelGenerator.d.ts +++ b/TypeScript/11BundleLoadingSample/types/generators/BotLevelGenerator.d.ts @@ -4,12 +4,14 @@ import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; +import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class BotLevelGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; protected databaseService: DatabaseService; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService); + protected mathUtil: MathUtil; + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, mathUtil: MathUtil); /** * Return a randomised bot level and exp value * @param levelDetails Min and max of level for bot @@ -18,6 +20,7 @@ export declare class BotLevelGenerator { * @returns IRandomisedBotLevelResult object */ generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult; + protected chooseBotLevel(min: number, max: number, shift: number, number: number): number; /** * Get the highest level a bot can be relative to the players level, but no further than the max size from globals.exp_table * @param botGenerationDetails Details to help generate a bot diff --git a/TypeScript/11BundleLoadingSample/types/generators/BotLootGenerator.d.ts b/TypeScript/11BundleLoadingSample/types/generators/BotLootGenerator.d.ts index fee56ce..c0583c6 100644 --- a/TypeScript/11BundleLoadingSample/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/11BundleLoadingSample/types/generators/BotLootGenerator.d.ts @@ -18,9 +18,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/11BundleLoadingSample/types/generators/BotWeaponGenerator.d.ts b/TypeScript/11BundleLoadingSample/types/generators/BotWeaponGenerator.d.ts index 5559bfa..8e03b35 100644 --- a/TypeScript/11BundleLoadingSample/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/11BundleLoadingSample/types/generators/BotWeaponGenerator.d.ts @@ -18,9 +18,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RepairService } from "@spt/services/RepairService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotWeaponGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/11BundleLoadingSample/types/generators/LocationGenerator.d.ts b/TypeScript/11BundleLoadingSample/types/generators/LocationGenerator.d.ts index 222b0ab..9a2b0c4 100644 --- a/TypeScript/11BundleLoadingSample/types/generators/LocationGenerator.d.ts +++ b/TypeScript/11BundleLoadingSample/types/generators/LocationGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export interface IContainerItem { items: Item[]; width: number; diff --git a/TypeScript/11BundleLoadingSample/types/generators/PlayerScavGenerator.d.ts b/TypeScript/11BundleLoadingSample/types/generators/PlayerScavGenerator.d.ts index 2414150..e317bf6 100644 --- a/TypeScript/11BundleLoadingSample/types/generators/PlayerScavGenerator.d.ts +++ b/TypeScript/11BundleLoadingSample/types/generators/PlayerScavGenerator.d.ts @@ -14,9 +14,9 @@ import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class PlayerScavGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/11BundleLoadingSample/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/11BundleLoadingSample/types/generators/RagfairOfferGenerator.d.ts index 9435390..ca09729 100644 --- a/TypeScript/11BundleLoadingSample/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/11BundleLoadingSample/types/generators/RagfairOfferGenerator.d.ts @@ -19,10 +19,10 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/11BundleLoadingSample/types/generators/RepeatableQuestGenerator.d.ts b/TypeScript/11BundleLoadingSample/types/generators/RepeatableQuestGenerator.d.ts index 77c4e79..339f322 100644 --- a/TypeScript/11BundleLoadingSample/types/generators/RepeatableQuestGenerator.d.ts +++ b/TypeScript/11BundleLoadingSample/types/generators/RepeatableQuestGenerator.d.ts @@ -11,10 +11,10 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/11BundleLoadingSample/types/generators/RepeatableQuestRewardGenerator.d.ts b/TypeScript/11BundleLoadingSample/types/generators/RepeatableQuestRewardGenerator.d.ts index 1e09994..713a394 100644 --- a/TypeScript/11BundleLoadingSample/types/generators/RepeatableQuestRewardGenerator.d.ts +++ b/TypeScript/11BundleLoadingSample/types/generators/RepeatableQuestRewardGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestRewardGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/11BundleLoadingSample/types/helpers/BotDifficultyHelper.d.ts b/TypeScript/11BundleLoadingSample/types/helpers/BotDifficultyHelper.d.ts index 63572a5..2348bd3 100644 --- a/TypeScript/11BundleLoadingSample/types/helpers/BotDifficultyHelper.d.ts +++ b/TypeScript/11BundleLoadingSample/types/helpers/BotDifficultyHelper.d.ts @@ -5,8 +5,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotDifficultyHelper { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/11BundleLoadingSample/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/11BundleLoadingSample/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index c51bf7e..c38f0a0 100644 --- a/TypeScript/11BundleLoadingSample/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/11BundleLoadingSample/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GiveSptCommand implements ISptCommand { protected logger: ILogger; protected itemHelper: ItemHelper; diff --git a/TypeScript/11BundleLoadingSample/types/helpers/HealthHelper.d.ts b/TypeScript/11BundleLoadingSample/types/helpers/HealthHelper.d.ts index 650f633..a164285 100644 --- a/TypeScript/11BundleLoadingSample/types/helpers/HealthHelper.d.ts +++ b/TypeScript/11BundleLoadingSample/types/helpers/HealthHelper.d.ts @@ -5,8 +5,8 @@ import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/11BundleLoadingSample/types/helpers/HideoutHelper.d.ts b/TypeScript/11BundleLoadingSample/types/helpers/HideoutHelper.d.ts index c4aaa4c..df0376b 100644 --- a/TypeScript/11BundleLoadingSample/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/11BundleLoadingSample/types/helpers/HideoutHelper.d.ts @@ -18,10 +18,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/11BundleLoadingSample/types/helpers/InRaidHelper.d.ts b/TypeScript/11BundleLoadingSample/types/helpers/InRaidHelper.d.ts index 449be9f..987c9ec 100644 --- a/TypeScript/11BundleLoadingSample/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/11BundleLoadingSample/types/helpers/InRaidHelper.d.ts @@ -15,9 +15,9 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InRaidHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/11BundleLoadingSample/types/helpers/InventoryHelper.d.ts b/TypeScript/11BundleLoadingSample/types/helpers/InventoryHelper.d.ts index f0ff69a..92bb49c 100644 --- a/TypeScript/11BundleLoadingSample/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/11BundleLoadingSample/types/helpers/InventoryHelper.d.ts @@ -23,9 +23,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/11BundleLoadingSample/types/helpers/ItemHelper.d.ts b/TypeScript/11BundleLoadingSample/types/helpers/ItemHelper.d.ts index da5dd11..c304cee 100644 --- a/TypeScript/11BundleLoadingSample/types/helpers/ItemHelper.d.ts +++ b/TypeScript/11BundleLoadingSample/types/helpers/ItemHelper.d.ts @@ -11,13 +11,13 @@ import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { CompareUtil } from "@spt/utils/CompareUtil"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ItemHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/11BundleLoadingSample/types/helpers/ProfileHelper.d.ts b/TypeScript/11BundleLoadingSample/types/helpers/ProfileHelper.d.ts index 0671179..cdab870 100644 --- a/TypeScript/11BundleLoadingSample/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/11BundleLoadingSample/types/helpers/ProfileHelper.d.ts @@ -11,10 +11,10 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/11BundleLoadingSample/types/helpers/QuestHelper.d.ts b/TypeScript/11BundleLoadingSample/types/helpers/QuestHelper.d.ts index 2b84b8f..2d5730d 100644 --- a/TypeScript/11BundleLoadingSample/types/helpers/QuestHelper.d.ts +++ b/TypeScript/11BundleLoadingSample/types/helpers/QuestHelper.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/11BundleLoadingSample/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/11BundleLoadingSample/types/helpers/RagfairOfferHelper.d.ts index b526554..2386316 100644 --- a/TypeScript/11BundleLoadingSample/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/11BundleLoadingSample/types/helpers/RagfairOfferHelper.d.ts @@ -151,7 +151,7 @@ export declare class RagfairOfferHelper { * @param boughtAmount Amount item was purchased for * @returns IItemEventRouterResponse */ - protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; + completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; /** * Get a localised message for when players offer has sold on flea * @param itemTpl Item sold diff --git a/TypeScript/11BundleLoadingSample/types/helpers/RagfairServerHelper.d.ts b/TypeScript/11BundleLoadingSample/types/helpers/RagfairServerHelper.d.ts index 927caf5..3e1fea9 100644 --- a/TypeScript/11BundleLoadingSample/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/11BundleLoadingSample/types/helpers/RagfairServerHelper.d.ts @@ -12,9 +12,9 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Helper class for common ragfair server actions */ diff --git a/TypeScript/11BundleLoadingSample/types/helpers/RepairHelper.d.ts b/TypeScript/11BundleLoadingSample/types/helpers/RepairHelper.d.ts index 99a21da..63c78c9 100644 --- a/TypeScript/11BundleLoadingSample/types/helpers/RepairHelper.d.ts +++ b/TypeScript/11BundleLoadingSample/types/helpers/RepairHelper.d.ts @@ -4,8 +4,8 @@ import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/11BundleLoadingSample/types/helpers/RepeatableQuestHelper.d.ts b/TypeScript/11BundleLoadingSample/types/helpers/RepeatableQuestHelper.d.ts index d92657e..8c65f40 100644 --- a/TypeScript/11BundleLoadingSample/types/helpers/RepeatableQuestHelper.d.ts +++ b/TypeScript/11BundleLoadingSample/types/helpers/RepeatableQuestHelper.d.ts @@ -1,8 +1,8 @@ import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestHelper { protected mathUtil: MathUtil; protected configServer: ConfigServer; diff --git a/TypeScript/11BundleLoadingSample/types/helpers/TradeHelper.d.ts b/TypeScript/11BundleLoadingSample/types/helpers/TradeHelper.d.ts index f994fda..6e6f3a2 100644 --- a/TypeScript/11BundleLoadingSample/types/helpers/TradeHelper.d.ts +++ b/TypeScript/11BundleLoadingSample/types/helpers/TradeHelper.d.ts @@ -17,8 +17,8 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TradeHelper { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/11BundleLoadingSample/types/helpers/TraderAssortHelper.d.ts b/TypeScript/11BundleLoadingSample/types/helpers/TraderAssortHelper.d.ts index 8f8f802..f1ecd3b 100644 --- a/TypeScript/11BundleLoadingSample/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/11BundleLoadingSample/types/helpers/TraderAssortHelper.d.ts @@ -14,9 +14,9 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; diff --git a/TypeScript/11BundleLoadingSample/types/loaders/BundleLoader.d.ts b/TypeScript/11BundleLoadingSample/types/loaders/BundleLoader.d.ts index e270988..8c0ed4d 100644 --- a/TypeScript/11BundleLoadingSample/types/loaders/BundleLoader.d.ts +++ b/TypeScript/11BundleLoadingSample/types/loaders/BundleLoader.d.ts @@ -1,8 +1,8 @@ import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BundleInfo { modpath: string; filename: string; diff --git a/TypeScript/11BundleLoadingSample/types/loaders/PostDBModLoader.d.ts b/TypeScript/11BundleLoadingSample/types/loaders/PostDBModLoader.d.ts index b0c4bf4..a8bb6a9 100644 --- a/TypeScript/11BundleLoadingSample/types/loaders/PostDBModLoader.d.ts +++ b/TypeScript/11BundleLoadingSample/types/loaders/PostDBModLoader.d.ts @@ -1,10 +1,10 @@ -import { DependencyContainer } from "tsyringe"; import { OnLoad } from "@spt/di/OnLoad"; import { BundleLoader } from "@spt/loaders/BundleLoader"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostDBModLoader implements OnLoad { protected logger: ILogger; protected bundleLoader: BundleLoader; diff --git a/TypeScript/11BundleLoadingSample/types/loaders/PostSptModLoader.d.ts b/TypeScript/11BundleLoadingSample/types/loaders/PostSptModLoader.d.ts index fb54579..2603497 100644 --- a/TypeScript/11BundleLoadingSample/types/loaders/PostSptModLoader.d.ts +++ b/TypeScript/11BundleLoadingSample/types/loaders/PostSptModLoader.d.ts @@ -1,9 +1,9 @@ -import { DependencyContainer } from "tsyringe"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { IModLoader } from "@spt/models/spt/mod/IModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostSptModLoader implements IModLoader { protected logger: ILogger; protected preSptModLoader: PreSptModLoader; diff --git a/TypeScript/11BundleLoadingSample/types/loaders/PreSptModLoader.d.ts b/TypeScript/11BundleLoadingSample/types/loaders/PreSptModLoader.d.ts index bc846c8..8814525 100644 --- a/TypeScript/11BundleLoadingSample/types/loaders/PreSptModLoader.d.ts +++ b/TypeScript/11BundleLoadingSample/types/loaders/PreSptModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { ModDetails } from "@spt/models/eft/profile/ISptProfile"; @@ -11,6 +10,7 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { ModCompilerService } from "@spt/services/ModCompilerService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { DependencyContainer } from "tsyringe"; export declare class PreSptModLoader implements IModLoader { protected logger: ILogger; protected vfs: VFS; diff --git a/TypeScript/11BundleLoadingSample/types/models/eft/common/IEmptyRequestData.d.ts b/TypeScript/11BundleLoadingSample/types/models/eft/common/IEmptyRequestData.d.ts index 284d16e..52a7b12 100644 --- a/TypeScript/11BundleLoadingSample/types/models/eft/common/IEmptyRequestData.d.ts +++ b/TypeScript/11BundleLoadingSample/types/models/eft/common/IEmptyRequestData.d.ts @@ -1,2 +1 @@ -export interface IEmptyRequestData { -} +export type IEmptyRequestData = {}; diff --git a/TypeScript/11BundleLoadingSample/types/models/eft/common/tables/IBotBase.d.ts b/TypeScript/11BundleLoadingSample/types/models/eft/common/tables/IBotBase.d.ts index a7fe1ca..be37845 100644 --- a/TypeScript/11BundleLoadingSample/types/models/eft/common/tables/IBotBase.d.ts +++ b/TypeScript/11BundleLoadingSample/types/models/eft/common/tables/IBotBase.d.ts @@ -373,8 +373,7 @@ export interface LastCompleted { export interface Notes { Notes: Note[]; } -export interface CarExtractCounts { -} +export type CarExtractCounts = {}; export declare enum SurvivorClass { UNKNOWN = 0, NEUTRALIZER = 1, diff --git a/TypeScript/11BundleLoadingSample/types/models/eft/common/tables/ILocationsBase.d.ts b/TypeScript/11BundleLoadingSample/types/models/eft/common/tables/ILocationsBase.d.ts index 2c96af3..16bca24 100644 --- a/TypeScript/11BundleLoadingSample/types/models/eft/common/tables/ILocationsBase.d.ts +++ b/TypeScript/11BundleLoadingSample/types/models/eft/common/tables/ILocationsBase.d.ts @@ -2,8 +2,7 @@ export interface ILocationsBase { locations: Locations; paths: Path[]; } -export interface Locations { -} +export type Locations = {}; export interface Path { Source: string; Destination: string; diff --git a/TypeScript/11BundleLoadingSample/types/models/eft/common/tables/IProfileTemplate.d.ts b/TypeScript/11BundleLoadingSample/types/models/eft/common/tables/IProfileTemplate.d.ts index 20923bc..6ba9221 100644 --- a/TypeScript/11BundleLoadingSample/types/models/eft/common/tables/IProfileTemplate.d.ts +++ b/TypeScript/11BundleLoadingSample/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -1,12 +1,12 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { Dialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; export interface IProfileTemplates { - "Standard": IProfileSides; + Standard: IProfileSides; "Left Behind": IProfileSides; "Prepare To Escape": IProfileSides; "Edge Of Darkness": IProfileSides; - "Unheard": IProfileSides; - "Tournament": IProfileSides; + Unheard: IProfileSides; + Tournament: IProfileSides; "SPT Developer": IProfileSides; "SPT Easy start": IProfileSides; "SPT Zero to hero": IProfileSides; diff --git a/TypeScript/11BundleLoadingSample/types/models/eft/common/tables/ITrader.d.ts b/TypeScript/11BundleLoadingSample/types/models/eft/common/tables/ITrader.d.ts index 14ab409..40cf004 100644 --- a/TypeScript/11BundleLoadingSample/types/models/eft/common/tables/ITrader.d.ts +++ b/TypeScript/11BundleLoadingSample/types/models/eft/common/tables/ITrader.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; export interface ITrader { assort?: ITraderAssort; @@ -78,6 +79,8 @@ export interface IBarterScheme { _tpl: string; onlyFunctional?: boolean; sptQuestLocked?: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface ISuit { _id: string; diff --git a/TypeScript/11BundleLoadingSample/types/models/eft/hideout/IQteData.d.ts b/TypeScript/11BundleLoadingSample/types/models/eft/hideout/IQteData.d.ts index 7f507e1..fe6cce6 100644 --- a/TypeScript/11BundleLoadingSample/types/models/eft/hideout/IQteData.d.ts +++ b/TypeScript/11BundleLoadingSample/types/models/eft/hideout/IQteData.d.ts @@ -1,14 +1,14 @@ import { Effect } from "@spt/models/eft/health/Effect"; import { BodyPart } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; import { QteActivityType } from "@spt/models/enums/hideout/QteActivityType"; import { QteEffectType } from "@spt/models/enums/hideout/QteEffectType"; import { QteResultType } from "@spt/models/enums/hideout/QteResultType"; import { QteRewardType } from "@spt/models/enums/hideout/QteRewardType"; import { QteType } from "@spt/models/enums/hideout/QteType"; import { RequirementType } from "@spt/models/enums/hideout/RequirementType"; -import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt/models/enums/SkillTypes"; -import { Traders } from "@spt/models/enums/Traders"; export interface IQteData { id: string; type: QteActivityType; diff --git a/TypeScript/11BundleLoadingSample/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/11BundleLoadingSample/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index f1123c1..5971372 100644 --- a/TypeScript/11BundleLoadingSample/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/TypeScript/11BundleLoadingSample/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -15,7 +15,5 @@ export interface Items { change: any[]; del: any[]; } -export interface Production { -} -export interface TraderRelations { -} +export type Production = {}; +export type TraderRelations = {}; diff --git a/TypeScript/11BundleLoadingSample/types/models/eft/profile/ISptProfile.d.ts b/TypeScript/11BundleLoadingSample/types/models/eft/profile/ISptProfile.d.ts index a8e742a..dd7aea6 100644 --- a/TypeScript/11BundleLoadingSample/types/models/eft/profile/ISptProfile.d.ts +++ b/TypeScript/11BundleLoadingSample/types/models/eft/profile/ISptProfile.d.ts @@ -209,12 +209,9 @@ export interface Effects { LeftLeg: LeftLeg; RightLeg: RightLeg; } -export interface Head { -} -export interface Chest { -} -export interface Stomach { -} +export type Head = {}; +export type Chest = {}; +export type Stomach = {}; export interface LeftArm { Fracture?: number; } diff --git a/TypeScript/11BundleLoadingSample/types/models/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/11BundleLoadingSample/types/models/eft/ragfair/IRagfairOffer.d.ts index eeeb79d..f6c07fc 100644 --- a/TypeScript/11BundleLoadingSample/types/models/eft/ragfair/IRagfairOffer.d.ts +++ b/TypeScript/11BundleLoadingSample/types/models/eft/ragfair/IRagfairOffer.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface IRagfairOffer { sellResult?: SellResult[]; @@ -28,6 +29,8 @@ export interface OfferRequirement { _tpl: string; count: number; onlyFunctional: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface IRagfairOfferUser { id: string; diff --git a/TypeScript/11BundleLoadingSample/types/models/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/11BundleLoadingSample/types/models/eft/ragfair/ISearchRequestData.d.ts index 8261c5b..c631de8 100644 --- a/TypeScript/11BundleLoadingSample/types/models/eft/ragfair/ISearchRequestData.d.ts +++ b/TypeScript/11BundleLoadingSample/types/models/eft/ragfair/ISearchRequestData.d.ts @@ -29,5 +29,4 @@ export declare enum OfferOwnerType { TRADEROWNERTYPE = 1, PLAYEROWNERTYPE = 2 } -export interface BuildItems { -} +export type BuildItems = {}; diff --git a/TypeScript/11BundleLoadingSample/types/models/enums/BaseClasses.d.ts b/TypeScript/11BundleLoadingSample/types/models/enums/BaseClasses.d.ts index 65fc95e..32ebf7c 100644 --- a/TypeScript/11BundleLoadingSample/types/models/enums/BaseClasses.d.ts +++ b/TypeScript/11BundleLoadingSample/types/models/enums/BaseClasses.d.ts @@ -107,6 +107,6 @@ export declare enum BaseClasses { RECEIVER = "55818a304bdc2db5418b457d", BARREL = "555ef6e44bdc2de9068b457e", CHARGING_HANDLE = "55818a6f4bdc2db9688b456b", - COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569 ", + COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569", HIDEOUT_AREA_CONTAINER = "63da6da4784a55176c018dba" } diff --git a/TypeScript/11BundleLoadingSample/types/models/enums/DogtagExchangeSide.d.ts b/TypeScript/11BundleLoadingSample/types/models/enums/DogtagExchangeSide.d.ts new file mode 100644 index 0000000..de3d4df --- /dev/null +++ b/TypeScript/11BundleLoadingSample/types/models/enums/DogtagExchangeSide.d.ts @@ -0,0 +1,5 @@ +export declare enum DogtagExchangeSide { + USEC = "Usec", + BEAR = "Bear", + ANY = "Any" +} diff --git a/TypeScript/11BundleLoadingSample/types/models/spt/server/ExhaustableArray.d.ts b/TypeScript/11BundleLoadingSample/types/models/spt/server/ExhaustableArray.d.ts index c27f41f..50a6b68 100644 --- a/TypeScript/11BundleLoadingSample/types/models/spt/server/ExhaustableArray.d.ts +++ b/TypeScript/11BundleLoadingSample/types/models/spt/server/ExhaustableArray.d.ts @@ -1,5 +1,5 @@ -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ExhaustableArray implements IExhaustableArray { private itemPool; private randomUtil; diff --git a/TypeScript/11BundleLoadingSample/types/routers/EventOutputHolder.d.ts b/TypeScript/11BundleLoadingSample/types/routers/EventOutputHolder.d.ts index ef20706..148461a 100644 --- a/TypeScript/11BundleLoadingSample/types/routers/EventOutputHolder.d.ts +++ b/TypeScript/11BundleLoadingSample/types/routers/EventOutputHolder.d.ts @@ -3,8 +3,8 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IHideoutImprovement, Productive, TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; import { TraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class EventOutputHolder { protected profileHelper: ProfileHelper; protected timeUtil: TimeUtil; @@ -12,7 +12,7 @@ export declare class EventOutputHolder { /** * What has client been informed of this game session * Key = sessionId, then second key is prod id - */ + */ protected clientActiveSessionStorage: Record>; diff --git a/TypeScript/11BundleLoadingSample/types/servers/HttpServer.d.ts b/TypeScript/11BundleLoadingSample/types/servers/HttpServer.d.ts index b00fe68..0024ba3 100644 --- a/TypeScript/11BundleLoadingSample/types/servers/HttpServer.d.ts +++ b/TypeScript/11BundleLoadingSample/types/servers/HttpServer.d.ts @@ -6,8 +6,8 @@ import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; -import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { WebSocketServer } from "@spt/servers/WebSocketServer"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { LocalisationService } from "@spt/services/LocalisationService"; export declare class HttpServer { protected logger: ILogger; diff --git a/TypeScript/11BundleLoadingSample/types/servers/WebSocketServer.d.ts b/TypeScript/11BundleLoadingSample/types/servers/WebSocketServer.d.ts index f4e07bb..6121824 100644 --- a/TypeScript/11BundleLoadingSample/types/servers/WebSocketServer.d.ts +++ b/TypeScript/11BundleLoadingSample/types/servers/WebSocketServer.d.ts @@ -1,12 +1,12 @@ /// import http, { IncomingMessage } from "node:http"; -import { WebSocket, Server } from "ws"; import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { Server, WebSocket } from "ws"; export declare class WebSocketServer { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/11BundleLoadingSample/types/servers/ws/SptWebSocketConnectionHandler.d.ts b/TypeScript/11BundleLoadingSample/types/servers/ws/SptWebSocketConnectionHandler.d.ts index 98d0898..70fc96a 100644 --- a/TypeScript/11BundleLoadingSample/types/servers/ws/SptWebSocketConnectionHandler.d.ts +++ b/TypeScript/11BundleLoadingSample/types/servers/ws/SptWebSocketConnectionHandler.d.ts @@ -1,7 +1,6 @@ /// /// import { IncomingMessage } from "http"; -import { WebSocket } from "ws"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; @@ -11,6 +10,7 @@ import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectio import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; +import { WebSocket } from "ws"; export declare class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler { protected logger: ILogger; protected profileHelper: ProfileHelper; diff --git a/TypeScript/11BundleLoadingSample/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts b/TypeScript/11BundleLoadingSample/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts index d5247ec..5556129 100644 --- a/TypeScript/11BundleLoadingSample/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts +++ b/TypeScript/11BundleLoadingSample/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts @@ -1,6 +1,6 @@ -import { RawData, WebSocket } from "ws"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; +import { RawData, WebSocket } from "ws"; export declare class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler { protected logger: ILogger; constructor(logger: ILogger); diff --git a/TypeScript/11BundleLoadingSample/types/services/FenceService.d.ts b/TypeScript/11BundleLoadingSample/types/services/FenceService.d.ts index c156122..58dc076 100644 --- a/TypeScript/11BundleLoadingSample/types/services/FenceService.d.ts +++ b/TypeScript/11BundleLoadingSample/types/services/FenceService.d.ts @@ -13,9 +13,9 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Handle actions surrounding Fence * e.g. generating or refreshing assorts / get next refresh time diff --git a/TypeScript/11BundleLoadingSample/types/services/InsuranceService.d.ts b/TypeScript/11BundleLoadingSample/types/services/InsuranceService.d.ts index 0000e66..f799102 100644 --- a/TypeScript/11BundleLoadingSample/types/services/InsuranceService.d.ts +++ b/TypeScript/11BundleLoadingSample/types/services/InsuranceService.d.ts @@ -18,10 +18,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceService { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/11BundleLoadingSample/types/services/LocalisationService.d.ts b/TypeScript/11BundleLoadingSample/types/services/LocalisationService.d.ts index 42dfa4e..855c138 100644 --- a/TypeScript/11BundleLoadingSample/types/services/LocalisationService.d.ts +++ b/TypeScript/11BundleLoadingSample/types/services/LocalisationService.d.ts @@ -1,8 +1,8 @@ -import { I18n } from "i18n"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { LocaleService } from "@spt/services/LocaleService"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { I18n } from "i18n"; /** * Handles translating server text into different langauges */ diff --git a/TypeScript/11BundleLoadingSample/types/services/ProfileFixerService.d.ts b/TypeScript/11BundleLoadingSample/types/services/ProfileFixerService.d.ts index 525b867..91e4780 100644 --- a/TypeScript/11BundleLoadingSample/types/services/ProfileFixerService.d.ts +++ b/TypeScript/11BundleLoadingSample/types/services/ProfileFixerService.d.ts @@ -8,7 +8,7 @@ import { Bonus, HideoutSlot } from "@spt/models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea"; -import { ISptProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; +import { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; @@ -16,11 +16,11 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileFixerService { protected logger: ILogger; protected watermark: Watermark; @@ -73,6 +73,7 @@ export declare class ProfileFixerService { */ protected removeDanglingTaskConditionCounters(pmcProfile: IPmcData): void; protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullRagfairRatings(pmcProfile: IPmcData): void; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; /** diff --git a/TypeScript/11BundleLoadingSample/types/services/RagfairOfferService.d.ts b/TypeScript/11BundleLoadingSample/types/services/RagfairOfferService.d.ts index 6c13b1d..98dd179 100644 --- a/TypeScript/11BundleLoadingSample/types/services/RagfairOfferService.d.ts +++ b/TypeScript/11BundleLoadingSample/types/services/RagfairOfferService.d.ts @@ -10,10 +10,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/11BundleLoadingSample/types/services/mod/CustomItemService.d.ts b/TypeScript/11BundleLoadingSample/types/services/mod/CustomItemService.d.ts index 1926bed..f112872 100644 --- a/TypeScript/11BundleLoadingSample/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/11BundleLoadingSample/types/services/mod/CustomItemService.d.ts @@ -4,8 +4,8 @@ import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetail import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/11BundleLoadingSample/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/11BundleLoadingSample/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts index 3c9d955..91c84d9 100644 --- a/TypeScript/11BundleLoadingSample/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts +++ b/TypeScript/11BundleLoadingSample/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class DynamicRouterModService { private container; constructor(container: DependencyContainer); diff --git a/TypeScript/11BundleLoadingSample/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/11BundleLoadingSample/types/services/mod/staticRouter/StaticRouterModService.d.ts index f60432d..0c3d4d8 100644 --- a/TypeScript/11BundleLoadingSample/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/TypeScript/11BundleLoadingSample/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class StaticRouterModService { protected container: DependencyContainer; constructor(container: DependencyContainer); diff --git a/TypeScript/11BundleLoadingSample/types/utils/JsonUtil.d.ts b/TypeScript/11BundleLoadingSample/types/utils/JsonUtil.d.ts index b30822c..4419228 100644 --- a/TypeScript/11BundleLoadingSample/types/utils/JsonUtil.d.ts +++ b/TypeScript/11BundleLoadingSample/types/utils/JsonUtil.d.ts @@ -1,7 +1,7 @@ -import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { HashUtil } from "@spt/utils/HashUtil"; import { VFS } from "@spt/utils/VFS"; +import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; export declare class JsonUtil { protected vfs: VFS; protected hashUtil: HashUtil; diff --git a/TypeScript/11BundleLoadingSample/types/utils/RandomUtil.d.ts b/TypeScript/11BundleLoadingSample/types/utils/RandomUtil.d.ts index 49f242d..0da184f 100644 --- a/TypeScript/11BundleLoadingSample/types/utils/RandomUtil.d.ts +++ b/TypeScript/11BundleLoadingSample/types/utils/RandomUtil.d.ts @@ -1,6 +1,6 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects * based on the relative probability of each of its elements. diff --git a/TypeScript/11BundleLoadingSample/types/utils/logging/AbstractWinstonLogger.d.ts b/TypeScript/11BundleLoadingSample/types/utils/logging/AbstractWinstonLogger.d.ts index 7098f85..ef54434 100644 --- a/TypeScript/11BundleLoadingSample/types/utils/logging/AbstractWinstonLogger.d.ts +++ b/TypeScript/11BundleLoadingSample/types/utils/logging/AbstractWinstonLogger.d.ts @@ -1,12 +1,12 @@ /// import fs from "node:fs"; -import winston from "winston"; import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; import { SptLogger } from "@spt/models/spt/logging/SptLogger"; import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; import { ILogger } from "@spt/models/spt/utils/ILogger"; +import winston from "winston"; export declare abstract class AbstractWinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected showDebugInConsole: boolean; diff --git a/TypeScript/12ClassExtensionOverride/types/controllers/BotController.d.ts b/TypeScript/12ClassExtensionOverride/types/controllers/BotController.d.ts index 6431fca..475f51b 100644 --- a/TypeScript/12ClassExtensionOverride/types/controllers/BotController.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/controllers/BotController.d.ts @@ -20,8 +20,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/12ClassExtensionOverride/types/controllers/BuildController.d.ts b/TypeScript/12ClassExtensionOverride/types/controllers/BuildController.d.ts index ed8adf6..2cb9c59 100644 --- a/TypeScript/12ClassExtensionOverride/types/controllers/BuildController.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/controllers/BuildController.d.ts @@ -9,8 +9,8 @@ import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BuildController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/12ClassExtensionOverride/types/controllers/GameController.d.ts b/TypeScript/12ClassExtensionOverride/types/controllers/GameController.d.ts index 533a81c..e219c04 100644 --- a/TypeScript/12ClassExtensionOverride/types/controllers/GameController.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/controllers/GameController.d.ts @@ -34,10 +34,10 @@ import { ProfileActivityService } from "@spt/services/ProfileActivityService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GameController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/12ClassExtensionOverride/types/controllers/HealthController.d.ts b/TypeScript/12ClassExtensionOverride/types/controllers/HealthController.d.ts index 5482283..5a0a0a6 100644 --- a/TypeScript/12ClassExtensionOverride/types/controllers/HealthController.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/controllers/HealthController.d.ts @@ -12,8 +12,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthController { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/12ClassExtensionOverride/types/controllers/HideoutController.d.ts b/TypeScript/12ClassExtensionOverride/types/controllers/HideoutController.d.ts index e9d1ed9..89a428c 100644 --- a/TypeScript/12ClassExtensionOverride/types/controllers/HideoutController.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/controllers/HideoutController.d.ts @@ -35,11 +35,11 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; import { ProfileActivityService } from "@spt/services/ProfileActivityService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/12ClassExtensionOverride/types/controllers/InraidController.d.ts b/TypeScript/12ClassExtensionOverride/types/controllers/InraidController.d.ts index 87f419b..9f0c409 100644 --- a/TypeScript/12ClassExtensionOverride/types/controllers/InraidController.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/controllers/InraidController.d.ts @@ -13,6 +13,7 @@ import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRe import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState"; import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig"; import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; @@ -31,7 +32,6 @@ import { PmcChatResponseService } from "@spt/services/PmcChatResponseService"; import { TraderServicesService } from "@spt/services/TraderServicesService"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; -import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; /** * Logic for handling In Raid callbacks */ diff --git a/TypeScript/12ClassExtensionOverride/types/controllers/InsuranceController.d.ts b/TypeScript/12ClassExtensionOverride/types/controllers/InsuranceController.d.ts index f921b83..543e915 100644 --- a/TypeScript/12ClassExtensionOverride/types/controllers/InsuranceController.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/controllers/InsuranceController.d.ts @@ -21,11 +21,11 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PaymentService } from "@spt/services/PaymentService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceController { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/12ClassExtensionOverride/types/controllers/InventoryController.d.ts b/TypeScript/12ClassExtensionOverride/types/controllers/InventoryController.d.ts index 40bb084..c986ce8 100644 --- a/TypeScript/12ClassExtensionOverride/types/controllers/InventoryController.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/controllers/InventoryController.d.ts @@ -37,10 +37,10 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MapMarkerService } from "@spt/services/MapMarkerService"; import { PlayerService } from "@spt/services/PlayerService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/12ClassExtensionOverride/types/controllers/LocationController.d.ts b/TypeScript/12ClassExtensionOverride/types/controllers/LocationController.d.ts index 727a8c8..a541b9c 100644 --- a/TypeScript/12ClassExtensionOverride/types/controllers/LocationController.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/controllers/LocationController.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class LocationController { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; diff --git a/TypeScript/12ClassExtensionOverride/types/controllers/ProfileController.d.ts b/TypeScript/12ClassExtensionOverride/types/controllers/ProfileController.d.ts index e8dae73..7e6d35c 100644 --- a/TypeScript/12ClassExtensionOverride/types/controllers/ProfileController.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/controllers/ProfileController.d.ts @@ -26,9 +26,9 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/12ClassExtensionOverride/types/controllers/QuestController.d.ts b/TypeScript/12ClassExtensionOverride/types/controllers/QuestController.d.ts index 3cdce00..6a5b415 100644 --- a/TypeScript/12ClassExtensionOverride/types/controllers/QuestController.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/controllers/QuestController.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/12ClassExtensionOverride/types/controllers/RepeatableQuestController.d.ts b/TypeScript/12ClassExtensionOverride/types/controllers/RepeatableQuestController.d.ts index 74f39eb..016f8c6 100644 --- a/TypeScript/12ClassExtensionOverride/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/controllers/RepeatableQuestController.d.ts @@ -18,11 +18,11 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/12ClassExtensionOverride/types/controllers/TradeController.d.ts b/TypeScript/12ClassExtensionOverride/types/controllers/TradeController.d.ts index bc72e92..842a97b 100644 --- a/TypeScript/12ClassExtensionOverride/types/controllers/TradeController.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/controllers/TradeController.d.ts @@ -1,5 +1,6 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper"; import { TradeHelper } from "@spt/helpers/TradeHelper"; import { TraderHelper } from "@spt/helpers/TraderHelper"; import { IPmcData } from "@spt/models/eft/common/IPmcData"; @@ -35,6 +36,7 @@ export declare class TradeController { protected hashUtil: HashUtil; protected itemHelper: ItemHelper; protected profileHelper: ProfileHelper; + protected ragfairOfferHelper: RagfairOfferHelper; protected traderHelper: TraderHelper; protected ragfairServer: RagfairServer; protected httpResponse: HttpResponseUtil; @@ -44,7 +46,7 @@ export declare class TradeController { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairOfferHelper: RagfairOfferHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); /** Handle TradingConfirm event */ confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; /** Handle RagFairBuyOffer event */ @@ -67,10 +69,17 @@ export declare class TradeController { * @param output Output to send back to client */ protected buyPmcItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void; + /** + * Is the provided offerid and ownerid from a player made offer + * @param offerId Id of the offer + * @param offerOwnerId Owner id + * @returns true if offer was made by a player + */ + protected isPlayerOffer(offerId: string, offerOwnerId: string): boolean; /** * Does Player have necessary trader loyalty to purchase flea offer * @param sellerIsTrader is seller trader - * @param fleaOffer FLea offer being bought + * @param fleaOffer Flea offer being bought * @param pmcData Player profile * @returns True if player can buy offer */ diff --git a/TypeScript/12ClassExtensionOverride/types/controllers/TraderController.d.ts b/TypeScript/12ClassExtensionOverride/types/controllers/TraderController.d.ts index 7fc6d78..3592fc6 100644 --- a/TypeScript/12ClassExtensionOverride/types/controllers/TraderController.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/controllers/TraderController.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/12ClassExtensionOverride/types/generators/BotEquipmentModGenerator.d.ts b/TypeScript/12ClassExtensionOverride/types/generators/BotEquipmentModGenerator.d.ts index 419120f..3952293 100644 --- a/TypeScript/12ClassExtensionOverride/types/generators/BotEquipmentModGenerator.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/generators/BotEquipmentModGenerator.d.ts @@ -25,9 +25,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotEquipmentModGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -65,7 +65,7 @@ export declare class BotEquipmentModGenerator { * @param settings Bot equipment generation settings * @param modSlot Armor slot being filtered * @param existingPlateTplPool Plates tpls to choose from - * @param armorItem + * @param armorItem The armor items db template * @returns Array of plate tpls to choose from */ protected filterPlateModsForSlotByLevel(settings: IGenerateEquipmentProperties, modSlot: string, existingPlateTplPool: string[], armorItem: ITemplateItem): IFilterPlateModsForSlotByLevelResult; diff --git a/TypeScript/12ClassExtensionOverride/types/generators/BotGenerator.d.ts b/TypeScript/12ClassExtensionOverride/types/generators/BotGenerator.d.ts index 8ab4371..ebb8a59 100644 --- a/TypeScript/12ClassExtensionOverride/types/generators/BotGenerator.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/generators/BotGenerator.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/12ClassExtensionOverride/types/generators/BotLevelGenerator.d.ts b/TypeScript/12ClassExtensionOverride/types/generators/BotLevelGenerator.d.ts index dee61e2..a8a8895 100644 --- a/TypeScript/12ClassExtensionOverride/types/generators/BotLevelGenerator.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/generators/BotLevelGenerator.d.ts @@ -4,12 +4,14 @@ import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; +import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class BotLevelGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; protected databaseService: DatabaseService; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService); + protected mathUtil: MathUtil; + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, mathUtil: MathUtil); /** * Return a randomised bot level and exp value * @param levelDetails Min and max of level for bot @@ -18,6 +20,7 @@ export declare class BotLevelGenerator { * @returns IRandomisedBotLevelResult object */ generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult; + protected chooseBotLevel(min: number, max: number, shift: number, number: number): number; /** * Get the highest level a bot can be relative to the players level, but no further than the max size from globals.exp_table * @param botGenerationDetails Details to help generate a bot diff --git a/TypeScript/12ClassExtensionOverride/types/generators/BotLootGenerator.d.ts b/TypeScript/12ClassExtensionOverride/types/generators/BotLootGenerator.d.ts index fee56ce..c0583c6 100644 --- a/TypeScript/12ClassExtensionOverride/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/generators/BotLootGenerator.d.ts @@ -18,9 +18,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/12ClassExtensionOverride/types/generators/BotWeaponGenerator.d.ts b/TypeScript/12ClassExtensionOverride/types/generators/BotWeaponGenerator.d.ts index 5559bfa..8e03b35 100644 --- a/TypeScript/12ClassExtensionOverride/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/generators/BotWeaponGenerator.d.ts @@ -18,9 +18,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RepairService } from "@spt/services/RepairService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotWeaponGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/12ClassExtensionOverride/types/generators/LocationGenerator.d.ts b/TypeScript/12ClassExtensionOverride/types/generators/LocationGenerator.d.ts index 222b0ab..9a2b0c4 100644 --- a/TypeScript/12ClassExtensionOverride/types/generators/LocationGenerator.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/generators/LocationGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export interface IContainerItem { items: Item[]; width: number; diff --git a/TypeScript/12ClassExtensionOverride/types/generators/PlayerScavGenerator.d.ts b/TypeScript/12ClassExtensionOverride/types/generators/PlayerScavGenerator.d.ts index 2414150..e317bf6 100644 --- a/TypeScript/12ClassExtensionOverride/types/generators/PlayerScavGenerator.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/generators/PlayerScavGenerator.d.ts @@ -14,9 +14,9 @@ import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class PlayerScavGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/12ClassExtensionOverride/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/12ClassExtensionOverride/types/generators/RagfairOfferGenerator.d.ts index 9435390..ca09729 100644 --- a/TypeScript/12ClassExtensionOverride/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/generators/RagfairOfferGenerator.d.ts @@ -19,10 +19,10 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/12ClassExtensionOverride/types/generators/RepeatableQuestGenerator.d.ts b/TypeScript/12ClassExtensionOverride/types/generators/RepeatableQuestGenerator.d.ts index 77c4e79..339f322 100644 --- a/TypeScript/12ClassExtensionOverride/types/generators/RepeatableQuestGenerator.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/generators/RepeatableQuestGenerator.d.ts @@ -11,10 +11,10 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/12ClassExtensionOverride/types/generators/RepeatableQuestRewardGenerator.d.ts b/TypeScript/12ClassExtensionOverride/types/generators/RepeatableQuestRewardGenerator.d.ts index 1e09994..713a394 100644 --- a/TypeScript/12ClassExtensionOverride/types/generators/RepeatableQuestRewardGenerator.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/generators/RepeatableQuestRewardGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestRewardGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/12ClassExtensionOverride/types/helpers/BotDifficultyHelper.d.ts b/TypeScript/12ClassExtensionOverride/types/helpers/BotDifficultyHelper.d.ts index 63572a5..2348bd3 100644 --- a/TypeScript/12ClassExtensionOverride/types/helpers/BotDifficultyHelper.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/helpers/BotDifficultyHelper.d.ts @@ -5,8 +5,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotDifficultyHelper { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/12ClassExtensionOverride/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/12ClassExtensionOverride/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index c51bf7e..c38f0a0 100644 --- a/TypeScript/12ClassExtensionOverride/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GiveSptCommand implements ISptCommand { protected logger: ILogger; protected itemHelper: ItemHelper; diff --git a/TypeScript/12ClassExtensionOverride/types/helpers/HealthHelper.d.ts b/TypeScript/12ClassExtensionOverride/types/helpers/HealthHelper.d.ts index 650f633..a164285 100644 --- a/TypeScript/12ClassExtensionOverride/types/helpers/HealthHelper.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/helpers/HealthHelper.d.ts @@ -5,8 +5,8 @@ import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/12ClassExtensionOverride/types/helpers/HideoutHelper.d.ts b/TypeScript/12ClassExtensionOverride/types/helpers/HideoutHelper.d.ts index c4aaa4c..df0376b 100644 --- a/TypeScript/12ClassExtensionOverride/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/helpers/HideoutHelper.d.ts @@ -18,10 +18,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/12ClassExtensionOverride/types/helpers/InRaidHelper.d.ts b/TypeScript/12ClassExtensionOverride/types/helpers/InRaidHelper.d.ts index 449be9f..987c9ec 100644 --- a/TypeScript/12ClassExtensionOverride/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/helpers/InRaidHelper.d.ts @@ -15,9 +15,9 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InRaidHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/12ClassExtensionOverride/types/helpers/InventoryHelper.d.ts b/TypeScript/12ClassExtensionOverride/types/helpers/InventoryHelper.d.ts index f0ff69a..92bb49c 100644 --- a/TypeScript/12ClassExtensionOverride/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/helpers/InventoryHelper.d.ts @@ -23,9 +23,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/12ClassExtensionOverride/types/helpers/ItemHelper.d.ts b/TypeScript/12ClassExtensionOverride/types/helpers/ItemHelper.d.ts index da5dd11..c304cee 100644 --- a/TypeScript/12ClassExtensionOverride/types/helpers/ItemHelper.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/helpers/ItemHelper.d.ts @@ -11,13 +11,13 @@ import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { CompareUtil } from "@spt/utils/CompareUtil"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ItemHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/12ClassExtensionOverride/types/helpers/ProfileHelper.d.ts b/TypeScript/12ClassExtensionOverride/types/helpers/ProfileHelper.d.ts index 0671179..cdab870 100644 --- a/TypeScript/12ClassExtensionOverride/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/helpers/ProfileHelper.d.ts @@ -11,10 +11,10 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/12ClassExtensionOverride/types/helpers/QuestHelper.d.ts b/TypeScript/12ClassExtensionOverride/types/helpers/QuestHelper.d.ts index 2b84b8f..2d5730d 100644 --- a/TypeScript/12ClassExtensionOverride/types/helpers/QuestHelper.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/helpers/QuestHelper.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/12ClassExtensionOverride/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/12ClassExtensionOverride/types/helpers/RagfairOfferHelper.d.ts index b526554..2386316 100644 --- a/TypeScript/12ClassExtensionOverride/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/helpers/RagfairOfferHelper.d.ts @@ -151,7 +151,7 @@ export declare class RagfairOfferHelper { * @param boughtAmount Amount item was purchased for * @returns IItemEventRouterResponse */ - protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; + completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; /** * Get a localised message for when players offer has sold on flea * @param itemTpl Item sold diff --git a/TypeScript/12ClassExtensionOverride/types/helpers/RagfairServerHelper.d.ts b/TypeScript/12ClassExtensionOverride/types/helpers/RagfairServerHelper.d.ts index 927caf5..3e1fea9 100644 --- a/TypeScript/12ClassExtensionOverride/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/helpers/RagfairServerHelper.d.ts @@ -12,9 +12,9 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Helper class for common ragfair server actions */ diff --git a/TypeScript/12ClassExtensionOverride/types/helpers/RepairHelper.d.ts b/TypeScript/12ClassExtensionOverride/types/helpers/RepairHelper.d.ts index 99a21da..63c78c9 100644 --- a/TypeScript/12ClassExtensionOverride/types/helpers/RepairHelper.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/helpers/RepairHelper.d.ts @@ -4,8 +4,8 @@ import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/12ClassExtensionOverride/types/helpers/RepeatableQuestHelper.d.ts b/TypeScript/12ClassExtensionOverride/types/helpers/RepeatableQuestHelper.d.ts index d92657e..8c65f40 100644 --- a/TypeScript/12ClassExtensionOverride/types/helpers/RepeatableQuestHelper.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/helpers/RepeatableQuestHelper.d.ts @@ -1,8 +1,8 @@ import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestHelper { protected mathUtil: MathUtil; protected configServer: ConfigServer; diff --git a/TypeScript/12ClassExtensionOverride/types/helpers/TradeHelper.d.ts b/TypeScript/12ClassExtensionOverride/types/helpers/TradeHelper.d.ts index f994fda..6e6f3a2 100644 --- a/TypeScript/12ClassExtensionOverride/types/helpers/TradeHelper.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/helpers/TradeHelper.d.ts @@ -17,8 +17,8 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TradeHelper { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/12ClassExtensionOverride/types/helpers/TraderAssortHelper.d.ts b/TypeScript/12ClassExtensionOverride/types/helpers/TraderAssortHelper.d.ts index 8f8f802..f1ecd3b 100644 --- a/TypeScript/12ClassExtensionOverride/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/helpers/TraderAssortHelper.d.ts @@ -14,9 +14,9 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; diff --git a/TypeScript/12ClassExtensionOverride/types/loaders/BundleLoader.d.ts b/TypeScript/12ClassExtensionOverride/types/loaders/BundleLoader.d.ts index e270988..8c0ed4d 100644 --- a/TypeScript/12ClassExtensionOverride/types/loaders/BundleLoader.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/loaders/BundleLoader.d.ts @@ -1,8 +1,8 @@ import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BundleInfo { modpath: string; filename: string; diff --git a/TypeScript/12ClassExtensionOverride/types/loaders/PostDBModLoader.d.ts b/TypeScript/12ClassExtensionOverride/types/loaders/PostDBModLoader.d.ts index b0c4bf4..a8bb6a9 100644 --- a/TypeScript/12ClassExtensionOverride/types/loaders/PostDBModLoader.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/loaders/PostDBModLoader.d.ts @@ -1,10 +1,10 @@ -import { DependencyContainer } from "tsyringe"; import { OnLoad } from "@spt/di/OnLoad"; import { BundleLoader } from "@spt/loaders/BundleLoader"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostDBModLoader implements OnLoad { protected logger: ILogger; protected bundleLoader: BundleLoader; diff --git a/TypeScript/12ClassExtensionOverride/types/loaders/PostSptModLoader.d.ts b/TypeScript/12ClassExtensionOverride/types/loaders/PostSptModLoader.d.ts index fb54579..2603497 100644 --- a/TypeScript/12ClassExtensionOverride/types/loaders/PostSptModLoader.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/loaders/PostSptModLoader.d.ts @@ -1,9 +1,9 @@ -import { DependencyContainer } from "tsyringe"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { IModLoader } from "@spt/models/spt/mod/IModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostSptModLoader implements IModLoader { protected logger: ILogger; protected preSptModLoader: PreSptModLoader; diff --git a/TypeScript/12ClassExtensionOverride/types/loaders/PreSptModLoader.d.ts b/TypeScript/12ClassExtensionOverride/types/loaders/PreSptModLoader.d.ts index bc846c8..8814525 100644 --- a/TypeScript/12ClassExtensionOverride/types/loaders/PreSptModLoader.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/loaders/PreSptModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { ModDetails } from "@spt/models/eft/profile/ISptProfile"; @@ -11,6 +10,7 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { ModCompilerService } from "@spt/services/ModCompilerService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { DependencyContainer } from "tsyringe"; export declare class PreSptModLoader implements IModLoader { protected logger: ILogger; protected vfs: VFS; diff --git a/TypeScript/12ClassExtensionOverride/types/models/eft/common/IEmptyRequestData.d.ts b/TypeScript/12ClassExtensionOverride/types/models/eft/common/IEmptyRequestData.d.ts index 284d16e..52a7b12 100644 --- a/TypeScript/12ClassExtensionOverride/types/models/eft/common/IEmptyRequestData.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/models/eft/common/IEmptyRequestData.d.ts @@ -1,2 +1 @@ -export interface IEmptyRequestData { -} +export type IEmptyRequestData = {}; diff --git a/TypeScript/12ClassExtensionOverride/types/models/eft/common/tables/IBotBase.d.ts b/TypeScript/12ClassExtensionOverride/types/models/eft/common/tables/IBotBase.d.ts index a7fe1ca..be37845 100644 --- a/TypeScript/12ClassExtensionOverride/types/models/eft/common/tables/IBotBase.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/models/eft/common/tables/IBotBase.d.ts @@ -373,8 +373,7 @@ export interface LastCompleted { export interface Notes { Notes: Note[]; } -export interface CarExtractCounts { -} +export type CarExtractCounts = {}; export declare enum SurvivorClass { UNKNOWN = 0, NEUTRALIZER = 1, diff --git a/TypeScript/12ClassExtensionOverride/types/models/eft/common/tables/ILocationsBase.d.ts b/TypeScript/12ClassExtensionOverride/types/models/eft/common/tables/ILocationsBase.d.ts index 2c96af3..16bca24 100644 --- a/TypeScript/12ClassExtensionOverride/types/models/eft/common/tables/ILocationsBase.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/models/eft/common/tables/ILocationsBase.d.ts @@ -2,8 +2,7 @@ export interface ILocationsBase { locations: Locations; paths: Path[]; } -export interface Locations { -} +export type Locations = {}; export interface Path { Source: string; Destination: string; diff --git a/TypeScript/12ClassExtensionOverride/types/models/eft/common/tables/IProfileTemplate.d.ts b/TypeScript/12ClassExtensionOverride/types/models/eft/common/tables/IProfileTemplate.d.ts index 20923bc..6ba9221 100644 --- a/TypeScript/12ClassExtensionOverride/types/models/eft/common/tables/IProfileTemplate.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -1,12 +1,12 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { Dialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; export interface IProfileTemplates { - "Standard": IProfileSides; + Standard: IProfileSides; "Left Behind": IProfileSides; "Prepare To Escape": IProfileSides; "Edge Of Darkness": IProfileSides; - "Unheard": IProfileSides; - "Tournament": IProfileSides; + Unheard: IProfileSides; + Tournament: IProfileSides; "SPT Developer": IProfileSides; "SPT Easy start": IProfileSides; "SPT Zero to hero": IProfileSides; diff --git a/TypeScript/12ClassExtensionOverride/types/models/eft/common/tables/ITrader.d.ts b/TypeScript/12ClassExtensionOverride/types/models/eft/common/tables/ITrader.d.ts index 14ab409..40cf004 100644 --- a/TypeScript/12ClassExtensionOverride/types/models/eft/common/tables/ITrader.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/models/eft/common/tables/ITrader.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; export interface ITrader { assort?: ITraderAssort; @@ -78,6 +79,8 @@ export interface IBarterScheme { _tpl: string; onlyFunctional?: boolean; sptQuestLocked?: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface ISuit { _id: string; diff --git a/TypeScript/12ClassExtensionOverride/types/models/eft/hideout/IQteData.d.ts b/TypeScript/12ClassExtensionOverride/types/models/eft/hideout/IQteData.d.ts index 7f507e1..fe6cce6 100644 --- a/TypeScript/12ClassExtensionOverride/types/models/eft/hideout/IQteData.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/models/eft/hideout/IQteData.d.ts @@ -1,14 +1,14 @@ import { Effect } from "@spt/models/eft/health/Effect"; import { BodyPart } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; import { QteActivityType } from "@spt/models/enums/hideout/QteActivityType"; import { QteEffectType } from "@spt/models/enums/hideout/QteEffectType"; import { QteResultType } from "@spt/models/enums/hideout/QteResultType"; import { QteRewardType } from "@spt/models/enums/hideout/QteRewardType"; import { QteType } from "@spt/models/enums/hideout/QteType"; import { RequirementType } from "@spt/models/enums/hideout/RequirementType"; -import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt/models/enums/SkillTypes"; -import { Traders } from "@spt/models/enums/Traders"; export interface IQteData { id: string; type: QteActivityType; diff --git a/TypeScript/12ClassExtensionOverride/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/12ClassExtensionOverride/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index f1123c1..5971372 100644 --- a/TypeScript/12ClassExtensionOverride/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -15,7 +15,5 @@ export interface Items { change: any[]; del: any[]; } -export interface Production { -} -export interface TraderRelations { -} +export type Production = {}; +export type TraderRelations = {}; diff --git a/TypeScript/12ClassExtensionOverride/types/models/eft/profile/ISptProfile.d.ts b/TypeScript/12ClassExtensionOverride/types/models/eft/profile/ISptProfile.d.ts index a8e742a..dd7aea6 100644 --- a/TypeScript/12ClassExtensionOverride/types/models/eft/profile/ISptProfile.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/models/eft/profile/ISptProfile.d.ts @@ -209,12 +209,9 @@ export interface Effects { LeftLeg: LeftLeg; RightLeg: RightLeg; } -export interface Head { -} -export interface Chest { -} -export interface Stomach { -} +export type Head = {}; +export type Chest = {}; +export type Stomach = {}; export interface LeftArm { Fracture?: number; } diff --git a/TypeScript/12ClassExtensionOverride/types/models/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/12ClassExtensionOverride/types/models/eft/ragfair/IRagfairOffer.d.ts index eeeb79d..f6c07fc 100644 --- a/TypeScript/12ClassExtensionOverride/types/models/eft/ragfair/IRagfairOffer.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/models/eft/ragfair/IRagfairOffer.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface IRagfairOffer { sellResult?: SellResult[]; @@ -28,6 +29,8 @@ export interface OfferRequirement { _tpl: string; count: number; onlyFunctional: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface IRagfairOfferUser { id: string; diff --git a/TypeScript/12ClassExtensionOverride/types/models/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/12ClassExtensionOverride/types/models/eft/ragfair/ISearchRequestData.d.ts index 8261c5b..c631de8 100644 --- a/TypeScript/12ClassExtensionOverride/types/models/eft/ragfair/ISearchRequestData.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/models/eft/ragfair/ISearchRequestData.d.ts @@ -29,5 +29,4 @@ export declare enum OfferOwnerType { TRADEROWNERTYPE = 1, PLAYEROWNERTYPE = 2 } -export interface BuildItems { -} +export type BuildItems = {}; diff --git a/TypeScript/12ClassExtensionOverride/types/models/enums/BaseClasses.d.ts b/TypeScript/12ClassExtensionOverride/types/models/enums/BaseClasses.d.ts index 65fc95e..32ebf7c 100644 --- a/TypeScript/12ClassExtensionOverride/types/models/enums/BaseClasses.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/models/enums/BaseClasses.d.ts @@ -107,6 +107,6 @@ export declare enum BaseClasses { RECEIVER = "55818a304bdc2db5418b457d", BARREL = "555ef6e44bdc2de9068b457e", CHARGING_HANDLE = "55818a6f4bdc2db9688b456b", - COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569 ", + COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569", HIDEOUT_AREA_CONTAINER = "63da6da4784a55176c018dba" } diff --git a/TypeScript/12ClassExtensionOverride/types/models/enums/DogtagExchangeSide.d.ts b/TypeScript/12ClassExtensionOverride/types/models/enums/DogtagExchangeSide.d.ts new file mode 100644 index 0000000..de3d4df --- /dev/null +++ b/TypeScript/12ClassExtensionOverride/types/models/enums/DogtagExchangeSide.d.ts @@ -0,0 +1,5 @@ +export declare enum DogtagExchangeSide { + USEC = "Usec", + BEAR = "Bear", + ANY = "Any" +} diff --git a/TypeScript/12ClassExtensionOverride/types/models/spt/server/ExhaustableArray.d.ts b/TypeScript/12ClassExtensionOverride/types/models/spt/server/ExhaustableArray.d.ts index c27f41f..50a6b68 100644 --- a/TypeScript/12ClassExtensionOverride/types/models/spt/server/ExhaustableArray.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/models/spt/server/ExhaustableArray.d.ts @@ -1,5 +1,5 @@ -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ExhaustableArray implements IExhaustableArray { private itemPool; private randomUtil; diff --git a/TypeScript/12ClassExtensionOverride/types/routers/EventOutputHolder.d.ts b/TypeScript/12ClassExtensionOverride/types/routers/EventOutputHolder.d.ts index ef20706..148461a 100644 --- a/TypeScript/12ClassExtensionOverride/types/routers/EventOutputHolder.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/routers/EventOutputHolder.d.ts @@ -3,8 +3,8 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IHideoutImprovement, Productive, TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; import { TraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class EventOutputHolder { protected profileHelper: ProfileHelper; protected timeUtil: TimeUtil; @@ -12,7 +12,7 @@ export declare class EventOutputHolder { /** * What has client been informed of this game session * Key = sessionId, then second key is prod id - */ + */ protected clientActiveSessionStorage: Record>; diff --git a/TypeScript/12ClassExtensionOverride/types/servers/HttpServer.d.ts b/TypeScript/12ClassExtensionOverride/types/servers/HttpServer.d.ts index b00fe68..0024ba3 100644 --- a/TypeScript/12ClassExtensionOverride/types/servers/HttpServer.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/servers/HttpServer.d.ts @@ -6,8 +6,8 @@ import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; -import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { WebSocketServer } from "@spt/servers/WebSocketServer"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { LocalisationService } from "@spt/services/LocalisationService"; export declare class HttpServer { protected logger: ILogger; diff --git a/TypeScript/12ClassExtensionOverride/types/servers/WebSocketServer.d.ts b/TypeScript/12ClassExtensionOverride/types/servers/WebSocketServer.d.ts index f4e07bb..6121824 100644 --- a/TypeScript/12ClassExtensionOverride/types/servers/WebSocketServer.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/servers/WebSocketServer.d.ts @@ -1,12 +1,12 @@ /// import http, { IncomingMessage } from "node:http"; -import { WebSocket, Server } from "ws"; import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { Server, WebSocket } from "ws"; export declare class WebSocketServer { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/12ClassExtensionOverride/types/servers/ws/SptWebSocketConnectionHandler.d.ts b/TypeScript/12ClassExtensionOverride/types/servers/ws/SptWebSocketConnectionHandler.d.ts index 98d0898..70fc96a 100644 --- a/TypeScript/12ClassExtensionOverride/types/servers/ws/SptWebSocketConnectionHandler.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/servers/ws/SptWebSocketConnectionHandler.d.ts @@ -1,7 +1,6 @@ /// /// import { IncomingMessage } from "http"; -import { WebSocket } from "ws"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; @@ -11,6 +10,7 @@ import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectio import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; +import { WebSocket } from "ws"; export declare class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler { protected logger: ILogger; protected profileHelper: ProfileHelper; diff --git a/TypeScript/12ClassExtensionOverride/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts b/TypeScript/12ClassExtensionOverride/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts index d5247ec..5556129 100644 --- a/TypeScript/12ClassExtensionOverride/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts @@ -1,6 +1,6 @@ -import { RawData, WebSocket } from "ws"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; +import { RawData, WebSocket } from "ws"; export declare class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler { protected logger: ILogger; constructor(logger: ILogger); diff --git a/TypeScript/12ClassExtensionOverride/types/services/FenceService.d.ts b/TypeScript/12ClassExtensionOverride/types/services/FenceService.d.ts index c156122..58dc076 100644 --- a/TypeScript/12ClassExtensionOverride/types/services/FenceService.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/services/FenceService.d.ts @@ -13,9 +13,9 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Handle actions surrounding Fence * e.g. generating or refreshing assorts / get next refresh time diff --git a/TypeScript/12ClassExtensionOverride/types/services/InsuranceService.d.ts b/TypeScript/12ClassExtensionOverride/types/services/InsuranceService.d.ts index 0000e66..f799102 100644 --- a/TypeScript/12ClassExtensionOverride/types/services/InsuranceService.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/services/InsuranceService.d.ts @@ -18,10 +18,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceService { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/12ClassExtensionOverride/types/services/LocalisationService.d.ts b/TypeScript/12ClassExtensionOverride/types/services/LocalisationService.d.ts index 42dfa4e..855c138 100644 --- a/TypeScript/12ClassExtensionOverride/types/services/LocalisationService.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/services/LocalisationService.d.ts @@ -1,8 +1,8 @@ -import { I18n } from "i18n"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { LocaleService } from "@spt/services/LocaleService"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { I18n } from "i18n"; /** * Handles translating server text into different langauges */ diff --git a/TypeScript/12ClassExtensionOverride/types/services/ProfileFixerService.d.ts b/TypeScript/12ClassExtensionOverride/types/services/ProfileFixerService.d.ts index 525b867..91e4780 100644 --- a/TypeScript/12ClassExtensionOverride/types/services/ProfileFixerService.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/services/ProfileFixerService.d.ts @@ -8,7 +8,7 @@ import { Bonus, HideoutSlot } from "@spt/models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea"; -import { ISptProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; +import { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; @@ -16,11 +16,11 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileFixerService { protected logger: ILogger; protected watermark: Watermark; @@ -73,6 +73,7 @@ export declare class ProfileFixerService { */ protected removeDanglingTaskConditionCounters(pmcProfile: IPmcData): void; protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullRagfairRatings(pmcProfile: IPmcData): void; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; /** diff --git a/TypeScript/12ClassExtensionOverride/types/services/RagfairOfferService.d.ts b/TypeScript/12ClassExtensionOverride/types/services/RagfairOfferService.d.ts index 6c13b1d..98dd179 100644 --- a/TypeScript/12ClassExtensionOverride/types/services/RagfairOfferService.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/services/RagfairOfferService.d.ts @@ -10,10 +10,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/12ClassExtensionOverride/types/services/mod/CustomItemService.d.ts b/TypeScript/12ClassExtensionOverride/types/services/mod/CustomItemService.d.ts index 1926bed..f112872 100644 --- a/TypeScript/12ClassExtensionOverride/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/services/mod/CustomItemService.d.ts @@ -4,8 +4,8 @@ import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetail import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/12ClassExtensionOverride/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/12ClassExtensionOverride/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts index 3c9d955..91c84d9 100644 --- a/TypeScript/12ClassExtensionOverride/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class DynamicRouterModService { private container; constructor(container: DependencyContainer); diff --git a/TypeScript/12ClassExtensionOverride/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/12ClassExtensionOverride/types/services/mod/staticRouter/StaticRouterModService.d.ts index f60432d..0c3d4d8 100644 --- a/TypeScript/12ClassExtensionOverride/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class StaticRouterModService { protected container: DependencyContainer; constructor(container: DependencyContainer); diff --git a/TypeScript/12ClassExtensionOverride/types/utils/JsonUtil.d.ts b/TypeScript/12ClassExtensionOverride/types/utils/JsonUtil.d.ts index b30822c..4419228 100644 --- a/TypeScript/12ClassExtensionOverride/types/utils/JsonUtil.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/utils/JsonUtil.d.ts @@ -1,7 +1,7 @@ -import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { HashUtil } from "@spt/utils/HashUtil"; import { VFS } from "@spt/utils/VFS"; +import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; export declare class JsonUtil { protected vfs: VFS; protected hashUtil: HashUtil; diff --git a/TypeScript/12ClassExtensionOverride/types/utils/RandomUtil.d.ts b/TypeScript/12ClassExtensionOverride/types/utils/RandomUtil.d.ts index 49f242d..0da184f 100644 --- a/TypeScript/12ClassExtensionOverride/types/utils/RandomUtil.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/utils/RandomUtil.d.ts @@ -1,6 +1,6 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects * based on the relative probability of each of its elements. diff --git a/TypeScript/12ClassExtensionOverride/types/utils/logging/AbstractWinstonLogger.d.ts b/TypeScript/12ClassExtensionOverride/types/utils/logging/AbstractWinstonLogger.d.ts index 7098f85..ef54434 100644 --- a/TypeScript/12ClassExtensionOverride/types/utils/logging/AbstractWinstonLogger.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/utils/logging/AbstractWinstonLogger.d.ts @@ -1,12 +1,12 @@ /// import fs from "node:fs"; -import winston from "winston"; import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; import { SptLogger } from "@spt/models/spt/logging/SptLogger"; import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; import { ILogger } from "@spt/models/spt/utils/ILogger"; +import winston from "winston"; export declare abstract class AbstractWinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected showDebugInConsole: boolean; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/BotController.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/BotController.d.ts index 6431fca..475f51b 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/BotController.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/BotController.d.ts @@ -20,8 +20,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/BuildController.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/BuildController.d.ts index ed8adf6..2cb9c59 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/BuildController.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/BuildController.d.ts @@ -9,8 +9,8 @@ import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BuildController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/GameController.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/GameController.d.ts index 533a81c..e219c04 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/GameController.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/GameController.d.ts @@ -34,10 +34,10 @@ import { ProfileActivityService } from "@spt/services/ProfileActivityService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GameController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/HealthController.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/HealthController.d.ts index 5482283..5a0a0a6 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/HealthController.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/HealthController.d.ts @@ -12,8 +12,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthController { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/HideoutController.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/HideoutController.d.ts index e9d1ed9..89a428c 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/HideoutController.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/HideoutController.d.ts @@ -35,11 +35,11 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; import { ProfileActivityService } from "@spt/services/ProfileActivityService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/InraidController.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/InraidController.d.ts index 87f419b..9f0c409 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/InraidController.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/InraidController.d.ts @@ -13,6 +13,7 @@ import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRe import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState"; import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig"; import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; @@ -31,7 +32,6 @@ import { PmcChatResponseService } from "@spt/services/PmcChatResponseService"; import { TraderServicesService } from "@spt/services/TraderServicesService"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; -import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; /** * Logic for handling In Raid callbacks */ diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/InsuranceController.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/InsuranceController.d.ts index f921b83..543e915 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/InsuranceController.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/InsuranceController.d.ts @@ -21,11 +21,11 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PaymentService } from "@spt/services/PaymentService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceController { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/InventoryController.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/InventoryController.d.ts index 40bb084..c986ce8 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/InventoryController.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/InventoryController.d.ts @@ -37,10 +37,10 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MapMarkerService } from "@spt/services/MapMarkerService"; import { PlayerService } from "@spt/services/PlayerService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/LocationController.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/LocationController.d.ts index 727a8c8..a541b9c 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/LocationController.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/LocationController.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class LocationController { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/ProfileController.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/ProfileController.d.ts index e8dae73..7e6d35c 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/ProfileController.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/ProfileController.d.ts @@ -26,9 +26,9 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/QuestController.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/QuestController.d.ts index 3cdce00..6a5b415 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/QuestController.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/QuestController.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/RepeatableQuestController.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/RepeatableQuestController.d.ts index 74f39eb..016f8c6 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/RepeatableQuestController.d.ts @@ -18,11 +18,11 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/TradeController.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/TradeController.d.ts index bc72e92..842a97b 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/TradeController.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/TradeController.d.ts @@ -1,5 +1,6 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper"; import { TradeHelper } from "@spt/helpers/TradeHelper"; import { TraderHelper } from "@spt/helpers/TraderHelper"; import { IPmcData } from "@spt/models/eft/common/IPmcData"; @@ -35,6 +36,7 @@ export declare class TradeController { protected hashUtil: HashUtil; protected itemHelper: ItemHelper; protected profileHelper: ProfileHelper; + protected ragfairOfferHelper: RagfairOfferHelper; protected traderHelper: TraderHelper; protected ragfairServer: RagfairServer; protected httpResponse: HttpResponseUtil; @@ -44,7 +46,7 @@ export declare class TradeController { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairOfferHelper: RagfairOfferHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); /** Handle TradingConfirm event */ confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; /** Handle RagFairBuyOffer event */ @@ -67,10 +69,17 @@ export declare class TradeController { * @param output Output to send back to client */ protected buyPmcItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void; + /** + * Is the provided offerid and ownerid from a player made offer + * @param offerId Id of the offer + * @param offerOwnerId Owner id + * @returns true if offer was made by a player + */ + protected isPlayerOffer(offerId: string, offerOwnerId: string): boolean; /** * Does Player have necessary trader loyalty to purchase flea offer * @param sellerIsTrader is seller trader - * @param fleaOffer FLea offer being bought + * @param fleaOffer Flea offer being bought * @param pmcData Player profile * @returns True if player can buy offer */ diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/TraderController.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/TraderController.d.ts index 7fc6d78..3592fc6 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/TraderController.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/controllers/TraderController.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/generators/BotEquipmentModGenerator.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/generators/BotEquipmentModGenerator.d.ts index 419120f..3952293 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/generators/BotEquipmentModGenerator.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/generators/BotEquipmentModGenerator.d.ts @@ -25,9 +25,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotEquipmentModGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -65,7 +65,7 @@ export declare class BotEquipmentModGenerator { * @param settings Bot equipment generation settings * @param modSlot Armor slot being filtered * @param existingPlateTplPool Plates tpls to choose from - * @param armorItem + * @param armorItem The armor items db template * @returns Array of plate tpls to choose from */ protected filterPlateModsForSlotByLevel(settings: IGenerateEquipmentProperties, modSlot: string, existingPlateTplPool: string[], armorItem: ITemplateItem): IFilterPlateModsForSlotByLevelResult; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/generators/BotGenerator.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/generators/BotGenerator.d.ts index 8ab4371..ebb8a59 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/generators/BotGenerator.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/generators/BotGenerator.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/generators/BotLevelGenerator.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/generators/BotLevelGenerator.d.ts index dee61e2..a8a8895 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/generators/BotLevelGenerator.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/generators/BotLevelGenerator.d.ts @@ -4,12 +4,14 @@ import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; +import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class BotLevelGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; protected databaseService: DatabaseService; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService); + protected mathUtil: MathUtil; + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, mathUtil: MathUtil); /** * Return a randomised bot level and exp value * @param levelDetails Min and max of level for bot @@ -18,6 +20,7 @@ export declare class BotLevelGenerator { * @returns IRandomisedBotLevelResult object */ generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult; + protected chooseBotLevel(min: number, max: number, shift: number, number: number): number; /** * Get the highest level a bot can be relative to the players level, but no further than the max size from globals.exp_table * @param botGenerationDetails Details to help generate a bot diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/generators/BotLootGenerator.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/generators/BotLootGenerator.d.ts index fee56ce..c0583c6 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/generators/BotLootGenerator.d.ts @@ -18,9 +18,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/generators/BotWeaponGenerator.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/generators/BotWeaponGenerator.d.ts index 5559bfa..8e03b35 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/generators/BotWeaponGenerator.d.ts @@ -18,9 +18,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RepairService } from "@spt/services/RepairService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotWeaponGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/generators/LocationGenerator.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/generators/LocationGenerator.d.ts index 222b0ab..9a2b0c4 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/generators/LocationGenerator.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/generators/LocationGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export interface IContainerItem { items: Item[]; width: number; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/generators/PlayerScavGenerator.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/generators/PlayerScavGenerator.d.ts index 2414150..e317bf6 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/generators/PlayerScavGenerator.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/generators/PlayerScavGenerator.d.ts @@ -14,9 +14,9 @@ import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class PlayerScavGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/generators/RagfairOfferGenerator.d.ts index 9435390..ca09729 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/generators/RagfairOfferGenerator.d.ts @@ -19,10 +19,10 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/generators/RepeatableQuestGenerator.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/generators/RepeatableQuestGenerator.d.ts index 77c4e79..339f322 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/generators/RepeatableQuestGenerator.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/generators/RepeatableQuestGenerator.d.ts @@ -11,10 +11,10 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/generators/RepeatableQuestRewardGenerator.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/generators/RepeatableQuestRewardGenerator.d.ts index 1e09994..713a394 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/generators/RepeatableQuestRewardGenerator.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/generators/RepeatableQuestRewardGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestRewardGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/BotDifficultyHelper.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/BotDifficultyHelper.d.ts index 63572a5..2348bd3 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/BotDifficultyHelper.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/BotDifficultyHelper.d.ts @@ -5,8 +5,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotDifficultyHelper { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index c51bf7e..c38f0a0 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GiveSptCommand implements ISptCommand { protected logger: ILogger; protected itemHelper: ItemHelper; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/HealthHelper.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/HealthHelper.d.ts index 650f633..a164285 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/HealthHelper.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/HealthHelper.d.ts @@ -5,8 +5,8 @@ import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/HideoutHelper.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/HideoutHelper.d.ts index c4aaa4c..df0376b 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/HideoutHelper.d.ts @@ -18,10 +18,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/InRaidHelper.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/InRaidHelper.d.ts index 449be9f..987c9ec 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/InRaidHelper.d.ts @@ -15,9 +15,9 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InRaidHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/InventoryHelper.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/InventoryHelper.d.ts index f0ff69a..92bb49c 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/InventoryHelper.d.ts @@ -23,9 +23,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/ItemHelper.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/ItemHelper.d.ts index da5dd11..c304cee 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/ItemHelper.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/ItemHelper.d.ts @@ -11,13 +11,13 @@ import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { CompareUtil } from "@spt/utils/CompareUtil"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ItemHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/ProfileHelper.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/ProfileHelper.d.ts index 0671179..cdab870 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/ProfileHelper.d.ts @@ -11,10 +11,10 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/QuestHelper.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/QuestHelper.d.ts index 2b84b8f..2d5730d 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/QuestHelper.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/QuestHelper.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/RagfairOfferHelper.d.ts index b526554..2386316 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/RagfairOfferHelper.d.ts @@ -151,7 +151,7 @@ export declare class RagfairOfferHelper { * @param boughtAmount Amount item was purchased for * @returns IItemEventRouterResponse */ - protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; + completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; /** * Get a localised message for when players offer has sold on flea * @param itemTpl Item sold diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/RagfairServerHelper.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/RagfairServerHelper.d.ts index 927caf5..3e1fea9 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/RagfairServerHelper.d.ts @@ -12,9 +12,9 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Helper class for common ragfair server actions */ diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/RepairHelper.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/RepairHelper.d.ts index 99a21da..63c78c9 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/RepairHelper.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/RepairHelper.d.ts @@ -4,8 +4,8 @@ import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/RepeatableQuestHelper.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/RepeatableQuestHelper.d.ts index d92657e..8c65f40 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/RepeatableQuestHelper.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/RepeatableQuestHelper.d.ts @@ -1,8 +1,8 @@ import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestHelper { protected mathUtil: MathUtil; protected configServer: ConfigServer; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/TradeHelper.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/TradeHelper.d.ts index f994fda..6e6f3a2 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/TradeHelper.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/TradeHelper.d.ts @@ -17,8 +17,8 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TradeHelper { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/TraderAssortHelper.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/TraderAssortHelper.d.ts index 8f8f802..f1ecd3b 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/helpers/TraderAssortHelper.d.ts @@ -14,9 +14,9 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/loaders/BundleLoader.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/loaders/BundleLoader.d.ts index e270988..8c0ed4d 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/loaders/BundleLoader.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/loaders/BundleLoader.d.ts @@ -1,8 +1,8 @@ import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BundleInfo { modpath: string; filename: string; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/loaders/PostDBModLoader.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/loaders/PostDBModLoader.d.ts index b0c4bf4..a8bb6a9 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/loaders/PostDBModLoader.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/loaders/PostDBModLoader.d.ts @@ -1,10 +1,10 @@ -import { DependencyContainer } from "tsyringe"; import { OnLoad } from "@spt/di/OnLoad"; import { BundleLoader } from "@spt/loaders/BundleLoader"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostDBModLoader implements OnLoad { protected logger: ILogger; protected bundleLoader: BundleLoader; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/loaders/PostSptModLoader.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/loaders/PostSptModLoader.d.ts index fb54579..2603497 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/loaders/PostSptModLoader.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/loaders/PostSptModLoader.d.ts @@ -1,9 +1,9 @@ -import { DependencyContainer } from "tsyringe"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { IModLoader } from "@spt/models/spt/mod/IModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostSptModLoader implements IModLoader { protected logger: ILogger; protected preSptModLoader: PreSptModLoader; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/loaders/PreSptModLoader.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/loaders/PreSptModLoader.d.ts index bc846c8..8814525 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/loaders/PreSptModLoader.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/loaders/PreSptModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { ModDetails } from "@spt/models/eft/profile/ISptProfile"; @@ -11,6 +10,7 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { ModCompilerService } from "@spt/services/ModCompilerService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { DependencyContainer } from "tsyringe"; export declare class PreSptModLoader implements IModLoader { protected logger: ILogger; protected vfs: VFS; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/common/IEmptyRequestData.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/common/IEmptyRequestData.d.ts index 284d16e..52a7b12 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/common/IEmptyRequestData.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/common/IEmptyRequestData.d.ts @@ -1,2 +1 @@ -export interface IEmptyRequestData { -} +export type IEmptyRequestData = {}; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/common/tables/IBotBase.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/common/tables/IBotBase.d.ts index a7fe1ca..be37845 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/common/tables/IBotBase.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/common/tables/IBotBase.d.ts @@ -373,8 +373,7 @@ export interface LastCompleted { export interface Notes { Notes: Note[]; } -export interface CarExtractCounts { -} +export type CarExtractCounts = {}; export declare enum SurvivorClass { UNKNOWN = 0, NEUTRALIZER = 1, diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/common/tables/ILocationsBase.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/common/tables/ILocationsBase.d.ts index 2c96af3..16bca24 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/common/tables/ILocationsBase.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/common/tables/ILocationsBase.d.ts @@ -2,8 +2,7 @@ export interface ILocationsBase { locations: Locations; paths: Path[]; } -export interface Locations { -} +export type Locations = {}; export interface Path { Source: string; Destination: string; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/common/tables/IProfileTemplate.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/common/tables/IProfileTemplate.d.ts index 20923bc..6ba9221 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/common/tables/IProfileTemplate.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -1,12 +1,12 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { Dialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; export interface IProfileTemplates { - "Standard": IProfileSides; + Standard: IProfileSides; "Left Behind": IProfileSides; "Prepare To Escape": IProfileSides; "Edge Of Darkness": IProfileSides; - "Unheard": IProfileSides; - "Tournament": IProfileSides; + Unheard: IProfileSides; + Tournament: IProfileSides; "SPT Developer": IProfileSides; "SPT Easy start": IProfileSides; "SPT Zero to hero": IProfileSides; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/common/tables/ITrader.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/common/tables/ITrader.d.ts index 14ab409..40cf004 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/common/tables/ITrader.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/common/tables/ITrader.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; export interface ITrader { assort?: ITraderAssort; @@ -78,6 +79,8 @@ export interface IBarterScheme { _tpl: string; onlyFunctional?: boolean; sptQuestLocked?: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface ISuit { _id: string; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/hideout/IQteData.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/hideout/IQteData.d.ts index 7f507e1..fe6cce6 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/hideout/IQteData.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/hideout/IQteData.d.ts @@ -1,14 +1,14 @@ import { Effect } from "@spt/models/eft/health/Effect"; import { BodyPart } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; import { QteActivityType } from "@spt/models/enums/hideout/QteActivityType"; import { QteEffectType } from "@spt/models/enums/hideout/QteEffectType"; import { QteResultType } from "@spt/models/enums/hideout/QteResultType"; import { QteRewardType } from "@spt/models/enums/hideout/QteRewardType"; import { QteType } from "@spt/models/enums/hideout/QteType"; import { RequirementType } from "@spt/models/enums/hideout/RequirementType"; -import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt/models/enums/SkillTypes"; -import { Traders } from "@spt/models/enums/Traders"; export interface IQteData { id: string; type: QteActivityType; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index f1123c1..5971372 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -15,7 +15,5 @@ export interface Items { change: any[]; del: any[]; } -export interface Production { -} -export interface TraderRelations { -} +export type Production = {}; +export type TraderRelations = {}; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/profile/ISptProfile.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/profile/ISptProfile.d.ts index a8e742a..dd7aea6 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/profile/ISptProfile.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/profile/ISptProfile.d.ts @@ -209,12 +209,9 @@ export interface Effects { LeftLeg: LeftLeg; RightLeg: RightLeg; } -export interface Head { -} -export interface Chest { -} -export interface Stomach { -} +export type Head = {}; +export type Chest = {}; +export type Stomach = {}; export interface LeftArm { Fracture?: number; } diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/ragfair/IRagfairOffer.d.ts index eeeb79d..f6c07fc 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/ragfair/IRagfairOffer.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/ragfair/IRagfairOffer.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface IRagfairOffer { sellResult?: SellResult[]; @@ -28,6 +29,8 @@ export interface OfferRequirement { _tpl: string; count: number; onlyFunctional: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface IRagfairOfferUser { id: string; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/ragfair/ISearchRequestData.d.ts index 8261c5b..c631de8 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/ragfair/ISearchRequestData.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/ragfair/ISearchRequestData.d.ts @@ -29,5 +29,4 @@ export declare enum OfferOwnerType { TRADEROWNERTYPE = 1, PLAYEROWNERTYPE = 2 } -export interface BuildItems { -} +export type BuildItems = {}; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/models/enums/BaseClasses.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/models/enums/BaseClasses.d.ts index 65fc95e..32ebf7c 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/models/enums/BaseClasses.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/models/enums/BaseClasses.d.ts @@ -107,6 +107,6 @@ export declare enum BaseClasses { RECEIVER = "55818a304bdc2db5418b457d", BARREL = "555ef6e44bdc2de9068b457e", CHARGING_HANDLE = "55818a6f4bdc2db9688b456b", - COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569 ", + COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569", HIDEOUT_AREA_CONTAINER = "63da6da4784a55176c018dba" } diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/models/enums/DogtagExchangeSide.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/models/enums/DogtagExchangeSide.d.ts new file mode 100644 index 0000000..de3d4df --- /dev/null +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/models/enums/DogtagExchangeSide.d.ts @@ -0,0 +1,5 @@ +export declare enum DogtagExchangeSide { + USEC = "Usec", + BEAR = "Bear", + ANY = "Any" +} diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/models/spt/server/ExhaustableArray.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/models/spt/server/ExhaustableArray.d.ts index c27f41f..50a6b68 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/models/spt/server/ExhaustableArray.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/models/spt/server/ExhaustableArray.d.ts @@ -1,5 +1,5 @@ -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ExhaustableArray implements IExhaustableArray { private itemPool; private randomUtil; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/routers/EventOutputHolder.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/routers/EventOutputHolder.d.ts index ef20706..148461a 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/routers/EventOutputHolder.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/routers/EventOutputHolder.d.ts @@ -3,8 +3,8 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IHideoutImprovement, Productive, TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; import { TraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class EventOutputHolder { protected profileHelper: ProfileHelper; protected timeUtil: TimeUtil; @@ -12,7 +12,7 @@ export declare class EventOutputHolder { /** * What has client been informed of this game session * Key = sessionId, then second key is prod id - */ + */ protected clientActiveSessionStorage: Record>; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/servers/HttpServer.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/servers/HttpServer.d.ts index b00fe68..0024ba3 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/servers/HttpServer.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/servers/HttpServer.d.ts @@ -6,8 +6,8 @@ import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; -import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { WebSocketServer } from "@spt/servers/WebSocketServer"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { LocalisationService } from "@spt/services/LocalisationService"; export declare class HttpServer { protected logger: ILogger; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/servers/WebSocketServer.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/servers/WebSocketServer.d.ts index f4e07bb..6121824 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/servers/WebSocketServer.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/servers/WebSocketServer.d.ts @@ -1,12 +1,12 @@ /// import http, { IncomingMessage } from "node:http"; -import { WebSocket, Server } from "ws"; import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { Server, WebSocket } from "ws"; export declare class WebSocketServer { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/servers/ws/SptWebSocketConnectionHandler.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/servers/ws/SptWebSocketConnectionHandler.d.ts index 98d0898..70fc96a 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/servers/ws/SptWebSocketConnectionHandler.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/servers/ws/SptWebSocketConnectionHandler.d.ts @@ -1,7 +1,6 @@ /// /// import { IncomingMessage } from "http"; -import { WebSocket } from "ws"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; @@ -11,6 +10,7 @@ import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectio import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; +import { WebSocket } from "ws"; export declare class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler { protected logger: ILogger; protected profileHelper: ProfileHelper; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts index d5247ec..5556129 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts @@ -1,6 +1,6 @@ -import { RawData, WebSocket } from "ws"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; +import { RawData, WebSocket } from "ws"; export declare class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler { protected logger: ILogger; constructor(logger: ILogger); diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/services/FenceService.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/services/FenceService.d.ts index c156122..58dc076 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/services/FenceService.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/services/FenceService.d.ts @@ -13,9 +13,9 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Handle actions surrounding Fence * e.g. generating or refreshing assorts / get next refresh time diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/services/InsuranceService.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/services/InsuranceService.d.ts index 0000e66..f799102 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/services/InsuranceService.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/services/InsuranceService.d.ts @@ -18,10 +18,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceService { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/services/LocalisationService.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/services/LocalisationService.d.ts index 42dfa4e..855c138 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/services/LocalisationService.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/services/LocalisationService.d.ts @@ -1,8 +1,8 @@ -import { I18n } from "i18n"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { LocaleService } from "@spt/services/LocaleService"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { I18n } from "i18n"; /** * Handles translating server text into different langauges */ diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/services/ProfileFixerService.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/services/ProfileFixerService.d.ts index 525b867..91e4780 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/services/ProfileFixerService.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/services/ProfileFixerService.d.ts @@ -8,7 +8,7 @@ import { Bonus, HideoutSlot } from "@spt/models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea"; -import { ISptProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; +import { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; @@ -16,11 +16,11 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileFixerService { protected logger: ILogger; protected watermark: Watermark; @@ -73,6 +73,7 @@ export declare class ProfileFixerService { */ protected removeDanglingTaskConditionCounters(pmcProfile: IPmcData): void; protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullRagfairRatings(pmcProfile: IPmcData): void; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; /** diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/services/RagfairOfferService.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/services/RagfairOfferService.d.ts index 6c13b1d..98dd179 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/services/RagfairOfferService.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/services/RagfairOfferService.d.ts @@ -10,10 +10,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/services/mod/CustomItemService.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/services/mod/CustomItemService.d.ts index 1926bed..f112872 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/services/mod/CustomItemService.d.ts @@ -4,8 +4,8 @@ import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetail import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts index 3c9d955..91c84d9 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class DynamicRouterModService { private container; constructor(container: DependencyContainer); diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/services/mod/staticRouter/StaticRouterModService.d.ts index f60432d..0c3d4d8 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class StaticRouterModService { protected container: DependencyContainer; constructor(container: DependencyContainer); diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/utils/JsonUtil.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/utils/JsonUtil.d.ts index b30822c..4419228 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/utils/JsonUtil.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/utils/JsonUtil.d.ts @@ -1,7 +1,7 @@ -import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { HashUtil } from "@spt/utils/HashUtil"; import { VFS } from "@spt/utils/VFS"; +import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; export declare class JsonUtil { protected vfs: VFS; protected hashUtil: HashUtil; diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/utils/RandomUtil.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/utils/RandomUtil.d.ts index 49f242d..0da184f 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/utils/RandomUtil.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/utils/RandomUtil.d.ts @@ -1,6 +1,6 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects * based on the relative probability of each of its elements. diff --git a/TypeScript/13.1AddTraderWithAssortJSON/types/utils/logging/AbstractWinstonLogger.d.ts b/TypeScript/13.1AddTraderWithAssortJSON/types/utils/logging/AbstractWinstonLogger.d.ts index 7098f85..ef54434 100644 --- a/TypeScript/13.1AddTraderWithAssortJSON/types/utils/logging/AbstractWinstonLogger.d.ts +++ b/TypeScript/13.1AddTraderWithAssortJSON/types/utils/logging/AbstractWinstonLogger.d.ts @@ -1,12 +1,12 @@ /// import fs from "node:fs"; -import winston from "winston"; import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; import { SptLogger } from "@spt/models/spt/logging/SptLogger"; import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; import { ILogger } from "@spt/models/spt/utils/ILogger"; +import winston from "winston"; export declare abstract class AbstractWinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected showDebugInConsole: boolean; diff --git a/TypeScript/13AddTrader/types/controllers/BotController.d.ts b/TypeScript/13AddTrader/types/controllers/BotController.d.ts index 6431fca..475f51b 100644 --- a/TypeScript/13AddTrader/types/controllers/BotController.d.ts +++ b/TypeScript/13AddTrader/types/controllers/BotController.d.ts @@ -20,8 +20,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/13AddTrader/types/controllers/BuildController.d.ts b/TypeScript/13AddTrader/types/controllers/BuildController.d.ts index ed8adf6..2cb9c59 100644 --- a/TypeScript/13AddTrader/types/controllers/BuildController.d.ts +++ b/TypeScript/13AddTrader/types/controllers/BuildController.d.ts @@ -9,8 +9,8 @@ import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BuildController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/13AddTrader/types/controllers/GameController.d.ts b/TypeScript/13AddTrader/types/controllers/GameController.d.ts index 533a81c..e219c04 100644 --- a/TypeScript/13AddTrader/types/controllers/GameController.d.ts +++ b/TypeScript/13AddTrader/types/controllers/GameController.d.ts @@ -34,10 +34,10 @@ import { ProfileActivityService } from "@spt/services/ProfileActivityService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GameController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/13AddTrader/types/controllers/HealthController.d.ts b/TypeScript/13AddTrader/types/controllers/HealthController.d.ts index 5482283..5a0a0a6 100644 --- a/TypeScript/13AddTrader/types/controllers/HealthController.d.ts +++ b/TypeScript/13AddTrader/types/controllers/HealthController.d.ts @@ -12,8 +12,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthController { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/13AddTrader/types/controllers/HideoutController.d.ts b/TypeScript/13AddTrader/types/controllers/HideoutController.d.ts index e9d1ed9..89a428c 100644 --- a/TypeScript/13AddTrader/types/controllers/HideoutController.d.ts +++ b/TypeScript/13AddTrader/types/controllers/HideoutController.d.ts @@ -35,11 +35,11 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; import { ProfileActivityService } from "@spt/services/ProfileActivityService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/13AddTrader/types/controllers/InraidController.d.ts b/TypeScript/13AddTrader/types/controllers/InraidController.d.ts index 87f419b..9f0c409 100644 --- a/TypeScript/13AddTrader/types/controllers/InraidController.d.ts +++ b/TypeScript/13AddTrader/types/controllers/InraidController.d.ts @@ -13,6 +13,7 @@ import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRe import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState"; import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig"; import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; @@ -31,7 +32,6 @@ import { PmcChatResponseService } from "@spt/services/PmcChatResponseService"; import { TraderServicesService } from "@spt/services/TraderServicesService"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; -import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; /** * Logic for handling In Raid callbacks */ diff --git a/TypeScript/13AddTrader/types/controllers/InsuranceController.d.ts b/TypeScript/13AddTrader/types/controllers/InsuranceController.d.ts index f921b83..543e915 100644 --- a/TypeScript/13AddTrader/types/controllers/InsuranceController.d.ts +++ b/TypeScript/13AddTrader/types/controllers/InsuranceController.d.ts @@ -21,11 +21,11 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PaymentService } from "@spt/services/PaymentService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceController { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/13AddTrader/types/controllers/InventoryController.d.ts b/TypeScript/13AddTrader/types/controllers/InventoryController.d.ts index 40bb084..c986ce8 100644 --- a/TypeScript/13AddTrader/types/controllers/InventoryController.d.ts +++ b/TypeScript/13AddTrader/types/controllers/InventoryController.d.ts @@ -37,10 +37,10 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MapMarkerService } from "@spt/services/MapMarkerService"; import { PlayerService } from "@spt/services/PlayerService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/13AddTrader/types/controllers/LocationController.d.ts b/TypeScript/13AddTrader/types/controllers/LocationController.d.ts index 727a8c8..a541b9c 100644 --- a/TypeScript/13AddTrader/types/controllers/LocationController.d.ts +++ b/TypeScript/13AddTrader/types/controllers/LocationController.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class LocationController { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; diff --git a/TypeScript/13AddTrader/types/controllers/ProfileController.d.ts b/TypeScript/13AddTrader/types/controllers/ProfileController.d.ts index e8dae73..7e6d35c 100644 --- a/TypeScript/13AddTrader/types/controllers/ProfileController.d.ts +++ b/TypeScript/13AddTrader/types/controllers/ProfileController.d.ts @@ -26,9 +26,9 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/13AddTrader/types/controllers/QuestController.d.ts b/TypeScript/13AddTrader/types/controllers/QuestController.d.ts index 3cdce00..6a5b415 100644 --- a/TypeScript/13AddTrader/types/controllers/QuestController.d.ts +++ b/TypeScript/13AddTrader/types/controllers/QuestController.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/13AddTrader/types/controllers/RepeatableQuestController.d.ts b/TypeScript/13AddTrader/types/controllers/RepeatableQuestController.d.ts index 74f39eb..016f8c6 100644 --- a/TypeScript/13AddTrader/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/13AddTrader/types/controllers/RepeatableQuestController.d.ts @@ -18,11 +18,11 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/13AddTrader/types/controllers/TradeController.d.ts b/TypeScript/13AddTrader/types/controllers/TradeController.d.ts index bc72e92..842a97b 100644 --- a/TypeScript/13AddTrader/types/controllers/TradeController.d.ts +++ b/TypeScript/13AddTrader/types/controllers/TradeController.d.ts @@ -1,5 +1,6 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper"; import { TradeHelper } from "@spt/helpers/TradeHelper"; import { TraderHelper } from "@spt/helpers/TraderHelper"; import { IPmcData } from "@spt/models/eft/common/IPmcData"; @@ -35,6 +36,7 @@ export declare class TradeController { protected hashUtil: HashUtil; protected itemHelper: ItemHelper; protected profileHelper: ProfileHelper; + protected ragfairOfferHelper: RagfairOfferHelper; protected traderHelper: TraderHelper; protected ragfairServer: RagfairServer; protected httpResponse: HttpResponseUtil; @@ -44,7 +46,7 @@ export declare class TradeController { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairOfferHelper: RagfairOfferHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); /** Handle TradingConfirm event */ confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; /** Handle RagFairBuyOffer event */ @@ -67,10 +69,17 @@ export declare class TradeController { * @param output Output to send back to client */ protected buyPmcItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void; + /** + * Is the provided offerid and ownerid from a player made offer + * @param offerId Id of the offer + * @param offerOwnerId Owner id + * @returns true if offer was made by a player + */ + protected isPlayerOffer(offerId: string, offerOwnerId: string): boolean; /** * Does Player have necessary trader loyalty to purchase flea offer * @param sellerIsTrader is seller trader - * @param fleaOffer FLea offer being bought + * @param fleaOffer Flea offer being bought * @param pmcData Player profile * @returns True if player can buy offer */ diff --git a/TypeScript/13AddTrader/types/controllers/TraderController.d.ts b/TypeScript/13AddTrader/types/controllers/TraderController.d.ts index 7fc6d78..3592fc6 100644 --- a/TypeScript/13AddTrader/types/controllers/TraderController.d.ts +++ b/TypeScript/13AddTrader/types/controllers/TraderController.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/13AddTrader/types/generators/BotEquipmentModGenerator.d.ts b/TypeScript/13AddTrader/types/generators/BotEquipmentModGenerator.d.ts index 419120f..3952293 100644 --- a/TypeScript/13AddTrader/types/generators/BotEquipmentModGenerator.d.ts +++ b/TypeScript/13AddTrader/types/generators/BotEquipmentModGenerator.d.ts @@ -25,9 +25,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotEquipmentModGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -65,7 +65,7 @@ export declare class BotEquipmentModGenerator { * @param settings Bot equipment generation settings * @param modSlot Armor slot being filtered * @param existingPlateTplPool Plates tpls to choose from - * @param armorItem + * @param armorItem The armor items db template * @returns Array of plate tpls to choose from */ protected filterPlateModsForSlotByLevel(settings: IGenerateEquipmentProperties, modSlot: string, existingPlateTplPool: string[], armorItem: ITemplateItem): IFilterPlateModsForSlotByLevelResult; diff --git a/TypeScript/13AddTrader/types/generators/BotGenerator.d.ts b/TypeScript/13AddTrader/types/generators/BotGenerator.d.ts index 8ab4371..ebb8a59 100644 --- a/TypeScript/13AddTrader/types/generators/BotGenerator.d.ts +++ b/TypeScript/13AddTrader/types/generators/BotGenerator.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/13AddTrader/types/generators/BotLevelGenerator.d.ts b/TypeScript/13AddTrader/types/generators/BotLevelGenerator.d.ts index dee61e2..a8a8895 100644 --- a/TypeScript/13AddTrader/types/generators/BotLevelGenerator.d.ts +++ b/TypeScript/13AddTrader/types/generators/BotLevelGenerator.d.ts @@ -4,12 +4,14 @@ import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; +import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class BotLevelGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; protected databaseService: DatabaseService; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService); + protected mathUtil: MathUtil; + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, mathUtil: MathUtil); /** * Return a randomised bot level and exp value * @param levelDetails Min and max of level for bot @@ -18,6 +20,7 @@ export declare class BotLevelGenerator { * @returns IRandomisedBotLevelResult object */ generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult; + protected chooseBotLevel(min: number, max: number, shift: number, number: number): number; /** * Get the highest level a bot can be relative to the players level, but no further than the max size from globals.exp_table * @param botGenerationDetails Details to help generate a bot diff --git a/TypeScript/13AddTrader/types/generators/BotLootGenerator.d.ts b/TypeScript/13AddTrader/types/generators/BotLootGenerator.d.ts index fee56ce..c0583c6 100644 --- a/TypeScript/13AddTrader/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/13AddTrader/types/generators/BotLootGenerator.d.ts @@ -18,9 +18,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/13AddTrader/types/generators/BotWeaponGenerator.d.ts b/TypeScript/13AddTrader/types/generators/BotWeaponGenerator.d.ts index 5559bfa..8e03b35 100644 --- a/TypeScript/13AddTrader/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/13AddTrader/types/generators/BotWeaponGenerator.d.ts @@ -18,9 +18,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RepairService } from "@spt/services/RepairService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotWeaponGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/13AddTrader/types/generators/LocationGenerator.d.ts b/TypeScript/13AddTrader/types/generators/LocationGenerator.d.ts index 222b0ab..9a2b0c4 100644 --- a/TypeScript/13AddTrader/types/generators/LocationGenerator.d.ts +++ b/TypeScript/13AddTrader/types/generators/LocationGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export interface IContainerItem { items: Item[]; width: number; diff --git a/TypeScript/13AddTrader/types/generators/PlayerScavGenerator.d.ts b/TypeScript/13AddTrader/types/generators/PlayerScavGenerator.d.ts index 2414150..e317bf6 100644 --- a/TypeScript/13AddTrader/types/generators/PlayerScavGenerator.d.ts +++ b/TypeScript/13AddTrader/types/generators/PlayerScavGenerator.d.ts @@ -14,9 +14,9 @@ import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class PlayerScavGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/13AddTrader/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/13AddTrader/types/generators/RagfairOfferGenerator.d.ts index 9435390..ca09729 100644 --- a/TypeScript/13AddTrader/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/13AddTrader/types/generators/RagfairOfferGenerator.d.ts @@ -19,10 +19,10 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/13AddTrader/types/generators/RepeatableQuestGenerator.d.ts b/TypeScript/13AddTrader/types/generators/RepeatableQuestGenerator.d.ts index 77c4e79..339f322 100644 --- a/TypeScript/13AddTrader/types/generators/RepeatableQuestGenerator.d.ts +++ b/TypeScript/13AddTrader/types/generators/RepeatableQuestGenerator.d.ts @@ -11,10 +11,10 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/13AddTrader/types/generators/RepeatableQuestRewardGenerator.d.ts b/TypeScript/13AddTrader/types/generators/RepeatableQuestRewardGenerator.d.ts index 1e09994..713a394 100644 --- a/TypeScript/13AddTrader/types/generators/RepeatableQuestRewardGenerator.d.ts +++ b/TypeScript/13AddTrader/types/generators/RepeatableQuestRewardGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestRewardGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/13AddTrader/types/helpers/BotDifficultyHelper.d.ts b/TypeScript/13AddTrader/types/helpers/BotDifficultyHelper.d.ts index 63572a5..2348bd3 100644 --- a/TypeScript/13AddTrader/types/helpers/BotDifficultyHelper.d.ts +++ b/TypeScript/13AddTrader/types/helpers/BotDifficultyHelper.d.ts @@ -5,8 +5,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotDifficultyHelper { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/13AddTrader/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/13AddTrader/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index c51bf7e..c38f0a0 100644 --- a/TypeScript/13AddTrader/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/13AddTrader/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GiveSptCommand implements ISptCommand { protected logger: ILogger; protected itemHelper: ItemHelper; diff --git a/TypeScript/13AddTrader/types/helpers/HealthHelper.d.ts b/TypeScript/13AddTrader/types/helpers/HealthHelper.d.ts index 650f633..a164285 100644 --- a/TypeScript/13AddTrader/types/helpers/HealthHelper.d.ts +++ b/TypeScript/13AddTrader/types/helpers/HealthHelper.d.ts @@ -5,8 +5,8 @@ import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/13AddTrader/types/helpers/HideoutHelper.d.ts b/TypeScript/13AddTrader/types/helpers/HideoutHelper.d.ts index c4aaa4c..df0376b 100644 --- a/TypeScript/13AddTrader/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/13AddTrader/types/helpers/HideoutHelper.d.ts @@ -18,10 +18,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/13AddTrader/types/helpers/InRaidHelper.d.ts b/TypeScript/13AddTrader/types/helpers/InRaidHelper.d.ts index 449be9f..987c9ec 100644 --- a/TypeScript/13AddTrader/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/13AddTrader/types/helpers/InRaidHelper.d.ts @@ -15,9 +15,9 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InRaidHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/13AddTrader/types/helpers/InventoryHelper.d.ts b/TypeScript/13AddTrader/types/helpers/InventoryHelper.d.ts index f0ff69a..92bb49c 100644 --- a/TypeScript/13AddTrader/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/13AddTrader/types/helpers/InventoryHelper.d.ts @@ -23,9 +23,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/13AddTrader/types/helpers/ItemHelper.d.ts b/TypeScript/13AddTrader/types/helpers/ItemHelper.d.ts index da5dd11..c304cee 100644 --- a/TypeScript/13AddTrader/types/helpers/ItemHelper.d.ts +++ b/TypeScript/13AddTrader/types/helpers/ItemHelper.d.ts @@ -11,13 +11,13 @@ import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { CompareUtil } from "@spt/utils/CompareUtil"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ItemHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/13AddTrader/types/helpers/ProfileHelper.d.ts b/TypeScript/13AddTrader/types/helpers/ProfileHelper.d.ts index 0671179..cdab870 100644 --- a/TypeScript/13AddTrader/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/13AddTrader/types/helpers/ProfileHelper.d.ts @@ -11,10 +11,10 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/13AddTrader/types/helpers/QuestHelper.d.ts b/TypeScript/13AddTrader/types/helpers/QuestHelper.d.ts index 2b84b8f..2d5730d 100644 --- a/TypeScript/13AddTrader/types/helpers/QuestHelper.d.ts +++ b/TypeScript/13AddTrader/types/helpers/QuestHelper.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/13AddTrader/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/13AddTrader/types/helpers/RagfairOfferHelper.d.ts index b526554..2386316 100644 --- a/TypeScript/13AddTrader/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/13AddTrader/types/helpers/RagfairOfferHelper.d.ts @@ -151,7 +151,7 @@ export declare class RagfairOfferHelper { * @param boughtAmount Amount item was purchased for * @returns IItemEventRouterResponse */ - protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; + completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; /** * Get a localised message for when players offer has sold on flea * @param itemTpl Item sold diff --git a/TypeScript/13AddTrader/types/helpers/RagfairServerHelper.d.ts b/TypeScript/13AddTrader/types/helpers/RagfairServerHelper.d.ts index 927caf5..3e1fea9 100644 --- a/TypeScript/13AddTrader/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/13AddTrader/types/helpers/RagfairServerHelper.d.ts @@ -12,9 +12,9 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Helper class for common ragfair server actions */ diff --git a/TypeScript/13AddTrader/types/helpers/RepairHelper.d.ts b/TypeScript/13AddTrader/types/helpers/RepairHelper.d.ts index 99a21da..63c78c9 100644 --- a/TypeScript/13AddTrader/types/helpers/RepairHelper.d.ts +++ b/TypeScript/13AddTrader/types/helpers/RepairHelper.d.ts @@ -4,8 +4,8 @@ import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/13AddTrader/types/helpers/RepeatableQuestHelper.d.ts b/TypeScript/13AddTrader/types/helpers/RepeatableQuestHelper.d.ts index d92657e..8c65f40 100644 --- a/TypeScript/13AddTrader/types/helpers/RepeatableQuestHelper.d.ts +++ b/TypeScript/13AddTrader/types/helpers/RepeatableQuestHelper.d.ts @@ -1,8 +1,8 @@ import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestHelper { protected mathUtil: MathUtil; protected configServer: ConfigServer; diff --git a/TypeScript/13AddTrader/types/helpers/TradeHelper.d.ts b/TypeScript/13AddTrader/types/helpers/TradeHelper.d.ts index f994fda..6e6f3a2 100644 --- a/TypeScript/13AddTrader/types/helpers/TradeHelper.d.ts +++ b/TypeScript/13AddTrader/types/helpers/TradeHelper.d.ts @@ -17,8 +17,8 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TradeHelper { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/13AddTrader/types/helpers/TraderAssortHelper.d.ts b/TypeScript/13AddTrader/types/helpers/TraderAssortHelper.d.ts index 8f8f802..f1ecd3b 100644 --- a/TypeScript/13AddTrader/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/13AddTrader/types/helpers/TraderAssortHelper.d.ts @@ -14,9 +14,9 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; diff --git a/TypeScript/13AddTrader/types/loaders/BundleLoader.d.ts b/TypeScript/13AddTrader/types/loaders/BundleLoader.d.ts index e270988..8c0ed4d 100644 --- a/TypeScript/13AddTrader/types/loaders/BundleLoader.d.ts +++ b/TypeScript/13AddTrader/types/loaders/BundleLoader.d.ts @@ -1,8 +1,8 @@ import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BundleInfo { modpath: string; filename: string; diff --git a/TypeScript/13AddTrader/types/loaders/PostDBModLoader.d.ts b/TypeScript/13AddTrader/types/loaders/PostDBModLoader.d.ts index b0c4bf4..a8bb6a9 100644 --- a/TypeScript/13AddTrader/types/loaders/PostDBModLoader.d.ts +++ b/TypeScript/13AddTrader/types/loaders/PostDBModLoader.d.ts @@ -1,10 +1,10 @@ -import { DependencyContainer } from "tsyringe"; import { OnLoad } from "@spt/di/OnLoad"; import { BundleLoader } from "@spt/loaders/BundleLoader"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostDBModLoader implements OnLoad { protected logger: ILogger; protected bundleLoader: BundleLoader; diff --git a/TypeScript/13AddTrader/types/loaders/PostSptModLoader.d.ts b/TypeScript/13AddTrader/types/loaders/PostSptModLoader.d.ts index fb54579..2603497 100644 --- a/TypeScript/13AddTrader/types/loaders/PostSptModLoader.d.ts +++ b/TypeScript/13AddTrader/types/loaders/PostSptModLoader.d.ts @@ -1,9 +1,9 @@ -import { DependencyContainer } from "tsyringe"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { IModLoader } from "@spt/models/spt/mod/IModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostSptModLoader implements IModLoader { protected logger: ILogger; protected preSptModLoader: PreSptModLoader; diff --git a/TypeScript/13AddTrader/types/loaders/PreSptModLoader.d.ts b/TypeScript/13AddTrader/types/loaders/PreSptModLoader.d.ts index bc846c8..8814525 100644 --- a/TypeScript/13AddTrader/types/loaders/PreSptModLoader.d.ts +++ b/TypeScript/13AddTrader/types/loaders/PreSptModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { ModDetails } from "@spt/models/eft/profile/ISptProfile"; @@ -11,6 +10,7 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { ModCompilerService } from "@spt/services/ModCompilerService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { DependencyContainer } from "tsyringe"; export declare class PreSptModLoader implements IModLoader { protected logger: ILogger; protected vfs: VFS; diff --git a/TypeScript/13AddTrader/types/models/eft/common/IEmptyRequestData.d.ts b/TypeScript/13AddTrader/types/models/eft/common/IEmptyRequestData.d.ts index 284d16e..52a7b12 100644 --- a/TypeScript/13AddTrader/types/models/eft/common/IEmptyRequestData.d.ts +++ b/TypeScript/13AddTrader/types/models/eft/common/IEmptyRequestData.d.ts @@ -1,2 +1 @@ -export interface IEmptyRequestData { -} +export type IEmptyRequestData = {}; diff --git a/TypeScript/13AddTrader/types/models/eft/common/tables/IBotBase.d.ts b/TypeScript/13AddTrader/types/models/eft/common/tables/IBotBase.d.ts index a7fe1ca..be37845 100644 --- a/TypeScript/13AddTrader/types/models/eft/common/tables/IBotBase.d.ts +++ b/TypeScript/13AddTrader/types/models/eft/common/tables/IBotBase.d.ts @@ -373,8 +373,7 @@ export interface LastCompleted { export interface Notes { Notes: Note[]; } -export interface CarExtractCounts { -} +export type CarExtractCounts = {}; export declare enum SurvivorClass { UNKNOWN = 0, NEUTRALIZER = 1, diff --git a/TypeScript/13AddTrader/types/models/eft/common/tables/ILocationsBase.d.ts b/TypeScript/13AddTrader/types/models/eft/common/tables/ILocationsBase.d.ts index 2c96af3..16bca24 100644 --- a/TypeScript/13AddTrader/types/models/eft/common/tables/ILocationsBase.d.ts +++ b/TypeScript/13AddTrader/types/models/eft/common/tables/ILocationsBase.d.ts @@ -2,8 +2,7 @@ export interface ILocationsBase { locations: Locations; paths: Path[]; } -export interface Locations { -} +export type Locations = {}; export interface Path { Source: string; Destination: string; diff --git a/TypeScript/13AddTrader/types/models/eft/common/tables/IProfileTemplate.d.ts b/TypeScript/13AddTrader/types/models/eft/common/tables/IProfileTemplate.d.ts index 20923bc..6ba9221 100644 --- a/TypeScript/13AddTrader/types/models/eft/common/tables/IProfileTemplate.d.ts +++ b/TypeScript/13AddTrader/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -1,12 +1,12 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { Dialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; export interface IProfileTemplates { - "Standard": IProfileSides; + Standard: IProfileSides; "Left Behind": IProfileSides; "Prepare To Escape": IProfileSides; "Edge Of Darkness": IProfileSides; - "Unheard": IProfileSides; - "Tournament": IProfileSides; + Unheard: IProfileSides; + Tournament: IProfileSides; "SPT Developer": IProfileSides; "SPT Easy start": IProfileSides; "SPT Zero to hero": IProfileSides; diff --git a/TypeScript/13AddTrader/types/models/eft/common/tables/ITrader.d.ts b/TypeScript/13AddTrader/types/models/eft/common/tables/ITrader.d.ts index 14ab409..40cf004 100644 --- a/TypeScript/13AddTrader/types/models/eft/common/tables/ITrader.d.ts +++ b/TypeScript/13AddTrader/types/models/eft/common/tables/ITrader.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; export interface ITrader { assort?: ITraderAssort; @@ -78,6 +79,8 @@ export interface IBarterScheme { _tpl: string; onlyFunctional?: boolean; sptQuestLocked?: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface ISuit { _id: string; diff --git a/TypeScript/13AddTrader/types/models/eft/hideout/IQteData.d.ts b/TypeScript/13AddTrader/types/models/eft/hideout/IQteData.d.ts index 7f507e1..fe6cce6 100644 --- a/TypeScript/13AddTrader/types/models/eft/hideout/IQteData.d.ts +++ b/TypeScript/13AddTrader/types/models/eft/hideout/IQteData.d.ts @@ -1,14 +1,14 @@ import { Effect } from "@spt/models/eft/health/Effect"; import { BodyPart } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; import { QteActivityType } from "@spt/models/enums/hideout/QteActivityType"; import { QteEffectType } from "@spt/models/enums/hideout/QteEffectType"; import { QteResultType } from "@spt/models/enums/hideout/QteResultType"; import { QteRewardType } from "@spt/models/enums/hideout/QteRewardType"; import { QteType } from "@spt/models/enums/hideout/QteType"; import { RequirementType } from "@spt/models/enums/hideout/RequirementType"; -import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt/models/enums/SkillTypes"; -import { Traders } from "@spt/models/enums/Traders"; export interface IQteData { id: string; type: QteActivityType; diff --git a/TypeScript/13AddTrader/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/13AddTrader/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index f1123c1..5971372 100644 --- a/TypeScript/13AddTrader/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/TypeScript/13AddTrader/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -15,7 +15,5 @@ export interface Items { change: any[]; del: any[]; } -export interface Production { -} -export interface TraderRelations { -} +export type Production = {}; +export type TraderRelations = {}; diff --git a/TypeScript/13AddTrader/types/models/eft/profile/ISptProfile.d.ts b/TypeScript/13AddTrader/types/models/eft/profile/ISptProfile.d.ts index a8e742a..dd7aea6 100644 --- a/TypeScript/13AddTrader/types/models/eft/profile/ISptProfile.d.ts +++ b/TypeScript/13AddTrader/types/models/eft/profile/ISptProfile.d.ts @@ -209,12 +209,9 @@ export interface Effects { LeftLeg: LeftLeg; RightLeg: RightLeg; } -export interface Head { -} -export interface Chest { -} -export interface Stomach { -} +export type Head = {}; +export type Chest = {}; +export type Stomach = {}; export interface LeftArm { Fracture?: number; } diff --git a/TypeScript/13AddTrader/types/models/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/13AddTrader/types/models/eft/ragfair/IRagfairOffer.d.ts index eeeb79d..f6c07fc 100644 --- a/TypeScript/13AddTrader/types/models/eft/ragfair/IRagfairOffer.d.ts +++ b/TypeScript/13AddTrader/types/models/eft/ragfair/IRagfairOffer.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface IRagfairOffer { sellResult?: SellResult[]; @@ -28,6 +29,8 @@ export interface OfferRequirement { _tpl: string; count: number; onlyFunctional: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface IRagfairOfferUser { id: string; diff --git a/TypeScript/13AddTrader/types/models/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/13AddTrader/types/models/eft/ragfair/ISearchRequestData.d.ts index 8261c5b..c631de8 100644 --- a/TypeScript/13AddTrader/types/models/eft/ragfair/ISearchRequestData.d.ts +++ b/TypeScript/13AddTrader/types/models/eft/ragfair/ISearchRequestData.d.ts @@ -29,5 +29,4 @@ export declare enum OfferOwnerType { TRADEROWNERTYPE = 1, PLAYEROWNERTYPE = 2 } -export interface BuildItems { -} +export type BuildItems = {}; diff --git a/TypeScript/13AddTrader/types/models/enums/BaseClasses.d.ts b/TypeScript/13AddTrader/types/models/enums/BaseClasses.d.ts index 65fc95e..32ebf7c 100644 --- a/TypeScript/13AddTrader/types/models/enums/BaseClasses.d.ts +++ b/TypeScript/13AddTrader/types/models/enums/BaseClasses.d.ts @@ -107,6 +107,6 @@ export declare enum BaseClasses { RECEIVER = "55818a304bdc2db5418b457d", BARREL = "555ef6e44bdc2de9068b457e", CHARGING_HANDLE = "55818a6f4bdc2db9688b456b", - COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569 ", + COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569", HIDEOUT_AREA_CONTAINER = "63da6da4784a55176c018dba" } diff --git a/TypeScript/13AddTrader/types/models/enums/DogtagExchangeSide.d.ts b/TypeScript/13AddTrader/types/models/enums/DogtagExchangeSide.d.ts new file mode 100644 index 0000000..de3d4df --- /dev/null +++ b/TypeScript/13AddTrader/types/models/enums/DogtagExchangeSide.d.ts @@ -0,0 +1,5 @@ +export declare enum DogtagExchangeSide { + USEC = "Usec", + BEAR = "Bear", + ANY = "Any" +} diff --git a/TypeScript/13AddTrader/types/models/spt/server/ExhaustableArray.d.ts b/TypeScript/13AddTrader/types/models/spt/server/ExhaustableArray.d.ts index c27f41f..50a6b68 100644 --- a/TypeScript/13AddTrader/types/models/spt/server/ExhaustableArray.d.ts +++ b/TypeScript/13AddTrader/types/models/spt/server/ExhaustableArray.d.ts @@ -1,5 +1,5 @@ -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ExhaustableArray implements IExhaustableArray { private itemPool; private randomUtil; diff --git a/TypeScript/13AddTrader/types/routers/EventOutputHolder.d.ts b/TypeScript/13AddTrader/types/routers/EventOutputHolder.d.ts index ef20706..148461a 100644 --- a/TypeScript/13AddTrader/types/routers/EventOutputHolder.d.ts +++ b/TypeScript/13AddTrader/types/routers/EventOutputHolder.d.ts @@ -3,8 +3,8 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IHideoutImprovement, Productive, TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; import { TraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class EventOutputHolder { protected profileHelper: ProfileHelper; protected timeUtil: TimeUtil; @@ -12,7 +12,7 @@ export declare class EventOutputHolder { /** * What has client been informed of this game session * Key = sessionId, then second key is prod id - */ + */ protected clientActiveSessionStorage: Record>; diff --git a/TypeScript/13AddTrader/types/servers/HttpServer.d.ts b/TypeScript/13AddTrader/types/servers/HttpServer.d.ts index b00fe68..0024ba3 100644 --- a/TypeScript/13AddTrader/types/servers/HttpServer.d.ts +++ b/TypeScript/13AddTrader/types/servers/HttpServer.d.ts @@ -6,8 +6,8 @@ import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; -import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { WebSocketServer } from "@spt/servers/WebSocketServer"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { LocalisationService } from "@spt/services/LocalisationService"; export declare class HttpServer { protected logger: ILogger; diff --git a/TypeScript/13AddTrader/types/servers/WebSocketServer.d.ts b/TypeScript/13AddTrader/types/servers/WebSocketServer.d.ts index f4e07bb..6121824 100644 --- a/TypeScript/13AddTrader/types/servers/WebSocketServer.d.ts +++ b/TypeScript/13AddTrader/types/servers/WebSocketServer.d.ts @@ -1,12 +1,12 @@ /// import http, { IncomingMessage } from "node:http"; -import { WebSocket, Server } from "ws"; import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { Server, WebSocket } from "ws"; export declare class WebSocketServer { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/13AddTrader/types/servers/ws/SptWebSocketConnectionHandler.d.ts b/TypeScript/13AddTrader/types/servers/ws/SptWebSocketConnectionHandler.d.ts index 98d0898..70fc96a 100644 --- a/TypeScript/13AddTrader/types/servers/ws/SptWebSocketConnectionHandler.d.ts +++ b/TypeScript/13AddTrader/types/servers/ws/SptWebSocketConnectionHandler.d.ts @@ -1,7 +1,6 @@ /// /// import { IncomingMessage } from "http"; -import { WebSocket } from "ws"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; @@ -11,6 +10,7 @@ import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectio import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; +import { WebSocket } from "ws"; export declare class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler { protected logger: ILogger; protected profileHelper: ProfileHelper; diff --git a/TypeScript/13AddTrader/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts b/TypeScript/13AddTrader/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts index d5247ec..5556129 100644 --- a/TypeScript/13AddTrader/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts +++ b/TypeScript/13AddTrader/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts @@ -1,6 +1,6 @@ -import { RawData, WebSocket } from "ws"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; +import { RawData, WebSocket } from "ws"; export declare class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler { protected logger: ILogger; constructor(logger: ILogger); diff --git a/TypeScript/13AddTrader/types/services/FenceService.d.ts b/TypeScript/13AddTrader/types/services/FenceService.d.ts index c156122..58dc076 100644 --- a/TypeScript/13AddTrader/types/services/FenceService.d.ts +++ b/TypeScript/13AddTrader/types/services/FenceService.d.ts @@ -13,9 +13,9 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Handle actions surrounding Fence * e.g. generating or refreshing assorts / get next refresh time diff --git a/TypeScript/13AddTrader/types/services/InsuranceService.d.ts b/TypeScript/13AddTrader/types/services/InsuranceService.d.ts index 0000e66..f799102 100644 --- a/TypeScript/13AddTrader/types/services/InsuranceService.d.ts +++ b/TypeScript/13AddTrader/types/services/InsuranceService.d.ts @@ -18,10 +18,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceService { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/13AddTrader/types/services/LocalisationService.d.ts b/TypeScript/13AddTrader/types/services/LocalisationService.d.ts index 42dfa4e..855c138 100644 --- a/TypeScript/13AddTrader/types/services/LocalisationService.d.ts +++ b/TypeScript/13AddTrader/types/services/LocalisationService.d.ts @@ -1,8 +1,8 @@ -import { I18n } from "i18n"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { LocaleService } from "@spt/services/LocaleService"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { I18n } from "i18n"; /** * Handles translating server text into different langauges */ diff --git a/TypeScript/13AddTrader/types/services/ProfileFixerService.d.ts b/TypeScript/13AddTrader/types/services/ProfileFixerService.d.ts index 525b867..91e4780 100644 --- a/TypeScript/13AddTrader/types/services/ProfileFixerService.d.ts +++ b/TypeScript/13AddTrader/types/services/ProfileFixerService.d.ts @@ -8,7 +8,7 @@ import { Bonus, HideoutSlot } from "@spt/models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea"; -import { ISptProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; +import { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; @@ -16,11 +16,11 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileFixerService { protected logger: ILogger; protected watermark: Watermark; @@ -73,6 +73,7 @@ export declare class ProfileFixerService { */ protected removeDanglingTaskConditionCounters(pmcProfile: IPmcData): void; protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullRagfairRatings(pmcProfile: IPmcData): void; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; /** diff --git a/TypeScript/13AddTrader/types/services/RagfairOfferService.d.ts b/TypeScript/13AddTrader/types/services/RagfairOfferService.d.ts index 6c13b1d..98dd179 100644 --- a/TypeScript/13AddTrader/types/services/RagfairOfferService.d.ts +++ b/TypeScript/13AddTrader/types/services/RagfairOfferService.d.ts @@ -10,10 +10,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/13AddTrader/types/services/mod/CustomItemService.d.ts b/TypeScript/13AddTrader/types/services/mod/CustomItemService.d.ts index 1926bed..f112872 100644 --- a/TypeScript/13AddTrader/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/13AddTrader/types/services/mod/CustomItemService.d.ts @@ -4,8 +4,8 @@ import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetail import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/13AddTrader/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/13AddTrader/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts index 3c9d955..91c84d9 100644 --- a/TypeScript/13AddTrader/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts +++ b/TypeScript/13AddTrader/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class DynamicRouterModService { private container; constructor(container: DependencyContainer); diff --git a/TypeScript/13AddTrader/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/13AddTrader/types/services/mod/staticRouter/StaticRouterModService.d.ts index f60432d..0c3d4d8 100644 --- a/TypeScript/13AddTrader/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/TypeScript/13AddTrader/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class StaticRouterModService { protected container: DependencyContainer; constructor(container: DependencyContainer); diff --git a/TypeScript/13AddTrader/types/utils/JsonUtil.d.ts b/TypeScript/13AddTrader/types/utils/JsonUtil.d.ts index b30822c..4419228 100644 --- a/TypeScript/13AddTrader/types/utils/JsonUtil.d.ts +++ b/TypeScript/13AddTrader/types/utils/JsonUtil.d.ts @@ -1,7 +1,7 @@ -import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { HashUtil } from "@spt/utils/HashUtil"; import { VFS } from "@spt/utils/VFS"; +import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; export declare class JsonUtil { protected vfs: VFS; protected hashUtil: HashUtil; diff --git a/TypeScript/13AddTrader/types/utils/RandomUtil.d.ts b/TypeScript/13AddTrader/types/utils/RandomUtil.d.ts index 49f242d..0da184f 100644 --- a/TypeScript/13AddTrader/types/utils/RandomUtil.d.ts +++ b/TypeScript/13AddTrader/types/utils/RandomUtil.d.ts @@ -1,6 +1,6 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects * based on the relative probability of each of its elements. diff --git a/TypeScript/13AddTrader/types/utils/logging/AbstractWinstonLogger.d.ts b/TypeScript/13AddTrader/types/utils/logging/AbstractWinstonLogger.d.ts index 7098f85..ef54434 100644 --- a/TypeScript/13AddTrader/types/utils/logging/AbstractWinstonLogger.d.ts +++ b/TypeScript/13AddTrader/types/utils/logging/AbstractWinstonLogger.d.ts @@ -1,12 +1,12 @@ /// import fs from "node:fs"; -import winston from "winston"; import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; import { SptLogger } from "@spt/models/spt/logging/SptLogger"; import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; import { ILogger } from "@spt/models/spt/utils/ILogger"; +import winston from "winston"; export declare abstract class AbstractWinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected showDebugInConsole: boolean; diff --git a/TypeScript/14AfterDBLoadHook/types/controllers/BotController.d.ts b/TypeScript/14AfterDBLoadHook/types/controllers/BotController.d.ts index 6431fca..475f51b 100644 --- a/TypeScript/14AfterDBLoadHook/types/controllers/BotController.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/controllers/BotController.d.ts @@ -20,8 +20,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/14AfterDBLoadHook/types/controllers/BuildController.d.ts b/TypeScript/14AfterDBLoadHook/types/controllers/BuildController.d.ts index ed8adf6..2cb9c59 100644 --- a/TypeScript/14AfterDBLoadHook/types/controllers/BuildController.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/controllers/BuildController.d.ts @@ -9,8 +9,8 @@ import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BuildController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/14AfterDBLoadHook/types/controllers/GameController.d.ts b/TypeScript/14AfterDBLoadHook/types/controllers/GameController.d.ts index 533a81c..e219c04 100644 --- a/TypeScript/14AfterDBLoadHook/types/controllers/GameController.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/controllers/GameController.d.ts @@ -34,10 +34,10 @@ import { ProfileActivityService } from "@spt/services/ProfileActivityService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GameController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/14AfterDBLoadHook/types/controllers/HealthController.d.ts b/TypeScript/14AfterDBLoadHook/types/controllers/HealthController.d.ts index 5482283..5a0a0a6 100644 --- a/TypeScript/14AfterDBLoadHook/types/controllers/HealthController.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/controllers/HealthController.d.ts @@ -12,8 +12,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthController { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/14AfterDBLoadHook/types/controllers/HideoutController.d.ts b/TypeScript/14AfterDBLoadHook/types/controllers/HideoutController.d.ts index e9d1ed9..89a428c 100644 --- a/TypeScript/14AfterDBLoadHook/types/controllers/HideoutController.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/controllers/HideoutController.d.ts @@ -35,11 +35,11 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; import { ProfileActivityService } from "@spt/services/ProfileActivityService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/14AfterDBLoadHook/types/controllers/InraidController.d.ts b/TypeScript/14AfterDBLoadHook/types/controllers/InraidController.d.ts index 87f419b..9f0c409 100644 --- a/TypeScript/14AfterDBLoadHook/types/controllers/InraidController.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/controllers/InraidController.d.ts @@ -13,6 +13,7 @@ import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRe import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState"; import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig"; import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; @@ -31,7 +32,6 @@ import { PmcChatResponseService } from "@spt/services/PmcChatResponseService"; import { TraderServicesService } from "@spt/services/TraderServicesService"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; -import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; /** * Logic for handling In Raid callbacks */ diff --git a/TypeScript/14AfterDBLoadHook/types/controllers/InsuranceController.d.ts b/TypeScript/14AfterDBLoadHook/types/controllers/InsuranceController.d.ts index f921b83..543e915 100644 --- a/TypeScript/14AfterDBLoadHook/types/controllers/InsuranceController.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/controllers/InsuranceController.d.ts @@ -21,11 +21,11 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PaymentService } from "@spt/services/PaymentService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceController { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/14AfterDBLoadHook/types/controllers/InventoryController.d.ts b/TypeScript/14AfterDBLoadHook/types/controllers/InventoryController.d.ts index 40bb084..c986ce8 100644 --- a/TypeScript/14AfterDBLoadHook/types/controllers/InventoryController.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/controllers/InventoryController.d.ts @@ -37,10 +37,10 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MapMarkerService } from "@spt/services/MapMarkerService"; import { PlayerService } from "@spt/services/PlayerService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/14AfterDBLoadHook/types/controllers/LocationController.d.ts b/TypeScript/14AfterDBLoadHook/types/controllers/LocationController.d.ts index 727a8c8..a541b9c 100644 --- a/TypeScript/14AfterDBLoadHook/types/controllers/LocationController.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/controllers/LocationController.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class LocationController { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; diff --git a/TypeScript/14AfterDBLoadHook/types/controllers/ProfileController.d.ts b/TypeScript/14AfterDBLoadHook/types/controllers/ProfileController.d.ts index e8dae73..7e6d35c 100644 --- a/TypeScript/14AfterDBLoadHook/types/controllers/ProfileController.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/controllers/ProfileController.d.ts @@ -26,9 +26,9 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/14AfterDBLoadHook/types/controllers/QuestController.d.ts b/TypeScript/14AfterDBLoadHook/types/controllers/QuestController.d.ts index 3cdce00..6a5b415 100644 --- a/TypeScript/14AfterDBLoadHook/types/controllers/QuestController.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/controllers/QuestController.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/14AfterDBLoadHook/types/controllers/RepeatableQuestController.d.ts b/TypeScript/14AfterDBLoadHook/types/controllers/RepeatableQuestController.d.ts index 74f39eb..016f8c6 100644 --- a/TypeScript/14AfterDBLoadHook/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/controllers/RepeatableQuestController.d.ts @@ -18,11 +18,11 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/14AfterDBLoadHook/types/controllers/TradeController.d.ts b/TypeScript/14AfterDBLoadHook/types/controllers/TradeController.d.ts index bc72e92..842a97b 100644 --- a/TypeScript/14AfterDBLoadHook/types/controllers/TradeController.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/controllers/TradeController.d.ts @@ -1,5 +1,6 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper"; import { TradeHelper } from "@spt/helpers/TradeHelper"; import { TraderHelper } from "@spt/helpers/TraderHelper"; import { IPmcData } from "@spt/models/eft/common/IPmcData"; @@ -35,6 +36,7 @@ export declare class TradeController { protected hashUtil: HashUtil; protected itemHelper: ItemHelper; protected profileHelper: ProfileHelper; + protected ragfairOfferHelper: RagfairOfferHelper; protected traderHelper: TraderHelper; protected ragfairServer: RagfairServer; protected httpResponse: HttpResponseUtil; @@ -44,7 +46,7 @@ export declare class TradeController { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairOfferHelper: RagfairOfferHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); /** Handle TradingConfirm event */ confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; /** Handle RagFairBuyOffer event */ @@ -67,10 +69,17 @@ export declare class TradeController { * @param output Output to send back to client */ protected buyPmcItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void; + /** + * Is the provided offerid and ownerid from a player made offer + * @param offerId Id of the offer + * @param offerOwnerId Owner id + * @returns true if offer was made by a player + */ + protected isPlayerOffer(offerId: string, offerOwnerId: string): boolean; /** * Does Player have necessary trader loyalty to purchase flea offer * @param sellerIsTrader is seller trader - * @param fleaOffer FLea offer being bought + * @param fleaOffer Flea offer being bought * @param pmcData Player profile * @returns True if player can buy offer */ diff --git a/TypeScript/14AfterDBLoadHook/types/controllers/TraderController.d.ts b/TypeScript/14AfterDBLoadHook/types/controllers/TraderController.d.ts index 7fc6d78..3592fc6 100644 --- a/TypeScript/14AfterDBLoadHook/types/controllers/TraderController.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/controllers/TraderController.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/14AfterDBLoadHook/types/generators/BotEquipmentModGenerator.d.ts b/TypeScript/14AfterDBLoadHook/types/generators/BotEquipmentModGenerator.d.ts index 419120f..3952293 100644 --- a/TypeScript/14AfterDBLoadHook/types/generators/BotEquipmentModGenerator.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/generators/BotEquipmentModGenerator.d.ts @@ -25,9 +25,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotEquipmentModGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -65,7 +65,7 @@ export declare class BotEquipmentModGenerator { * @param settings Bot equipment generation settings * @param modSlot Armor slot being filtered * @param existingPlateTplPool Plates tpls to choose from - * @param armorItem + * @param armorItem The armor items db template * @returns Array of plate tpls to choose from */ protected filterPlateModsForSlotByLevel(settings: IGenerateEquipmentProperties, modSlot: string, existingPlateTplPool: string[], armorItem: ITemplateItem): IFilterPlateModsForSlotByLevelResult; diff --git a/TypeScript/14AfterDBLoadHook/types/generators/BotGenerator.d.ts b/TypeScript/14AfterDBLoadHook/types/generators/BotGenerator.d.ts index 8ab4371..ebb8a59 100644 --- a/TypeScript/14AfterDBLoadHook/types/generators/BotGenerator.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/generators/BotGenerator.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/14AfterDBLoadHook/types/generators/BotLevelGenerator.d.ts b/TypeScript/14AfterDBLoadHook/types/generators/BotLevelGenerator.d.ts index dee61e2..a8a8895 100644 --- a/TypeScript/14AfterDBLoadHook/types/generators/BotLevelGenerator.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/generators/BotLevelGenerator.d.ts @@ -4,12 +4,14 @@ import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; +import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class BotLevelGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; protected databaseService: DatabaseService; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService); + protected mathUtil: MathUtil; + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, mathUtil: MathUtil); /** * Return a randomised bot level and exp value * @param levelDetails Min and max of level for bot @@ -18,6 +20,7 @@ export declare class BotLevelGenerator { * @returns IRandomisedBotLevelResult object */ generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult; + protected chooseBotLevel(min: number, max: number, shift: number, number: number): number; /** * Get the highest level a bot can be relative to the players level, but no further than the max size from globals.exp_table * @param botGenerationDetails Details to help generate a bot diff --git a/TypeScript/14AfterDBLoadHook/types/generators/BotLootGenerator.d.ts b/TypeScript/14AfterDBLoadHook/types/generators/BotLootGenerator.d.ts index fee56ce..c0583c6 100644 --- a/TypeScript/14AfterDBLoadHook/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/generators/BotLootGenerator.d.ts @@ -18,9 +18,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/14AfterDBLoadHook/types/generators/BotWeaponGenerator.d.ts b/TypeScript/14AfterDBLoadHook/types/generators/BotWeaponGenerator.d.ts index 5559bfa..8e03b35 100644 --- a/TypeScript/14AfterDBLoadHook/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/generators/BotWeaponGenerator.d.ts @@ -18,9 +18,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RepairService } from "@spt/services/RepairService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotWeaponGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/14AfterDBLoadHook/types/generators/LocationGenerator.d.ts b/TypeScript/14AfterDBLoadHook/types/generators/LocationGenerator.d.ts index 222b0ab..9a2b0c4 100644 --- a/TypeScript/14AfterDBLoadHook/types/generators/LocationGenerator.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/generators/LocationGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export interface IContainerItem { items: Item[]; width: number; diff --git a/TypeScript/14AfterDBLoadHook/types/generators/PlayerScavGenerator.d.ts b/TypeScript/14AfterDBLoadHook/types/generators/PlayerScavGenerator.d.ts index 2414150..e317bf6 100644 --- a/TypeScript/14AfterDBLoadHook/types/generators/PlayerScavGenerator.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/generators/PlayerScavGenerator.d.ts @@ -14,9 +14,9 @@ import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class PlayerScavGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/14AfterDBLoadHook/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/14AfterDBLoadHook/types/generators/RagfairOfferGenerator.d.ts index 9435390..ca09729 100644 --- a/TypeScript/14AfterDBLoadHook/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/generators/RagfairOfferGenerator.d.ts @@ -19,10 +19,10 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/14AfterDBLoadHook/types/generators/RepeatableQuestGenerator.d.ts b/TypeScript/14AfterDBLoadHook/types/generators/RepeatableQuestGenerator.d.ts index 77c4e79..339f322 100644 --- a/TypeScript/14AfterDBLoadHook/types/generators/RepeatableQuestGenerator.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/generators/RepeatableQuestGenerator.d.ts @@ -11,10 +11,10 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/14AfterDBLoadHook/types/generators/RepeatableQuestRewardGenerator.d.ts b/TypeScript/14AfterDBLoadHook/types/generators/RepeatableQuestRewardGenerator.d.ts index 1e09994..713a394 100644 --- a/TypeScript/14AfterDBLoadHook/types/generators/RepeatableQuestRewardGenerator.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/generators/RepeatableQuestRewardGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestRewardGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/14AfterDBLoadHook/types/helpers/BotDifficultyHelper.d.ts b/TypeScript/14AfterDBLoadHook/types/helpers/BotDifficultyHelper.d.ts index 63572a5..2348bd3 100644 --- a/TypeScript/14AfterDBLoadHook/types/helpers/BotDifficultyHelper.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/helpers/BotDifficultyHelper.d.ts @@ -5,8 +5,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotDifficultyHelper { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/14AfterDBLoadHook/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/14AfterDBLoadHook/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index c51bf7e..c38f0a0 100644 --- a/TypeScript/14AfterDBLoadHook/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GiveSptCommand implements ISptCommand { protected logger: ILogger; protected itemHelper: ItemHelper; diff --git a/TypeScript/14AfterDBLoadHook/types/helpers/HealthHelper.d.ts b/TypeScript/14AfterDBLoadHook/types/helpers/HealthHelper.d.ts index 650f633..a164285 100644 --- a/TypeScript/14AfterDBLoadHook/types/helpers/HealthHelper.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/helpers/HealthHelper.d.ts @@ -5,8 +5,8 @@ import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/14AfterDBLoadHook/types/helpers/HideoutHelper.d.ts b/TypeScript/14AfterDBLoadHook/types/helpers/HideoutHelper.d.ts index c4aaa4c..df0376b 100644 --- a/TypeScript/14AfterDBLoadHook/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/helpers/HideoutHelper.d.ts @@ -18,10 +18,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/14AfterDBLoadHook/types/helpers/InRaidHelper.d.ts b/TypeScript/14AfterDBLoadHook/types/helpers/InRaidHelper.d.ts index 449be9f..987c9ec 100644 --- a/TypeScript/14AfterDBLoadHook/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/helpers/InRaidHelper.d.ts @@ -15,9 +15,9 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InRaidHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/14AfterDBLoadHook/types/helpers/InventoryHelper.d.ts b/TypeScript/14AfterDBLoadHook/types/helpers/InventoryHelper.d.ts index f0ff69a..92bb49c 100644 --- a/TypeScript/14AfterDBLoadHook/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/helpers/InventoryHelper.d.ts @@ -23,9 +23,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/14AfterDBLoadHook/types/helpers/ItemHelper.d.ts b/TypeScript/14AfterDBLoadHook/types/helpers/ItemHelper.d.ts index da5dd11..c304cee 100644 --- a/TypeScript/14AfterDBLoadHook/types/helpers/ItemHelper.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/helpers/ItemHelper.d.ts @@ -11,13 +11,13 @@ import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { CompareUtil } from "@spt/utils/CompareUtil"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ItemHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/14AfterDBLoadHook/types/helpers/ProfileHelper.d.ts b/TypeScript/14AfterDBLoadHook/types/helpers/ProfileHelper.d.ts index 0671179..cdab870 100644 --- a/TypeScript/14AfterDBLoadHook/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/helpers/ProfileHelper.d.ts @@ -11,10 +11,10 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/14AfterDBLoadHook/types/helpers/QuestHelper.d.ts b/TypeScript/14AfterDBLoadHook/types/helpers/QuestHelper.d.ts index 2b84b8f..2d5730d 100644 --- a/TypeScript/14AfterDBLoadHook/types/helpers/QuestHelper.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/helpers/QuestHelper.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/14AfterDBLoadHook/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/14AfterDBLoadHook/types/helpers/RagfairOfferHelper.d.ts index b526554..2386316 100644 --- a/TypeScript/14AfterDBLoadHook/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/helpers/RagfairOfferHelper.d.ts @@ -151,7 +151,7 @@ export declare class RagfairOfferHelper { * @param boughtAmount Amount item was purchased for * @returns IItemEventRouterResponse */ - protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; + completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; /** * Get a localised message for when players offer has sold on flea * @param itemTpl Item sold diff --git a/TypeScript/14AfterDBLoadHook/types/helpers/RagfairServerHelper.d.ts b/TypeScript/14AfterDBLoadHook/types/helpers/RagfairServerHelper.d.ts index 927caf5..3e1fea9 100644 --- a/TypeScript/14AfterDBLoadHook/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/helpers/RagfairServerHelper.d.ts @@ -12,9 +12,9 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Helper class for common ragfair server actions */ diff --git a/TypeScript/14AfterDBLoadHook/types/helpers/RepairHelper.d.ts b/TypeScript/14AfterDBLoadHook/types/helpers/RepairHelper.d.ts index 99a21da..63c78c9 100644 --- a/TypeScript/14AfterDBLoadHook/types/helpers/RepairHelper.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/helpers/RepairHelper.d.ts @@ -4,8 +4,8 @@ import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/14AfterDBLoadHook/types/helpers/RepeatableQuestHelper.d.ts b/TypeScript/14AfterDBLoadHook/types/helpers/RepeatableQuestHelper.d.ts index d92657e..8c65f40 100644 --- a/TypeScript/14AfterDBLoadHook/types/helpers/RepeatableQuestHelper.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/helpers/RepeatableQuestHelper.d.ts @@ -1,8 +1,8 @@ import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestHelper { protected mathUtil: MathUtil; protected configServer: ConfigServer; diff --git a/TypeScript/14AfterDBLoadHook/types/helpers/TradeHelper.d.ts b/TypeScript/14AfterDBLoadHook/types/helpers/TradeHelper.d.ts index f994fda..6e6f3a2 100644 --- a/TypeScript/14AfterDBLoadHook/types/helpers/TradeHelper.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/helpers/TradeHelper.d.ts @@ -17,8 +17,8 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TradeHelper { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/14AfterDBLoadHook/types/helpers/TraderAssortHelper.d.ts b/TypeScript/14AfterDBLoadHook/types/helpers/TraderAssortHelper.d.ts index 8f8f802..f1ecd3b 100644 --- a/TypeScript/14AfterDBLoadHook/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/helpers/TraderAssortHelper.d.ts @@ -14,9 +14,9 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; diff --git a/TypeScript/14AfterDBLoadHook/types/loaders/BundleLoader.d.ts b/TypeScript/14AfterDBLoadHook/types/loaders/BundleLoader.d.ts index e270988..8c0ed4d 100644 --- a/TypeScript/14AfterDBLoadHook/types/loaders/BundleLoader.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/loaders/BundleLoader.d.ts @@ -1,8 +1,8 @@ import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BundleInfo { modpath: string; filename: string; diff --git a/TypeScript/14AfterDBLoadHook/types/loaders/PostDBModLoader.d.ts b/TypeScript/14AfterDBLoadHook/types/loaders/PostDBModLoader.d.ts index b0c4bf4..a8bb6a9 100644 --- a/TypeScript/14AfterDBLoadHook/types/loaders/PostDBModLoader.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/loaders/PostDBModLoader.d.ts @@ -1,10 +1,10 @@ -import { DependencyContainer } from "tsyringe"; import { OnLoad } from "@spt/di/OnLoad"; import { BundleLoader } from "@spt/loaders/BundleLoader"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostDBModLoader implements OnLoad { protected logger: ILogger; protected bundleLoader: BundleLoader; diff --git a/TypeScript/14AfterDBLoadHook/types/loaders/PostSptModLoader.d.ts b/TypeScript/14AfterDBLoadHook/types/loaders/PostSptModLoader.d.ts index fb54579..2603497 100644 --- a/TypeScript/14AfterDBLoadHook/types/loaders/PostSptModLoader.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/loaders/PostSptModLoader.d.ts @@ -1,9 +1,9 @@ -import { DependencyContainer } from "tsyringe"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { IModLoader } from "@spt/models/spt/mod/IModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostSptModLoader implements IModLoader { protected logger: ILogger; protected preSptModLoader: PreSptModLoader; diff --git a/TypeScript/14AfterDBLoadHook/types/loaders/PreSptModLoader.d.ts b/TypeScript/14AfterDBLoadHook/types/loaders/PreSptModLoader.d.ts index bc846c8..8814525 100644 --- a/TypeScript/14AfterDBLoadHook/types/loaders/PreSptModLoader.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/loaders/PreSptModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { ModDetails } from "@spt/models/eft/profile/ISptProfile"; @@ -11,6 +10,7 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { ModCompilerService } from "@spt/services/ModCompilerService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { DependencyContainer } from "tsyringe"; export declare class PreSptModLoader implements IModLoader { protected logger: ILogger; protected vfs: VFS; diff --git a/TypeScript/14AfterDBLoadHook/types/models/eft/common/IEmptyRequestData.d.ts b/TypeScript/14AfterDBLoadHook/types/models/eft/common/IEmptyRequestData.d.ts index 284d16e..52a7b12 100644 --- a/TypeScript/14AfterDBLoadHook/types/models/eft/common/IEmptyRequestData.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/models/eft/common/IEmptyRequestData.d.ts @@ -1,2 +1 @@ -export interface IEmptyRequestData { -} +export type IEmptyRequestData = {}; diff --git a/TypeScript/14AfterDBLoadHook/types/models/eft/common/tables/IBotBase.d.ts b/TypeScript/14AfterDBLoadHook/types/models/eft/common/tables/IBotBase.d.ts index a7fe1ca..be37845 100644 --- a/TypeScript/14AfterDBLoadHook/types/models/eft/common/tables/IBotBase.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/models/eft/common/tables/IBotBase.d.ts @@ -373,8 +373,7 @@ export interface LastCompleted { export interface Notes { Notes: Note[]; } -export interface CarExtractCounts { -} +export type CarExtractCounts = {}; export declare enum SurvivorClass { UNKNOWN = 0, NEUTRALIZER = 1, diff --git a/TypeScript/14AfterDBLoadHook/types/models/eft/common/tables/ILocationsBase.d.ts b/TypeScript/14AfterDBLoadHook/types/models/eft/common/tables/ILocationsBase.d.ts index 2c96af3..16bca24 100644 --- a/TypeScript/14AfterDBLoadHook/types/models/eft/common/tables/ILocationsBase.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/models/eft/common/tables/ILocationsBase.d.ts @@ -2,8 +2,7 @@ export interface ILocationsBase { locations: Locations; paths: Path[]; } -export interface Locations { -} +export type Locations = {}; export interface Path { Source: string; Destination: string; diff --git a/TypeScript/14AfterDBLoadHook/types/models/eft/common/tables/IProfileTemplate.d.ts b/TypeScript/14AfterDBLoadHook/types/models/eft/common/tables/IProfileTemplate.d.ts index 20923bc..6ba9221 100644 --- a/TypeScript/14AfterDBLoadHook/types/models/eft/common/tables/IProfileTemplate.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -1,12 +1,12 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { Dialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; export interface IProfileTemplates { - "Standard": IProfileSides; + Standard: IProfileSides; "Left Behind": IProfileSides; "Prepare To Escape": IProfileSides; "Edge Of Darkness": IProfileSides; - "Unheard": IProfileSides; - "Tournament": IProfileSides; + Unheard: IProfileSides; + Tournament: IProfileSides; "SPT Developer": IProfileSides; "SPT Easy start": IProfileSides; "SPT Zero to hero": IProfileSides; diff --git a/TypeScript/14AfterDBLoadHook/types/models/eft/common/tables/ITrader.d.ts b/TypeScript/14AfterDBLoadHook/types/models/eft/common/tables/ITrader.d.ts index 14ab409..40cf004 100644 --- a/TypeScript/14AfterDBLoadHook/types/models/eft/common/tables/ITrader.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/models/eft/common/tables/ITrader.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; export interface ITrader { assort?: ITraderAssort; @@ -78,6 +79,8 @@ export interface IBarterScheme { _tpl: string; onlyFunctional?: boolean; sptQuestLocked?: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface ISuit { _id: string; diff --git a/TypeScript/14AfterDBLoadHook/types/models/eft/hideout/IQteData.d.ts b/TypeScript/14AfterDBLoadHook/types/models/eft/hideout/IQteData.d.ts index 7f507e1..fe6cce6 100644 --- a/TypeScript/14AfterDBLoadHook/types/models/eft/hideout/IQteData.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/models/eft/hideout/IQteData.d.ts @@ -1,14 +1,14 @@ import { Effect } from "@spt/models/eft/health/Effect"; import { BodyPart } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; import { QteActivityType } from "@spt/models/enums/hideout/QteActivityType"; import { QteEffectType } from "@spt/models/enums/hideout/QteEffectType"; import { QteResultType } from "@spt/models/enums/hideout/QteResultType"; import { QteRewardType } from "@spt/models/enums/hideout/QteRewardType"; import { QteType } from "@spt/models/enums/hideout/QteType"; import { RequirementType } from "@spt/models/enums/hideout/RequirementType"; -import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt/models/enums/SkillTypes"; -import { Traders } from "@spt/models/enums/Traders"; export interface IQteData { id: string; type: QteActivityType; diff --git a/TypeScript/14AfterDBLoadHook/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/14AfterDBLoadHook/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index f1123c1..5971372 100644 --- a/TypeScript/14AfterDBLoadHook/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -15,7 +15,5 @@ export interface Items { change: any[]; del: any[]; } -export interface Production { -} -export interface TraderRelations { -} +export type Production = {}; +export type TraderRelations = {}; diff --git a/TypeScript/14AfterDBLoadHook/types/models/eft/profile/ISptProfile.d.ts b/TypeScript/14AfterDBLoadHook/types/models/eft/profile/ISptProfile.d.ts index a8e742a..dd7aea6 100644 --- a/TypeScript/14AfterDBLoadHook/types/models/eft/profile/ISptProfile.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/models/eft/profile/ISptProfile.d.ts @@ -209,12 +209,9 @@ export interface Effects { LeftLeg: LeftLeg; RightLeg: RightLeg; } -export interface Head { -} -export interface Chest { -} -export interface Stomach { -} +export type Head = {}; +export type Chest = {}; +export type Stomach = {}; export interface LeftArm { Fracture?: number; } diff --git a/TypeScript/14AfterDBLoadHook/types/models/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/14AfterDBLoadHook/types/models/eft/ragfair/IRagfairOffer.d.ts index eeeb79d..f6c07fc 100644 --- a/TypeScript/14AfterDBLoadHook/types/models/eft/ragfair/IRagfairOffer.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/models/eft/ragfair/IRagfairOffer.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface IRagfairOffer { sellResult?: SellResult[]; @@ -28,6 +29,8 @@ export interface OfferRequirement { _tpl: string; count: number; onlyFunctional: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface IRagfairOfferUser { id: string; diff --git a/TypeScript/14AfterDBLoadHook/types/models/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/14AfterDBLoadHook/types/models/eft/ragfair/ISearchRequestData.d.ts index 8261c5b..c631de8 100644 --- a/TypeScript/14AfterDBLoadHook/types/models/eft/ragfair/ISearchRequestData.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/models/eft/ragfair/ISearchRequestData.d.ts @@ -29,5 +29,4 @@ export declare enum OfferOwnerType { TRADEROWNERTYPE = 1, PLAYEROWNERTYPE = 2 } -export interface BuildItems { -} +export type BuildItems = {}; diff --git a/TypeScript/14AfterDBLoadHook/types/models/enums/BaseClasses.d.ts b/TypeScript/14AfterDBLoadHook/types/models/enums/BaseClasses.d.ts index 65fc95e..32ebf7c 100644 --- a/TypeScript/14AfterDBLoadHook/types/models/enums/BaseClasses.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/models/enums/BaseClasses.d.ts @@ -107,6 +107,6 @@ export declare enum BaseClasses { RECEIVER = "55818a304bdc2db5418b457d", BARREL = "555ef6e44bdc2de9068b457e", CHARGING_HANDLE = "55818a6f4bdc2db9688b456b", - COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569 ", + COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569", HIDEOUT_AREA_CONTAINER = "63da6da4784a55176c018dba" } diff --git a/TypeScript/14AfterDBLoadHook/types/models/enums/DogtagExchangeSide.d.ts b/TypeScript/14AfterDBLoadHook/types/models/enums/DogtagExchangeSide.d.ts new file mode 100644 index 0000000..de3d4df --- /dev/null +++ b/TypeScript/14AfterDBLoadHook/types/models/enums/DogtagExchangeSide.d.ts @@ -0,0 +1,5 @@ +export declare enum DogtagExchangeSide { + USEC = "Usec", + BEAR = "Bear", + ANY = "Any" +} diff --git a/TypeScript/14AfterDBLoadHook/types/models/spt/server/ExhaustableArray.d.ts b/TypeScript/14AfterDBLoadHook/types/models/spt/server/ExhaustableArray.d.ts index c27f41f..50a6b68 100644 --- a/TypeScript/14AfterDBLoadHook/types/models/spt/server/ExhaustableArray.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/models/spt/server/ExhaustableArray.d.ts @@ -1,5 +1,5 @@ -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ExhaustableArray implements IExhaustableArray { private itemPool; private randomUtil; diff --git a/TypeScript/14AfterDBLoadHook/types/routers/EventOutputHolder.d.ts b/TypeScript/14AfterDBLoadHook/types/routers/EventOutputHolder.d.ts index ef20706..148461a 100644 --- a/TypeScript/14AfterDBLoadHook/types/routers/EventOutputHolder.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/routers/EventOutputHolder.d.ts @@ -3,8 +3,8 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IHideoutImprovement, Productive, TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; import { TraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class EventOutputHolder { protected profileHelper: ProfileHelper; protected timeUtil: TimeUtil; @@ -12,7 +12,7 @@ export declare class EventOutputHolder { /** * What has client been informed of this game session * Key = sessionId, then second key is prod id - */ + */ protected clientActiveSessionStorage: Record>; diff --git a/TypeScript/14AfterDBLoadHook/types/servers/HttpServer.d.ts b/TypeScript/14AfterDBLoadHook/types/servers/HttpServer.d.ts index b00fe68..0024ba3 100644 --- a/TypeScript/14AfterDBLoadHook/types/servers/HttpServer.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/servers/HttpServer.d.ts @@ -6,8 +6,8 @@ import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; -import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { WebSocketServer } from "@spt/servers/WebSocketServer"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { LocalisationService } from "@spt/services/LocalisationService"; export declare class HttpServer { protected logger: ILogger; diff --git a/TypeScript/14AfterDBLoadHook/types/servers/WebSocketServer.d.ts b/TypeScript/14AfterDBLoadHook/types/servers/WebSocketServer.d.ts index f4e07bb..6121824 100644 --- a/TypeScript/14AfterDBLoadHook/types/servers/WebSocketServer.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/servers/WebSocketServer.d.ts @@ -1,12 +1,12 @@ /// import http, { IncomingMessage } from "node:http"; -import { WebSocket, Server } from "ws"; import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { Server, WebSocket } from "ws"; export declare class WebSocketServer { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/14AfterDBLoadHook/types/servers/ws/SptWebSocketConnectionHandler.d.ts b/TypeScript/14AfterDBLoadHook/types/servers/ws/SptWebSocketConnectionHandler.d.ts index 98d0898..70fc96a 100644 --- a/TypeScript/14AfterDBLoadHook/types/servers/ws/SptWebSocketConnectionHandler.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/servers/ws/SptWebSocketConnectionHandler.d.ts @@ -1,7 +1,6 @@ /// /// import { IncomingMessage } from "http"; -import { WebSocket } from "ws"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; @@ -11,6 +10,7 @@ import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectio import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; +import { WebSocket } from "ws"; export declare class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler { protected logger: ILogger; protected profileHelper: ProfileHelper; diff --git a/TypeScript/14AfterDBLoadHook/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts b/TypeScript/14AfterDBLoadHook/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts index d5247ec..5556129 100644 --- a/TypeScript/14AfterDBLoadHook/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts @@ -1,6 +1,6 @@ -import { RawData, WebSocket } from "ws"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; +import { RawData, WebSocket } from "ws"; export declare class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler { protected logger: ILogger; constructor(logger: ILogger); diff --git a/TypeScript/14AfterDBLoadHook/types/services/FenceService.d.ts b/TypeScript/14AfterDBLoadHook/types/services/FenceService.d.ts index c156122..58dc076 100644 --- a/TypeScript/14AfterDBLoadHook/types/services/FenceService.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/services/FenceService.d.ts @@ -13,9 +13,9 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Handle actions surrounding Fence * e.g. generating or refreshing assorts / get next refresh time diff --git a/TypeScript/14AfterDBLoadHook/types/services/InsuranceService.d.ts b/TypeScript/14AfterDBLoadHook/types/services/InsuranceService.d.ts index 0000e66..f799102 100644 --- a/TypeScript/14AfterDBLoadHook/types/services/InsuranceService.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/services/InsuranceService.d.ts @@ -18,10 +18,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceService { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/14AfterDBLoadHook/types/services/LocalisationService.d.ts b/TypeScript/14AfterDBLoadHook/types/services/LocalisationService.d.ts index 42dfa4e..855c138 100644 --- a/TypeScript/14AfterDBLoadHook/types/services/LocalisationService.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/services/LocalisationService.d.ts @@ -1,8 +1,8 @@ -import { I18n } from "i18n"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { LocaleService } from "@spt/services/LocaleService"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { I18n } from "i18n"; /** * Handles translating server text into different langauges */ diff --git a/TypeScript/14AfterDBLoadHook/types/services/ProfileFixerService.d.ts b/TypeScript/14AfterDBLoadHook/types/services/ProfileFixerService.d.ts index 525b867..91e4780 100644 --- a/TypeScript/14AfterDBLoadHook/types/services/ProfileFixerService.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/services/ProfileFixerService.d.ts @@ -8,7 +8,7 @@ import { Bonus, HideoutSlot } from "@spt/models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea"; -import { ISptProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; +import { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; @@ -16,11 +16,11 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileFixerService { protected logger: ILogger; protected watermark: Watermark; @@ -73,6 +73,7 @@ export declare class ProfileFixerService { */ protected removeDanglingTaskConditionCounters(pmcProfile: IPmcData): void; protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullRagfairRatings(pmcProfile: IPmcData): void; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; /** diff --git a/TypeScript/14AfterDBLoadHook/types/services/RagfairOfferService.d.ts b/TypeScript/14AfterDBLoadHook/types/services/RagfairOfferService.d.ts index 6c13b1d..98dd179 100644 --- a/TypeScript/14AfterDBLoadHook/types/services/RagfairOfferService.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/services/RagfairOfferService.d.ts @@ -10,10 +10,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/14AfterDBLoadHook/types/services/mod/CustomItemService.d.ts b/TypeScript/14AfterDBLoadHook/types/services/mod/CustomItemService.d.ts index 1926bed..f112872 100644 --- a/TypeScript/14AfterDBLoadHook/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/services/mod/CustomItemService.d.ts @@ -4,8 +4,8 @@ import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetail import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/14AfterDBLoadHook/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/14AfterDBLoadHook/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts index 3c9d955..91c84d9 100644 --- a/TypeScript/14AfterDBLoadHook/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class DynamicRouterModService { private container; constructor(container: DependencyContainer); diff --git a/TypeScript/14AfterDBLoadHook/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/14AfterDBLoadHook/types/services/mod/staticRouter/StaticRouterModService.d.ts index f60432d..0c3d4d8 100644 --- a/TypeScript/14AfterDBLoadHook/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class StaticRouterModService { protected container: DependencyContainer; constructor(container: DependencyContainer); diff --git a/TypeScript/14AfterDBLoadHook/types/utils/JsonUtil.d.ts b/TypeScript/14AfterDBLoadHook/types/utils/JsonUtil.d.ts index b30822c..4419228 100644 --- a/TypeScript/14AfterDBLoadHook/types/utils/JsonUtil.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/utils/JsonUtil.d.ts @@ -1,7 +1,7 @@ -import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { HashUtil } from "@spt/utils/HashUtil"; import { VFS } from "@spt/utils/VFS"; +import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; export declare class JsonUtil { protected vfs: VFS; protected hashUtil: HashUtil; diff --git a/TypeScript/14AfterDBLoadHook/types/utils/RandomUtil.d.ts b/TypeScript/14AfterDBLoadHook/types/utils/RandomUtil.d.ts index 49f242d..0da184f 100644 --- a/TypeScript/14AfterDBLoadHook/types/utils/RandomUtil.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/utils/RandomUtil.d.ts @@ -1,6 +1,6 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects * based on the relative probability of each of its elements. diff --git a/TypeScript/14AfterDBLoadHook/types/utils/logging/AbstractWinstonLogger.d.ts b/TypeScript/14AfterDBLoadHook/types/utils/logging/AbstractWinstonLogger.d.ts index 7098f85..ef54434 100644 --- a/TypeScript/14AfterDBLoadHook/types/utils/logging/AbstractWinstonLogger.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/utils/logging/AbstractWinstonLogger.d.ts @@ -1,12 +1,12 @@ /// import fs from "node:fs"; -import winston from "winston"; import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; import { SptLogger } from "@spt/models/spt/logging/SptLogger"; import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; import { ILogger } from "@spt/models/spt/utils/ILogger"; +import winston from "winston"; export declare abstract class AbstractWinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected showDebugInConsole: boolean; diff --git a/TypeScript/15HttpListenerExample/types/controllers/BotController.d.ts b/TypeScript/15HttpListenerExample/types/controllers/BotController.d.ts index 6431fca..475f51b 100644 --- a/TypeScript/15HttpListenerExample/types/controllers/BotController.d.ts +++ b/TypeScript/15HttpListenerExample/types/controllers/BotController.d.ts @@ -20,8 +20,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/15HttpListenerExample/types/controllers/BuildController.d.ts b/TypeScript/15HttpListenerExample/types/controllers/BuildController.d.ts index ed8adf6..2cb9c59 100644 --- a/TypeScript/15HttpListenerExample/types/controllers/BuildController.d.ts +++ b/TypeScript/15HttpListenerExample/types/controllers/BuildController.d.ts @@ -9,8 +9,8 @@ import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BuildController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/15HttpListenerExample/types/controllers/GameController.d.ts b/TypeScript/15HttpListenerExample/types/controllers/GameController.d.ts index 533a81c..e219c04 100644 --- a/TypeScript/15HttpListenerExample/types/controllers/GameController.d.ts +++ b/TypeScript/15HttpListenerExample/types/controllers/GameController.d.ts @@ -34,10 +34,10 @@ import { ProfileActivityService } from "@spt/services/ProfileActivityService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GameController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/15HttpListenerExample/types/controllers/HealthController.d.ts b/TypeScript/15HttpListenerExample/types/controllers/HealthController.d.ts index 5482283..5a0a0a6 100644 --- a/TypeScript/15HttpListenerExample/types/controllers/HealthController.d.ts +++ b/TypeScript/15HttpListenerExample/types/controllers/HealthController.d.ts @@ -12,8 +12,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthController { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/15HttpListenerExample/types/controllers/HideoutController.d.ts b/TypeScript/15HttpListenerExample/types/controllers/HideoutController.d.ts index e9d1ed9..89a428c 100644 --- a/TypeScript/15HttpListenerExample/types/controllers/HideoutController.d.ts +++ b/TypeScript/15HttpListenerExample/types/controllers/HideoutController.d.ts @@ -35,11 +35,11 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; import { ProfileActivityService } from "@spt/services/ProfileActivityService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/15HttpListenerExample/types/controllers/InraidController.d.ts b/TypeScript/15HttpListenerExample/types/controllers/InraidController.d.ts index 87f419b..9f0c409 100644 --- a/TypeScript/15HttpListenerExample/types/controllers/InraidController.d.ts +++ b/TypeScript/15HttpListenerExample/types/controllers/InraidController.d.ts @@ -13,6 +13,7 @@ import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRe import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState"; import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig"; import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; @@ -31,7 +32,6 @@ import { PmcChatResponseService } from "@spt/services/PmcChatResponseService"; import { TraderServicesService } from "@spt/services/TraderServicesService"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; -import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; /** * Logic for handling In Raid callbacks */ diff --git a/TypeScript/15HttpListenerExample/types/controllers/InsuranceController.d.ts b/TypeScript/15HttpListenerExample/types/controllers/InsuranceController.d.ts index f921b83..543e915 100644 --- a/TypeScript/15HttpListenerExample/types/controllers/InsuranceController.d.ts +++ b/TypeScript/15HttpListenerExample/types/controllers/InsuranceController.d.ts @@ -21,11 +21,11 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PaymentService } from "@spt/services/PaymentService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceController { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/15HttpListenerExample/types/controllers/InventoryController.d.ts b/TypeScript/15HttpListenerExample/types/controllers/InventoryController.d.ts index 40bb084..c986ce8 100644 --- a/TypeScript/15HttpListenerExample/types/controllers/InventoryController.d.ts +++ b/TypeScript/15HttpListenerExample/types/controllers/InventoryController.d.ts @@ -37,10 +37,10 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MapMarkerService } from "@spt/services/MapMarkerService"; import { PlayerService } from "@spt/services/PlayerService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/15HttpListenerExample/types/controllers/LocationController.d.ts b/TypeScript/15HttpListenerExample/types/controllers/LocationController.d.ts index 727a8c8..a541b9c 100644 --- a/TypeScript/15HttpListenerExample/types/controllers/LocationController.d.ts +++ b/TypeScript/15HttpListenerExample/types/controllers/LocationController.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class LocationController { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; diff --git a/TypeScript/15HttpListenerExample/types/controllers/ProfileController.d.ts b/TypeScript/15HttpListenerExample/types/controllers/ProfileController.d.ts index e8dae73..7e6d35c 100644 --- a/TypeScript/15HttpListenerExample/types/controllers/ProfileController.d.ts +++ b/TypeScript/15HttpListenerExample/types/controllers/ProfileController.d.ts @@ -26,9 +26,9 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/15HttpListenerExample/types/controllers/QuestController.d.ts b/TypeScript/15HttpListenerExample/types/controllers/QuestController.d.ts index 3cdce00..6a5b415 100644 --- a/TypeScript/15HttpListenerExample/types/controllers/QuestController.d.ts +++ b/TypeScript/15HttpListenerExample/types/controllers/QuestController.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/15HttpListenerExample/types/controllers/RepeatableQuestController.d.ts b/TypeScript/15HttpListenerExample/types/controllers/RepeatableQuestController.d.ts index 74f39eb..016f8c6 100644 --- a/TypeScript/15HttpListenerExample/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/15HttpListenerExample/types/controllers/RepeatableQuestController.d.ts @@ -18,11 +18,11 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/15HttpListenerExample/types/controllers/TradeController.d.ts b/TypeScript/15HttpListenerExample/types/controllers/TradeController.d.ts index bc72e92..842a97b 100644 --- a/TypeScript/15HttpListenerExample/types/controllers/TradeController.d.ts +++ b/TypeScript/15HttpListenerExample/types/controllers/TradeController.d.ts @@ -1,5 +1,6 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper"; import { TradeHelper } from "@spt/helpers/TradeHelper"; import { TraderHelper } from "@spt/helpers/TraderHelper"; import { IPmcData } from "@spt/models/eft/common/IPmcData"; @@ -35,6 +36,7 @@ export declare class TradeController { protected hashUtil: HashUtil; protected itemHelper: ItemHelper; protected profileHelper: ProfileHelper; + protected ragfairOfferHelper: RagfairOfferHelper; protected traderHelper: TraderHelper; protected ragfairServer: RagfairServer; protected httpResponse: HttpResponseUtil; @@ -44,7 +46,7 @@ export declare class TradeController { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairOfferHelper: RagfairOfferHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); /** Handle TradingConfirm event */ confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; /** Handle RagFairBuyOffer event */ @@ -67,10 +69,17 @@ export declare class TradeController { * @param output Output to send back to client */ protected buyPmcItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void; + /** + * Is the provided offerid and ownerid from a player made offer + * @param offerId Id of the offer + * @param offerOwnerId Owner id + * @returns true if offer was made by a player + */ + protected isPlayerOffer(offerId: string, offerOwnerId: string): boolean; /** * Does Player have necessary trader loyalty to purchase flea offer * @param sellerIsTrader is seller trader - * @param fleaOffer FLea offer being bought + * @param fleaOffer Flea offer being bought * @param pmcData Player profile * @returns True if player can buy offer */ diff --git a/TypeScript/15HttpListenerExample/types/controllers/TraderController.d.ts b/TypeScript/15HttpListenerExample/types/controllers/TraderController.d.ts index 7fc6d78..3592fc6 100644 --- a/TypeScript/15HttpListenerExample/types/controllers/TraderController.d.ts +++ b/TypeScript/15HttpListenerExample/types/controllers/TraderController.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/15HttpListenerExample/types/generators/BotEquipmentModGenerator.d.ts b/TypeScript/15HttpListenerExample/types/generators/BotEquipmentModGenerator.d.ts index 419120f..3952293 100644 --- a/TypeScript/15HttpListenerExample/types/generators/BotEquipmentModGenerator.d.ts +++ b/TypeScript/15HttpListenerExample/types/generators/BotEquipmentModGenerator.d.ts @@ -25,9 +25,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotEquipmentModGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -65,7 +65,7 @@ export declare class BotEquipmentModGenerator { * @param settings Bot equipment generation settings * @param modSlot Armor slot being filtered * @param existingPlateTplPool Plates tpls to choose from - * @param armorItem + * @param armorItem The armor items db template * @returns Array of plate tpls to choose from */ protected filterPlateModsForSlotByLevel(settings: IGenerateEquipmentProperties, modSlot: string, existingPlateTplPool: string[], armorItem: ITemplateItem): IFilterPlateModsForSlotByLevelResult; diff --git a/TypeScript/15HttpListenerExample/types/generators/BotGenerator.d.ts b/TypeScript/15HttpListenerExample/types/generators/BotGenerator.d.ts index 8ab4371..ebb8a59 100644 --- a/TypeScript/15HttpListenerExample/types/generators/BotGenerator.d.ts +++ b/TypeScript/15HttpListenerExample/types/generators/BotGenerator.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/15HttpListenerExample/types/generators/BotLevelGenerator.d.ts b/TypeScript/15HttpListenerExample/types/generators/BotLevelGenerator.d.ts index dee61e2..a8a8895 100644 --- a/TypeScript/15HttpListenerExample/types/generators/BotLevelGenerator.d.ts +++ b/TypeScript/15HttpListenerExample/types/generators/BotLevelGenerator.d.ts @@ -4,12 +4,14 @@ import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; +import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class BotLevelGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; protected databaseService: DatabaseService; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService); + protected mathUtil: MathUtil; + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, mathUtil: MathUtil); /** * Return a randomised bot level and exp value * @param levelDetails Min and max of level for bot @@ -18,6 +20,7 @@ export declare class BotLevelGenerator { * @returns IRandomisedBotLevelResult object */ generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult; + protected chooseBotLevel(min: number, max: number, shift: number, number: number): number; /** * Get the highest level a bot can be relative to the players level, but no further than the max size from globals.exp_table * @param botGenerationDetails Details to help generate a bot diff --git a/TypeScript/15HttpListenerExample/types/generators/BotLootGenerator.d.ts b/TypeScript/15HttpListenerExample/types/generators/BotLootGenerator.d.ts index fee56ce..c0583c6 100644 --- a/TypeScript/15HttpListenerExample/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/15HttpListenerExample/types/generators/BotLootGenerator.d.ts @@ -18,9 +18,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/15HttpListenerExample/types/generators/BotWeaponGenerator.d.ts b/TypeScript/15HttpListenerExample/types/generators/BotWeaponGenerator.d.ts index 5559bfa..8e03b35 100644 --- a/TypeScript/15HttpListenerExample/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/15HttpListenerExample/types/generators/BotWeaponGenerator.d.ts @@ -18,9 +18,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RepairService } from "@spt/services/RepairService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotWeaponGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/15HttpListenerExample/types/generators/LocationGenerator.d.ts b/TypeScript/15HttpListenerExample/types/generators/LocationGenerator.d.ts index 222b0ab..9a2b0c4 100644 --- a/TypeScript/15HttpListenerExample/types/generators/LocationGenerator.d.ts +++ b/TypeScript/15HttpListenerExample/types/generators/LocationGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export interface IContainerItem { items: Item[]; width: number; diff --git a/TypeScript/15HttpListenerExample/types/generators/PlayerScavGenerator.d.ts b/TypeScript/15HttpListenerExample/types/generators/PlayerScavGenerator.d.ts index 2414150..e317bf6 100644 --- a/TypeScript/15HttpListenerExample/types/generators/PlayerScavGenerator.d.ts +++ b/TypeScript/15HttpListenerExample/types/generators/PlayerScavGenerator.d.ts @@ -14,9 +14,9 @@ import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class PlayerScavGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/15HttpListenerExample/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/15HttpListenerExample/types/generators/RagfairOfferGenerator.d.ts index 9435390..ca09729 100644 --- a/TypeScript/15HttpListenerExample/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/15HttpListenerExample/types/generators/RagfairOfferGenerator.d.ts @@ -19,10 +19,10 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/15HttpListenerExample/types/generators/RepeatableQuestGenerator.d.ts b/TypeScript/15HttpListenerExample/types/generators/RepeatableQuestGenerator.d.ts index 77c4e79..339f322 100644 --- a/TypeScript/15HttpListenerExample/types/generators/RepeatableQuestGenerator.d.ts +++ b/TypeScript/15HttpListenerExample/types/generators/RepeatableQuestGenerator.d.ts @@ -11,10 +11,10 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/15HttpListenerExample/types/generators/RepeatableQuestRewardGenerator.d.ts b/TypeScript/15HttpListenerExample/types/generators/RepeatableQuestRewardGenerator.d.ts index 1e09994..713a394 100644 --- a/TypeScript/15HttpListenerExample/types/generators/RepeatableQuestRewardGenerator.d.ts +++ b/TypeScript/15HttpListenerExample/types/generators/RepeatableQuestRewardGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestRewardGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/15HttpListenerExample/types/helpers/BotDifficultyHelper.d.ts b/TypeScript/15HttpListenerExample/types/helpers/BotDifficultyHelper.d.ts index 63572a5..2348bd3 100644 --- a/TypeScript/15HttpListenerExample/types/helpers/BotDifficultyHelper.d.ts +++ b/TypeScript/15HttpListenerExample/types/helpers/BotDifficultyHelper.d.ts @@ -5,8 +5,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotDifficultyHelper { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/15HttpListenerExample/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/15HttpListenerExample/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index c51bf7e..c38f0a0 100644 --- a/TypeScript/15HttpListenerExample/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/15HttpListenerExample/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GiveSptCommand implements ISptCommand { protected logger: ILogger; protected itemHelper: ItemHelper; diff --git a/TypeScript/15HttpListenerExample/types/helpers/HealthHelper.d.ts b/TypeScript/15HttpListenerExample/types/helpers/HealthHelper.d.ts index 650f633..a164285 100644 --- a/TypeScript/15HttpListenerExample/types/helpers/HealthHelper.d.ts +++ b/TypeScript/15HttpListenerExample/types/helpers/HealthHelper.d.ts @@ -5,8 +5,8 @@ import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/15HttpListenerExample/types/helpers/HideoutHelper.d.ts b/TypeScript/15HttpListenerExample/types/helpers/HideoutHelper.d.ts index c4aaa4c..df0376b 100644 --- a/TypeScript/15HttpListenerExample/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/15HttpListenerExample/types/helpers/HideoutHelper.d.ts @@ -18,10 +18,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/15HttpListenerExample/types/helpers/InRaidHelper.d.ts b/TypeScript/15HttpListenerExample/types/helpers/InRaidHelper.d.ts index 449be9f..987c9ec 100644 --- a/TypeScript/15HttpListenerExample/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/15HttpListenerExample/types/helpers/InRaidHelper.d.ts @@ -15,9 +15,9 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InRaidHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/15HttpListenerExample/types/helpers/InventoryHelper.d.ts b/TypeScript/15HttpListenerExample/types/helpers/InventoryHelper.d.ts index f0ff69a..92bb49c 100644 --- a/TypeScript/15HttpListenerExample/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/15HttpListenerExample/types/helpers/InventoryHelper.d.ts @@ -23,9 +23,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/15HttpListenerExample/types/helpers/ItemHelper.d.ts b/TypeScript/15HttpListenerExample/types/helpers/ItemHelper.d.ts index da5dd11..c304cee 100644 --- a/TypeScript/15HttpListenerExample/types/helpers/ItemHelper.d.ts +++ b/TypeScript/15HttpListenerExample/types/helpers/ItemHelper.d.ts @@ -11,13 +11,13 @@ import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { CompareUtil } from "@spt/utils/CompareUtil"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ItemHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/15HttpListenerExample/types/helpers/ProfileHelper.d.ts b/TypeScript/15HttpListenerExample/types/helpers/ProfileHelper.d.ts index 0671179..cdab870 100644 --- a/TypeScript/15HttpListenerExample/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/15HttpListenerExample/types/helpers/ProfileHelper.d.ts @@ -11,10 +11,10 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/15HttpListenerExample/types/helpers/QuestHelper.d.ts b/TypeScript/15HttpListenerExample/types/helpers/QuestHelper.d.ts index 2b84b8f..2d5730d 100644 --- a/TypeScript/15HttpListenerExample/types/helpers/QuestHelper.d.ts +++ b/TypeScript/15HttpListenerExample/types/helpers/QuestHelper.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/15HttpListenerExample/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/15HttpListenerExample/types/helpers/RagfairOfferHelper.d.ts index b526554..2386316 100644 --- a/TypeScript/15HttpListenerExample/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/15HttpListenerExample/types/helpers/RagfairOfferHelper.d.ts @@ -151,7 +151,7 @@ export declare class RagfairOfferHelper { * @param boughtAmount Amount item was purchased for * @returns IItemEventRouterResponse */ - protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; + completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; /** * Get a localised message for when players offer has sold on flea * @param itemTpl Item sold diff --git a/TypeScript/15HttpListenerExample/types/helpers/RagfairServerHelper.d.ts b/TypeScript/15HttpListenerExample/types/helpers/RagfairServerHelper.d.ts index 927caf5..3e1fea9 100644 --- a/TypeScript/15HttpListenerExample/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/15HttpListenerExample/types/helpers/RagfairServerHelper.d.ts @@ -12,9 +12,9 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Helper class for common ragfair server actions */ diff --git a/TypeScript/15HttpListenerExample/types/helpers/RepairHelper.d.ts b/TypeScript/15HttpListenerExample/types/helpers/RepairHelper.d.ts index 99a21da..63c78c9 100644 --- a/TypeScript/15HttpListenerExample/types/helpers/RepairHelper.d.ts +++ b/TypeScript/15HttpListenerExample/types/helpers/RepairHelper.d.ts @@ -4,8 +4,8 @@ import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/15HttpListenerExample/types/helpers/RepeatableQuestHelper.d.ts b/TypeScript/15HttpListenerExample/types/helpers/RepeatableQuestHelper.d.ts index d92657e..8c65f40 100644 --- a/TypeScript/15HttpListenerExample/types/helpers/RepeatableQuestHelper.d.ts +++ b/TypeScript/15HttpListenerExample/types/helpers/RepeatableQuestHelper.d.ts @@ -1,8 +1,8 @@ import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestHelper { protected mathUtil: MathUtil; protected configServer: ConfigServer; diff --git a/TypeScript/15HttpListenerExample/types/helpers/TradeHelper.d.ts b/TypeScript/15HttpListenerExample/types/helpers/TradeHelper.d.ts index f994fda..6e6f3a2 100644 --- a/TypeScript/15HttpListenerExample/types/helpers/TradeHelper.d.ts +++ b/TypeScript/15HttpListenerExample/types/helpers/TradeHelper.d.ts @@ -17,8 +17,8 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TradeHelper { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/15HttpListenerExample/types/helpers/TraderAssortHelper.d.ts b/TypeScript/15HttpListenerExample/types/helpers/TraderAssortHelper.d.ts index 8f8f802..f1ecd3b 100644 --- a/TypeScript/15HttpListenerExample/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/15HttpListenerExample/types/helpers/TraderAssortHelper.d.ts @@ -14,9 +14,9 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; diff --git a/TypeScript/15HttpListenerExample/types/loaders/BundleLoader.d.ts b/TypeScript/15HttpListenerExample/types/loaders/BundleLoader.d.ts index e270988..8c0ed4d 100644 --- a/TypeScript/15HttpListenerExample/types/loaders/BundleLoader.d.ts +++ b/TypeScript/15HttpListenerExample/types/loaders/BundleLoader.d.ts @@ -1,8 +1,8 @@ import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BundleInfo { modpath: string; filename: string; diff --git a/TypeScript/15HttpListenerExample/types/loaders/PostDBModLoader.d.ts b/TypeScript/15HttpListenerExample/types/loaders/PostDBModLoader.d.ts index b0c4bf4..a8bb6a9 100644 --- a/TypeScript/15HttpListenerExample/types/loaders/PostDBModLoader.d.ts +++ b/TypeScript/15HttpListenerExample/types/loaders/PostDBModLoader.d.ts @@ -1,10 +1,10 @@ -import { DependencyContainer } from "tsyringe"; import { OnLoad } from "@spt/di/OnLoad"; import { BundleLoader } from "@spt/loaders/BundleLoader"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostDBModLoader implements OnLoad { protected logger: ILogger; protected bundleLoader: BundleLoader; diff --git a/TypeScript/15HttpListenerExample/types/loaders/PostSptModLoader.d.ts b/TypeScript/15HttpListenerExample/types/loaders/PostSptModLoader.d.ts index fb54579..2603497 100644 --- a/TypeScript/15HttpListenerExample/types/loaders/PostSptModLoader.d.ts +++ b/TypeScript/15HttpListenerExample/types/loaders/PostSptModLoader.d.ts @@ -1,9 +1,9 @@ -import { DependencyContainer } from "tsyringe"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { IModLoader } from "@spt/models/spt/mod/IModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostSptModLoader implements IModLoader { protected logger: ILogger; protected preSptModLoader: PreSptModLoader; diff --git a/TypeScript/15HttpListenerExample/types/loaders/PreSptModLoader.d.ts b/TypeScript/15HttpListenerExample/types/loaders/PreSptModLoader.d.ts index bc846c8..8814525 100644 --- a/TypeScript/15HttpListenerExample/types/loaders/PreSptModLoader.d.ts +++ b/TypeScript/15HttpListenerExample/types/loaders/PreSptModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { ModDetails } from "@spt/models/eft/profile/ISptProfile"; @@ -11,6 +10,7 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { ModCompilerService } from "@spt/services/ModCompilerService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { DependencyContainer } from "tsyringe"; export declare class PreSptModLoader implements IModLoader { protected logger: ILogger; protected vfs: VFS; diff --git a/TypeScript/15HttpListenerExample/types/models/eft/common/IEmptyRequestData.d.ts b/TypeScript/15HttpListenerExample/types/models/eft/common/IEmptyRequestData.d.ts index 284d16e..52a7b12 100644 --- a/TypeScript/15HttpListenerExample/types/models/eft/common/IEmptyRequestData.d.ts +++ b/TypeScript/15HttpListenerExample/types/models/eft/common/IEmptyRequestData.d.ts @@ -1,2 +1 @@ -export interface IEmptyRequestData { -} +export type IEmptyRequestData = {}; diff --git a/TypeScript/15HttpListenerExample/types/models/eft/common/tables/IBotBase.d.ts b/TypeScript/15HttpListenerExample/types/models/eft/common/tables/IBotBase.d.ts index a7fe1ca..be37845 100644 --- a/TypeScript/15HttpListenerExample/types/models/eft/common/tables/IBotBase.d.ts +++ b/TypeScript/15HttpListenerExample/types/models/eft/common/tables/IBotBase.d.ts @@ -373,8 +373,7 @@ export interface LastCompleted { export interface Notes { Notes: Note[]; } -export interface CarExtractCounts { -} +export type CarExtractCounts = {}; export declare enum SurvivorClass { UNKNOWN = 0, NEUTRALIZER = 1, diff --git a/TypeScript/15HttpListenerExample/types/models/eft/common/tables/ILocationsBase.d.ts b/TypeScript/15HttpListenerExample/types/models/eft/common/tables/ILocationsBase.d.ts index 2c96af3..16bca24 100644 --- a/TypeScript/15HttpListenerExample/types/models/eft/common/tables/ILocationsBase.d.ts +++ b/TypeScript/15HttpListenerExample/types/models/eft/common/tables/ILocationsBase.d.ts @@ -2,8 +2,7 @@ export interface ILocationsBase { locations: Locations; paths: Path[]; } -export interface Locations { -} +export type Locations = {}; export interface Path { Source: string; Destination: string; diff --git a/TypeScript/15HttpListenerExample/types/models/eft/common/tables/IProfileTemplate.d.ts b/TypeScript/15HttpListenerExample/types/models/eft/common/tables/IProfileTemplate.d.ts index 20923bc..6ba9221 100644 --- a/TypeScript/15HttpListenerExample/types/models/eft/common/tables/IProfileTemplate.d.ts +++ b/TypeScript/15HttpListenerExample/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -1,12 +1,12 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { Dialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; export interface IProfileTemplates { - "Standard": IProfileSides; + Standard: IProfileSides; "Left Behind": IProfileSides; "Prepare To Escape": IProfileSides; "Edge Of Darkness": IProfileSides; - "Unheard": IProfileSides; - "Tournament": IProfileSides; + Unheard: IProfileSides; + Tournament: IProfileSides; "SPT Developer": IProfileSides; "SPT Easy start": IProfileSides; "SPT Zero to hero": IProfileSides; diff --git a/TypeScript/15HttpListenerExample/types/models/eft/common/tables/ITrader.d.ts b/TypeScript/15HttpListenerExample/types/models/eft/common/tables/ITrader.d.ts index 14ab409..40cf004 100644 --- a/TypeScript/15HttpListenerExample/types/models/eft/common/tables/ITrader.d.ts +++ b/TypeScript/15HttpListenerExample/types/models/eft/common/tables/ITrader.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; export interface ITrader { assort?: ITraderAssort; @@ -78,6 +79,8 @@ export interface IBarterScheme { _tpl: string; onlyFunctional?: boolean; sptQuestLocked?: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface ISuit { _id: string; diff --git a/TypeScript/15HttpListenerExample/types/models/eft/hideout/IQteData.d.ts b/TypeScript/15HttpListenerExample/types/models/eft/hideout/IQteData.d.ts index 7f507e1..fe6cce6 100644 --- a/TypeScript/15HttpListenerExample/types/models/eft/hideout/IQteData.d.ts +++ b/TypeScript/15HttpListenerExample/types/models/eft/hideout/IQteData.d.ts @@ -1,14 +1,14 @@ import { Effect } from "@spt/models/eft/health/Effect"; import { BodyPart } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; import { QteActivityType } from "@spt/models/enums/hideout/QteActivityType"; import { QteEffectType } from "@spt/models/enums/hideout/QteEffectType"; import { QteResultType } from "@spt/models/enums/hideout/QteResultType"; import { QteRewardType } from "@spt/models/enums/hideout/QteRewardType"; import { QteType } from "@spt/models/enums/hideout/QteType"; import { RequirementType } from "@spt/models/enums/hideout/RequirementType"; -import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt/models/enums/SkillTypes"; -import { Traders } from "@spt/models/enums/Traders"; export interface IQteData { id: string; type: QteActivityType; diff --git a/TypeScript/15HttpListenerExample/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/15HttpListenerExample/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index f1123c1..5971372 100644 --- a/TypeScript/15HttpListenerExample/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/TypeScript/15HttpListenerExample/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -15,7 +15,5 @@ export interface Items { change: any[]; del: any[]; } -export interface Production { -} -export interface TraderRelations { -} +export type Production = {}; +export type TraderRelations = {}; diff --git a/TypeScript/15HttpListenerExample/types/models/eft/profile/ISptProfile.d.ts b/TypeScript/15HttpListenerExample/types/models/eft/profile/ISptProfile.d.ts index a8e742a..dd7aea6 100644 --- a/TypeScript/15HttpListenerExample/types/models/eft/profile/ISptProfile.d.ts +++ b/TypeScript/15HttpListenerExample/types/models/eft/profile/ISptProfile.d.ts @@ -209,12 +209,9 @@ export interface Effects { LeftLeg: LeftLeg; RightLeg: RightLeg; } -export interface Head { -} -export interface Chest { -} -export interface Stomach { -} +export type Head = {}; +export type Chest = {}; +export type Stomach = {}; export interface LeftArm { Fracture?: number; } diff --git a/TypeScript/15HttpListenerExample/types/models/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/15HttpListenerExample/types/models/eft/ragfair/IRagfairOffer.d.ts index eeeb79d..f6c07fc 100644 --- a/TypeScript/15HttpListenerExample/types/models/eft/ragfair/IRagfairOffer.d.ts +++ b/TypeScript/15HttpListenerExample/types/models/eft/ragfair/IRagfairOffer.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface IRagfairOffer { sellResult?: SellResult[]; @@ -28,6 +29,8 @@ export interface OfferRequirement { _tpl: string; count: number; onlyFunctional: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface IRagfairOfferUser { id: string; diff --git a/TypeScript/15HttpListenerExample/types/models/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/15HttpListenerExample/types/models/eft/ragfair/ISearchRequestData.d.ts index 8261c5b..c631de8 100644 --- a/TypeScript/15HttpListenerExample/types/models/eft/ragfair/ISearchRequestData.d.ts +++ b/TypeScript/15HttpListenerExample/types/models/eft/ragfair/ISearchRequestData.d.ts @@ -29,5 +29,4 @@ export declare enum OfferOwnerType { TRADEROWNERTYPE = 1, PLAYEROWNERTYPE = 2 } -export interface BuildItems { -} +export type BuildItems = {}; diff --git a/TypeScript/15HttpListenerExample/types/models/enums/BaseClasses.d.ts b/TypeScript/15HttpListenerExample/types/models/enums/BaseClasses.d.ts index 65fc95e..32ebf7c 100644 --- a/TypeScript/15HttpListenerExample/types/models/enums/BaseClasses.d.ts +++ b/TypeScript/15HttpListenerExample/types/models/enums/BaseClasses.d.ts @@ -107,6 +107,6 @@ export declare enum BaseClasses { RECEIVER = "55818a304bdc2db5418b457d", BARREL = "555ef6e44bdc2de9068b457e", CHARGING_HANDLE = "55818a6f4bdc2db9688b456b", - COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569 ", + COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569", HIDEOUT_AREA_CONTAINER = "63da6da4784a55176c018dba" } diff --git a/TypeScript/15HttpListenerExample/types/models/enums/DogtagExchangeSide.d.ts b/TypeScript/15HttpListenerExample/types/models/enums/DogtagExchangeSide.d.ts new file mode 100644 index 0000000..de3d4df --- /dev/null +++ b/TypeScript/15HttpListenerExample/types/models/enums/DogtagExchangeSide.d.ts @@ -0,0 +1,5 @@ +export declare enum DogtagExchangeSide { + USEC = "Usec", + BEAR = "Bear", + ANY = "Any" +} diff --git a/TypeScript/15HttpListenerExample/types/models/spt/server/ExhaustableArray.d.ts b/TypeScript/15HttpListenerExample/types/models/spt/server/ExhaustableArray.d.ts index c27f41f..50a6b68 100644 --- a/TypeScript/15HttpListenerExample/types/models/spt/server/ExhaustableArray.d.ts +++ b/TypeScript/15HttpListenerExample/types/models/spt/server/ExhaustableArray.d.ts @@ -1,5 +1,5 @@ -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ExhaustableArray implements IExhaustableArray { private itemPool; private randomUtil; diff --git a/TypeScript/15HttpListenerExample/types/routers/EventOutputHolder.d.ts b/TypeScript/15HttpListenerExample/types/routers/EventOutputHolder.d.ts index ef20706..148461a 100644 --- a/TypeScript/15HttpListenerExample/types/routers/EventOutputHolder.d.ts +++ b/TypeScript/15HttpListenerExample/types/routers/EventOutputHolder.d.ts @@ -3,8 +3,8 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IHideoutImprovement, Productive, TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; import { TraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class EventOutputHolder { protected profileHelper: ProfileHelper; protected timeUtil: TimeUtil; @@ -12,7 +12,7 @@ export declare class EventOutputHolder { /** * What has client been informed of this game session * Key = sessionId, then second key is prod id - */ + */ protected clientActiveSessionStorage: Record>; diff --git a/TypeScript/15HttpListenerExample/types/servers/HttpServer.d.ts b/TypeScript/15HttpListenerExample/types/servers/HttpServer.d.ts index b00fe68..0024ba3 100644 --- a/TypeScript/15HttpListenerExample/types/servers/HttpServer.d.ts +++ b/TypeScript/15HttpListenerExample/types/servers/HttpServer.d.ts @@ -6,8 +6,8 @@ import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; -import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { WebSocketServer } from "@spt/servers/WebSocketServer"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { LocalisationService } from "@spt/services/LocalisationService"; export declare class HttpServer { protected logger: ILogger; diff --git a/TypeScript/15HttpListenerExample/types/servers/WebSocketServer.d.ts b/TypeScript/15HttpListenerExample/types/servers/WebSocketServer.d.ts index f4e07bb..6121824 100644 --- a/TypeScript/15HttpListenerExample/types/servers/WebSocketServer.d.ts +++ b/TypeScript/15HttpListenerExample/types/servers/WebSocketServer.d.ts @@ -1,12 +1,12 @@ /// import http, { IncomingMessage } from "node:http"; -import { WebSocket, Server } from "ws"; import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { Server, WebSocket } from "ws"; export declare class WebSocketServer { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/15HttpListenerExample/types/servers/ws/SptWebSocketConnectionHandler.d.ts b/TypeScript/15HttpListenerExample/types/servers/ws/SptWebSocketConnectionHandler.d.ts index 98d0898..70fc96a 100644 --- a/TypeScript/15HttpListenerExample/types/servers/ws/SptWebSocketConnectionHandler.d.ts +++ b/TypeScript/15HttpListenerExample/types/servers/ws/SptWebSocketConnectionHandler.d.ts @@ -1,7 +1,6 @@ /// /// import { IncomingMessage } from "http"; -import { WebSocket } from "ws"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; @@ -11,6 +10,7 @@ import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectio import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; +import { WebSocket } from "ws"; export declare class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler { protected logger: ILogger; protected profileHelper: ProfileHelper; diff --git a/TypeScript/15HttpListenerExample/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts b/TypeScript/15HttpListenerExample/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts index d5247ec..5556129 100644 --- a/TypeScript/15HttpListenerExample/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts +++ b/TypeScript/15HttpListenerExample/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts @@ -1,6 +1,6 @@ -import { RawData, WebSocket } from "ws"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; +import { RawData, WebSocket } from "ws"; export declare class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler { protected logger: ILogger; constructor(logger: ILogger); diff --git a/TypeScript/15HttpListenerExample/types/services/FenceService.d.ts b/TypeScript/15HttpListenerExample/types/services/FenceService.d.ts index c156122..58dc076 100644 --- a/TypeScript/15HttpListenerExample/types/services/FenceService.d.ts +++ b/TypeScript/15HttpListenerExample/types/services/FenceService.d.ts @@ -13,9 +13,9 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Handle actions surrounding Fence * e.g. generating or refreshing assorts / get next refresh time diff --git a/TypeScript/15HttpListenerExample/types/services/InsuranceService.d.ts b/TypeScript/15HttpListenerExample/types/services/InsuranceService.d.ts index 0000e66..f799102 100644 --- a/TypeScript/15HttpListenerExample/types/services/InsuranceService.d.ts +++ b/TypeScript/15HttpListenerExample/types/services/InsuranceService.d.ts @@ -18,10 +18,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceService { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/15HttpListenerExample/types/services/LocalisationService.d.ts b/TypeScript/15HttpListenerExample/types/services/LocalisationService.d.ts index 42dfa4e..855c138 100644 --- a/TypeScript/15HttpListenerExample/types/services/LocalisationService.d.ts +++ b/TypeScript/15HttpListenerExample/types/services/LocalisationService.d.ts @@ -1,8 +1,8 @@ -import { I18n } from "i18n"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { LocaleService } from "@spt/services/LocaleService"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { I18n } from "i18n"; /** * Handles translating server text into different langauges */ diff --git a/TypeScript/15HttpListenerExample/types/services/ProfileFixerService.d.ts b/TypeScript/15HttpListenerExample/types/services/ProfileFixerService.d.ts index 525b867..91e4780 100644 --- a/TypeScript/15HttpListenerExample/types/services/ProfileFixerService.d.ts +++ b/TypeScript/15HttpListenerExample/types/services/ProfileFixerService.d.ts @@ -8,7 +8,7 @@ import { Bonus, HideoutSlot } from "@spt/models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea"; -import { ISptProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; +import { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; @@ -16,11 +16,11 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileFixerService { protected logger: ILogger; protected watermark: Watermark; @@ -73,6 +73,7 @@ export declare class ProfileFixerService { */ protected removeDanglingTaskConditionCounters(pmcProfile: IPmcData): void; protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullRagfairRatings(pmcProfile: IPmcData): void; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; /** diff --git a/TypeScript/15HttpListenerExample/types/services/RagfairOfferService.d.ts b/TypeScript/15HttpListenerExample/types/services/RagfairOfferService.d.ts index 6c13b1d..98dd179 100644 --- a/TypeScript/15HttpListenerExample/types/services/RagfairOfferService.d.ts +++ b/TypeScript/15HttpListenerExample/types/services/RagfairOfferService.d.ts @@ -10,10 +10,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/15HttpListenerExample/types/services/mod/CustomItemService.d.ts b/TypeScript/15HttpListenerExample/types/services/mod/CustomItemService.d.ts index 1926bed..f112872 100644 --- a/TypeScript/15HttpListenerExample/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/15HttpListenerExample/types/services/mod/CustomItemService.d.ts @@ -4,8 +4,8 @@ import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetail import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/15HttpListenerExample/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/15HttpListenerExample/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts index 3c9d955..91c84d9 100644 --- a/TypeScript/15HttpListenerExample/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts +++ b/TypeScript/15HttpListenerExample/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class DynamicRouterModService { private container; constructor(container: DependencyContainer); diff --git a/TypeScript/15HttpListenerExample/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/15HttpListenerExample/types/services/mod/staticRouter/StaticRouterModService.d.ts index f60432d..0c3d4d8 100644 --- a/TypeScript/15HttpListenerExample/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/TypeScript/15HttpListenerExample/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class StaticRouterModService { protected container: DependencyContainer; constructor(container: DependencyContainer); diff --git a/TypeScript/15HttpListenerExample/types/utils/JsonUtil.d.ts b/TypeScript/15HttpListenerExample/types/utils/JsonUtil.d.ts index b30822c..4419228 100644 --- a/TypeScript/15HttpListenerExample/types/utils/JsonUtil.d.ts +++ b/TypeScript/15HttpListenerExample/types/utils/JsonUtil.d.ts @@ -1,7 +1,7 @@ -import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { HashUtil } from "@spt/utils/HashUtil"; import { VFS } from "@spt/utils/VFS"; +import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; export declare class JsonUtil { protected vfs: VFS; protected hashUtil: HashUtil; diff --git a/TypeScript/15HttpListenerExample/types/utils/RandomUtil.d.ts b/TypeScript/15HttpListenerExample/types/utils/RandomUtil.d.ts index 49f242d..0da184f 100644 --- a/TypeScript/15HttpListenerExample/types/utils/RandomUtil.d.ts +++ b/TypeScript/15HttpListenerExample/types/utils/RandomUtil.d.ts @@ -1,6 +1,6 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects * based on the relative probability of each of its elements. diff --git a/TypeScript/15HttpListenerExample/types/utils/logging/AbstractWinstonLogger.d.ts b/TypeScript/15HttpListenerExample/types/utils/logging/AbstractWinstonLogger.d.ts index 7098f85..ef54434 100644 --- a/TypeScript/15HttpListenerExample/types/utils/logging/AbstractWinstonLogger.d.ts +++ b/TypeScript/15HttpListenerExample/types/utils/logging/AbstractWinstonLogger.d.ts @@ -1,12 +1,12 @@ /// import fs from "node:fs"; -import winston from "winston"; import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; import { SptLogger } from "@spt/models/spt/logging/SptLogger"; import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; import { ILogger } from "@spt/models/spt/utils/ILogger"; +import winston from "winston"; export declare abstract class AbstractWinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected showDebugInConsole: boolean; diff --git a/TypeScript/16ImporterUtil/types/controllers/BotController.d.ts b/TypeScript/16ImporterUtil/types/controllers/BotController.d.ts index 6431fca..475f51b 100644 --- a/TypeScript/16ImporterUtil/types/controllers/BotController.d.ts +++ b/TypeScript/16ImporterUtil/types/controllers/BotController.d.ts @@ -20,8 +20,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/16ImporterUtil/types/controllers/BuildController.d.ts b/TypeScript/16ImporterUtil/types/controllers/BuildController.d.ts index ed8adf6..2cb9c59 100644 --- a/TypeScript/16ImporterUtil/types/controllers/BuildController.d.ts +++ b/TypeScript/16ImporterUtil/types/controllers/BuildController.d.ts @@ -9,8 +9,8 @@ import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BuildController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/16ImporterUtil/types/controllers/GameController.d.ts b/TypeScript/16ImporterUtil/types/controllers/GameController.d.ts index 533a81c..e219c04 100644 --- a/TypeScript/16ImporterUtil/types/controllers/GameController.d.ts +++ b/TypeScript/16ImporterUtil/types/controllers/GameController.d.ts @@ -34,10 +34,10 @@ import { ProfileActivityService } from "@spt/services/ProfileActivityService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GameController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/16ImporterUtil/types/controllers/HealthController.d.ts b/TypeScript/16ImporterUtil/types/controllers/HealthController.d.ts index 5482283..5a0a0a6 100644 --- a/TypeScript/16ImporterUtil/types/controllers/HealthController.d.ts +++ b/TypeScript/16ImporterUtil/types/controllers/HealthController.d.ts @@ -12,8 +12,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthController { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/16ImporterUtil/types/controllers/HideoutController.d.ts b/TypeScript/16ImporterUtil/types/controllers/HideoutController.d.ts index e9d1ed9..89a428c 100644 --- a/TypeScript/16ImporterUtil/types/controllers/HideoutController.d.ts +++ b/TypeScript/16ImporterUtil/types/controllers/HideoutController.d.ts @@ -35,11 +35,11 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; import { ProfileActivityService } from "@spt/services/ProfileActivityService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/16ImporterUtil/types/controllers/InraidController.d.ts b/TypeScript/16ImporterUtil/types/controllers/InraidController.d.ts index 87f419b..9f0c409 100644 --- a/TypeScript/16ImporterUtil/types/controllers/InraidController.d.ts +++ b/TypeScript/16ImporterUtil/types/controllers/InraidController.d.ts @@ -13,6 +13,7 @@ import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRe import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState"; import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig"; import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; @@ -31,7 +32,6 @@ import { PmcChatResponseService } from "@spt/services/PmcChatResponseService"; import { TraderServicesService } from "@spt/services/TraderServicesService"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; -import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; /** * Logic for handling In Raid callbacks */ diff --git a/TypeScript/16ImporterUtil/types/controllers/InsuranceController.d.ts b/TypeScript/16ImporterUtil/types/controllers/InsuranceController.d.ts index f921b83..543e915 100644 --- a/TypeScript/16ImporterUtil/types/controllers/InsuranceController.d.ts +++ b/TypeScript/16ImporterUtil/types/controllers/InsuranceController.d.ts @@ -21,11 +21,11 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PaymentService } from "@spt/services/PaymentService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceController { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/16ImporterUtil/types/controllers/InventoryController.d.ts b/TypeScript/16ImporterUtil/types/controllers/InventoryController.d.ts index 40bb084..c986ce8 100644 --- a/TypeScript/16ImporterUtil/types/controllers/InventoryController.d.ts +++ b/TypeScript/16ImporterUtil/types/controllers/InventoryController.d.ts @@ -37,10 +37,10 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MapMarkerService } from "@spt/services/MapMarkerService"; import { PlayerService } from "@spt/services/PlayerService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/16ImporterUtil/types/controllers/LocationController.d.ts b/TypeScript/16ImporterUtil/types/controllers/LocationController.d.ts index 727a8c8..a541b9c 100644 --- a/TypeScript/16ImporterUtil/types/controllers/LocationController.d.ts +++ b/TypeScript/16ImporterUtil/types/controllers/LocationController.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class LocationController { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; diff --git a/TypeScript/16ImporterUtil/types/controllers/ProfileController.d.ts b/TypeScript/16ImporterUtil/types/controllers/ProfileController.d.ts index e8dae73..7e6d35c 100644 --- a/TypeScript/16ImporterUtil/types/controllers/ProfileController.d.ts +++ b/TypeScript/16ImporterUtil/types/controllers/ProfileController.d.ts @@ -26,9 +26,9 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/16ImporterUtil/types/controllers/QuestController.d.ts b/TypeScript/16ImporterUtil/types/controllers/QuestController.d.ts index 3cdce00..6a5b415 100644 --- a/TypeScript/16ImporterUtil/types/controllers/QuestController.d.ts +++ b/TypeScript/16ImporterUtil/types/controllers/QuestController.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/16ImporterUtil/types/controllers/RepeatableQuestController.d.ts b/TypeScript/16ImporterUtil/types/controllers/RepeatableQuestController.d.ts index 74f39eb..016f8c6 100644 --- a/TypeScript/16ImporterUtil/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/16ImporterUtil/types/controllers/RepeatableQuestController.d.ts @@ -18,11 +18,11 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/16ImporterUtil/types/controllers/TradeController.d.ts b/TypeScript/16ImporterUtil/types/controllers/TradeController.d.ts index bc72e92..842a97b 100644 --- a/TypeScript/16ImporterUtil/types/controllers/TradeController.d.ts +++ b/TypeScript/16ImporterUtil/types/controllers/TradeController.d.ts @@ -1,5 +1,6 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper"; import { TradeHelper } from "@spt/helpers/TradeHelper"; import { TraderHelper } from "@spt/helpers/TraderHelper"; import { IPmcData } from "@spt/models/eft/common/IPmcData"; @@ -35,6 +36,7 @@ export declare class TradeController { protected hashUtil: HashUtil; protected itemHelper: ItemHelper; protected profileHelper: ProfileHelper; + protected ragfairOfferHelper: RagfairOfferHelper; protected traderHelper: TraderHelper; protected ragfairServer: RagfairServer; protected httpResponse: HttpResponseUtil; @@ -44,7 +46,7 @@ export declare class TradeController { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairOfferHelper: RagfairOfferHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); /** Handle TradingConfirm event */ confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; /** Handle RagFairBuyOffer event */ @@ -67,10 +69,17 @@ export declare class TradeController { * @param output Output to send back to client */ protected buyPmcItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void; + /** + * Is the provided offerid and ownerid from a player made offer + * @param offerId Id of the offer + * @param offerOwnerId Owner id + * @returns true if offer was made by a player + */ + protected isPlayerOffer(offerId: string, offerOwnerId: string): boolean; /** * Does Player have necessary trader loyalty to purchase flea offer * @param sellerIsTrader is seller trader - * @param fleaOffer FLea offer being bought + * @param fleaOffer Flea offer being bought * @param pmcData Player profile * @returns True if player can buy offer */ diff --git a/TypeScript/16ImporterUtil/types/controllers/TraderController.d.ts b/TypeScript/16ImporterUtil/types/controllers/TraderController.d.ts index 7fc6d78..3592fc6 100644 --- a/TypeScript/16ImporterUtil/types/controllers/TraderController.d.ts +++ b/TypeScript/16ImporterUtil/types/controllers/TraderController.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/16ImporterUtil/types/generators/BotEquipmentModGenerator.d.ts b/TypeScript/16ImporterUtil/types/generators/BotEquipmentModGenerator.d.ts index 419120f..3952293 100644 --- a/TypeScript/16ImporterUtil/types/generators/BotEquipmentModGenerator.d.ts +++ b/TypeScript/16ImporterUtil/types/generators/BotEquipmentModGenerator.d.ts @@ -25,9 +25,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotEquipmentModGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -65,7 +65,7 @@ export declare class BotEquipmentModGenerator { * @param settings Bot equipment generation settings * @param modSlot Armor slot being filtered * @param existingPlateTplPool Plates tpls to choose from - * @param armorItem + * @param armorItem The armor items db template * @returns Array of plate tpls to choose from */ protected filterPlateModsForSlotByLevel(settings: IGenerateEquipmentProperties, modSlot: string, existingPlateTplPool: string[], armorItem: ITemplateItem): IFilterPlateModsForSlotByLevelResult; diff --git a/TypeScript/16ImporterUtil/types/generators/BotGenerator.d.ts b/TypeScript/16ImporterUtil/types/generators/BotGenerator.d.ts index 8ab4371..ebb8a59 100644 --- a/TypeScript/16ImporterUtil/types/generators/BotGenerator.d.ts +++ b/TypeScript/16ImporterUtil/types/generators/BotGenerator.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/16ImporterUtil/types/generators/BotLevelGenerator.d.ts b/TypeScript/16ImporterUtil/types/generators/BotLevelGenerator.d.ts index dee61e2..a8a8895 100644 --- a/TypeScript/16ImporterUtil/types/generators/BotLevelGenerator.d.ts +++ b/TypeScript/16ImporterUtil/types/generators/BotLevelGenerator.d.ts @@ -4,12 +4,14 @@ import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; +import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class BotLevelGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; protected databaseService: DatabaseService; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService); + protected mathUtil: MathUtil; + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, mathUtil: MathUtil); /** * Return a randomised bot level and exp value * @param levelDetails Min and max of level for bot @@ -18,6 +20,7 @@ export declare class BotLevelGenerator { * @returns IRandomisedBotLevelResult object */ generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult; + protected chooseBotLevel(min: number, max: number, shift: number, number: number): number; /** * Get the highest level a bot can be relative to the players level, but no further than the max size from globals.exp_table * @param botGenerationDetails Details to help generate a bot diff --git a/TypeScript/16ImporterUtil/types/generators/BotLootGenerator.d.ts b/TypeScript/16ImporterUtil/types/generators/BotLootGenerator.d.ts index fee56ce..c0583c6 100644 --- a/TypeScript/16ImporterUtil/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/16ImporterUtil/types/generators/BotLootGenerator.d.ts @@ -18,9 +18,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/16ImporterUtil/types/generators/BotWeaponGenerator.d.ts b/TypeScript/16ImporterUtil/types/generators/BotWeaponGenerator.d.ts index 5559bfa..8e03b35 100644 --- a/TypeScript/16ImporterUtil/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/16ImporterUtil/types/generators/BotWeaponGenerator.d.ts @@ -18,9 +18,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RepairService } from "@spt/services/RepairService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotWeaponGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/16ImporterUtil/types/generators/LocationGenerator.d.ts b/TypeScript/16ImporterUtil/types/generators/LocationGenerator.d.ts index 222b0ab..9a2b0c4 100644 --- a/TypeScript/16ImporterUtil/types/generators/LocationGenerator.d.ts +++ b/TypeScript/16ImporterUtil/types/generators/LocationGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export interface IContainerItem { items: Item[]; width: number; diff --git a/TypeScript/16ImporterUtil/types/generators/PlayerScavGenerator.d.ts b/TypeScript/16ImporterUtil/types/generators/PlayerScavGenerator.d.ts index 2414150..e317bf6 100644 --- a/TypeScript/16ImporterUtil/types/generators/PlayerScavGenerator.d.ts +++ b/TypeScript/16ImporterUtil/types/generators/PlayerScavGenerator.d.ts @@ -14,9 +14,9 @@ import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class PlayerScavGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/16ImporterUtil/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/16ImporterUtil/types/generators/RagfairOfferGenerator.d.ts index 9435390..ca09729 100644 --- a/TypeScript/16ImporterUtil/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/16ImporterUtil/types/generators/RagfairOfferGenerator.d.ts @@ -19,10 +19,10 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/16ImporterUtil/types/generators/RepeatableQuestGenerator.d.ts b/TypeScript/16ImporterUtil/types/generators/RepeatableQuestGenerator.d.ts index 77c4e79..339f322 100644 --- a/TypeScript/16ImporterUtil/types/generators/RepeatableQuestGenerator.d.ts +++ b/TypeScript/16ImporterUtil/types/generators/RepeatableQuestGenerator.d.ts @@ -11,10 +11,10 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/16ImporterUtil/types/generators/RepeatableQuestRewardGenerator.d.ts b/TypeScript/16ImporterUtil/types/generators/RepeatableQuestRewardGenerator.d.ts index 1e09994..713a394 100644 --- a/TypeScript/16ImporterUtil/types/generators/RepeatableQuestRewardGenerator.d.ts +++ b/TypeScript/16ImporterUtil/types/generators/RepeatableQuestRewardGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestRewardGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/16ImporterUtil/types/helpers/BotDifficultyHelper.d.ts b/TypeScript/16ImporterUtil/types/helpers/BotDifficultyHelper.d.ts index 63572a5..2348bd3 100644 --- a/TypeScript/16ImporterUtil/types/helpers/BotDifficultyHelper.d.ts +++ b/TypeScript/16ImporterUtil/types/helpers/BotDifficultyHelper.d.ts @@ -5,8 +5,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotDifficultyHelper { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/16ImporterUtil/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/16ImporterUtil/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index c51bf7e..c38f0a0 100644 --- a/TypeScript/16ImporterUtil/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/16ImporterUtil/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GiveSptCommand implements ISptCommand { protected logger: ILogger; protected itemHelper: ItemHelper; diff --git a/TypeScript/16ImporterUtil/types/helpers/HealthHelper.d.ts b/TypeScript/16ImporterUtil/types/helpers/HealthHelper.d.ts index 650f633..a164285 100644 --- a/TypeScript/16ImporterUtil/types/helpers/HealthHelper.d.ts +++ b/TypeScript/16ImporterUtil/types/helpers/HealthHelper.d.ts @@ -5,8 +5,8 @@ import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/16ImporterUtil/types/helpers/HideoutHelper.d.ts b/TypeScript/16ImporterUtil/types/helpers/HideoutHelper.d.ts index c4aaa4c..df0376b 100644 --- a/TypeScript/16ImporterUtil/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/16ImporterUtil/types/helpers/HideoutHelper.d.ts @@ -18,10 +18,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/16ImporterUtil/types/helpers/InRaidHelper.d.ts b/TypeScript/16ImporterUtil/types/helpers/InRaidHelper.d.ts index 449be9f..987c9ec 100644 --- a/TypeScript/16ImporterUtil/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/16ImporterUtil/types/helpers/InRaidHelper.d.ts @@ -15,9 +15,9 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InRaidHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/16ImporterUtil/types/helpers/InventoryHelper.d.ts b/TypeScript/16ImporterUtil/types/helpers/InventoryHelper.d.ts index f0ff69a..92bb49c 100644 --- a/TypeScript/16ImporterUtil/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/16ImporterUtil/types/helpers/InventoryHelper.d.ts @@ -23,9 +23,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/16ImporterUtil/types/helpers/ItemHelper.d.ts b/TypeScript/16ImporterUtil/types/helpers/ItemHelper.d.ts index da5dd11..c304cee 100644 --- a/TypeScript/16ImporterUtil/types/helpers/ItemHelper.d.ts +++ b/TypeScript/16ImporterUtil/types/helpers/ItemHelper.d.ts @@ -11,13 +11,13 @@ import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { CompareUtil } from "@spt/utils/CompareUtil"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ItemHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/16ImporterUtil/types/helpers/ProfileHelper.d.ts b/TypeScript/16ImporterUtil/types/helpers/ProfileHelper.d.ts index 0671179..cdab870 100644 --- a/TypeScript/16ImporterUtil/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/16ImporterUtil/types/helpers/ProfileHelper.d.ts @@ -11,10 +11,10 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/16ImporterUtil/types/helpers/QuestHelper.d.ts b/TypeScript/16ImporterUtil/types/helpers/QuestHelper.d.ts index 2b84b8f..2d5730d 100644 --- a/TypeScript/16ImporterUtil/types/helpers/QuestHelper.d.ts +++ b/TypeScript/16ImporterUtil/types/helpers/QuestHelper.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/16ImporterUtil/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/16ImporterUtil/types/helpers/RagfairOfferHelper.d.ts index b526554..2386316 100644 --- a/TypeScript/16ImporterUtil/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/16ImporterUtil/types/helpers/RagfairOfferHelper.d.ts @@ -151,7 +151,7 @@ export declare class RagfairOfferHelper { * @param boughtAmount Amount item was purchased for * @returns IItemEventRouterResponse */ - protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; + completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; /** * Get a localised message for when players offer has sold on flea * @param itemTpl Item sold diff --git a/TypeScript/16ImporterUtil/types/helpers/RagfairServerHelper.d.ts b/TypeScript/16ImporterUtil/types/helpers/RagfairServerHelper.d.ts index 927caf5..3e1fea9 100644 --- a/TypeScript/16ImporterUtil/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/16ImporterUtil/types/helpers/RagfairServerHelper.d.ts @@ -12,9 +12,9 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Helper class for common ragfair server actions */ diff --git a/TypeScript/16ImporterUtil/types/helpers/RepairHelper.d.ts b/TypeScript/16ImporterUtil/types/helpers/RepairHelper.d.ts index 99a21da..63c78c9 100644 --- a/TypeScript/16ImporterUtil/types/helpers/RepairHelper.d.ts +++ b/TypeScript/16ImporterUtil/types/helpers/RepairHelper.d.ts @@ -4,8 +4,8 @@ import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/16ImporterUtil/types/helpers/RepeatableQuestHelper.d.ts b/TypeScript/16ImporterUtil/types/helpers/RepeatableQuestHelper.d.ts index d92657e..8c65f40 100644 --- a/TypeScript/16ImporterUtil/types/helpers/RepeatableQuestHelper.d.ts +++ b/TypeScript/16ImporterUtil/types/helpers/RepeatableQuestHelper.d.ts @@ -1,8 +1,8 @@ import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestHelper { protected mathUtil: MathUtil; protected configServer: ConfigServer; diff --git a/TypeScript/16ImporterUtil/types/helpers/TradeHelper.d.ts b/TypeScript/16ImporterUtil/types/helpers/TradeHelper.d.ts index f994fda..6e6f3a2 100644 --- a/TypeScript/16ImporterUtil/types/helpers/TradeHelper.d.ts +++ b/TypeScript/16ImporterUtil/types/helpers/TradeHelper.d.ts @@ -17,8 +17,8 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TradeHelper { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/16ImporterUtil/types/helpers/TraderAssortHelper.d.ts b/TypeScript/16ImporterUtil/types/helpers/TraderAssortHelper.d.ts index 8f8f802..f1ecd3b 100644 --- a/TypeScript/16ImporterUtil/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/16ImporterUtil/types/helpers/TraderAssortHelper.d.ts @@ -14,9 +14,9 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; diff --git a/TypeScript/16ImporterUtil/types/loaders/BundleLoader.d.ts b/TypeScript/16ImporterUtil/types/loaders/BundleLoader.d.ts index e270988..8c0ed4d 100644 --- a/TypeScript/16ImporterUtil/types/loaders/BundleLoader.d.ts +++ b/TypeScript/16ImporterUtil/types/loaders/BundleLoader.d.ts @@ -1,8 +1,8 @@ import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BundleInfo { modpath: string; filename: string; diff --git a/TypeScript/16ImporterUtil/types/loaders/PostDBModLoader.d.ts b/TypeScript/16ImporterUtil/types/loaders/PostDBModLoader.d.ts index b0c4bf4..a8bb6a9 100644 --- a/TypeScript/16ImporterUtil/types/loaders/PostDBModLoader.d.ts +++ b/TypeScript/16ImporterUtil/types/loaders/PostDBModLoader.d.ts @@ -1,10 +1,10 @@ -import { DependencyContainer } from "tsyringe"; import { OnLoad } from "@spt/di/OnLoad"; import { BundleLoader } from "@spt/loaders/BundleLoader"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostDBModLoader implements OnLoad { protected logger: ILogger; protected bundleLoader: BundleLoader; diff --git a/TypeScript/16ImporterUtil/types/loaders/PostSptModLoader.d.ts b/TypeScript/16ImporterUtil/types/loaders/PostSptModLoader.d.ts index fb54579..2603497 100644 --- a/TypeScript/16ImporterUtil/types/loaders/PostSptModLoader.d.ts +++ b/TypeScript/16ImporterUtil/types/loaders/PostSptModLoader.d.ts @@ -1,9 +1,9 @@ -import { DependencyContainer } from "tsyringe"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { IModLoader } from "@spt/models/spt/mod/IModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostSptModLoader implements IModLoader { protected logger: ILogger; protected preSptModLoader: PreSptModLoader; diff --git a/TypeScript/16ImporterUtil/types/loaders/PreSptModLoader.d.ts b/TypeScript/16ImporterUtil/types/loaders/PreSptModLoader.d.ts index bc846c8..8814525 100644 --- a/TypeScript/16ImporterUtil/types/loaders/PreSptModLoader.d.ts +++ b/TypeScript/16ImporterUtil/types/loaders/PreSptModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { ModDetails } from "@spt/models/eft/profile/ISptProfile"; @@ -11,6 +10,7 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { ModCompilerService } from "@spt/services/ModCompilerService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { DependencyContainer } from "tsyringe"; export declare class PreSptModLoader implements IModLoader { protected logger: ILogger; protected vfs: VFS; diff --git a/TypeScript/16ImporterUtil/types/models/eft/common/IEmptyRequestData.d.ts b/TypeScript/16ImporterUtil/types/models/eft/common/IEmptyRequestData.d.ts index 284d16e..52a7b12 100644 --- a/TypeScript/16ImporterUtil/types/models/eft/common/IEmptyRequestData.d.ts +++ b/TypeScript/16ImporterUtil/types/models/eft/common/IEmptyRequestData.d.ts @@ -1,2 +1 @@ -export interface IEmptyRequestData { -} +export type IEmptyRequestData = {}; diff --git a/TypeScript/16ImporterUtil/types/models/eft/common/tables/IBotBase.d.ts b/TypeScript/16ImporterUtil/types/models/eft/common/tables/IBotBase.d.ts index a7fe1ca..be37845 100644 --- a/TypeScript/16ImporterUtil/types/models/eft/common/tables/IBotBase.d.ts +++ b/TypeScript/16ImporterUtil/types/models/eft/common/tables/IBotBase.d.ts @@ -373,8 +373,7 @@ export interface LastCompleted { export interface Notes { Notes: Note[]; } -export interface CarExtractCounts { -} +export type CarExtractCounts = {}; export declare enum SurvivorClass { UNKNOWN = 0, NEUTRALIZER = 1, diff --git a/TypeScript/16ImporterUtil/types/models/eft/common/tables/ILocationsBase.d.ts b/TypeScript/16ImporterUtil/types/models/eft/common/tables/ILocationsBase.d.ts index 2c96af3..16bca24 100644 --- a/TypeScript/16ImporterUtil/types/models/eft/common/tables/ILocationsBase.d.ts +++ b/TypeScript/16ImporterUtil/types/models/eft/common/tables/ILocationsBase.d.ts @@ -2,8 +2,7 @@ export interface ILocationsBase { locations: Locations; paths: Path[]; } -export interface Locations { -} +export type Locations = {}; export interface Path { Source: string; Destination: string; diff --git a/TypeScript/16ImporterUtil/types/models/eft/common/tables/IProfileTemplate.d.ts b/TypeScript/16ImporterUtil/types/models/eft/common/tables/IProfileTemplate.d.ts index 20923bc..6ba9221 100644 --- a/TypeScript/16ImporterUtil/types/models/eft/common/tables/IProfileTemplate.d.ts +++ b/TypeScript/16ImporterUtil/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -1,12 +1,12 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { Dialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; export interface IProfileTemplates { - "Standard": IProfileSides; + Standard: IProfileSides; "Left Behind": IProfileSides; "Prepare To Escape": IProfileSides; "Edge Of Darkness": IProfileSides; - "Unheard": IProfileSides; - "Tournament": IProfileSides; + Unheard: IProfileSides; + Tournament: IProfileSides; "SPT Developer": IProfileSides; "SPT Easy start": IProfileSides; "SPT Zero to hero": IProfileSides; diff --git a/TypeScript/16ImporterUtil/types/models/eft/common/tables/ITrader.d.ts b/TypeScript/16ImporterUtil/types/models/eft/common/tables/ITrader.d.ts index 14ab409..40cf004 100644 --- a/TypeScript/16ImporterUtil/types/models/eft/common/tables/ITrader.d.ts +++ b/TypeScript/16ImporterUtil/types/models/eft/common/tables/ITrader.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; export interface ITrader { assort?: ITraderAssort; @@ -78,6 +79,8 @@ export interface IBarterScheme { _tpl: string; onlyFunctional?: boolean; sptQuestLocked?: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface ISuit { _id: string; diff --git a/TypeScript/16ImporterUtil/types/models/eft/hideout/IQteData.d.ts b/TypeScript/16ImporterUtil/types/models/eft/hideout/IQteData.d.ts index 7f507e1..fe6cce6 100644 --- a/TypeScript/16ImporterUtil/types/models/eft/hideout/IQteData.d.ts +++ b/TypeScript/16ImporterUtil/types/models/eft/hideout/IQteData.d.ts @@ -1,14 +1,14 @@ import { Effect } from "@spt/models/eft/health/Effect"; import { BodyPart } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; import { QteActivityType } from "@spt/models/enums/hideout/QteActivityType"; import { QteEffectType } from "@spt/models/enums/hideout/QteEffectType"; import { QteResultType } from "@spt/models/enums/hideout/QteResultType"; import { QteRewardType } from "@spt/models/enums/hideout/QteRewardType"; import { QteType } from "@spt/models/enums/hideout/QteType"; import { RequirementType } from "@spt/models/enums/hideout/RequirementType"; -import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt/models/enums/SkillTypes"; -import { Traders } from "@spt/models/enums/Traders"; export interface IQteData { id: string; type: QteActivityType; diff --git a/TypeScript/16ImporterUtil/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/16ImporterUtil/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index f1123c1..5971372 100644 --- a/TypeScript/16ImporterUtil/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/TypeScript/16ImporterUtil/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -15,7 +15,5 @@ export interface Items { change: any[]; del: any[]; } -export interface Production { -} -export interface TraderRelations { -} +export type Production = {}; +export type TraderRelations = {}; diff --git a/TypeScript/16ImporterUtil/types/models/eft/profile/ISptProfile.d.ts b/TypeScript/16ImporterUtil/types/models/eft/profile/ISptProfile.d.ts index a8e742a..dd7aea6 100644 --- a/TypeScript/16ImporterUtil/types/models/eft/profile/ISptProfile.d.ts +++ b/TypeScript/16ImporterUtil/types/models/eft/profile/ISptProfile.d.ts @@ -209,12 +209,9 @@ export interface Effects { LeftLeg: LeftLeg; RightLeg: RightLeg; } -export interface Head { -} -export interface Chest { -} -export interface Stomach { -} +export type Head = {}; +export type Chest = {}; +export type Stomach = {}; export interface LeftArm { Fracture?: number; } diff --git a/TypeScript/16ImporterUtil/types/models/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/16ImporterUtil/types/models/eft/ragfair/IRagfairOffer.d.ts index eeeb79d..f6c07fc 100644 --- a/TypeScript/16ImporterUtil/types/models/eft/ragfair/IRagfairOffer.d.ts +++ b/TypeScript/16ImporterUtil/types/models/eft/ragfair/IRagfairOffer.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface IRagfairOffer { sellResult?: SellResult[]; @@ -28,6 +29,8 @@ export interface OfferRequirement { _tpl: string; count: number; onlyFunctional: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface IRagfairOfferUser { id: string; diff --git a/TypeScript/16ImporterUtil/types/models/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/16ImporterUtil/types/models/eft/ragfair/ISearchRequestData.d.ts index 8261c5b..c631de8 100644 --- a/TypeScript/16ImporterUtil/types/models/eft/ragfair/ISearchRequestData.d.ts +++ b/TypeScript/16ImporterUtil/types/models/eft/ragfair/ISearchRequestData.d.ts @@ -29,5 +29,4 @@ export declare enum OfferOwnerType { TRADEROWNERTYPE = 1, PLAYEROWNERTYPE = 2 } -export interface BuildItems { -} +export type BuildItems = {}; diff --git a/TypeScript/16ImporterUtil/types/models/enums/BaseClasses.d.ts b/TypeScript/16ImporterUtil/types/models/enums/BaseClasses.d.ts index 65fc95e..32ebf7c 100644 --- a/TypeScript/16ImporterUtil/types/models/enums/BaseClasses.d.ts +++ b/TypeScript/16ImporterUtil/types/models/enums/BaseClasses.d.ts @@ -107,6 +107,6 @@ export declare enum BaseClasses { RECEIVER = "55818a304bdc2db5418b457d", BARREL = "555ef6e44bdc2de9068b457e", CHARGING_HANDLE = "55818a6f4bdc2db9688b456b", - COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569 ", + COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569", HIDEOUT_AREA_CONTAINER = "63da6da4784a55176c018dba" } diff --git a/TypeScript/16ImporterUtil/types/models/enums/DogtagExchangeSide.d.ts b/TypeScript/16ImporterUtil/types/models/enums/DogtagExchangeSide.d.ts new file mode 100644 index 0000000..de3d4df --- /dev/null +++ b/TypeScript/16ImporterUtil/types/models/enums/DogtagExchangeSide.d.ts @@ -0,0 +1,5 @@ +export declare enum DogtagExchangeSide { + USEC = "Usec", + BEAR = "Bear", + ANY = "Any" +} diff --git a/TypeScript/16ImporterUtil/types/models/spt/server/ExhaustableArray.d.ts b/TypeScript/16ImporterUtil/types/models/spt/server/ExhaustableArray.d.ts index c27f41f..50a6b68 100644 --- a/TypeScript/16ImporterUtil/types/models/spt/server/ExhaustableArray.d.ts +++ b/TypeScript/16ImporterUtil/types/models/spt/server/ExhaustableArray.d.ts @@ -1,5 +1,5 @@ -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ExhaustableArray implements IExhaustableArray { private itemPool; private randomUtil; diff --git a/TypeScript/16ImporterUtil/types/routers/EventOutputHolder.d.ts b/TypeScript/16ImporterUtil/types/routers/EventOutputHolder.d.ts index ef20706..148461a 100644 --- a/TypeScript/16ImporterUtil/types/routers/EventOutputHolder.d.ts +++ b/TypeScript/16ImporterUtil/types/routers/EventOutputHolder.d.ts @@ -3,8 +3,8 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IHideoutImprovement, Productive, TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; import { TraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class EventOutputHolder { protected profileHelper: ProfileHelper; protected timeUtil: TimeUtil; @@ -12,7 +12,7 @@ export declare class EventOutputHolder { /** * What has client been informed of this game session * Key = sessionId, then second key is prod id - */ + */ protected clientActiveSessionStorage: Record>; diff --git a/TypeScript/16ImporterUtil/types/servers/HttpServer.d.ts b/TypeScript/16ImporterUtil/types/servers/HttpServer.d.ts index b00fe68..0024ba3 100644 --- a/TypeScript/16ImporterUtil/types/servers/HttpServer.d.ts +++ b/TypeScript/16ImporterUtil/types/servers/HttpServer.d.ts @@ -6,8 +6,8 @@ import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; -import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { WebSocketServer } from "@spt/servers/WebSocketServer"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { LocalisationService } from "@spt/services/LocalisationService"; export declare class HttpServer { protected logger: ILogger; diff --git a/TypeScript/16ImporterUtil/types/servers/WebSocketServer.d.ts b/TypeScript/16ImporterUtil/types/servers/WebSocketServer.d.ts index f4e07bb..6121824 100644 --- a/TypeScript/16ImporterUtil/types/servers/WebSocketServer.d.ts +++ b/TypeScript/16ImporterUtil/types/servers/WebSocketServer.d.ts @@ -1,12 +1,12 @@ /// import http, { IncomingMessage } from "node:http"; -import { WebSocket, Server } from "ws"; import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { Server, WebSocket } from "ws"; export declare class WebSocketServer { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/16ImporterUtil/types/servers/ws/SptWebSocketConnectionHandler.d.ts b/TypeScript/16ImporterUtil/types/servers/ws/SptWebSocketConnectionHandler.d.ts index 98d0898..70fc96a 100644 --- a/TypeScript/16ImporterUtil/types/servers/ws/SptWebSocketConnectionHandler.d.ts +++ b/TypeScript/16ImporterUtil/types/servers/ws/SptWebSocketConnectionHandler.d.ts @@ -1,7 +1,6 @@ /// /// import { IncomingMessage } from "http"; -import { WebSocket } from "ws"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; @@ -11,6 +10,7 @@ import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectio import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; +import { WebSocket } from "ws"; export declare class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler { protected logger: ILogger; protected profileHelper: ProfileHelper; diff --git a/TypeScript/16ImporterUtil/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts b/TypeScript/16ImporterUtil/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts index d5247ec..5556129 100644 --- a/TypeScript/16ImporterUtil/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts +++ b/TypeScript/16ImporterUtil/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts @@ -1,6 +1,6 @@ -import { RawData, WebSocket } from "ws"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; +import { RawData, WebSocket } from "ws"; export declare class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler { protected logger: ILogger; constructor(logger: ILogger); diff --git a/TypeScript/16ImporterUtil/types/services/FenceService.d.ts b/TypeScript/16ImporterUtil/types/services/FenceService.d.ts index c156122..58dc076 100644 --- a/TypeScript/16ImporterUtil/types/services/FenceService.d.ts +++ b/TypeScript/16ImporterUtil/types/services/FenceService.d.ts @@ -13,9 +13,9 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Handle actions surrounding Fence * e.g. generating or refreshing assorts / get next refresh time diff --git a/TypeScript/16ImporterUtil/types/services/InsuranceService.d.ts b/TypeScript/16ImporterUtil/types/services/InsuranceService.d.ts index 0000e66..f799102 100644 --- a/TypeScript/16ImporterUtil/types/services/InsuranceService.d.ts +++ b/TypeScript/16ImporterUtil/types/services/InsuranceService.d.ts @@ -18,10 +18,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceService { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/16ImporterUtil/types/services/LocalisationService.d.ts b/TypeScript/16ImporterUtil/types/services/LocalisationService.d.ts index 42dfa4e..855c138 100644 --- a/TypeScript/16ImporterUtil/types/services/LocalisationService.d.ts +++ b/TypeScript/16ImporterUtil/types/services/LocalisationService.d.ts @@ -1,8 +1,8 @@ -import { I18n } from "i18n"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { LocaleService } from "@spt/services/LocaleService"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { I18n } from "i18n"; /** * Handles translating server text into different langauges */ diff --git a/TypeScript/16ImporterUtil/types/services/ProfileFixerService.d.ts b/TypeScript/16ImporterUtil/types/services/ProfileFixerService.d.ts index 525b867..91e4780 100644 --- a/TypeScript/16ImporterUtil/types/services/ProfileFixerService.d.ts +++ b/TypeScript/16ImporterUtil/types/services/ProfileFixerService.d.ts @@ -8,7 +8,7 @@ import { Bonus, HideoutSlot } from "@spt/models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea"; -import { ISptProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; +import { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; @@ -16,11 +16,11 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileFixerService { protected logger: ILogger; protected watermark: Watermark; @@ -73,6 +73,7 @@ export declare class ProfileFixerService { */ protected removeDanglingTaskConditionCounters(pmcProfile: IPmcData): void; protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullRagfairRatings(pmcProfile: IPmcData): void; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; /** diff --git a/TypeScript/16ImporterUtil/types/services/RagfairOfferService.d.ts b/TypeScript/16ImporterUtil/types/services/RagfairOfferService.d.ts index 6c13b1d..98dd179 100644 --- a/TypeScript/16ImporterUtil/types/services/RagfairOfferService.d.ts +++ b/TypeScript/16ImporterUtil/types/services/RagfairOfferService.d.ts @@ -10,10 +10,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/16ImporterUtil/types/services/mod/CustomItemService.d.ts b/TypeScript/16ImporterUtil/types/services/mod/CustomItemService.d.ts index 1926bed..f112872 100644 --- a/TypeScript/16ImporterUtil/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/16ImporterUtil/types/services/mod/CustomItemService.d.ts @@ -4,8 +4,8 @@ import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetail import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/16ImporterUtil/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/16ImporterUtil/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts index 3c9d955..91c84d9 100644 --- a/TypeScript/16ImporterUtil/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts +++ b/TypeScript/16ImporterUtil/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class DynamicRouterModService { private container; constructor(container: DependencyContainer); diff --git a/TypeScript/16ImporterUtil/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/16ImporterUtil/types/services/mod/staticRouter/StaticRouterModService.d.ts index f60432d..0c3d4d8 100644 --- a/TypeScript/16ImporterUtil/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/TypeScript/16ImporterUtil/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class StaticRouterModService { protected container: DependencyContainer; constructor(container: DependencyContainer); diff --git a/TypeScript/16ImporterUtil/types/utils/JsonUtil.d.ts b/TypeScript/16ImporterUtil/types/utils/JsonUtil.d.ts index b30822c..4419228 100644 --- a/TypeScript/16ImporterUtil/types/utils/JsonUtil.d.ts +++ b/TypeScript/16ImporterUtil/types/utils/JsonUtil.d.ts @@ -1,7 +1,7 @@ -import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { HashUtil } from "@spt/utils/HashUtil"; import { VFS } from "@spt/utils/VFS"; +import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; export declare class JsonUtil { protected vfs: VFS; protected hashUtil: HashUtil; diff --git a/TypeScript/16ImporterUtil/types/utils/RandomUtil.d.ts b/TypeScript/16ImporterUtil/types/utils/RandomUtil.d.ts index 49f242d..0da184f 100644 --- a/TypeScript/16ImporterUtil/types/utils/RandomUtil.d.ts +++ b/TypeScript/16ImporterUtil/types/utils/RandomUtil.d.ts @@ -1,6 +1,6 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects * based on the relative probability of each of its elements. diff --git a/TypeScript/16ImporterUtil/types/utils/logging/AbstractWinstonLogger.d.ts b/TypeScript/16ImporterUtil/types/utils/logging/AbstractWinstonLogger.d.ts index 7098f85..ef54434 100644 --- a/TypeScript/16ImporterUtil/types/utils/logging/AbstractWinstonLogger.d.ts +++ b/TypeScript/16ImporterUtil/types/utils/logging/AbstractWinstonLogger.d.ts @@ -1,12 +1,12 @@ /// import fs from "node:fs"; -import winston from "winston"; import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; import { SptLogger } from "@spt/models/spt/logging/SptLogger"; import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; import { ILogger } from "@spt/models/spt/utils/ILogger"; +import winston from "winston"; export declare abstract class AbstractWinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected showDebugInConsole: boolean; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/controllers/BotController.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/controllers/BotController.d.ts index 6431fca..475f51b 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/controllers/BotController.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/controllers/BotController.d.ts @@ -20,8 +20,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/controllers/BuildController.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/controllers/BuildController.d.ts index ed8adf6..2cb9c59 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/controllers/BuildController.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/controllers/BuildController.d.ts @@ -9,8 +9,8 @@ import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BuildController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/controllers/GameController.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/controllers/GameController.d.ts index 533a81c..e219c04 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/controllers/GameController.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/controllers/GameController.d.ts @@ -34,10 +34,10 @@ import { ProfileActivityService } from "@spt/services/ProfileActivityService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GameController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/controllers/HealthController.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/controllers/HealthController.d.ts index 5482283..5a0a0a6 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/controllers/HealthController.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/controllers/HealthController.d.ts @@ -12,8 +12,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthController { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/controllers/HideoutController.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/controllers/HideoutController.d.ts index e9d1ed9..89a428c 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/controllers/HideoutController.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/controllers/HideoutController.d.ts @@ -35,11 +35,11 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; import { ProfileActivityService } from "@spt/services/ProfileActivityService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/controllers/InraidController.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/controllers/InraidController.d.ts index 87f419b..9f0c409 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/controllers/InraidController.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/controllers/InraidController.d.ts @@ -13,6 +13,7 @@ import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRe import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState"; import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig"; import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; @@ -31,7 +32,6 @@ import { PmcChatResponseService } from "@spt/services/PmcChatResponseService"; import { TraderServicesService } from "@spt/services/TraderServicesService"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; -import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; /** * Logic for handling In Raid callbacks */ diff --git a/TypeScript/17AsyncImporterWithDependency1/types/controllers/InsuranceController.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/controllers/InsuranceController.d.ts index f921b83..543e915 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/controllers/InsuranceController.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/controllers/InsuranceController.d.ts @@ -21,11 +21,11 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PaymentService } from "@spt/services/PaymentService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceController { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/controllers/InventoryController.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/controllers/InventoryController.d.ts index 40bb084..c986ce8 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/controllers/InventoryController.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/controllers/InventoryController.d.ts @@ -37,10 +37,10 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MapMarkerService } from "@spt/services/MapMarkerService"; import { PlayerService } from "@spt/services/PlayerService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/controllers/LocationController.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/controllers/LocationController.d.ts index 727a8c8..a541b9c 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/controllers/LocationController.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/controllers/LocationController.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class LocationController { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/controllers/ProfileController.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/controllers/ProfileController.d.ts index e8dae73..7e6d35c 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/controllers/ProfileController.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/controllers/ProfileController.d.ts @@ -26,9 +26,9 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/controllers/QuestController.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/controllers/QuestController.d.ts index 3cdce00..6a5b415 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/controllers/QuestController.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/controllers/QuestController.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/controllers/RepeatableQuestController.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/controllers/RepeatableQuestController.d.ts index 74f39eb..016f8c6 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/controllers/RepeatableQuestController.d.ts @@ -18,11 +18,11 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/controllers/TradeController.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/controllers/TradeController.d.ts index bc72e92..842a97b 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/controllers/TradeController.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/controllers/TradeController.d.ts @@ -1,5 +1,6 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper"; import { TradeHelper } from "@spt/helpers/TradeHelper"; import { TraderHelper } from "@spt/helpers/TraderHelper"; import { IPmcData } from "@spt/models/eft/common/IPmcData"; @@ -35,6 +36,7 @@ export declare class TradeController { protected hashUtil: HashUtil; protected itemHelper: ItemHelper; protected profileHelper: ProfileHelper; + protected ragfairOfferHelper: RagfairOfferHelper; protected traderHelper: TraderHelper; protected ragfairServer: RagfairServer; protected httpResponse: HttpResponseUtil; @@ -44,7 +46,7 @@ export declare class TradeController { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairOfferHelper: RagfairOfferHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); /** Handle TradingConfirm event */ confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; /** Handle RagFairBuyOffer event */ @@ -67,10 +69,17 @@ export declare class TradeController { * @param output Output to send back to client */ protected buyPmcItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void; + /** + * Is the provided offerid and ownerid from a player made offer + * @param offerId Id of the offer + * @param offerOwnerId Owner id + * @returns true if offer was made by a player + */ + protected isPlayerOffer(offerId: string, offerOwnerId: string): boolean; /** * Does Player have necessary trader loyalty to purchase flea offer * @param sellerIsTrader is seller trader - * @param fleaOffer FLea offer being bought + * @param fleaOffer Flea offer being bought * @param pmcData Player profile * @returns True if player can buy offer */ diff --git a/TypeScript/17AsyncImporterWithDependency1/types/controllers/TraderController.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/controllers/TraderController.d.ts index 7fc6d78..3592fc6 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/controllers/TraderController.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/controllers/TraderController.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/generators/BotEquipmentModGenerator.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/generators/BotEquipmentModGenerator.d.ts index 419120f..3952293 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/generators/BotEquipmentModGenerator.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/generators/BotEquipmentModGenerator.d.ts @@ -25,9 +25,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotEquipmentModGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -65,7 +65,7 @@ export declare class BotEquipmentModGenerator { * @param settings Bot equipment generation settings * @param modSlot Armor slot being filtered * @param existingPlateTplPool Plates tpls to choose from - * @param armorItem + * @param armorItem The armor items db template * @returns Array of plate tpls to choose from */ protected filterPlateModsForSlotByLevel(settings: IGenerateEquipmentProperties, modSlot: string, existingPlateTplPool: string[], armorItem: ITemplateItem): IFilterPlateModsForSlotByLevelResult; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/generators/BotGenerator.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/generators/BotGenerator.d.ts index 8ab4371..ebb8a59 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/generators/BotGenerator.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/generators/BotGenerator.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/generators/BotLevelGenerator.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/generators/BotLevelGenerator.d.ts index dee61e2..a8a8895 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/generators/BotLevelGenerator.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/generators/BotLevelGenerator.d.ts @@ -4,12 +4,14 @@ import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; +import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class BotLevelGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; protected databaseService: DatabaseService; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService); + protected mathUtil: MathUtil; + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, mathUtil: MathUtil); /** * Return a randomised bot level and exp value * @param levelDetails Min and max of level for bot @@ -18,6 +20,7 @@ export declare class BotLevelGenerator { * @returns IRandomisedBotLevelResult object */ generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult; + protected chooseBotLevel(min: number, max: number, shift: number, number: number): number; /** * Get the highest level a bot can be relative to the players level, but no further than the max size from globals.exp_table * @param botGenerationDetails Details to help generate a bot diff --git a/TypeScript/17AsyncImporterWithDependency1/types/generators/BotLootGenerator.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/generators/BotLootGenerator.d.ts index fee56ce..c0583c6 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/generators/BotLootGenerator.d.ts @@ -18,9 +18,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/generators/BotWeaponGenerator.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/generators/BotWeaponGenerator.d.ts index 5559bfa..8e03b35 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/generators/BotWeaponGenerator.d.ts @@ -18,9 +18,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RepairService } from "@spt/services/RepairService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotWeaponGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/generators/LocationGenerator.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/generators/LocationGenerator.d.ts index 222b0ab..9a2b0c4 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/generators/LocationGenerator.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/generators/LocationGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export interface IContainerItem { items: Item[]; width: number; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/generators/PlayerScavGenerator.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/generators/PlayerScavGenerator.d.ts index 2414150..e317bf6 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/generators/PlayerScavGenerator.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/generators/PlayerScavGenerator.d.ts @@ -14,9 +14,9 @@ import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class PlayerScavGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/generators/RagfairOfferGenerator.d.ts index 9435390..ca09729 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/generators/RagfairOfferGenerator.d.ts @@ -19,10 +19,10 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/generators/RepeatableQuestGenerator.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/generators/RepeatableQuestGenerator.d.ts index 77c4e79..339f322 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/generators/RepeatableQuestGenerator.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/generators/RepeatableQuestGenerator.d.ts @@ -11,10 +11,10 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/generators/RepeatableQuestRewardGenerator.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/generators/RepeatableQuestRewardGenerator.d.ts index 1e09994..713a394 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/generators/RepeatableQuestRewardGenerator.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/generators/RepeatableQuestRewardGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestRewardGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/helpers/BotDifficultyHelper.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/helpers/BotDifficultyHelper.d.ts index 63572a5..2348bd3 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/helpers/BotDifficultyHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/helpers/BotDifficultyHelper.d.ts @@ -5,8 +5,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotDifficultyHelper { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index c51bf7e..c38f0a0 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GiveSptCommand implements ISptCommand { protected logger: ILogger; protected itemHelper: ItemHelper; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/helpers/HealthHelper.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/helpers/HealthHelper.d.ts index 650f633..a164285 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/helpers/HealthHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/helpers/HealthHelper.d.ts @@ -5,8 +5,8 @@ import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/helpers/HideoutHelper.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/helpers/HideoutHelper.d.ts index c4aaa4c..df0376b 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/helpers/HideoutHelper.d.ts @@ -18,10 +18,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/helpers/InRaidHelper.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/helpers/InRaidHelper.d.ts index 449be9f..987c9ec 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/helpers/InRaidHelper.d.ts @@ -15,9 +15,9 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InRaidHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/helpers/InventoryHelper.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/helpers/InventoryHelper.d.ts index f0ff69a..92bb49c 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/helpers/InventoryHelper.d.ts @@ -23,9 +23,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/helpers/ItemHelper.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/helpers/ItemHelper.d.ts index da5dd11..c304cee 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/helpers/ItemHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/helpers/ItemHelper.d.ts @@ -11,13 +11,13 @@ import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { CompareUtil } from "@spt/utils/CompareUtil"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ItemHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/helpers/ProfileHelper.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/helpers/ProfileHelper.d.ts index 0671179..cdab870 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/helpers/ProfileHelper.d.ts @@ -11,10 +11,10 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/helpers/QuestHelper.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/helpers/QuestHelper.d.ts index 2b84b8f..2d5730d 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/helpers/QuestHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/helpers/QuestHelper.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/helpers/RagfairOfferHelper.d.ts index b526554..2386316 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/helpers/RagfairOfferHelper.d.ts @@ -151,7 +151,7 @@ export declare class RagfairOfferHelper { * @param boughtAmount Amount item was purchased for * @returns IItemEventRouterResponse */ - protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; + completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; /** * Get a localised message for when players offer has sold on flea * @param itemTpl Item sold diff --git a/TypeScript/17AsyncImporterWithDependency1/types/helpers/RagfairServerHelper.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/helpers/RagfairServerHelper.d.ts index 927caf5..3e1fea9 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/helpers/RagfairServerHelper.d.ts @@ -12,9 +12,9 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Helper class for common ragfair server actions */ diff --git a/TypeScript/17AsyncImporterWithDependency1/types/helpers/RepairHelper.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/helpers/RepairHelper.d.ts index 99a21da..63c78c9 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/helpers/RepairHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/helpers/RepairHelper.d.ts @@ -4,8 +4,8 @@ import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/helpers/RepeatableQuestHelper.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/helpers/RepeatableQuestHelper.d.ts index d92657e..8c65f40 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/helpers/RepeatableQuestHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/helpers/RepeatableQuestHelper.d.ts @@ -1,8 +1,8 @@ import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestHelper { protected mathUtil: MathUtil; protected configServer: ConfigServer; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/helpers/TradeHelper.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/helpers/TradeHelper.d.ts index f994fda..6e6f3a2 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/helpers/TradeHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/helpers/TradeHelper.d.ts @@ -17,8 +17,8 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TradeHelper { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/helpers/TraderAssortHelper.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/helpers/TraderAssortHelper.d.ts index 8f8f802..f1ecd3b 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/helpers/TraderAssortHelper.d.ts @@ -14,9 +14,9 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/loaders/BundleLoader.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/loaders/BundleLoader.d.ts index e270988..8c0ed4d 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/loaders/BundleLoader.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/loaders/BundleLoader.d.ts @@ -1,8 +1,8 @@ import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BundleInfo { modpath: string; filename: string; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/loaders/PostDBModLoader.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/loaders/PostDBModLoader.d.ts index b0c4bf4..a8bb6a9 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/loaders/PostDBModLoader.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/loaders/PostDBModLoader.d.ts @@ -1,10 +1,10 @@ -import { DependencyContainer } from "tsyringe"; import { OnLoad } from "@spt/di/OnLoad"; import { BundleLoader } from "@spt/loaders/BundleLoader"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostDBModLoader implements OnLoad { protected logger: ILogger; protected bundleLoader: BundleLoader; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/loaders/PostSptModLoader.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/loaders/PostSptModLoader.d.ts index fb54579..2603497 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/loaders/PostSptModLoader.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/loaders/PostSptModLoader.d.ts @@ -1,9 +1,9 @@ -import { DependencyContainer } from "tsyringe"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { IModLoader } from "@spt/models/spt/mod/IModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostSptModLoader implements IModLoader { protected logger: ILogger; protected preSptModLoader: PreSptModLoader; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/loaders/PreSptModLoader.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/loaders/PreSptModLoader.d.ts index bc846c8..8814525 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/loaders/PreSptModLoader.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/loaders/PreSptModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { ModDetails } from "@spt/models/eft/profile/ISptProfile"; @@ -11,6 +10,7 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { ModCompilerService } from "@spt/services/ModCompilerService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { DependencyContainer } from "tsyringe"; export declare class PreSptModLoader implements IModLoader { protected logger: ILogger; protected vfs: VFS; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/IEmptyRequestData.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/IEmptyRequestData.d.ts index 284d16e..52a7b12 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/IEmptyRequestData.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/IEmptyRequestData.d.ts @@ -1,2 +1 @@ -export interface IEmptyRequestData { -} +export type IEmptyRequestData = {}; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/tables/IBotBase.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/tables/IBotBase.d.ts index a7fe1ca..be37845 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/tables/IBotBase.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/tables/IBotBase.d.ts @@ -373,8 +373,7 @@ export interface LastCompleted { export interface Notes { Notes: Note[]; } -export interface CarExtractCounts { -} +export type CarExtractCounts = {}; export declare enum SurvivorClass { UNKNOWN = 0, NEUTRALIZER = 1, diff --git a/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/tables/ILocationsBase.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/tables/ILocationsBase.d.ts index 2c96af3..16bca24 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/tables/ILocationsBase.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/tables/ILocationsBase.d.ts @@ -2,8 +2,7 @@ export interface ILocationsBase { locations: Locations; paths: Path[]; } -export interface Locations { -} +export type Locations = {}; export interface Path { Source: string; Destination: string; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/tables/IProfileTemplate.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/tables/IProfileTemplate.d.ts index 20923bc..6ba9221 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/tables/IProfileTemplate.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -1,12 +1,12 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { Dialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; export interface IProfileTemplates { - "Standard": IProfileSides; + Standard: IProfileSides; "Left Behind": IProfileSides; "Prepare To Escape": IProfileSides; "Edge Of Darkness": IProfileSides; - "Unheard": IProfileSides; - "Tournament": IProfileSides; + Unheard: IProfileSides; + Tournament: IProfileSides; "SPT Developer": IProfileSides; "SPT Easy start": IProfileSides; "SPT Zero to hero": IProfileSides; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/tables/ITrader.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/tables/ITrader.d.ts index 14ab409..40cf004 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/tables/ITrader.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/tables/ITrader.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; export interface ITrader { assort?: ITraderAssort; @@ -78,6 +79,8 @@ export interface IBarterScheme { _tpl: string; onlyFunctional?: boolean; sptQuestLocked?: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface ISuit { _id: string; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/models/eft/hideout/IQteData.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/models/eft/hideout/IQteData.d.ts index 7f507e1..fe6cce6 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/models/eft/hideout/IQteData.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/models/eft/hideout/IQteData.d.ts @@ -1,14 +1,14 @@ import { Effect } from "@spt/models/eft/health/Effect"; import { BodyPart } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; import { QteActivityType } from "@spt/models/enums/hideout/QteActivityType"; import { QteEffectType } from "@spt/models/enums/hideout/QteEffectType"; import { QteResultType } from "@spt/models/enums/hideout/QteResultType"; import { QteRewardType } from "@spt/models/enums/hideout/QteRewardType"; import { QteType } from "@spt/models/enums/hideout/QteType"; import { RequirementType } from "@spt/models/enums/hideout/RequirementType"; -import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt/models/enums/SkillTypes"; -import { Traders } from "@spt/models/enums/Traders"; export interface IQteData { id: string; type: QteActivityType; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index f1123c1..5971372 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -15,7 +15,5 @@ export interface Items { change: any[]; del: any[]; } -export interface Production { -} -export interface TraderRelations { -} +export type Production = {}; +export type TraderRelations = {}; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/models/eft/profile/ISptProfile.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/models/eft/profile/ISptProfile.d.ts index a8e742a..dd7aea6 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/models/eft/profile/ISptProfile.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/models/eft/profile/ISptProfile.d.ts @@ -209,12 +209,9 @@ export interface Effects { LeftLeg: LeftLeg; RightLeg: RightLeg; } -export interface Head { -} -export interface Chest { -} -export interface Stomach { -} +export type Head = {}; +export type Chest = {}; +export type Stomach = {}; export interface LeftArm { Fracture?: number; } diff --git a/TypeScript/17AsyncImporterWithDependency1/types/models/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/models/eft/ragfair/IRagfairOffer.d.ts index eeeb79d..f6c07fc 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/models/eft/ragfair/IRagfairOffer.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/models/eft/ragfair/IRagfairOffer.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface IRagfairOffer { sellResult?: SellResult[]; @@ -28,6 +29,8 @@ export interface OfferRequirement { _tpl: string; count: number; onlyFunctional: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface IRagfairOfferUser { id: string; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/models/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/models/eft/ragfair/ISearchRequestData.d.ts index 8261c5b..c631de8 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/models/eft/ragfair/ISearchRequestData.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/models/eft/ragfair/ISearchRequestData.d.ts @@ -29,5 +29,4 @@ export declare enum OfferOwnerType { TRADEROWNERTYPE = 1, PLAYEROWNERTYPE = 2 } -export interface BuildItems { -} +export type BuildItems = {}; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/models/enums/BaseClasses.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/models/enums/BaseClasses.d.ts index 65fc95e..32ebf7c 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/models/enums/BaseClasses.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/models/enums/BaseClasses.d.ts @@ -107,6 +107,6 @@ export declare enum BaseClasses { RECEIVER = "55818a304bdc2db5418b457d", BARREL = "555ef6e44bdc2de9068b457e", CHARGING_HANDLE = "55818a6f4bdc2db9688b456b", - COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569 ", + COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569", HIDEOUT_AREA_CONTAINER = "63da6da4784a55176c018dba" } diff --git a/TypeScript/17AsyncImporterWithDependency1/types/models/enums/DogtagExchangeSide.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/models/enums/DogtagExchangeSide.d.ts new file mode 100644 index 0000000..de3d4df --- /dev/null +++ b/TypeScript/17AsyncImporterWithDependency1/types/models/enums/DogtagExchangeSide.d.ts @@ -0,0 +1,5 @@ +export declare enum DogtagExchangeSide { + USEC = "Usec", + BEAR = "Bear", + ANY = "Any" +} diff --git a/TypeScript/17AsyncImporterWithDependency1/types/models/spt/server/ExhaustableArray.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/models/spt/server/ExhaustableArray.d.ts index c27f41f..50a6b68 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/models/spt/server/ExhaustableArray.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/models/spt/server/ExhaustableArray.d.ts @@ -1,5 +1,5 @@ -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ExhaustableArray implements IExhaustableArray { private itemPool; private randomUtil; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/routers/EventOutputHolder.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/routers/EventOutputHolder.d.ts index ef20706..148461a 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/routers/EventOutputHolder.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/routers/EventOutputHolder.d.ts @@ -3,8 +3,8 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IHideoutImprovement, Productive, TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; import { TraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class EventOutputHolder { protected profileHelper: ProfileHelper; protected timeUtil: TimeUtil; @@ -12,7 +12,7 @@ export declare class EventOutputHolder { /** * What has client been informed of this game session * Key = sessionId, then second key is prod id - */ + */ protected clientActiveSessionStorage: Record>; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/servers/HttpServer.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/servers/HttpServer.d.ts index b00fe68..0024ba3 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/servers/HttpServer.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/servers/HttpServer.d.ts @@ -6,8 +6,8 @@ import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; -import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { WebSocketServer } from "@spt/servers/WebSocketServer"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { LocalisationService } from "@spt/services/LocalisationService"; export declare class HttpServer { protected logger: ILogger; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/servers/WebSocketServer.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/servers/WebSocketServer.d.ts index f4e07bb..6121824 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/servers/WebSocketServer.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/servers/WebSocketServer.d.ts @@ -1,12 +1,12 @@ /// import http, { IncomingMessage } from "node:http"; -import { WebSocket, Server } from "ws"; import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { Server, WebSocket } from "ws"; export declare class WebSocketServer { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/servers/ws/SptWebSocketConnectionHandler.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/servers/ws/SptWebSocketConnectionHandler.d.ts index 98d0898..70fc96a 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/servers/ws/SptWebSocketConnectionHandler.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/servers/ws/SptWebSocketConnectionHandler.d.ts @@ -1,7 +1,6 @@ /// /// import { IncomingMessage } from "http"; -import { WebSocket } from "ws"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; @@ -11,6 +10,7 @@ import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectio import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; +import { WebSocket } from "ws"; export declare class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler { protected logger: ILogger; protected profileHelper: ProfileHelper; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts index d5247ec..5556129 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts @@ -1,6 +1,6 @@ -import { RawData, WebSocket } from "ws"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; +import { RawData, WebSocket } from "ws"; export declare class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler { protected logger: ILogger; constructor(logger: ILogger); diff --git a/TypeScript/17AsyncImporterWithDependency1/types/services/FenceService.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/services/FenceService.d.ts index c156122..58dc076 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/services/FenceService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/services/FenceService.d.ts @@ -13,9 +13,9 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Handle actions surrounding Fence * e.g. generating or refreshing assorts / get next refresh time diff --git a/TypeScript/17AsyncImporterWithDependency1/types/services/InsuranceService.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/services/InsuranceService.d.ts index 0000e66..f799102 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/services/InsuranceService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/services/InsuranceService.d.ts @@ -18,10 +18,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceService { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/services/LocalisationService.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/services/LocalisationService.d.ts index 42dfa4e..855c138 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/services/LocalisationService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/services/LocalisationService.d.ts @@ -1,8 +1,8 @@ -import { I18n } from "i18n"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { LocaleService } from "@spt/services/LocaleService"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { I18n } from "i18n"; /** * Handles translating server text into different langauges */ diff --git a/TypeScript/17AsyncImporterWithDependency1/types/services/ProfileFixerService.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/services/ProfileFixerService.d.ts index 525b867..91e4780 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/services/ProfileFixerService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/services/ProfileFixerService.d.ts @@ -8,7 +8,7 @@ import { Bonus, HideoutSlot } from "@spt/models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea"; -import { ISptProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; +import { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; @@ -16,11 +16,11 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileFixerService { protected logger: ILogger; protected watermark: Watermark; @@ -73,6 +73,7 @@ export declare class ProfileFixerService { */ protected removeDanglingTaskConditionCounters(pmcProfile: IPmcData): void; protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullRagfairRatings(pmcProfile: IPmcData): void; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; /** diff --git a/TypeScript/17AsyncImporterWithDependency1/types/services/RagfairOfferService.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/services/RagfairOfferService.d.ts index 6c13b1d..98dd179 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/services/RagfairOfferService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/services/RagfairOfferService.d.ts @@ -10,10 +10,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/services/mod/CustomItemService.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/services/mod/CustomItemService.d.ts index 1926bed..f112872 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/services/mod/CustomItemService.d.ts @@ -4,8 +4,8 @@ import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetail import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts index 3c9d955..91c84d9 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class DynamicRouterModService { private container; constructor(container: DependencyContainer); diff --git a/TypeScript/17AsyncImporterWithDependency1/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/services/mod/staticRouter/StaticRouterModService.d.ts index f60432d..0c3d4d8 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class StaticRouterModService { protected container: DependencyContainer; constructor(container: DependencyContainer); diff --git a/TypeScript/17AsyncImporterWithDependency1/types/utils/JsonUtil.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/utils/JsonUtil.d.ts index b30822c..4419228 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/utils/JsonUtil.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/utils/JsonUtil.d.ts @@ -1,7 +1,7 @@ -import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { HashUtil } from "@spt/utils/HashUtil"; import { VFS } from "@spt/utils/VFS"; +import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; export declare class JsonUtil { protected vfs: VFS; protected hashUtil: HashUtil; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/utils/RandomUtil.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/utils/RandomUtil.d.ts index 49f242d..0da184f 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/utils/RandomUtil.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/utils/RandomUtil.d.ts @@ -1,6 +1,6 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects * based on the relative probability of each of its elements. diff --git a/TypeScript/17AsyncImporterWithDependency1/types/utils/logging/AbstractWinstonLogger.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/utils/logging/AbstractWinstonLogger.d.ts index 7098f85..ef54434 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/utils/logging/AbstractWinstonLogger.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/utils/logging/AbstractWinstonLogger.d.ts @@ -1,12 +1,12 @@ /// import fs from "node:fs"; -import winston from "winston"; import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; import { SptLogger } from "@spt/models/spt/logging/SptLogger"; import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; import { ILogger } from "@spt/models/spt/utils/ILogger"; +import winston from "winston"; export declare abstract class AbstractWinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected showDebugInConsole: boolean; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/controllers/BotController.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/controllers/BotController.d.ts index 6431fca..475f51b 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/controllers/BotController.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/controllers/BotController.d.ts @@ -20,8 +20,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/controllers/BuildController.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/controllers/BuildController.d.ts index ed8adf6..2cb9c59 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/controllers/BuildController.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/controllers/BuildController.d.ts @@ -9,8 +9,8 @@ import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BuildController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/controllers/GameController.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/controllers/GameController.d.ts index 533a81c..e219c04 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/controllers/GameController.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/controllers/GameController.d.ts @@ -34,10 +34,10 @@ import { ProfileActivityService } from "@spt/services/ProfileActivityService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GameController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/controllers/HealthController.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/controllers/HealthController.d.ts index 5482283..5a0a0a6 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/controllers/HealthController.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/controllers/HealthController.d.ts @@ -12,8 +12,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthController { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/controllers/HideoutController.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/controllers/HideoutController.d.ts index e9d1ed9..89a428c 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/controllers/HideoutController.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/controllers/HideoutController.d.ts @@ -35,11 +35,11 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; import { ProfileActivityService } from "@spt/services/ProfileActivityService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/controllers/InraidController.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/controllers/InraidController.d.ts index 87f419b..9f0c409 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/controllers/InraidController.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/controllers/InraidController.d.ts @@ -13,6 +13,7 @@ import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRe import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState"; import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig"; import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; @@ -31,7 +32,6 @@ import { PmcChatResponseService } from "@spt/services/PmcChatResponseService"; import { TraderServicesService } from "@spt/services/TraderServicesService"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; -import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; /** * Logic for handling In Raid callbacks */ diff --git a/TypeScript/17AsyncImporterWithDependency2/types/controllers/InsuranceController.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/controllers/InsuranceController.d.ts index f921b83..543e915 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/controllers/InsuranceController.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/controllers/InsuranceController.d.ts @@ -21,11 +21,11 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PaymentService } from "@spt/services/PaymentService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceController { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/controllers/InventoryController.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/controllers/InventoryController.d.ts index 40bb084..c986ce8 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/controllers/InventoryController.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/controllers/InventoryController.d.ts @@ -37,10 +37,10 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MapMarkerService } from "@spt/services/MapMarkerService"; import { PlayerService } from "@spt/services/PlayerService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/controllers/LocationController.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/controllers/LocationController.d.ts index 727a8c8..a541b9c 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/controllers/LocationController.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/controllers/LocationController.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class LocationController { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/controllers/ProfileController.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/controllers/ProfileController.d.ts index e8dae73..7e6d35c 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/controllers/ProfileController.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/controllers/ProfileController.d.ts @@ -26,9 +26,9 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/controllers/QuestController.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/controllers/QuestController.d.ts index 3cdce00..6a5b415 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/controllers/QuestController.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/controllers/QuestController.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/controllers/RepeatableQuestController.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/controllers/RepeatableQuestController.d.ts index 74f39eb..016f8c6 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/controllers/RepeatableQuestController.d.ts @@ -18,11 +18,11 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/controllers/TradeController.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/controllers/TradeController.d.ts index bc72e92..842a97b 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/controllers/TradeController.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/controllers/TradeController.d.ts @@ -1,5 +1,6 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper"; import { TradeHelper } from "@spt/helpers/TradeHelper"; import { TraderHelper } from "@spt/helpers/TraderHelper"; import { IPmcData } from "@spt/models/eft/common/IPmcData"; @@ -35,6 +36,7 @@ export declare class TradeController { protected hashUtil: HashUtil; protected itemHelper: ItemHelper; protected profileHelper: ProfileHelper; + protected ragfairOfferHelper: RagfairOfferHelper; protected traderHelper: TraderHelper; protected ragfairServer: RagfairServer; protected httpResponse: HttpResponseUtil; @@ -44,7 +46,7 @@ export declare class TradeController { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairOfferHelper: RagfairOfferHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); /** Handle TradingConfirm event */ confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; /** Handle RagFairBuyOffer event */ @@ -67,10 +69,17 @@ export declare class TradeController { * @param output Output to send back to client */ protected buyPmcItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void; + /** + * Is the provided offerid and ownerid from a player made offer + * @param offerId Id of the offer + * @param offerOwnerId Owner id + * @returns true if offer was made by a player + */ + protected isPlayerOffer(offerId: string, offerOwnerId: string): boolean; /** * Does Player have necessary trader loyalty to purchase flea offer * @param sellerIsTrader is seller trader - * @param fleaOffer FLea offer being bought + * @param fleaOffer Flea offer being bought * @param pmcData Player profile * @returns True if player can buy offer */ diff --git a/TypeScript/17AsyncImporterWithDependency2/types/controllers/TraderController.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/controllers/TraderController.d.ts index 7fc6d78..3592fc6 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/controllers/TraderController.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/controllers/TraderController.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/generators/BotEquipmentModGenerator.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/generators/BotEquipmentModGenerator.d.ts index 419120f..3952293 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/generators/BotEquipmentModGenerator.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/generators/BotEquipmentModGenerator.d.ts @@ -25,9 +25,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotEquipmentModGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -65,7 +65,7 @@ export declare class BotEquipmentModGenerator { * @param settings Bot equipment generation settings * @param modSlot Armor slot being filtered * @param existingPlateTplPool Plates tpls to choose from - * @param armorItem + * @param armorItem The armor items db template * @returns Array of plate tpls to choose from */ protected filterPlateModsForSlotByLevel(settings: IGenerateEquipmentProperties, modSlot: string, existingPlateTplPool: string[], armorItem: ITemplateItem): IFilterPlateModsForSlotByLevelResult; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/generators/BotGenerator.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/generators/BotGenerator.d.ts index 8ab4371..ebb8a59 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/generators/BotGenerator.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/generators/BotGenerator.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/generators/BotLevelGenerator.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/generators/BotLevelGenerator.d.ts index dee61e2..a8a8895 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/generators/BotLevelGenerator.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/generators/BotLevelGenerator.d.ts @@ -4,12 +4,14 @@ import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; +import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class BotLevelGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; protected databaseService: DatabaseService; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService); + protected mathUtil: MathUtil; + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, mathUtil: MathUtil); /** * Return a randomised bot level and exp value * @param levelDetails Min and max of level for bot @@ -18,6 +20,7 @@ export declare class BotLevelGenerator { * @returns IRandomisedBotLevelResult object */ generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult; + protected chooseBotLevel(min: number, max: number, shift: number, number: number): number; /** * Get the highest level a bot can be relative to the players level, but no further than the max size from globals.exp_table * @param botGenerationDetails Details to help generate a bot diff --git a/TypeScript/17AsyncImporterWithDependency2/types/generators/BotLootGenerator.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/generators/BotLootGenerator.d.ts index fee56ce..c0583c6 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/generators/BotLootGenerator.d.ts @@ -18,9 +18,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/generators/BotWeaponGenerator.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/generators/BotWeaponGenerator.d.ts index 5559bfa..8e03b35 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/generators/BotWeaponGenerator.d.ts @@ -18,9 +18,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RepairService } from "@spt/services/RepairService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotWeaponGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/generators/LocationGenerator.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/generators/LocationGenerator.d.ts index 222b0ab..9a2b0c4 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/generators/LocationGenerator.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/generators/LocationGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export interface IContainerItem { items: Item[]; width: number; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/generators/PlayerScavGenerator.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/generators/PlayerScavGenerator.d.ts index 2414150..e317bf6 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/generators/PlayerScavGenerator.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/generators/PlayerScavGenerator.d.ts @@ -14,9 +14,9 @@ import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class PlayerScavGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/generators/RagfairOfferGenerator.d.ts index 9435390..ca09729 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/generators/RagfairOfferGenerator.d.ts @@ -19,10 +19,10 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/generators/RepeatableQuestGenerator.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/generators/RepeatableQuestGenerator.d.ts index 77c4e79..339f322 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/generators/RepeatableQuestGenerator.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/generators/RepeatableQuestGenerator.d.ts @@ -11,10 +11,10 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/generators/RepeatableQuestRewardGenerator.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/generators/RepeatableQuestRewardGenerator.d.ts index 1e09994..713a394 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/generators/RepeatableQuestRewardGenerator.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/generators/RepeatableQuestRewardGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestRewardGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/helpers/BotDifficultyHelper.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/helpers/BotDifficultyHelper.d.ts index 63572a5..2348bd3 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/helpers/BotDifficultyHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/helpers/BotDifficultyHelper.d.ts @@ -5,8 +5,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotDifficultyHelper { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index c51bf7e..c38f0a0 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GiveSptCommand implements ISptCommand { protected logger: ILogger; protected itemHelper: ItemHelper; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/helpers/HealthHelper.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/helpers/HealthHelper.d.ts index 650f633..a164285 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/helpers/HealthHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/helpers/HealthHelper.d.ts @@ -5,8 +5,8 @@ import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/helpers/HideoutHelper.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/helpers/HideoutHelper.d.ts index c4aaa4c..df0376b 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/helpers/HideoutHelper.d.ts @@ -18,10 +18,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/helpers/InRaidHelper.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/helpers/InRaidHelper.d.ts index 449be9f..987c9ec 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/helpers/InRaidHelper.d.ts @@ -15,9 +15,9 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InRaidHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/helpers/InventoryHelper.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/helpers/InventoryHelper.d.ts index f0ff69a..92bb49c 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/helpers/InventoryHelper.d.ts @@ -23,9 +23,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/helpers/ItemHelper.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/helpers/ItemHelper.d.ts index da5dd11..c304cee 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/helpers/ItemHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/helpers/ItemHelper.d.ts @@ -11,13 +11,13 @@ import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { CompareUtil } from "@spt/utils/CompareUtil"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ItemHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/helpers/ProfileHelper.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/helpers/ProfileHelper.d.ts index 0671179..cdab870 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/helpers/ProfileHelper.d.ts @@ -11,10 +11,10 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/helpers/QuestHelper.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/helpers/QuestHelper.d.ts index 2b84b8f..2d5730d 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/helpers/QuestHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/helpers/QuestHelper.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/helpers/RagfairOfferHelper.d.ts index b526554..2386316 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/helpers/RagfairOfferHelper.d.ts @@ -151,7 +151,7 @@ export declare class RagfairOfferHelper { * @param boughtAmount Amount item was purchased for * @returns IItemEventRouterResponse */ - protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; + completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; /** * Get a localised message for when players offer has sold on flea * @param itemTpl Item sold diff --git a/TypeScript/17AsyncImporterWithDependency2/types/helpers/RagfairServerHelper.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/helpers/RagfairServerHelper.d.ts index 927caf5..3e1fea9 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/helpers/RagfairServerHelper.d.ts @@ -12,9 +12,9 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Helper class for common ragfair server actions */ diff --git a/TypeScript/17AsyncImporterWithDependency2/types/helpers/RepairHelper.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/helpers/RepairHelper.d.ts index 99a21da..63c78c9 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/helpers/RepairHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/helpers/RepairHelper.d.ts @@ -4,8 +4,8 @@ import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/helpers/RepeatableQuestHelper.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/helpers/RepeatableQuestHelper.d.ts index d92657e..8c65f40 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/helpers/RepeatableQuestHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/helpers/RepeatableQuestHelper.d.ts @@ -1,8 +1,8 @@ import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestHelper { protected mathUtil: MathUtil; protected configServer: ConfigServer; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/helpers/TradeHelper.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/helpers/TradeHelper.d.ts index f994fda..6e6f3a2 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/helpers/TradeHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/helpers/TradeHelper.d.ts @@ -17,8 +17,8 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TradeHelper { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/helpers/TraderAssortHelper.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/helpers/TraderAssortHelper.d.ts index 8f8f802..f1ecd3b 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/helpers/TraderAssortHelper.d.ts @@ -14,9 +14,9 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/loaders/BundleLoader.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/loaders/BundleLoader.d.ts index e270988..8c0ed4d 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/loaders/BundleLoader.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/loaders/BundleLoader.d.ts @@ -1,8 +1,8 @@ import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BundleInfo { modpath: string; filename: string; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/loaders/PostDBModLoader.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/loaders/PostDBModLoader.d.ts index b0c4bf4..a8bb6a9 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/loaders/PostDBModLoader.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/loaders/PostDBModLoader.d.ts @@ -1,10 +1,10 @@ -import { DependencyContainer } from "tsyringe"; import { OnLoad } from "@spt/di/OnLoad"; import { BundleLoader } from "@spt/loaders/BundleLoader"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostDBModLoader implements OnLoad { protected logger: ILogger; protected bundleLoader: BundleLoader; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/loaders/PostSptModLoader.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/loaders/PostSptModLoader.d.ts index fb54579..2603497 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/loaders/PostSptModLoader.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/loaders/PostSptModLoader.d.ts @@ -1,9 +1,9 @@ -import { DependencyContainer } from "tsyringe"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { IModLoader } from "@spt/models/spt/mod/IModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostSptModLoader implements IModLoader { protected logger: ILogger; protected preSptModLoader: PreSptModLoader; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/loaders/PreSptModLoader.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/loaders/PreSptModLoader.d.ts index bc846c8..8814525 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/loaders/PreSptModLoader.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/loaders/PreSptModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { ModDetails } from "@spt/models/eft/profile/ISptProfile"; @@ -11,6 +10,7 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { ModCompilerService } from "@spt/services/ModCompilerService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { DependencyContainer } from "tsyringe"; export declare class PreSptModLoader implements IModLoader { protected logger: ILogger; protected vfs: VFS; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/IEmptyRequestData.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/IEmptyRequestData.d.ts index 284d16e..52a7b12 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/IEmptyRequestData.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/IEmptyRequestData.d.ts @@ -1,2 +1 @@ -export interface IEmptyRequestData { -} +export type IEmptyRequestData = {}; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/tables/IBotBase.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/tables/IBotBase.d.ts index a7fe1ca..be37845 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/tables/IBotBase.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/tables/IBotBase.d.ts @@ -373,8 +373,7 @@ export interface LastCompleted { export interface Notes { Notes: Note[]; } -export interface CarExtractCounts { -} +export type CarExtractCounts = {}; export declare enum SurvivorClass { UNKNOWN = 0, NEUTRALIZER = 1, diff --git a/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/tables/ILocationsBase.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/tables/ILocationsBase.d.ts index 2c96af3..16bca24 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/tables/ILocationsBase.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/tables/ILocationsBase.d.ts @@ -2,8 +2,7 @@ export interface ILocationsBase { locations: Locations; paths: Path[]; } -export interface Locations { -} +export type Locations = {}; export interface Path { Source: string; Destination: string; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/tables/IProfileTemplate.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/tables/IProfileTemplate.d.ts index 20923bc..6ba9221 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/tables/IProfileTemplate.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -1,12 +1,12 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { Dialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; export interface IProfileTemplates { - "Standard": IProfileSides; + Standard: IProfileSides; "Left Behind": IProfileSides; "Prepare To Escape": IProfileSides; "Edge Of Darkness": IProfileSides; - "Unheard": IProfileSides; - "Tournament": IProfileSides; + Unheard: IProfileSides; + Tournament: IProfileSides; "SPT Developer": IProfileSides; "SPT Easy start": IProfileSides; "SPT Zero to hero": IProfileSides; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/tables/ITrader.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/tables/ITrader.d.ts index 14ab409..40cf004 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/tables/ITrader.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/tables/ITrader.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; export interface ITrader { assort?: ITraderAssort; @@ -78,6 +79,8 @@ export interface IBarterScheme { _tpl: string; onlyFunctional?: boolean; sptQuestLocked?: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface ISuit { _id: string; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/models/eft/hideout/IQteData.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/models/eft/hideout/IQteData.d.ts index 7f507e1..fe6cce6 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/models/eft/hideout/IQteData.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/models/eft/hideout/IQteData.d.ts @@ -1,14 +1,14 @@ import { Effect } from "@spt/models/eft/health/Effect"; import { BodyPart } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; import { QteActivityType } from "@spt/models/enums/hideout/QteActivityType"; import { QteEffectType } from "@spt/models/enums/hideout/QteEffectType"; import { QteResultType } from "@spt/models/enums/hideout/QteResultType"; import { QteRewardType } from "@spt/models/enums/hideout/QteRewardType"; import { QteType } from "@spt/models/enums/hideout/QteType"; import { RequirementType } from "@spt/models/enums/hideout/RequirementType"; -import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt/models/enums/SkillTypes"; -import { Traders } from "@spt/models/enums/Traders"; export interface IQteData { id: string; type: QteActivityType; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index f1123c1..5971372 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -15,7 +15,5 @@ export interface Items { change: any[]; del: any[]; } -export interface Production { -} -export interface TraderRelations { -} +export type Production = {}; +export type TraderRelations = {}; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/models/eft/profile/ISptProfile.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/models/eft/profile/ISptProfile.d.ts index a8e742a..dd7aea6 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/models/eft/profile/ISptProfile.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/models/eft/profile/ISptProfile.d.ts @@ -209,12 +209,9 @@ export interface Effects { LeftLeg: LeftLeg; RightLeg: RightLeg; } -export interface Head { -} -export interface Chest { -} -export interface Stomach { -} +export type Head = {}; +export type Chest = {}; +export type Stomach = {}; export interface LeftArm { Fracture?: number; } diff --git a/TypeScript/17AsyncImporterWithDependency2/types/models/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/models/eft/ragfair/IRagfairOffer.d.ts index eeeb79d..f6c07fc 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/models/eft/ragfair/IRagfairOffer.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/models/eft/ragfair/IRagfairOffer.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface IRagfairOffer { sellResult?: SellResult[]; @@ -28,6 +29,8 @@ export interface OfferRequirement { _tpl: string; count: number; onlyFunctional: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface IRagfairOfferUser { id: string; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/models/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/models/eft/ragfair/ISearchRequestData.d.ts index 8261c5b..c631de8 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/models/eft/ragfair/ISearchRequestData.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/models/eft/ragfair/ISearchRequestData.d.ts @@ -29,5 +29,4 @@ export declare enum OfferOwnerType { TRADEROWNERTYPE = 1, PLAYEROWNERTYPE = 2 } -export interface BuildItems { -} +export type BuildItems = {}; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/models/enums/BaseClasses.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/models/enums/BaseClasses.d.ts index 65fc95e..32ebf7c 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/models/enums/BaseClasses.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/models/enums/BaseClasses.d.ts @@ -107,6 +107,6 @@ export declare enum BaseClasses { RECEIVER = "55818a304bdc2db5418b457d", BARREL = "555ef6e44bdc2de9068b457e", CHARGING_HANDLE = "55818a6f4bdc2db9688b456b", - COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569 ", + COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569", HIDEOUT_AREA_CONTAINER = "63da6da4784a55176c018dba" } diff --git a/TypeScript/17AsyncImporterWithDependency2/types/models/enums/DogtagExchangeSide.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/models/enums/DogtagExchangeSide.d.ts new file mode 100644 index 0000000..de3d4df --- /dev/null +++ b/TypeScript/17AsyncImporterWithDependency2/types/models/enums/DogtagExchangeSide.d.ts @@ -0,0 +1,5 @@ +export declare enum DogtagExchangeSide { + USEC = "Usec", + BEAR = "Bear", + ANY = "Any" +} diff --git a/TypeScript/17AsyncImporterWithDependency2/types/models/spt/server/ExhaustableArray.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/models/spt/server/ExhaustableArray.d.ts index c27f41f..50a6b68 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/models/spt/server/ExhaustableArray.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/models/spt/server/ExhaustableArray.d.ts @@ -1,5 +1,5 @@ -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ExhaustableArray implements IExhaustableArray { private itemPool; private randomUtil; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/routers/EventOutputHolder.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/routers/EventOutputHolder.d.ts index ef20706..148461a 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/routers/EventOutputHolder.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/routers/EventOutputHolder.d.ts @@ -3,8 +3,8 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IHideoutImprovement, Productive, TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; import { TraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class EventOutputHolder { protected profileHelper: ProfileHelper; protected timeUtil: TimeUtil; @@ -12,7 +12,7 @@ export declare class EventOutputHolder { /** * What has client been informed of this game session * Key = sessionId, then second key is prod id - */ + */ protected clientActiveSessionStorage: Record>; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/servers/HttpServer.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/servers/HttpServer.d.ts index b00fe68..0024ba3 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/servers/HttpServer.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/servers/HttpServer.d.ts @@ -6,8 +6,8 @@ import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; -import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { WebSocketServer } from "@spt/servers/WebSocketServer"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { LocalisationService } from "@spt/services/LocalisationService"; export declare class HttpServer { protected logger: ILogger; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/servers/WebSocketServer.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/servers/WebSocketServer.d.ts index f4e07bb..6121824 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/servers/WebSocketServer.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/servers/WebSocketServer.d.ts @@ -1,12 +1,12 @@ /// import http, { IncomingMessage } from "node:http"; -import { WebSocket, Server } from "ws"; import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { Server, WebSocket } from "ws"; export declare class WebSocketServer { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/servers/ws/SptWebSocketConnectionHandler.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/servers/ws/SptWebSocketConnectionHandler.d.ts index 98d0898..70fc96a 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/servers/ws/SptWebSocketConnectionHandler.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/servers/ws/SptWebSocketConnectionHandler.d.ts @@ -1,7 +1,6 @@ /// /// import { IncomingMessage } from "http"; -import { WebSocket } from "ws"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; @@ -11,6 +10,7 @@ import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectio import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; +import { WebSocket } from "ws"; export declare class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler { protected logger: ILogger; protected profileHelper: ProfileHelper; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts index d5247ec..5556129 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts @@ -1,6 +1,6 @@ -import { RawData, WebSocket } from "ws"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; +import { RawData, WebSocket } from "ws"; export declare class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler { protected logger: ILogger; constructor(logger: ILogger); diff --git a/TypeScript/17AsyncImporterWithDependency2/types/services/FenceService.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/services/FenceService.d.ts index c156122..58dc076 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/services/FenceService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/services/FenceService.d.ts @@ -13,9 +13,9 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Handle actions surrounding Fence * e.g. generating or refreshing assorts / get next refresh time diff --git a/TypeScript/17AsyncImporterWithDependency2/types/services/InsuranceService.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/services/InsuranceService.d.ts index 0000e66..f799102 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/services/InsuranceService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/services/InsuranceService.d.ts @@ -18,10 +18,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceService { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/services/LocalisationService.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/services/LocalisationService.d.ts index 42dfa4e..855c138 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/services/LocalisationService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/services/LocalisationService.d.ts @@ -1,8 +1,8 @@ -import { I18n } from "i18n"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { LocaleService } from "@spt/services/LocaleService"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { I18n } from "i18n"; /** * Handles translating server text into different langauges */ diff --git a/TypeScript/17AsyncImporterWithDependency2/types/services/ProfileFixerService.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/services/ProfileFixerService.d.ts index 525b867..91e4780 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/services/ProfileFixerService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/services/ProfileFixerService.d.ts @@ -8,7 +8,7 @@ import { Bonus, HideoutSlot } from "@spt/models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea"; -import { ISptProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; +import { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; @@ -16,11 +16,11 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileFixerService { protected logger: ILogger; protected watermark: Watermark; @@ -73,6 +73,7 @@ export declare class ProfileFixerService { */ protected removeDanglingTaskConditionCounters(pmcProfile: IPmcData): void; protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullRagfairRatings(pmcProfile: IPmcData): void; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; /** diff --git a/TypeScript/17AsyncImporterWithDependency2/types/services/RagfairOfferService.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/services/RagfairOfferService.d.ts index 6c13b1d..98dd179 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/services/RagfairOfferService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/services/RagfairOfferService.d.ts @@ -10,10 +10,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/services/mod/CustomItemService.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/services/mod/CustomItemService.d.ts index 1926bed..f112872 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/services/mod/CustomItemService.d.ts @@ -4,8 +4,8 @@ import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetail import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts index 3c9d955..91c84d9 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class DynamicRouterModService { private container; constructor(container: DependencyContainer); diff --git a/TypeScript/17AsyncImporterWithDependency2/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/services/mod/staticRouter/StaticRouterModService.d.ts index f60432d..0c3d4d8 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class StaticRouterModService { protected container: DependencyContainer; constructor(container: DependencyContainer); diff --git a/TypeScript/17AsyncImporterWithDependency2/types/utils/JsonUtil.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/utils/JsonUtil.d.ts index b30822c..4419228 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/utils/JsonUtil.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/utils/JsonUtil.d.ts @@ -1,7 +1,7 @@ -import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { HashUtil } from "@spt/utils/HashUtil"; import { VFS } from "@spt/utils/VFS"; +import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; export declare class JsonUtil { protected vfs: VFS; protected hashUtil: HashUtil; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/utils/RandomUtil.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/utils/RandomUtil.d.ts index 49f242d..0da184f 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/utils/RandomUtil.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/utils/RandomUtil.d.ts @@ -1,6 +1,6 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects * based on the relative probability of each of its elements. diff --git a/TypeScript/17AsyncImporterWithDependency2/types/utils/logging/AbstractWinstonLogger.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/utils/logging/AbstractWinstonLogger.d.ts index 7098f85..ef54434 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/utils/logging/AbstractWinstonLogger.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/utils/logging/AbstractWinstonLogger.d.ts @@ -1,12 +1,12 @@ /// import fs from "node:fs"; -import winston from "winston"; import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; import { SptLogger } from "@spt/models/spt/logging/SptLogger"; import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; import { ILogger } from "@spt/models/spt/utils/ILogger"; +import winston from "winston"; export declare abstract class AbstractWinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected showDebugInConsole: boolean; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/controllers/BotController.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/controllers/BotController.d.ts index 6431fca..475f51b 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/controllers/BotController.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/controllers/BotController.d.ts @@ -20,8 +20,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/controllers/BuildController.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/controllers/BuildController.d.ts index ed8adf6..2cb9c59 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/controllers/BuildController.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/controllers/BuildController.d.ts @@ -9,8 +9,8 @@ import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BuildController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/controllers/GameController.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/controllers/GameController.d.ts index 533a81c..e219c04 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/controllers/GameController.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/controllers/GameController.d.ts @@ -34,10 +34,10 @@ import { ProfileActivityService } from "@spt/services/ProfileActivityService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GameController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/controllers/HealthController.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/controllers/HealthController.d.ts index 5482283..5a0a0a6 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/controllers/HealthController.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/controllers/HealthController.d.ts @@ -12,8 +12,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthController { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/controllers/HideoutController.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/controllers/HideoutController.d.ts index e9d1ed9..89a428c 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/controllers/HideoutController.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/controllers/HideoutController.d.ts @@ -35,11 +35,11 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; import { ProfileActivityService } from "@spt/services/ProfileActivityService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/controllers/InraidController.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/controllers/InraidController.d.ts index 87f419b..9f0c409 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/controllers/InraidController.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/controllers/InraidController.d.ts @@ -13,6 +13,7 @@ import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRe import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState"; import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig"; import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; @@ -31,7 +32,6 @@ import { PmcChatResponseService } from "@spt/services/PmcChatResponseService"; import { TraderServicesService } from "@spt/services/TraderServicesService"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; -import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; /** * Logic for handling In Raid callbacks */ diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/controllers/InsuranceController.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/controllers/InsuranceController.d.ts index f921b83..543e915 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/controllers/InsuranceController.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/controllers/InsuranceController.d.ts @@ -21,11 +21,11 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PaymentService } from "@spt/services/PaymentService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceController { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/controllers/InventoryController.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/controllers/InventoryController.d.ts index 40bb084..c986ce8 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/controllers/InventoryController.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/controllers/InventoryController.d.ts @@ -37,10 +37,10 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MapMarkerService } from "@spt/services/MapMarkerService"; import { PlayerService } from "@spt/services/PlayerService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/controllers/LocationController.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/controllers/LocationController.d.ts index 727a8c8..a541b9c 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/controllers/LocationController.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/controllers/LocationController.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class LocationController { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/controllers/ProfileController.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/controllers/ProfileController.d.ts index e8dae73..7e6d35c 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/controllers/ProfileController.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/controllers/ProfileController.d.ts @@ -26,9 +26,9 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/controllers/QuestController.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/controllers/QuestController.d.ts index 3cdce00..6a5b415 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/controllers/QuestController.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/controllers/QuestController.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/controllers/RepeatableQuestController.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/controllers/RepeatableQuestController.d.ts index 74f39eb..016f8c6 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/controllers/RepeatableQuestController.d.ts @@ -18,11 +18,11 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/controllers/TradeController.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/controllers/TradeController.d.ts index bc72e92..842a97b 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/controllers/TradeController.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/controllers/TradeController.d.ts @@ -1,5 +1,6 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper"; import { TradeHelper } from "@spt/helpers/TradeHelper"; import { TraderHelper } from "@spt/helpers/TraderHelper"; import { IPmcData } from "@spt/models/eft/common/IPmcData"; @@ -35,6 +36,7 @@ export declare class TradeController { protected hashUtil: HashUtil; protected itemHelper: ItemHelper; protected profileHelper: ProfileHelper; + protected ragfairOfferHelper: RagfairOfferHelper; protected traderHelper: TraderHelper; protected ragfairServer: RagfairServer; protected httpResponse: HttpResponseUtil; @@ -44,7 +46,7 @@ export declare class TradeController { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairOfferHelper: RagfairOfferHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); /** Handle TradingConfirm event */ confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; /** Handle RagFairBuyOffer event */ @@ -67,10 +69,17 @@ export declare class TradeController { * @param output Output to send back to client */ protected buyPmcItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void; + /** + * Is the provided offerid and ownerid from a player made offer + * @param offerId Id of the offer + * @param offerOwnerId Owner id + * @returns true if offer was made by a player + */ + protected isPlayerOffer(offerId: string, offerOwnerId: string): boolean; /** * Does Player have necessary trader loyalty to purchase flea offer * @param sellerIsTrader is seller trader - * @param fleaOffer FLea offer being bought + * @param fleaOffer Flea offer being bought * @param pmcData Player profile * @returns True if player can buy offer */ diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/controllers/TraderController.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/controllers/TraderController.d.ts index 7fc6d78..3592fc6 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/controllers/TraderController.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/controllers/TraderController.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/generators/BotEquipmentModGenerator.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/generators/BotEquipmentModGenerator.d.ts index 419120f..3952293 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/generators/BotEquipmentModGenerator.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/generators/BotEquipmentModGenerator.d.ts @@ -25,9 +25,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotEquipmentModGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -65,7 +65,7 @@ export declare class BotEquipmentModGenerator { * @param settings Bot equipment generation settings * @param modSlot Armor slot being filtered * @param existingPlateTplPool Plates tpls to choose from - * @param armorItem + * @param armorItem The armor items db template * @returns Array of plate tpls to choose from */ protected filterPlateModsForSlotByLevel(settings: IGenerateEquipmentProperties, modSlot: string, existingPlateTplPool: string[], armorItem: ITemplateItem): IFilterPlateModsForSlotByLevelResult; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/generators/BotGenerator.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/generators/BotGenerator.d.ts index 8ab4371..ebb8a59 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/generators/BotGenerator.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/generators/BotGenerator.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/generators/BotLevelGenerator.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/generators/BotLevelGenerator.d.ts index dee61e2..a8a8895 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/generators/BotLevelGenerator.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/generators/BotLevelGenerator.d.ts @@ -4,12 +4,14 @@ import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; +import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class BotLevelGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; protected databaseService: DatabaseService; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService); + protected mathUtil: MathUtil; + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, mathUtil: MathUtil); /** * Return a randomised bot level and exp value * @param levelDetails Min and max of level for bot @@ -18,6 +20,7 @@ export declare class BotLevelGenerator { * @returns IRandomisedBotLevelResult object */ generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult; + protected chooseBotLevel(min: number, max: number, shift: number, number: number): number; /** * Get the highest level a bot can be relative to the players level, but no further than the max size from globals.exp_table * @param botGenerationDetails Details to help generate a bot diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/generators/BotLootGenerator.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/generators/BotLootGenerator.d.ts index fee56ce..c0583c6 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/generators/BotLootGenerator.d.ts @@ -18,9 +18,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/generators/BotWeaponGenerator.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/generators/BotWeaponGenerator.d.ts index 5559bfa..8e03b35 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/generators/BotWeaponGenerator.d.ts @@ -18,9 +18,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RepairService } from "@spt/services/RepairService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotWeaponGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/generators/LocationGenerator.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/generators/LocationGenerator.d.ts index 222b0ab..9a2b0c4 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/generators/LocationGenerator.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/generators/LocationGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export interface IContainerItem { items: Item[]; width: number; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/generators/PlayerScavGenerator.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/generators/PlayerScavGenerator.d.ts index 2414150..e317bf6 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/generators/PlayerScavGenerator.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/generators/PlayerScavGenerator.d.ts @@ -14,9 +14,9 @@ import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class PlayerScavGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/generators/RagfairOfferGenerator.d.ts index 9435390..ca09729 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/generators/RagfairOfferGenerator.d.ts @@ -19,10 +19,10 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/generators/RepeatableQuestGenerator.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/generators/RepeatableQuestGenerator.d.ts index 77c4e79..339f322 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/generators/RepeatableQuestGenerator.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/generators/RepeatableQuestGenerator.d.ts @@ -11,10 +11,10 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/generators/RepeatableQuestRewardGenerator.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/generators/RepeatableQuestRewardGenerator.d.ts index 1e09994..713a394 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/generators/RepeatableQuestRewardGenerator.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/generators/RepeatableQuestRewardGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestRewardGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/helpers/BotDifficultyHelper.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/helpers/BotDifficultyHelper.d.ts index 63572a5..2348bd3 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/helpers/BotDifficultyHelper.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/helpers/BotDifficultyHelper.d.ts @@ -5,8 +5,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotDifficultyHelper { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index c51bf7e..c38f0a0 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GiveSptCommand implements ISptCommand { protected logger: ILogger; protected itemHelper: ItemHelper; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/helpers/HealthHelper.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/helpers/HealthHelper.d.ts index 650f633..a164285 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/helpers/HealthHelper.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/helpers/HealthHelper.d.ts @@ -5,8 +5,8 @@ import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/helpers/HideoutHelper.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/helpers/HideoutHelper.d.ts index c4aaa4c..df0376b 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/helpers/HideoutHelper.d.ts @@ -18,10 +18,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/helpers/InRaidHelper.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/helpers/InRaidHelper.d.ts index 449be9f..987c9ec 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/helpers/InRaidHelper.d.ts @@ -15,9 +15,9 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InRaidHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/helpers/InventoryHelper.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/helpers/InventoryHelper.d.ts index f0ff69a..92bb49c 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/helpers/InventoryHelper.d.ts @@ -23,9 +23,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/helpers/ItemHelper.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/helpers/ItemHelper.d.ts index da5dd11..c304cee 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/helpers/ItemHelper.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/helpers/ItemHelper.d.ts @@ -11,13 +11,13 @@ import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { CompareUtil } from "@spt/utils/CompareUtil"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ItemHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/helpers/ProfileHelper.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/helpers/ProfileHelper.d.ts index 0671179..cdab870 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/helpers/ProfileHelper.d.ts @@ -11,10 +11,10 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/helpers/QuestHelper.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/helpers/QuestHelper.d.ts index 2b84b8f..2d5730d 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/helpers/QuestHelper.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/helpers/QuestHelper.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/helpers/RagfairOfferHelper.d.ts index b526554..2386316 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/helpers/RagfairOfferHelper.d.ts @@ -151,7 +151,7 @@ export declare class RagfairOfferHelper { * @param boughtAmount Amount item was purchased for * @returns IItemEventRouterResponse */ - protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; + completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; /** * Get a localised message for when players offer has sold on flea * @param itemTpl Item sold diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/helpers/RagfairServerHelper.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/helpers/RagfairServerHelper.d.ts index 927caf5..3e1fea9 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/helpers/RagfairServerHelper.d.ts @@ -12,9 +12,9 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Helper class for common ragfair server actions */ diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/helpers/RepairHelper.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/helpers/RepairHelper.d.ts index 99a21da..63c78c9 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/helpers/RepairHelper.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/helpers/RepairHelper.d.ts @@ -4,8 +4,8 @@ import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/helpers/RepeatableQuestHelper.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/helpers/RepeatableQuestHelper.d.ts index d92657e..8c65f40 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/helpers/RepeatableQuestHelper.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/helpers/RepeatableQuestHelper.d.ts @@ -1,8 +1,8 @@ import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestHelper { protected mathUtil: MathUtil; protected configServer: ConfigServer; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/helpers/TradeHelper.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/helpers/TradeHelper.d.ts index f994fda..6e6f3a2 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/helpers/TradeHelper.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/helpers/TradeHelper.d.ts @@ -17,8 +17,8 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TradeHelper { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/helpers/TraderAssortHelper.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/helpers/TraderAssortHelper.d.ts index 8f8f802..f1ecd3b 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/helpers/TraderAssortHelper.d.ts @@ -14,9 +14,9 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/loaders/BundleLoader.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/loaders/BundleLoader.d.ts index e270988..8c0ed4d 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/loaders/BundleLoader.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/loaders/BundleLoader.d.ts @@ -1,8 +1,8 @@ import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BundleInfo { modpath: string; filename: string; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/loaders/PostDBModLoader.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/loaders/PostDBModLoader.d.ts index b0c4bf4..a8bb6a9 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/loaders/PostDBModLoader.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/loaders/PostDBModLoader.d.ts @@ -1,10 +1,10 @@ -import { DependencyContainer } from "tsyringe"; import { OnLoad } from "@spt/di/OnLoad"; import { BundleLoader } from "@spt/loaders/BundleLoader"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostDBModLoader implements OnLoad { protected logger: ILogger; protected bundleLoader: BundleLoader; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/loaders/PostSptModLoader.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/loaders/PostSptModLoader.d.ts index fb54579..2603497 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/loaders/PostSptModLoader.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/loaders/PostSptModLoader.d.ts @@ -1,9 +1,9 @@ -import { DependencyContainer } from "tsyringe"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { IModLoader } from "@spt/models/spt/mod/IModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostSptModLoader implements IModLoader { protected logger: ILogger; protected preSptModLoader: PreSptModLoader; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/loaders/PreSptModLoader.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/loaders/PreSptModLoader.d.ts index bc846c8..8814525 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/loaders/PreSptModLoader.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/loaders/PreSptModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { ModDetails } from "@spt/models/eft/profile/ISptProfile"; @@ -11,6 +10,7 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { ModCompilerService } from "@spt/services/ModCompilerService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { DependencyContainer } from "tsyringe"; export declare class PreSptModLoader implements IModLoader { protected logger: ILogger; protected vfs: VFS; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/common/IEmptyRequestData.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/common/IEmptyRequestData.d.ts index 284d16e..52a7b12 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/common/IEmptyRequestData.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/common/IEmptyRequestData.d.ts @@ -1,2 +1 @@ -export interface IEmptyRequestData { -} +export type IEmptyRequestData = {}; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/common/tables/IBotBase.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/common/tables/IBotBase.d.ts index a7fe1ca..be37845 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/common/tables/IBotBase.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/common/tables/IBotBase.d.ts @@ -373,8 +373,7 @@ export interface LastCompleted { export interface Notes { Notes: Note[]; } -export interface CarExtractCounts { -} +export type CarExtractCounts = {}; export declare enum SurvivorClass { UNKNOWN = 0, NEUTRALIZER = 1, diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/common/tables/ILocationsBase.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/common/tables/ILocationsBase.d.ts index 2c96af3..16bca24 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/common/tables/ILocationsBase.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/common/tables/ILocationsBase.d.ts @@ -2,8 +2,7 @@ export interface ILocationsBase { locations: Locations; paths: Path[]; } -export interface Locations { -} +export type Locations = {}; export interface Path { Source: string; Destination: string; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/common/tables/IProfileTemplate.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/common/tables/IProfileTemplate.d.ts index 20923bc..6ba9221 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/common/tables/IProfileTemplate.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -1,12 +1,12 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { Dialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; export interface IProfileTemplates { - "Standard": IProfileSides; + Standard: IProfileSides; "Left Behind": IProfileSides; "Prepare To Escape": IProfileSides; "Edge Of Darkness": IProfileSides; - "Unheard": IProfileSides; - "Tournament": IProfileSides; + Unheard: IProfileSides; + Tournament: IProfileSides; "SPT Developer": IProfileSides; "SPT Easy start": IProfileSides; "SPT Zero to hero": IProfileSides; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/common/tables/ITrader.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/common/tables/ITrader.d.ts index 14ab409..40cf004 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/common/tables/ITrader.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/common/tables/ITrader.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; export interface ITrader { assort?: ITraderAssort; @@ -78,6 +79,8 @@ export interface IBarterScheme { _tpl: string; onlyFunctional?: boolean; sptQuestLocked?: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface ISuit { _id: string; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/hideout/IQteData.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/hideout/IQteData.d.ts index 7f507e1..fe6cce6 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/hideout/IQteData.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/hideout/IQteData.d.ts @@ -1,14 +1,14 @@ import { Effect } from "@spt/models/eft/health/Effect"; import { BodyPart } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; import { QteActivityType } from "@spt/models/enums/hideout/QteActivityType"; import { QteEffectType } from "@spt/models/enums/hideout/QteEffectType"; import { QteResultType } from "@spt/models/enums/hideout/QteResultType"; import { QteRewardType } from "@spt/models/enums/hideout/QteRewardType"; import { QteType } from "@spt/models/enums/hideout/QteType"; import { RequirementType } from "@spt/models/enums/hideout/RequirementType"; -import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt/models/enums/SkillTypes"; -import { Traders } from "@spt/models/enums/Traders"; export interface IQteData { id: string; type: QteActivityType; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index f1123c1..5971372 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -15,7 +15,5 @@ export interface Items { change: any[]; del: any[]; } -export interface Production { -} -export interface TraderRelations { -} +export type Production = {}; +export type TraderRelations = {}; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/profile/ISptProfile.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/profile/ISptProfile.d.ts index a8e742a..dd7aea6 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/profile/ISptProfile.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/profile/ISptProfile.d.ts @@ -209,12 +209,9 @@ export interface Effects { LeftLeg: LeftLeg; RightLeg: RightLeg; } -export interface Head { -} -export interface Chest { -} -export interface Stomach { -} +export type Head = {}; +export type Chest = {}; +export type Stomach = {}; export interface LeftArm { Fracture?: number; } diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/ragfair/IRagfairOffer.d.ts index eeeb79d..f6c07fc 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/ragfair/IRagfairOffer.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/ragfair/IRagfairOffer.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface IRagfairOffer { sellResult?: SellResult[]; @@ -28,6 +29,8 @@ export interface OfferRequirement { _tpl: string; count: number; onlyFunctional: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface IRagfairOfferUser { id: string; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/ragfair/ISearchRequestData.d.ts index 8261c5b..c631de8 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/ragfair/ISearchRequestData.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/models/eft/ragfair/ISearchRequestData.d.ts @@ -29,5 +29,4 @@ export declare enum OfferOwnerType { TRADEROWNERTYPE = 1, PLAYEROWNERTYPE = 2 } -export interface BuildItems { -} +export type BuildItems = {}; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/models/enums/BaseClasses.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/models/enums/BaseClasses.d.ts index 65fc95e..32ebf7c 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/models/enums/BaseClasses.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/models/enums/BaseClasses.d.ts @@ -107,6 +107,6 @@ export declare enum BaseClasses { RECEIVER = "55818a304bdc2db5418b457d", BARREL = "555ef6e44bdc2de9068b457e", CHARGING_HANDLE = "55818a6f4bdc2db9688b456b", - COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569 ", + COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569", HIDEOUT_AREA_CONTAINER = "63da6da4784a55176c018dba" } diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/models/enums/DogtagExchangeSide.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/models/enums/DogtagExchangeSide.d.ts new file mode 100644 index 0000000..de3d4df --- /dev/null +++ b/TypeScript/18.1CustomItemServiceLootBox/types/models/enums/DogtagExchangeSide.d.ts @@ -0,0 +1,5 @@ +export declare enum DogtagExchangeSide { + USEC = "Usec", + BEAR = "Bear", + ANY = "Any" +} diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/models/spt/server/ExhaustableArray.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/models/spt/server/ExhaustableArray.d.ts index c27f41f..50a6b68 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/models/spt/server/ExhaustableArray.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/models/spt/server/ExhaustableArray.d.ts @@ -1,5 +1,5 @@ -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ExhaustableArray implements IExhaustableArray { private itemPool; private randomUtil; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/routers/EventOutputHolder.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/routers/EventOutputHolder.d.ts index ef20706..148461a 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/routers/EventOutputHolder.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/routers/EventOutputHolder.d.ts @@ -3,8 +3,8 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IHideoutImprovement, Productive, TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; import { TraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class EventOutputHolder { protected profileHelper: ProfileHelper; protected timeUtil: TimeUtil; @@ -12,7 +12,7 @@ export declare class EventOutputHolder { /** * What has client been informed of this game session * Key = sessionId, then second key is prod id - */ + */ protected clientActiveSessionStorage: Record>; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/servers/HttpServer.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/servers/HttpServer.d.ts index b00fe68..0024ba3 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/servers/HttpServer.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/servers/HttpServer.d.ts @@ -6,8 +6,8 @@ import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; -import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { WebSocketServer } from "@spt/servers/WebSocketServer"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { LocalisationService } from "@spt/services/LocalisationService"; export declare class HttpServer { protected logger: ILogger; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/servers/WebSocketServer.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/servers/WebSocketServer.d.ts index f4e07bb..6121824 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/servers/WebSocketServer.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/servers/WebSocketServer.d.ts @@ -1,12 +1,12 @@ /// import http, { IncomingMessage } from "node:http"; -import { WebSocket, Server } from "ws"; import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { Server, WebSocket } from "ws"; export declare class WebSocketServer { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/servers/ws/SptWebSocketConnectionHandler.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/servers/ws/SptWebSocketConnectionHandler.d.ts index 98d0898..70fc96a 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/servers/ws/SptWebSocketConnectionHandler.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/servers/ws/SptWebSocketConnectionHandler.d.ts @@ -1,7 +1,6 @@ /// /// import { IncomingMessage } from "http"; -import { WebSocket } from "ws"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; @@ -11,6 +10,7 @@ import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectio import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; +import { WebSocket } from "ws"; export declare class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler { protected logger: ILogger; protected profileHelper: ProfileHelper; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts index d5247ec..5556129 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts @@ -1,6 +1,6 @@ -import { RawData, WebSocket } from "ws"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; +import { RawData, WebSocket } from "ws"; export declare class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler { protected logger: ILogger; constructor(logger: ILogger); diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/services/FenceService.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/services/FenceService.d.ts index c156122..58dc076 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/services/FenceService.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/services/FenceService.d.ts @@ -13,9 +13,9 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Handle actions surrounding Fence * e.g. generating or refreshing assorts / get next refresh time diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/services/InsuranceService.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/services/InsuranceService.d.ts index 0000e66..f799102 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/services/InsuranceService.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/services/InsuranceService.d.ts @@ -18,10 +18,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceService { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/services/LocalisationService.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/services/LocalisationService.d.ts index 42dfa4e..855c138 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/services/LocalisationService.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/services/LocalisationService.d.ts @@ -1,8 +1,8 @@ -import { I18n } from "i18n"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { LocaleService } from "@spt/services/LocaleService"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { I18n } from "i18n"; /** * Handles translating server text into different langauges */ diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/services/ProfileFixerService.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/services/ProfileFixerService.d.ts index 525b867..91e4780 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/services/ProfileFixerService.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/services/ProfileFixerService.d.ts @@ -8,7 +8,7 @@ import { Bonus, HideoutSlot } from "@spt/models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea"; -import { ISptProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; +import { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; @@ -16,11 +16,11 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileFixerService { protected logger: ILogger; protected watermark: Watermark; @@ -73,6 +73,7 @@ export declare class ProfileFixerService { */ protected removeDanglingTaskConditionCounters(pmcProfile: IPmcData): void; protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullRagfairRatings(pmcProfile: IPmcData): void; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; /** diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/services/RagfairOfferService.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/services/RagfairOfferService.d.ts index 6c13b1d..98dd179 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/services/RagfairOfferService.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/services/RagfairOfferService.d.ts @@ -10,10 +10,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/services/mod/CustomItemService.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/services/mod/CustomItemService.d.ts index 1926bed..f112872 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/services/mod/CustomItemService.d.ts @@ -4,8 +4,8 @@ import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetail import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts index 3c9d955..91c84d9 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class DynamicRouterModService { private container; constructor(container: DependencyContainer); diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/services/mod/staticRouter/StaticRouterModService.d.ts index f60432d..0c3d4d8 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class StaticRouterModService { protected container: DependencyContainer; constructor(container: DependencyContainer); diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/utils/JsonUtil.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/utils/JsonUtil.d.ts index b30822c..4419228 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/utils/JsonUtil.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/utils/JsonUtil.d.ts @@ -1,7 +1,7 @@ -import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { HashUtil } from "@spt/utils/HashUtil"; import { VFS } from "@spt/utils/VFS"; +import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; export declare class JsonUtil { protected vfs: VFS; protected hashUtil: HashUtil; diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/utils/RandomUtil.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/utils/RandomUtil.d.ts index 49f242d..0da184f 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/utils/RandomUtil.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/utils/RandomUtil.d.ts @@ -1,6 +1,6 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects * based on the relative probability of each of its elements. diff --git a/TypeScript/18.1CustomItemServiceLootBox/types/utils/logging/AbstractWinstonLogger.d.ts b/TypeScript/18.1CustomItemServiceLootBox/types/utils/logging/AbstractWinstonLogger.d.ts index 7098f85..ef54434 100644 --- a/TypeScript/18.1CustomItemServiceLootBox/types/utils/logging/AbstractWinstonLogger.d.ts +++ b/TypeScript/18.1CustomItemServiceLootBox/types/utils/logging/AbstractWinstonLogger.d.ts @@ -1,12 +1,12 @@ /// import fs from "node:fs"; -import winston from "winston"; import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; import { SptLogger } from "@spt/models/spt/logging/SptLogger"; import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; import { ILogger } from "@spt/models/spt/utils/ILogger"; +import winston from "winston"; export declare abstract class AbstractWinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected showDebugInConsole: boolean; diff --git a/TypeScript/18CustomItemService/types/controllers/BotController.d.ts b/TypeScript/18CustomItemService/types/controllers/BotController.d.ts index 6431fca..475f51b 100644 --- a/TypeScript/18CustomItemService/types/controllers/BotController.d.ts +++ b/TypeScript/18CustomItemService/types/controllers/BotController.d.ts @@ -20,8 +20,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/18CustomItemService/types/controllers/BuildController.d.ts b/TypeScript/18CustomItemService/types/controllers/BuildController.d.ts index ed8adf6..2cb9c59 100644 --- a/TypeScript/18CustomItemService/types/controllers/BuildController.d.ts +++ b/TypeScript/18CustomItemService/types/controllers/BuildController.d.ts @@ -9,8 +9,8 @@ import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BuildController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/18CustomItemService/types/controllers/GameController.d.ts b/TypeScript/18CustomItemService/types/controllers/GameController.d.ts index 533a81c..e219c04 100644 --- a/TypeScript/18CustomItemService/types/controllers/GameController.d.ts +++ b/TypeScript/18CustomItemService/types/controllers/GameController.d.ts @@ -34,10 +34,10 @@ import { ProfileActivityService } from "@spt/services/ProfileActivityService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GameController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/18CustomItemService/types/controllers/HealthController.d.ts b/TypeScript/18CustomItemService/types/controllers/HealthController.d.ts index 5482283..5a0a0a6 100644 --- a/TypeScript/18CustomItemService/types/controllers/HealthController.d.ts +++ b/TypeScript/18CustomItemService/types/controllers/HealthController.d.ts @@ -12,8 +12,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthController { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/18CustomItemService/types/controllers/HideoutController.d.ts b/TypeScript/18CustomItemService/types/controllers/HideoutController.d.ts index e9d1ed9..89a428c 100644 --- a/TypeScript/18CustomItemService/types/controllers/HideoutController.d.ts +++ b/TypeScript/18CustomItemService/types/controllers/HideoutController.d.ts @@ -35,11 +35,11 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; import { ProfileActivityService } from "@spt/services/ProfileActivityService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/18CustomItemService/types/controllers/InraidController.d.ts b/TypeScript/18CustomItemService/types/controllers/InraidController.d.ts index 87f419b..9f0c409 100644 --- a/TypeScript/18CustomItemService/types/controllers/InraidController.d.ts +++ b/TypeScript/18CustomItemService/types/controllers/InraidController.d.ts @@ -13,6 +13,7 @@ import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRe import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState"; import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig"; import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; @@ -31,7 +32,6 @@ import { PmcChatResponseService } from "@spt/services/PmcChatResponseService"; import { TraderServicesService } from "@spt/services/TraderServicesService"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; -import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; /** * Logic for handling In Raid callbacks */ diff --git a/TypeScript/18CustomItemService/types/controllers/InsuranceController.d.ts b/TypeScript/18CustomItemService/types/controllers/InsuranceController.d.ts index f921b83..543e915 100644 --- a/TypeScript/18CustomItemService/types/controllers/InsuranceController.d.ts +++ b/TypeScript/18CustomItemService/types/controllers/InsuranceController.d.ts @@ -21,11 +21,11 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PaymentService } from "@spt/services/PaymentService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceController { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/18CustomItemService/types/controllers/InventoryController.d.ts b/TypeScript/18CustomItemService/types/controllers/InventoryController.d.ts index 40bb084..c986ce8 100644 --- a/TypeScript/18CustomItemService/types/controllers/InventoryController.d.ts +++ b/TypeScript/18CustomItemService/types/controllers/InventoryController.d.ts @@ -37,10 +37,10 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MapMarkerService } from "@spt/services/MapMarkerService"; import { PlayerService } from "@spt/services/PlayerService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/18CustomItemService/types/controllers/LocationController.d.ts b/TypeScript/18CustomItemService/types/controllers/LocationController.d.ts index 727a8c8..a541b9c 100644 --- a/TypeScript/18CustomItemService/types/controllers/LocationController.d.ts +++ b/TypeScript/18CustomItemService/types/controllers/LocationController.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class LocationController { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; diff --git a/TypeScript/18CustomItemService/types/controllers/ProfileController.d.ts b/TypeScript/18CustomItemService/types/controllers/ProfileController.d.ts index e8dae73..7e6d35c 100644 --- a/TypeScript/18CustomItemService/types/controllers/ProfileController.d.ts +++ b/TypeScript/18CustomItemService/types/controllers/ProfileController.d.ts @@ -26,9 +26,9 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/18CustomItemService/types/controllers/QuestController.d.ts b/TypeScript/18CustomItemService/types/controllers/QuestController.d.ts index 3cdce00..6a5b415 100644 --- a/TypeScript/18CustomItemService/types/controllers/QuestController.d.ts +++ b/TypeScript/18CustomItemService/types/controllers/QuestController.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/18CustomItemService/types/controllers/RepeatableQuestController.d.ts b/TypeScript/18CustomItemService/types/controllers/RepeatableQuestController.d.ts index 74f39eb..016f8c6 100644 --- a/TypeScript/18CustomItemService/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/18CustomItemService/types/controllers/RepeatableQuestController.d.ts @@ -18,11 +18,11 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/18CustomItemService/types/controllers/TradeController.d.ts b/TypeScript/18CustomItemService/types/controllers/TradeController.d.ts index bc72e92..842a97b 100644 --- a/TypeScript/18CustomItemService/types/controllers/TradeController.d.ts +++ b/TypeScript/18CustomItemService/types/controllers/TradeController.d.ts @@ -1,5 +1,6 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper"; import { TradeHelper } from "@spt/helpers/TradeHelper"; import { TraderHelper } from "@spt/helpers/TraderHelper"; import { IPmcData } from "@spt/models/eft/common/IPmcData"; @@ -35,6 +36,7 @@ export declare class TradeController { protected hashUtil: HashUtil; protected itemHelper: ItemHelper; protected profileHelper: ProfileHelper; + protected ragfairOfferHelper: RagfairOfferHelper; protected traderHelper: TraderHelper; protected ragfairServer: RagfairServer; protected httpResponse: HttpResponseUtil; @@ -44,7 +46,7 @@ export declare class TradeController { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairOfferHelper: RagfairOfferHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); /** Handle TradingConfirm event */ confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; /** Handle RagFairBuyOffer event */ @@ -67,10 +69,17 @@ export declare class TradeController { * @param output Output to send back to client */ protected buyPmcItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void; + /** + * Is the provided offerid and ownerid from a player made offer + * @param offerId Id of the offer + * @param offerOwnerId Owner id + * @returns true if offer was made by a player + */ + protected isPlayerOffer(offerId: string, offerOwnerId: string): boolean; /** * Does Player have necessary trader loyalty to purchase flea offer * @param sellerIsTrader is seller trader - * @param fleaOffer FLea offer being bought + * @param fleaOffer Flea offer being bought * @param pmcData Player profile * @returns True if player can buy offer */ diff --git a/TypeScript/18CustomItemService/types/controllers/TraderController.d.ts b/TypeScript/18CustomItemService/types/controllers/TraderController.d.ts index 7fc6d78..3592fc6 100644 --- a/TypeScript/18CustomItemService/types/controllers/TraderController.d.ts +++ b/TypeScript/18CustomItemService/types/controllers/TraderController.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/18CustomItemService/types/generators/BotEquipmentModGenerator.d.ts b/TypeScript/18CustomItemService/types/generators/BotEquipmentModGenerator.d.ts index 419120f..3952293 100644 --- a/TypeScript/18CustomItemService/types/generators/BotEquipmentModGenerator.d.ts +++ b/TypeScript/18CustomItemService/types/generators/BotEquipmentModGenerator.d.ts @@ -25,9 +25,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotEquipmentModGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -65,7 +65,7 @@ export declare class BotEquipmentModGenerator { * @param settings Bot equipment generation settings * @param modSlot Armor slot being filtered * @param existingPlateTplPool Plates tpls to choose from - * @param armorItem + * @param armorItem The armor items db template * @returns Array of plate tpls to choose from */ protected filterPlateModsForSlotByLevel(settings: IGenerateEquipmentProperties, modSlot: string, existingPlateTplPool: string[], armorItem: ITemplateItem): IFilterPlateModsForSlotByLevelResult; diff --git a/TypeScript/18CustomItemService/types/generators/BotGenerator.d.ts b/TypeScript/18CustomItemService/types/generators/BotGenerator.d.ts index 8ab4371..ebb8a59 100644 --- a/TypeScript/18CustomItemService/types/generators/BotGenerator.d.ts +++ b/TypeScript/18CustomItemService/types/generators/BotGenerator.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/18CustomItemService/types/generators/BotLevelGenerator.d.ts b/TypeScript/18CustomItemService/types/generators/BotLevelGenerator.d.ts index dee61e2..a8a8895 100644 --- a/TypeScript/18CustomItemService/types/generators/BotLevelGenerator.d.ts +++ b/TypeScript/18CustomItemService/types/generators/BotLevelGenerator.d.ts @@ -4,12 +4,14 @@ import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; +import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class BotLevelGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; protected databaseService: DatabaseService; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService); + protected mathUtil: MathUtil; + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, mathUtil: MathUtil); /** * Return a randomised bot level and exp value * @param levelDetails Min and max of level for bot @@ -18,6 +20,7 @@ export declare class BotLevelGenerator { * @returns IRandomisedBotLevelResult object */ generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult; + protected chooseBotLevel(min: number, max: number, shift: number, number: number): number; /** * Get the highest level a bot can be relative to the players level, but no further than the max size from globals.exp_table * @param botGenerationDetails Details to help generate a bot diff --git a/TypeScript/18CustomItemService/types/generators/BotLootGenerator.d.ts b/TypeScript/18CustomItemService/types/generators/BotLootGenerator.d.ts index fee56ce..c0583c6 100644 --- a/TypeScript/18CustomItemService/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/18CustomItemService/types/generators/BotLootGenerator.d.ts @@ -18,9 +18,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/18CustomItemService/types/generators/BotWeaponGenerator.d.ts b/TypeScript/18CustomItemService/types/generators/BotWeaponGenerator.d.ts index 5559bfa..8e03b35 100644 --- a/TypeScript/18CustomItemService/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/18CustomItemService/types/generators/BotWeaponGenerator.d.ts @@ -18,9 +18,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RepairService } from "@spt/services/RepairService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotWeaponGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/18CustomItemService/types/generators/LocationGenerator.d.ts b/TypeScript/18CustomItemService/types/generators/LocationGenerator.d.ts index 222b0ab..9a2b0c4 100644 --- a/TypeScript/18CustomItemService/types/generators/LocationGenerator.d.ts +++ b/TypeScript/18CustomItemService/types/generators/LocationGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export interface IContainerItem { items: Item[]; width: number; diff --git a/TypeScript/18CustomItemService/types/generators/PlayerScavGenerator.d.ts b/TypeScript/18CustomItemService/types/generators/PlayerScavGenerator.d.ts index 2414150..e317bf6 100644 --- a/TypeScript/18CustomItemService/types/generators/PlayerScavGenerator.d.ts +++ b/TypeScript/18CustomItemService/types/generators/PlayerScavGenerator.d.ts @@ -14,9 +14,9 @@ import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class PlayerScavGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/18CustomItemService/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/18CustomItemService/types/generators/RagfairOfferGenerator.d.ts index 9435390..ca09729 100644 --- a/TypeScript/18CustomItemService/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/18CustomItemService/types/generators/RagfairOfferGenerator.d.ts @@ -19,10 +19,10 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/18CustomItemService/types/generators/RepeatableQuestGenerator.d.ts b/TypeScript/18CustomItemService/types/generators/RepeatableQuestGenerator.d.ts index 77c4e79..339f322 100644 --- a/TypeScript/18CustomItemService/types/generators/RepeatableQuestGenerator.d.ts +++ b/TypeScript/18CustomItemService/types/generators/RepeatableQuestGenerator.d.ts @@ -11,10 +11,10 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/18CustomItemService/types/generators/RepeatableQuestRewardGenerator.d.ts b/TypeScript/18CustomItemService/types/generators/RepeatableQuestRewardGenerator.d.ts index 1e09994..713a394 100644 --- a/TypeScript/18CustomItemService/types/generators/RepeatableQuestRewardGenerator.d.ts +++ b/TypeScript/18CustomItemService/types/generators/RepeatableQuestRewardGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestRewardGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/18CustomItemService/types/helpers/BotDifficultyHelper.d.ts b/TypeScript/18CustomItemService/types/helpers/BotDifficultyHelper.d.ts index 63572a5..2348bd3 100644 --- a/TypeScript/18CustomItemService/types/helpers/BotDifficultyHelper.d.ts +++ b/TypeScript/18CustomItemService/types/helpers/BotDifficultyHelper.d.ts @@ -5,8 +5,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotDifficultyHelper { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/18CustomItemService/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/18CustomItemService/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index c51bf7e..c38f0a0 100644 --- a/TypeScript/18CustomItemService/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/18CustomItemService/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GiveSptCommand implements ISptCommand { protected logger: ILogger; protected itemHelper: ItemHelper; diff --git a/TypeScript/18CustomItemService/types/helpers/HealthHelper.d.ts b/TypeScript/18CustomItemService/types/helpers/HealthHelper.d.ts index 650f633..a164285 100644 --- a/TypeScript/18CustomItemService/types/helpers/HealthHelper.d.ts +++ b/TypeScript/18CustomItemService/types/helpers/HealthHelper.d.ts @@ -5,8 +5,8 @@ import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/18CustomItemService/types/helpers/HideoutHelper.d.ts b/TypeScript/18CustomItemService/types/helpers/HideoutHelper.d.ts index c4aaa4c..df0376b 100644 --- a/TypeScript/18CustomItemService/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/18CustomItemService/types/helpers/HideoutHelper.d.ts @@ -18,10 +18,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/18CustomItemService/types/helpers/InRaidHelper.d.ts b/TypeScript/18CustomItemService/types/helpers/InRaidHelper.d.ts index 449be9f..987c9ec 100644 --- a/TypeScript/18CustomItemService/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/18CustomItemService/types/helpers/InRaidHelper.d.ts @@ -15,9 +15,9 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InRaidHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/18CustomItemService/types/helpers/InventoryHelper.d.ts b/TypeScript/18CustomItemService/types/helpers/InventoryHelper.d.ts index f0ff69a..92bb49c 100644 --- a/TypeScript/18CustomItemService/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/18CustomItemService/types/helpers/InventoryHelper.d.ts @@ -23,9 +23,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/18CustomItemService/types/helpers/ItemHelper.d.ts b/TypeScript/18CustomItemService/types/helpers/ItemHelper.d.ts index da5dd11..c304cee 100644 --- a/TypeScript/18CustomItemService/types/helpers/ItemHelper.d.ts +++ b/TypeScript/18CustomItemService/types/helpers/ItemHelper.d.ts @@ -11,13 +11,13 @@ import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { CompareUtil } from "@spt/utils/CompareUtil"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ItemHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/18CustomItemService/types/helpers/ProfileHelper.d.ts b/TypeScript/18CustomItemService/types/helpers/ProfileHelper.d.ts index 0671179..cdab870 100644 --- a/TypeScript/18CustomItemService/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/18CustomItemService/types/helpers/ProfileHelper.d.ts @@ -11,10 +11,10 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/18CustomItemService/types/helpers/QuestHelper.d.ts b/TypeScript/18CustomItemService/types/helpers/QuestHelper.d.ts index 2b84b8f..2d5730d 100644 --- a/TypeScript/18CustomItemService/types/helpers/QuestHelper.d.ts +++ b/TypeScript/18CustomItemService/types/helpers/QuestHelper.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/18CustomItemService/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/18CustomItemService/types/helpers/RagfairOfferHelper.d.ts index b526554..2386316 100644 --- a/TypeScript/18CustomItemService/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/18CustomItemService/types/helpers/RagfairOfferHelper.d.ts @@ -151,7 +151,7 @@ export declare class RagfairOfferHelper { * @param boughtAmount Amount item was purchased for * @returns IItemEventRouterResponse */ - protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; + completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; /** * Get a localised message for when players offer has sold on flea * @param itemTpl Item sold diff --git a/TypeScript/18CustomItemService/types/helpers/RagfairServerHelper.d.ts b/TypeScript/18CustomItemService/types/helpers/RagfairServerHelper.d.ts index 927caf5..3e1fea9 100644 --- a/TypeScript/18CustomItemService/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/18CustomItemService/types/helpers/RagfairServerHelper.d.ts @@ -12,9 +12,9 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Helper class for common ragfair server actions */ diff --git a/TypeScript/18CustomItemService/types/helpers/RepairHelper.d.ts b/TypeScript/18CustomItemService/types/helpers/RepairHelper.d.ts index 99a21da..63c78c9 100644 --- a/TypeScript/18CustomItemService/types/helpers/RepairHelper.d.ts +++ b/TypeScript/18CustomItemService/types/helpers/RepairHelper.d.ts @@ -4,8 +4,8 @@ import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/18CustomItemService/types/helpers/RepeatableQuestHelper.d.ts b/TypeScript/18CustomItemService/types/helpers/RepeatableQuestHelper.d.ts index d92657e..8c65f40 100644 --- a/TypeScript/18CustomItemService/types/helpers/RepeatableQuestHelper.d.ts +++ b/TypeScript/18CustomItemService/types/helpers/RepeatableQuestHelper.d.ts @@ -1,8 +1,8 @@ import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestHelper { protected mathUtil: MathUtil; protected configServer: ConfigServer; diff --git a/TypeScript/18CustomItemService/types/helpers/TradeHelper.d.ts b/TypeScript/18CustomItemService/types/helpers/TradeHelper.d.ts index f994fda..6e6f3a2 100644 --- a/TypeScript/18CustomItemService/types/helpers/TradeHelper.d.ts +++ b/TypeScript/18CustomItemService/types/helpers/TradeHelper.d.ts @@ -17,8 +17,8 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TradeHelper { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/18CustomItemService/types/helpers/TraderAssortHelper.d.ts b/TypeScript/18CustomItemService/types/helpers/TraderAssortHelper.d.ts index 8f8f802..f1ecd3b 100644 --- a/TypeScript/18CustomItemService/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/18CustomItemService/types/helpers/TraderAssortHelper.d.ts @@ -14,9 +14,9 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; diff --git a/TypeScript/18CustomItemService/types/loaders/BundleLoader.d.ts b/TypeScript/18CustomItemService/types/loaders/BundleLoader.d.ts index e270988..8c0ed4d 100644 --- a/TypeScript/18CustomItemService/types/loaders/BundleLoader.d.ts +++ b/TypeScript/18CustomItemService/types/loaders/BundleLoader.d.ts @@ -1,8 +1,8 @@ import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BundleInfo { modpath: string; filename: string; diff --git a/TypeScript/18CustomItemService/types/loaders/PostDBModLoader.d.ts b/TypeScript/18CustomItemService/types/loaders/PostDBModLoader.d.ts index b0c4bf4..a8bb6a9 100644 --- a/TypeScript/18CustomItemService/types/loaders/PostDBModLoader.d.ts +++ b/TypeScript/18CustomItemService/types/loaders/PostDBModLoader.d.ts @@ -1,10 +1,10 @@ -import { DependencyContainer } from "tsyringe"; import { OnLoad } from "@spt/di/OnLoad"; import { BundleLoader } from "@spt/loaders/BundleLoader"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostDBModLoader implements OnLoad { protected logger: ILogger; protected bundleLoader: BundleLoader; diff --git a/TypeScript/18CustomItemService/types/loaders/PostSptModLoader.d.ts b/TypeScript/18CustomItemService/types/loaders/PostSptModLoader.d.ts index fb54579..2603497 100644 --- a/TypeScript/18CustomItemService/types/loaders/PostSptModLoader.d.ts +++ b/TypeScript/18CustomItemService/types/loaders/PostSptModLoader.d.ts @@ -1,9 +1,9 @@ -import { DependencyContainer } from "tsyringe"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { IModLoader } from "@spt/models/spt/mod/IModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostSptModLoader implements IModLoader { protected logger: ILogger; protected preSptModLoader: PreSptModLoader; diff --git a/TypeScript/18CustomItemService/types/loaders/PreSptModLoader.d.ts b/TypeScript/18CustomItemService/types/loaders/PreSptModLoader.d.ts index bc846c8..8814525 100644 --- a/TypeScript/18CustomItemService/types/loaders/PreSptModLoader.d.ts +++ b/TypeScript/18CustomItemService/types/loaders/PreSptModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { ModDetails } from "@spt/models/eft/profile/ISptProfile"; @@ -11,6 +10,7 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { ModCompilerService } from "@spt/services/ModCompilerService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { DependencyContainer } from "tsyringe"; export declare class PreSptModLoader implements IModLoader { protected logger: ILogger; protected vfs: VFS; diff --git a/TypeScript/18CustomItemService/types/models/eft/common/IEmptyRequestData.d.ts b/TypeScript/18CustomItemService/types/models/eft/common/IEmptyRequestData.d.ts index 284d16e..52a7b12 100644 --- a/TypeScript/18CustomItemService/types/models/eft/common/IEmptyRequestData.d.ts +++ b/TypeScript/18CustomItemService/types/models/eft/common/IEmptyRequestData.d.ts @@ -1,2 +1 @@ -export interface IEmptyRequestData { -} +export type IEmptyRequestData = {}; diff --git a/TypeScript/18CustomItemService/types/models/eft/common/tables/IBotBase.d.ts b/TypeScript/18CustomItemService/types/models/eft/common/tables/IBotBase.d.ts index a7fe1ca..be37845 100644 --- a/TypeScript/18CustomItemService/types/models/eft/common/tables/IBotBase.d.ts +++ b/TypeScript/18CustomItemService/types/models/eft/common/tables/IBotBase.d.ts @@ -373,8 +373,7 @@ export interface LastCompleted { export interface Notes { Notes: Note[]; } -export interface CarExtractCounts { -} +export type CarExtractCounts = {}; export declare enum SurvivorClass { UNKNOWN = 0, NEUTRALIZER = 1, diff --git a/TypeScript/18CustomItemService/types/models/eft/common/tables/ILocationsBase.d.ts b/TypeScript/18CustomItemService/types/models/eft/common/tables/ILocationsBase.d.ts index 2c96af3..16bca24 100644 --- a/TypeScript/18CustomItemService/types/models/eft/common/tables/ILocationsBase.d.ts +++ b/TypeScript/18CustomItemService/types/models/eft/common/tables/ILocationsBase.d.ts @@ -2,8 +2,7 @@ export interface ILocationsBase { locations: Locations; paths: Path[]; } -export interface Locations { -} +export type Locations = {}; export interface Path { Source: string; Destination: string; diff --git a/TypeScript/18CustomItemService/types/models/eft/common/tables/IProfileTemplate.d.ts b/TypeScript/18CustomItemService/types/models/eft/common/tables/IProfileTemplate.d.ts index 20923bc..6ba9221 100644 --- a/TypeScript/18CustomItemService/types/models/eft/common/tables/IProfileTemplate.d.ts +++ b/TypeScript/18CustomItemService/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -1,12 +1,12 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { Dialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; export interface IProfileTemplates { - "Standard": IProfileSides; + Standard: IProfileSides; "Left Behind": IProfileSides; "Prepare To Escape": IProfileSides; "Edge Of Darkness": IProfileSides; - "Unheard": IProfileSides; - "Tournament": IProfileSides; + Unheard: IProfileSides; + Tournament: IProfileSides; "SPT Developer": IProfileSides; "SPT Easy start": IProfileSides; "SPT Zero to hero": IProfileSides; diff --git a/TypeScript/18CustomItemService/types/models/eft/common/tables/ITrader.d.ts b/TypeScript/18CustomItemService/types/models/eft/common/tables/ITrader.d.ts index 14ab409..40cf004 100644 --- a/TypeScript/18CustomItemService/types/models/eft/common/tables/ITrader.d.ts +++ b/TypeScript/18CustomItemService/types/models/eft/common/tables/ITrader.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; export interface ITrader { assort?: ITraderAssort; @@ -78,6 +79,8 @@ export interface IBarterScheme { _tpl: string; onlyFunctional?: boolean; sptQuestLocked?: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface ISuit { _id: string; diff --git a/TypeScript/18CustomItemService/types/models/eft/hideout/IQteData.d.ts b/TypeScript/18CustomItemService/types/models/eft/hideout/IQteData.d.ts index 7f507e1..fe6cce6 100644 --- a/TypeScript/18CustomItemService/types/models/eft/hideout/IQteData.d.ts +++ b/TypeScript/18CustomItemService/types/models/eft/hideout/IQteData.d.ts @@ -1,14 +1,14 @@ import { Effect } from "@spt/models/eft/health/Effect"; import { BodyPart } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; import { QteActivityType } from "@spt/models/enums/hideout/QteActivityType"; import { QteEffectType } from "@spt/models/enums/hideout/QteEffectType"; import { QteResultType } from "@spt/models/enums/hideout/QteResultType"; import { QteRewardType } from "@spt/models/enums/hideout/QteRewardType"; import { QteType } from "@spt/models/enums/hideout/QteType"; import { RequirementType } from "@spt/models/enums/hideout/RequirementType"; -import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt/models/enums/SkillTypes"; -import { Traders } from "@spt/models/enums/Traders"; export interface IQteData { id: string; type: QteActivityType; diff --git a/TypeScript/18CustomItemService/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/18CustomItemService/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index f1123c1..5971372 100644 --- a/TypeScript/18CustomItemService/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/TypeScript/18CustomItemService/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -15,7 +15,5 @@ export interface Items { change: any[]; del: any[]; } -export interface Production { -} -export interface TraderRelations { -} +export type Production = {}; +export type TraderRelations = {}; diff --git a/TypeScript/18CustomItemService/types/models/eft/profile/ISptProfile.d.ts b/TypeScript/18CustomItemService/types/models/eft/profile/ISptProfile.d.ts index a8e742a..dd7aea6 100644 --- a/TypeScript/18CustomItemService/types/models/eft/profile/ISptProfile.d.ts +++ b/TypeScript/18CustomItemService/types/models/eft/profile/ISptProfile.d.ts @@ -209,12 +209,9 @@ export interface Effects { LeftLeg: LeftLeg; RightLeg: RightLeg; } -export interface Head { -} -export interface Chest { -} -export interface Stomach { -} +export type Head = {}; +export type Chest = {}; +export type Stomach = {}; export interface LeftArm { Fracture?: number; } diff --git a/TypeScript/18CustomItemService/types/models/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/18CustomItemService/types/models/eft/ragfair/IRagfairOffer.d.ts index eeeb79d..f6c07fc 100644 --- a/TypeScript/18CustomItemService/types/models/eft/ragfair/IRagfairOffer.d.ts +++ b/TypeScript/18CustomItemService/types/models/eft/ragfair/IRagfairOffer.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface IRagfairOffer { sellResult?: SellResult[]; @@ -28,6 +29,8 @@ export interface OfferRequirement { _tpl: string; count: number; onlyFunctional: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface IRagfairOfferUser { id: string; diff --git a/TypeScript/18CustomItemService/types/models/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/18CustomItemService/types/models/eft/ragfair/ISearchRequestData.d.ts index 8261c5b..c631de8 100644 --- a/TypeScript/18CustomItemService/types/models/eft/ragfair/ISearchRequestData.d.ts +++ b/TypeScript/18CustomItemService/types/models/eft/ragfair/ISearchRequestData.d.ts @@ -29,5 +29,4 @@ export declare enum OfferOwnerType { TRADEROWNERTYPE = 1, PLAYEROWNERTYPE = 2 } -export interface BuildItems { -} +export type BuildItems = {}; diff --git a/TypeScript/18CustomItemService/types/models/enums/BaseClasses.d.ts b/TypeScript/18CustomItemService/types/models/enums/BaseClasses.d.ts index 65fc95e..32ebf7c 100644 --- a/TypeScript/18CustomItemService/types/models/enums/BaseClasses.d.ts +++ b/TypeScript/18CustomItemService/types/models/enums/BaseClasses.d.ts @@ -107,6 +107,6 @@ export declare enum BaseClasses { RECEIVER = "55818a304bdc2db5418b457d", BARREL = "555ef6e44bdc2de9068b457e", CHARGING_HANDLE = "55818a6f4bdc2db9688b456b", - COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569 ", + COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569", HIDEOUT_AREA_CONTAINER = "63da6da4784a55176c018dba" } diff --git a/TypeScript/18CustomItemService/types/models/enums/DogtagExchangeSide.d.ts b/TypeScript/18CustomItemService/types/models/enums/DogtagExchangeSide.d.ts new file mode 100644 index 0000000..de3d4df --- /dev/null +++ b/TypeScript/18CustomItemService/types/models/enums/DogtagExchangeSide.d.ts @@ -0,0 +1,5 @@ +export declare enum DogtagExchangeSide { + USEC = "Usec", + BEAR = "Bear", + ANY = "Any" +} diff --git a/TypeScript/18CustomItemService/types/models/spt/server/ExhaustableArray.d.ts b/TypeScript/18CustomItemService/types/models/spt/server/ExhaustableArray.d.ts index c27f41f..50a6b68 100644 --- a/TypeScript/18CustomItemService/types/models/spt/server/ExhaustableArray.d.ts +++ b/TypeScript/18CustomItemService/types/models/spt/server/ExhaustableArray.d.ts @@ -1,5 +1,5 @@ -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ExhaustableArray implements IExhaustableArray { private itemPool; private randomUtil; diff --git a/TypeScript/18CustomItemService/types/routers/EventOutputHolder.d.ts b/TypeScript/18CustomItemService/types/routers/EventOutputHolder.d.ts index ef20706..148461a 100644 --- a/TypeScript/18CustomItemService/types/routers/EventOutputHolder.d.ts +++ b/TypeScript/18CustomItemService/types/routers/EventOutputHolder.d.ts @@ -3,8 +3,8 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IHideoutImprovement, Productive, TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; import { TraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class EventOutputHolder { protected profileHelper: ProfileHelper; protected timeUtil: TimeUtil; @@ -12,7 +12,7 @@ export declare class EventOutputHolder { /** * What has client been informed of this game session * Key = sessionId, then second key is prod id - */ + */ protected clientActiveSessionStorage: Record>; diff --git a/TypeScript/18CustomItemService/types/servers/HttpServer.d.ts b/TypeScript/18CustomItemService/types/servers/HttpServer.d.ts index b00fe68..0024ba3 100644 --- a/TypeScript/18CustomItemService/types/servers/HttpServer.d.ts +++ b/TypeScript/18CustomItemService/types/servers/HttpServer.d.ts @@ -6,8 +6,8 @@ import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; -import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { WebSocketServer } from "@spt/servers/WebSocketServer"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { LocalisationService } from "@spt/services/LocalisationService"; export declare class HttpServer { protected logger: ILogger; diff --git a/TypeScript/18CustomItemService/types/servers/WebSocketServer.d.ts b/TypeScript/18CustomItemService/types/servers/WebSocketServer.d.ts index f4e07bb..6121824 100644 --- a/TypeScript/18CustomItemService/types/servers/WebSocketServer.d.ts +++ b/TypeScript/18CustomItemService/types/servers/WebSocketServer.d.ts @@ -1,12 +1,12 @@ /// import http, { IncomingMessage } from "node:http"; -import { WebSocket, Server } from "ws"; import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { Server, WebSocket } from "ws"; export declare class WebSocketServer { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/18CustomItemService/types/servers/ws/SptWebSocketConnectionHandler.d.ts b/TypeScript/18CustomItemService/types/servers/ws/SptWebSocketConnectionHandler.d.ts index 98d0898..70fc96a 100644 --- a/TypeScript/18CustomItemService/types/servers/ws/SptWebSocketConnectionHandler.d.ts +++ b/TypeScript/18CustomItemService/types/servers/ws/SptWebSocketConnectionHandler.d.ts @@ -1,7 +1,6 @@ /// /// import { IncomingMessage } from "http"; -import { WebSocket } from "ws"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; @@ -11,6 +10,7 @@ import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectio import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; +import { WebSocket } from "ws"; export declare class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler { protected logger: ILogger; protected profileHelper: ProfileHelper; diff --git a/TypeScript/18CustomItemService/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts b/TypeScript/18CustomItemService/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts index d5247ec..5556129 100644 --- a/TypeScript/18CustomItemService/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts +++ b/TypeScript/18CustomItemService/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts @@ -1,6 +1,6 @@ -import { RawData, WebSocket } from "ws"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; +import { RawData, WebSocket } from "ws"; export declare class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler { protected logger: ILogger; constructor(logger: ILogger); diff --git a/TypeScript/18CustomItemService/types/services/FenceService.d.ts b/TypeScript/18CustomItemService/types/services/FenceService.d.ts index c156122..58dc076 100644 --- a/TypeScript/18CustomItemService/types/services/FenceService.d.ts +++ b/TypeScript/18CustomItemService/types/services/FenceService.d.ts @@ -13,9 +13,9 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Handle actions surrounding Fence * e.g. generating or refreshing assorts / get next refresh time diff --git a/TypeScript/18CustomItemService/types/services/InsuranceService.d.ts b/TypeScript/18CustomItemService/types/services/InsuranceService.d.ts index 0000e66..f799102 100644 --- a/TypeScript/18CustomItemService/types/services/InsuranceService.d.ts +++ b/TypeScript/18CustomItemService/types/services/InsuranceService.d.ts @@ -18,10 +18,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceService { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/18CustomItemService/types/services/LocalisationService.d.ts b/TypeScript/18CustomItemService/types/services/LocalisationService.d.ts index 42dfa4e..855c138 100644 --- a/TypeScript/18CustomItemService/types/services/LocalisationService.d.ts +++ b/TypeScript/18CustomItemService/types/services/LocalisationService.d.ts @@ -1,8 +1,8 @@ -import { I18n } from "i18n"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { LocaleService } from "@spt/services/LocaleService"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { I18n } from "i18n"; /** * Handles translating server text into different langauges */ diff --git a/TypeScript/18CustomItemService/types/services/ProfileFixerService.d.ts b/TypeScript/18CustomItemService/types/services/ProfileFixerService.d.ts index 525b867..91e4780 100644 --- a/TypeScript/18CustomItemService/types/services/ProfileFixerService.d.ts +++ b/TypeScript/18CustomItemService/types/services/ProfileFixerService.d.ts @@ -8,7 +8,7 @@ import { Bonus, HideoutSlot } from "@spt/models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea"; -import { ISptProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; +import { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; @@ -16,11 +16,11 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileFixerService { protected logger: ILogger; protected watermark: Watermark; @@ -73,6 +73,7 @@ export declare class ProfileFixerService { */ protected removeDanglingTaskConditionCounters(pmcProfile: IPmcData): void; protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullRagfairRatings(pmcProfile: IPmcData): void; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; /** diff --git a/TypeScript/18CustomItemService/types/services/RagfairOfferService.d.ts b/TypeScript/18CustomItemService/types/services/RagfairOfferService.d.ts index 6c13b1d..98dd179 100644 --- a/TypeScript/18CustomItemService/types/services/RagfairOfferService.d.ts +++ b/TypeScript/18CustomItemService/types/services/RagfairOfferService.d.ts @@ -10,10 +10,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/18CustomItemService/types/services/mod/CustomItemService.d.ts b/TypeScript/18CustomItemService/types/services/mod/CustomItemService.d.ts index 1926bed..f112872 100644 --- a/TypeScript/18CustomItemService/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/18CustomItemService/types/services/mod/CustomItemService.d.ts @@ -4,8 +4,8 @@ import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetail import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/18CustomItemService/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/18CustomItemService/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts index 3c9d955..91c84d9 100644 --- a/TypeScript/18CustomItemService/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts +++ b/TypeScript/18CustomItemService/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class DynamicRouterModService { private container; constructor(container: DependencyContainer); diff --git a/TypeScript/18CustomItemService/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/18CustomItemService/types/services/mod/staticRouter/StaticRouterModService.d.ts index f60432d..0c3d4d8 100644 --- a/TypeScript/18CustomItemService/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/TypeScript/18CustomItemService/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class StaticRouterModService { protected container: DependencyContainer; constructor(container: DependencyContainer); diff --git a/TypeScript/18CustomItemService/types/utils/JsonUtil.d.ts b/TypeScript/18CustomItemService/types/utils/JsonUtil.d.ts index b30822c..4419228 100644 --- a/TypeScript/18CustomItemService/types/utils/JsonUtil.d.ts +++ b/TypeScript/18CustomItemService/types/utils/JsonUtil.d.ts @@ -1,7 +1,7 @@ -import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { HashUtil } from "@spt/utils/HashUtil"; import { VFS } from "@spt/utils/VFS"; +import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; export declare class JsonUtil { protected vfs: VFS; protected hashUtil: HashUtil; diff --git a/TypeScript/18CustomItemService/types/utils/RandomUtil.d.ts b/TypeScript/18CustomItemService/types/utils/RandomUtil.d.ts index 49f242d..0da184f 100644 --- a/TypeScript/18CustomItemService/types/utils/RandomUtil.d.ts +++ b/TypeScript/18CustomItemService/types/utils/RandomUtil.d.ts @@ -1,6 +1,6 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects * based on the relative probability of each of its elements. diff --git a/TypeScript/18CustomItemService/types/utils/logging/AbstractWinstonLogger.d.ts b/TypeScript/18CustomItemService/types/utils/logging/AbstractWinstonLogger.d.ts index 7098f85..ef54434 100644 --- a/TypeScript/18CustomItemService/types/utils/logging/AbstractWinstonLogger.d.ts +++ b/TypeScript/18CustomItemService/types/utils/logging/AbstractWinstonLogger.d.ts @@ -1,12 +1,12 @@ /// import fs from "node:fs"; -import winston from "winston"; import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; import { SptLogger } from "@spt/models/spt/logging/SptLogger"; import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; import { ILogger } from "@spt/models/spt/utils/ILogger"; +import winston from "winston"; export declare abstract class AbstractWinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected showDebugInConsole: boolean; diff --git a/TypeScript/19UseExternalLibraries/types/controllers/BotController.d.ts b/TypeScript/19UseExternalLibraries/types/controllers/BotController.d.ts index 6431fca..475f51b 100644 --- a/TypeScript/19UseExternalLibraries/types/controllers/BotController.d.ts +++ b/TypeScript/19UseExternalLibraries/types/controllers/BotController.d.ts @@ -20,8 +20,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/19UseExternalLibraries/types/controllers/BuildController.d.ts b/TypeScript/19UseExternalLibraries/types/controllers/BuildController.d.ts index ed8adf6..2cb9c59 100644 --- a/TypeScript/19UseExternalLibraries/types/controllers/BuildController.d.ts +++ b/TypeScript/19UseExternalLibraries/types/controllers/BuildController.d.ts @@ -9,8 +9,8 @@ import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BuildController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/19UseExternalLibraries/types/controllers/GameController.d.ts b/TypeScript/19UseExternalLibraries/types/controllers/GameController.d.ts index 533a81c..e219c04 100644 --- a/TypeScript/19UseExternalLibraries/types/controllers/GameController.d.ts +++ b/TypeScript/19UseExternalLibraries/types/controllers/GameController.d.ts @@ -34,10 +34,10 @@ import { ProfileActivityService } from "@spt/services/ProfileActivityService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GameController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/19UseExternalLibraries/types/controllers/HealthController.d.ts b/TypeScript/19UseExternalLibraries/types/controllers/HealthController.d.ts index 5482283..5a0a0a6 100644 --- a/TypeScript/19UseExternalLibraries/types/controllers/HealthController.d.ts +++ b/TypeScript/19UseExternalLibraries/types/controllers/HealthController.d.ts @@ -12,8 +12,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthController { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/19UseExternalLibraries/types/controllers/HideoutController.d.ts b/TypeScript/19UseExternalLibraries/types/controllers/HideoutController.d.ts index e9d1ed9..89a428c 100644 --- a/TypeScript/19UseExternalLibraries/types/controllers/HideoutController.d.ts +++ b/TypeScript/19UseExternalLibraries/types/controllers/HideoutController.d.ts @@ -35,11 +35,11 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; import { ProfileActivityService } from "@spt/services/ProfileActivityService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/19UseExternalLibraries/types/controllers/InraidController.d.ts b/TypeScript/19UseExternalLibraries/types/controllers/InraidController.d.ts index 87f419b..9f0c409 100644 --- a/TypeScript/19UseExternalLibraries/types/controllers/InraidController.d.ts +++ b/TypeScript/19UseExternalLibraries/types/controllers/InraidController.d.ts @@ -13,6 +13,7 @@ import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRe import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState"; import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig"; import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; @@ -31,7 +32,6 @@ import { PmcChatResponseService } from "@spt/services/PmcChatResponseService"; import { TraderServicesService } from "@spt/services/TraderServicesService"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; -import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; /** * Logic for handling In Raid callbacks */ diff --git a/TypeScript/19UseExternalLibraries/types/controllers/InsuranceController.d.ts b/TypeScript/19UseExternalLibraries/types/controllers/InsuranceController.d.ts index f921b83..543e915 100644 --- a/TypeScript/19UseExternalLibraries/types/controllers/InsuranceController.d.ts +++ b/TypeScript/19UseExternalLibraries/types/controllers/InsuranceController.d.ts @@ -21,11 +21,11 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PaymentService } from "@spt/services/PaymentService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceController { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/19UseExternalLibraries/types/controllers/InventoryController.d.ts b/TypeScript/19UseExternalLibraries/types/controllers/InventoryController.d.ts index 40bb084..c986ce8 100644 --- a/TypeScript/19UseExternalLibraries/types/controllers/InventoryController.d.ts +++ b/TypeScript/19UseExternalLibraries/types/controllers/InventoryController.d.ts @@ -37,10 +37,10 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MapMarkerService } from "@spt/services/MapMarkerService"; import { PlayerService } from "@spt/services/PlayerService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/19UseExternalLibraries/types/controllers/LocationController.d.ts b/TypeScript/19UseExternalLibraries/types/controllers/LocationController.d.ts index 727a8c8..a541b9c 100644 --- a/TypeScript/19UseExternalLibraries/types/controllers/LocationController.d.ts +++ b/TypeScript/19UseExternalLibraries/types/controllers/LocationController.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class LocationController { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; diff --git a/TypeScript/19UseExternalLibraries/types/controllers/ProfileController.d.ts b/TypeScript/19UseExternalLibraries/types/controllers/ProfileController.d.ts index e8dae73..7e6d35c 100644 --- a/TypeScript/19UseExternalLibraries/types/controllers/ProfileController.d.ts +++ b/TypeScript/19UseExternalLibraries/types/controllers/ProfileController.d.ts @@ -26,9 +26,9 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/19UseExternalLibraries/types/controllers/QuestController.d.ts b/TypeScript/19UseExternalLibraries/types/controllers/QuestController.d.ts index 3cdce00..6a5b415 100644 --- a/TypeScript/19UseExternalLibraries/types/controllers/QuestController.d.ts +++ b/TypeScript/19UseExternalLibraries/types/controllers/QuestController.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/19UseExternalLibraries/types/controllers/RepeatableQuestController.d.ts b/TypeScript/19UseExternalLibraries/types/controllers/RepeatableQuestController.d.ts index 74f39eb..016f8c6 100644 --- a/TypeScript/19UseExternalLibraries/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/19UseExternalLibraries/types/controllers/RepeatableQuestController.d.ts @@ -18,11 +18,11 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/19UseExternalLibraries/types/controllers/TradeController.d.ts b/TypeScript/19UseExternalLibraries/types/controllers/TradeController.d.ts index bc72e92..842a97b 100644 --- a/TypeScript/19UseExternalLibraries/types/controllers/TradeController.d.ts +++ b/TypeScript/19UseExternalLibraries/types/controllers/TradeController.d.ts @@ -1,5 +1,6 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper"; import { TradeHelper } from "@spt/helpers/TradeHelper"; import { TraderHelper } from "@spt/helpers/TraderHelper"; import { IPmcData } from "@spt/models/eft/common/IPmcData"; @@ -35,6 +36,7 @@ export declare class TradeController { protected hashUtil: HashUtil; protected itemHelper: ItemHelper; protected profileHelper: ProfileHelper; + protected ragfairOfferHelper: RagfairOfferHelper; protected traderHelper: TraderHelper; protected ragfairServer: RagfairServer; protected httpResponse: HttpResponseUtil; @@ -44,7 +46,7 @@ export declare class TradeController { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairOfferHelper: RagfairOfferHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); /** Handle TradingConfirm event */ confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; /** Handle RagFairBuyOffer event */ @@ -67,10 +69,17 @@ export declare class TradeController { * @param output Output to send back to client */ protected buyPmcItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void; + /** + * Is the provided offerid and ownerid from a player made offer + * @param offerId Id of the offer + * @param offerOwnerId Owner id + * @returns true if offer was made by a player + */ + protected isPlayerOffer(offerId: string, offerOwnerId: string): boolean; /** * Does Player have necessary trader loyalty to purchase flea offer * @param sellerIsTrader is seller trader - * @param fleaOffer FLea offer being bought + * @param fleaOffer Flea offer being bought * @param pmcData Player profile * @returns True if player can buy offer */ diff --git a/TypeScript/19UseExternalLibraries/types/controllers/TraderController.d.ts b/TypeScript/19UseExternalLibraries/types/controllers/TraderController.d.ts index 7fc6d78..3592fc6 100644 --- a/TypeScript/19UseExternalLibraries/types/controllers/TraderController.d.ts +++ b/TypeScript/19UseExternalLibraries/types/controllers/TraderController.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/19UseExternalLibraries/types/generators/BotEquipmentModGenerator.d.ts b/TypeScript/19UseExternalLibraries/types/generators/BotEquipmentModGenerator.d.ts index 419120f..3952293 100644 --- a/TypeScript/19UseExternalLibraries/types/generators/BotEquipmentModGenerator.d.ts +++ b/TypeScript/19UseExternalLibraries/types/generators/BotEquipmentModGenerator.d.ts @@ -25,9 +25,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotEquipmentModGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -65,7 +65,7 @@ export declare class BotEquipmentModGenerator { * @param settings Bot equipment generation settings * @param modSlot Armor slot being filtered * @param existingPlateTplPool Plates tpls to choose from - * @param armorItem + * @param armorItem The armor items db template * @returns Array of plate tpls to choose from */ protected filterPlateModsForSlotByLevel(settings: IGenerateEquipmentProperties, modSlot: string, existingPlateTplPool: string[], armorItem: ITemplateItem): IFilterPlateModsForSlotByLevelResult; diff --git a/TypeScript/19UseExternalLibraries/types/generators/BotGenerator.d.ts b/TypeScript/19UseExternalLibraries/types/generators/BotGenerator.d.ts index 8ab4371..ebb8a59 100644 --- a/TypeScript/19UseExternalLibraries/types/generators/BotGenerator.d.ts +++ b/TypeScript/19UseExternalLibraries/types/generators/BotGenerator.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/19UseExternalLibraries/types/generators/BotLevelGenerator.d.ts b/TypeScript/19UseExternalLibraries/types/generators/BotLevelGenerator.d.ts index dee61e2..a8a8895 100644 --- a/TypeScript/19UseExternalLibraries/types/generators/BotLevelGenerator.d.ts +++ b/TypeScript/19UseExternalLibraries/types/generators/BotLevelGenerator.d.ts @@ -4,12 +4,14 @@ import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; +import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class BotLevelGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; protected databaseService: DatabaseService; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService); + protected mathUtil: MathUtil; + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, mathUtil: MathUtil); /** * Return a randomised bot level and exp value * @param levelDetails Min and max of level for bot @@ -18,6 +20,7 @@ export declare class BotLevelGenerator { * @returns IRandomisedBotLevelResult object */ generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult; + protected chooseBotLevel(min: number, max: number, shift: number, number: number): number; /** * Get the highest level a bot can be relative to the players level, but no further than the max size from globals.exp_table * @param botGenerationDetails Details to help generate a bot diff --git a/TypeScript/19UseExternalLibraries/types/generators/BotLootGenerator.d.ts b/TypeScript/19UseExternalLibraries/types/generators/BotLootGenerator.d.ts index fee56ce..c0583c6 100644 --- a/TypeScript/19UseExternalLibraries/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/19UseExternalLibraries/types/generators/BotLootGenerator.d.ts @@ -18,9 +18,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/19UseExternalLibraries/types/generators/BotWeaponGenerator.d.ts b/TypeScript/19UseExternalLibraries/types/generators/BotWeaponGenerator.d.ts index 5559bfa..8e03b35 100644 --- a/TypeScript/19UseExternalLibraries/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/19UseExternalLibraries/types/generators/BotWeaponGenerator.d.ts @@ -18,9 +18,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RepairService } from "@spt/services/RepairService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotWeaponGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/19UseExternalLibraries/types/generators/LocationGenerator.d.ts b/TypeScript/19UseExternalLibraries/types/generators/LocationGenerator.d.ts index 222b0ab..9a2b0c4 100644 --- a/TypeScript/19UseExternalLibraries/types/generators/LocationGenerator.d.ts +++ b/TypeScript/19UseExternalLibraries/types/generators/LocationGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export interface IContainerItem { items: Item[]; width: number; diff --git a/TypeScript/19UseExternalLibraries/types/generators/PlayerScavGenerator.d.ts b/TypeScript/19UseExternalLibraries/types/generators/PlayerScavGenerator.d.ts index 2414150..e317bf6 100644 --- a/TypeScript/19UseExternalLibraries/types/generators/PlayerScavGenerator.d.ts +++ b/TypeScript/19UseExternalLibraries/types/generators/PlayerScavGenerator.d.ts @@ -14,9 +14,9 @@ import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class PlayerScavGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/19UseExternalLibraries/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/19UseExternalLibraries/types/generators/RagfairOfferGenerator.d.ts index 9435390..ca09729 100644 --- a/TypeScript/19UseExternalLibraries/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/19UseExternalLibraries/types/generators/RagfairOfferGenerator.d.ts @@ -19,10 +19,10 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/19UseExternalLibraries/types/generators/RepeatableQuestGenerator.d.ts b/TypeScript/19UseExternalLibraries/types/generators/RepeatableQuestGenerator.d.ts index 77c4e79..339f322 100644 --- a/TypeScript/19UseExternalLibraries/types/generators/RepeatableQuestGenerator.d.ts +++ b/TypeScript/19UseExternalLibraries/types/generators/RepeatableQuestGenerator.d.ts @@ -11,10 +11,10 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/19UseExternalLibraries/types/generators/RepeatableQuestRewardGenerator.d.ts b/TypeScript/19UseExternalLibraries/types/generators/RepeatableQuestRewardGenerator.d.ts index 1e09994..713a394 100644 --- a/TypeScript/19UseExternalLibraries/types/generators/RepeatableQuestRewardGenerator.d.ts +++ b/TypeScript/19UseExternalLibraries/types/generators/RepeatableQuestRewardGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestRewardGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/19UseExternalLibraries/types/helpers/BotDifficultyHelper.d.ts b/TypeScript/19UseExternalLibraries/types/helpers/BotDifficultyHelper.d.ts index 63572a5..2348bd3 100644 --- a/TypeScript/19UseExternalLibraries/types/helpers/BotDifficultyHelper.d.ts +++ b/TypeScript/19UseExternalLibraries/types/helpers/BotDifficultyHelper.d.ts @@ -5,8 +5,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotDifficultyHelper { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/19UseExternalLibraries/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/19UseExternalLibraries/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index c51bf7e..c38f0a0 100644 --- a/TypeScript/19UseExternalLibraries/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/19UseExternalLibraries/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GiveSptCommand implements ISptCommand { protected logger: ILogger; protected itemHelper: ItemHelper; diff --git a/TypeScript/19UseExternalLibraries/types/helpers/HealthHelper.d.ts b/TypeScript/19UseExternalLibraries/types/helpers/HealthHelper.d.ts index 650f633..a164285 100644 --- a/TypeScript/19UseExternalLibraries/types/helpers/HealthHelper.d.ts +++ b/TypeScript/19UseExternalLibraries/types/helpers/HealthHelper.d.ts @@ -5,8 +5,8 @@ import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/19UseExternalLibraries/types/helpers/HideoutHelper.d.ts b/TypeScript/19UseExternalLibraries/types/helpers/HideoutHelper.d.ts index c4aaa4c..df0376b 100644 --- a/TypeScript/19UseExternalLibraries/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/19UseExternalLibraries/types/helpers/HideoutHelper.d.ts @@ -18,10 +18,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/19UseExternalLibraries/types/helpers/InRaidHelper.d.ts b/TypeScript/19UseExternalLibraries/types/helpers/InRaidHelper.d.ts index 449be9f..987c9ec 100644 --- a/TypeScript/19UseExternalLibraries/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/19UseExternalLibraries/types/helpers/InRaidHelper.d.ts @@ -15,9 +15,9 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InRaidHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/19UseExternalLibraries/types/helpers/InventoryHelper.d.ts b/TypeScript/19UseExternalLibraries/types/helpers/InventoryHelper.d.ts index f0ff69a..92bb49c 100644 --- a/TypeScript/19UseExternalLibraries/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/19UseExternalLibraries/types/helpers/InventoryHelper.d.ts @@ -23,9 +23,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/19UseExternalLibraries/types/helpers/ItemHelper.d.ts b/TypeScript/19UseExternalLibraries/types/helpers/ItemHelper.d.ts index da5dd11..c304cee 100644 --- a/TypeScript/19UseExternalLibraries/types/helpers/ItemHelper.d.ts +++ b/TypeScript/19UseExternalLibraries/types/helpers/ItemHelper.d.ts @@ -11,13 +11,13 @@ import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { CompareUtil } from "@spt/utils/CompareUtil"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ItemHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/19UseExternalLibraries/types/helpers/ProfileHelper.d.ts b/TypeScript/19UseExternalLibraries/types/helpers/ProfileHelper.d.ts index 0671179..cdab870 100644 --- a/TypeScript/19UseExternalLibraries/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/19UseExternalLibraries/types/helpers/ProfileHelper.d.ts @@ -11,10 +11,10 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/19UseExternalLibraries/types/helpers/QuestHelper.d.ts b/TypeScript/19UseExternalLibraries/types/helpers/QuestHelper.d.ts index 2b84b8f..2d5730d 100644 --- a/TypeScript/19UseExternalLibraries/types/helpers/QuestHelper.d.ts +++ b/TypeScript/19UseExternalLibraries/types/helpers/QuestHelper.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/19UseExternalLibraries/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/19UseExternalLibraries/types/helpers/RagfairOfferHelper.d.ts index b526554..2386316 100644 --- a/TypeScript/19UseExternalLibraries/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/19UseExternalLibraries/types/helpers/RagfairOfferHelper.d.ts @@ -151,7 +151,7 @@ export declare class RagfairOfferHelper { * @param boughtAmount Amount item was purchased for * @returns IItemEventRouterResponse */ - protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; + completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; /** * Get a localised message for when players offer has sold on flea * @param itemTpl Item sold diff --git a/TypeScript/19UseExternalLibraries/types/helpers/RagfairServerHelper.d.ts b/TypeScript/19UseExternalLibraries/types/helpers/RagfairServerHelper.d.ts index 927caf5..3e1fea9 100644 --- a/TypeScript/19UseExternalLibraries/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/19UseExternalLibraries/types/helpers/RagfairServerHelper.d.ts @@ -12,9 +12,9 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Helper class for common ragfair server actions */ diff --git a/TypeScript/19UseExternalLibraries/types/helpers/RepairHelper.d.ts b/TypeScript/19UseExternalLibraries/types/helpers/RepairHelper.d.ts index 99a21da..63c78c9 100644 --- a/TypeScript/19UseExternalLibraries/types/helpers/RepairHelper.d.ts +++ b/TypeScript/19UseExternalLibraries/types/helpers/RepairHelper.d.ts @@ -4,8 +4,8 @@ import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/19UseExternalLibraries/types/helpers/RepeatableQuestHelper.d.ts b/TypeScript/19UseExternalLibraries/types/helpers/RepeatableQuestHelper.d.ts index d92657e..8c65f40 100644 --- a/TypeScript/19UseExternalLibraries/types/helpers/RepeatableQuestHelper.d.ts +++ b/TypeScript/19UseExternalLibraries/types/helpers/RepeatableQuestHelper.d.ts @@ -1,8 +1,8 @@ import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestHelper { protected mathUtil: MathUtil; protected configServer: ConfigServer; diff --git a/TypeScript/19UseExternalLibraries/types/helpers/TradeHelper.d.ts b/TypeScript/19UseExternalLibraries/types/helpers/TradeHelper.d.ts index f994fda..6e6f3a2 100644 --- a/TypeScript/19UseExternalLibraries/types/helpers/TradeHelper.d.ts +++ b/TypeScript/19UseExternalLibraries/types/helpers/TradeHelper.d.ts @@ -17,8 +17,8 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TradeHelper { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/19UseExternalLibraries/types/helpers/TraderAssortHelper.d.ts b/TypeScript/19UseExternalLibraries/types/helpers/TraderAssortHelper.d.ts index 8f8f802..f1ecd3b 100644 --- a/TypeScript/19UseExternalLibraries/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/19UseExternalLibraries/types/helpers/TraderAssortHelper.d.ts @@ -14,9 +14,9 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; diff --git a/TypeScript/19UseExternalLibraries/types/loaders/BundleLoader.d.ts b/TypeScript/19UseExternalLibraries/types/loaders/BundleLoader.d.ts index e270988..8c0ed4d 100644 --- a/TypeScript/19UseExternalLibraries/types/loaders/BundleLoader.d.ts +++ b/TypeScript/19UseExternalLibraries/types/loaders/BundleLoader.d.ts @@ -1,8 +1,8 @@ import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BundleInfo { modpath: string; filename: string; diff --git a/TypeScript/19UseExternalLibraries/types/loaders/PostDBModLoader.d.ts b/TypeScript/19UseExternalLibraries/types/loaders/PostDBModLoader.d.ts index b0c4bf4..a8bb6a9 100644 --- a/TypeScript/19UseExternalLibraries/types/loaders/PostDBModLoader.d.ts +++ b/TypeScript/19UseExternalLibraries/types/loaders/PostDBModLoader.d.ts @@ -1,10 +1,10 @@ -import { DependencyContainer } from "tsyringe"; import { OnLoad } from "@spt/di/OnLoad"; import { BundleLoader } from "@spt/loaders/BundleLoader"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostDBModLoader implements OnLoad { protected logger: ILogger; protected bundleLoader: BundleLoader; diff --git a/TypeScript/19UseExternalLibraries/types/loaders/PostSptModLoader.d.ts b/TypeScript/19UseExternalLibraries/types/loaders/PostSptModLoader.d.ts index fb54579..2603497 100644 --- a/TypeScript/19UseExternalLibraries/types/loaders/PostSptModLoader.d.ts +++ b/TypeScript/19UseExternalLibraries/types/loaders/PostSptModLoader.d.ts @@ -1,9 +1,9 @@ -import { DependencyContainer } from "tsyringe"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { IModLoader } from "@spt/models/spt/mod/IModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostSptModLoader implements IModLoader { protected logger: ILogger; protected preSptModLoader: PreSptModLoader; diff --git a/TypeScript/19UseExternalLibraries/types/loaders/PreSptModLoader.d.ts b/TypeScript/19UseExternalLibraries/types/loaders/PreSptModLoader.d.ts index bc846c8..8814525 100644 --- a/TypeScript/19UseExternalLibraries/types/loaders/PreSptModLoader.d.ts +++ b/TypeScript/19UseExternalLibraries/types/loaders/PreSptModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { ModDetails } from "@spt/models/eft/profile/ISptProfile"; @@ -11,6 +10,7 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { ModCompilerService } from "@spt/services/ModCompilerService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { DependencyContainer } from "tsyringe"; export declare class PreSptModLoader implements IModLoader { protected logger: ILogger; protected vfs: VFS; diff --git a/TypeScript/19UseExternalLibraries/types/models/eft/common/IEmptyRequestData.d.ts b/TypeScript/19UseExternalLibraries/types/models/eft/common/IEmptyRequestData.d.ts index 284d16e..52a7b12 100644 --- a/TypeScript/19UseExternalLibraries/types/models/eft/common/IEmptyRequestData.d.ts +++ b/TypeScript/19UseExternalLibraries/types/models/eft/common/IEmptyRequestData.d.ts @@ -1,2 +1 @@ -export interface IEmptyRequestData { -} +export type IEmptyRequestData = {}; diff --git a/TypeScript/19UseExternalLibraries/types/models/eft/common/tables/IBotBase.d.ts b/TypeScript/19UseExternalLibraries/types/models/eft/common/tables/IBotBase.d.ts index a7fe1ca..be37845 100644 --- a/TypeScript/19UseExternalLibraries/types/models/eft/common/tables/IBotBase.d.ts +++ b/TypeScript/19UseExternalLibraries/types/models/eft/common/tables/IBotBase.d.ts @@ -373,8 +373,7 @@ export interface LastCompleted { export interface Notes { Notes: Note[]; } -export interface CarExtractCounts { -} +export type CarExtractCounts = {}; export declare enum SurvivorClass { UNKNOWN = 0, NEUTRALIZER = 1, diff --git a/TypeScript/19UseExternalLibraries/types/models/eft/common/tables/ILocationsBase.d.ts b/TypeScript/19UseExternalLibraries/types/models/eft/common/tables/ILocationsBase.d.ts index 2c96af3..16bca24 100644 --- a/TypeScript/19UseExternalLibraries/types/models/eft/common/tables/ILocationsBase.d.ts +++ b/TypeScript/19UseExternalLibraries/types/models/eft/common/tables/ILocationsBase.d.ts @@ -2,8 +2,7 @@ export interface ILocationsBase { locations: Locations; paths: Path[]; } -export interface Locations { -} +export type Locations = {}; export interface Path { Source: string; Destination: string; diff --git a/TypeScript/19UseExternalLibraries/types/models/eft/common/tables/IProfileTemplate.d.ts b/TypeScript/19UseExternalLibraries/types/models/eft/common/tables/IProfileTemplate.d.ts index 20923bc..6ba9221 100644 --- a/TypeScript/19UseExternalLibraries/types/models/eft/common/tables/IProfileTemplate.d.ts +++ b/TypeScript/19UseExternalLibraries/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -1,12 +1,12 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { Dialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; export interface IProfileTemplates { - "Standard": IProfileSides; + Standard: IProfileSides; "Left Behind": IProfileSides; "Prepare To Escape": IProfileSides; "Edge Of Darkness": IProfileSides; - "Unheard": IProfileSides; - "Tournament": IProfileSides; + Unheard: IProfileSides; + Tournament: IProfileSides; "SPT Developer": IProfileSides; "SPT Easy start": IProfileSides; "SPT Zero to hero": IProfileSides; diff --git a/TypeScript/19UseExternalLibraries/types/models/eft/common/tables/ITrader.d.ts b/TypeScript/19UseExternalLibraries/types/models/eft/common/tables/ITrader.d.ts index 14ab409..40cf004 100644 --- a/TypeScript/19UseExternalLibraries/types/models/eft/common/tables/ITrader.d.ts +++ b/TypeScript/19UseExternalLibraries/types/models/eft/common/tables/ITrader.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; export interface ITrader { assort?: ITraderAssort; @@ -78,6 +79,8 @@ export interface IBarterScheme { _tpl: string; onlyFunctional?: boolean; sptQuestLocked?: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface ISuit { _id: string; diff --git a/TypeScript/19UseExternalLibraries/types/models/eft/hideout/IQteData.d.ts b/TypeScript/19UseExternalLibraries/types/models/eft/hideout/IQteData.d.ts index 7f507e1..fe6cce6 100644 --- a/TypeScript/19UseExternalLibraries/types/models/eft/hideout/IQteData.d.ts +++ b/TypeScript/19UseExternalLibraries/types/models/eft/hideout/IQteData.d.ts @@ -1,14 +1,14 @@ import { Effect } from "@spt/models/eft/health/Effect"; import { BodyPart } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; import { QteActivityType } from "@spt/models/enums/hideout/QteActivityType"; import { QteEffectType } from "@spt/models/enums/hideout/QteEffectType"; import { QteResultType } from "@spt/models/enums/hideout/QteResultType"; import { QteRewardType } from "@spt/models/enums/hideout/QteRewardType"; import { QteType } from "@spt/models/enums/hideout/QteType"; import { RequirementType } from "@spt/models/enums/hideout/RequirementType"; -import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt/models/enums/SkillTypes"; -import { Traders } from "@spt/models/enums/Traders"; export interface IQteData { id: string; type: QteActivityType; diff --git a/TypeScript/19UseExternalLibraries/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/19UseExternalLibraries/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index f1123c1..5971372 100644 --- a/TypeScript/19UseExternalLibraries/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/TypeScript/19UseExternalLibraries/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -15,7 +15,5 @@ export interface Items { change: any[]; del: any[]; } -export interface Production { -} -export interface TraderRelations { -} +export type Production = {}; +export type TraderRelations = {}; diff --git a/TypeScript/19UseExternalLibraries/types/models/eft/profile/ISptProfile.d.ts b/TypeScript/19UseExternalLibraries/types/models/eft/profile/ISptProfile.d.ts index a8e742a..dd7aea6 100644 --- a/TypeScript/19UseExternalLibraries/types/models/eft/profile/ISptProfile.d.ts +++ b/TypeScript/19UseExternalLibraries/types/models/eft/profile/ISptProfile.d.ts @@ -209,12 +209,9 @@ export interface Effects { LeftLeg: LeftLeg; RightLeg: RightLeg; } -export interface Head { -} -export interface Chest { -} -export interface Stomach { -} +export type Head = {}; +export type Chest = {}; +export type Stomach = {}; export interface LeftArm { Fracture?: number; } diff --git a/TypeScript/19UseExternalLibraries/types/models/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/19UseExternalLibraries/types/models/eft/ragfair/IRagfairOffer.d.ts index eeeb79d..f6c07fc 100644 --- a/TypeScript/19UseExternalLibraries/types/models/eft/ragfair/IRagfairOffer.d.ts +++ b/TypeScript/19UseExternalLibraries/types/models/eft/ragfair/IRagfairOffer.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface IRagfairOffer { sellResult?: SellResult[]; @@ -28,6 +29,8 @@ export interface OfferRequirement { _tpl: string; count: number; onlyFunctional: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface IRagfairOfferUser { id: string; diff --git a/TypeScript/19UseExternalLibraries/types/models/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/19UseExternalLibraries/types/models/eft/ragfair/ISearchRequestData.d.ts index 8261c5b..c631de8 100644 --- a/TypeScript/19UseExternalLibraries/types/models/eft/ragfair/ISearchRequestData.d.ts +++ b/TypeScript/19UseExternalLibraries/types/models/eft/ragfair/ISearchRequestData.d.ts @@ -29,5 +29,4 @@ export declare enum OfferOwnerType { TRADEROWNERTYPE = 1, PLAYEROWNERTYPE = 2 } -export interface BuildItems { -} +export type BuildItems = {}; diff --git a/TypeScript/19UseExternalLibraries/types/models/enums/BaseClasses.d.ts b/TypeScript/19UseExternalLibraries/types/models/enums/BaseClasses.d.ts index 65fc95e..32ebf7c 100644 --- a/TypeScript/19UseExternalLibraries/types/models/enums/BaseClasses.d.ts +++ b/TypeScript/19UseExternalLibraries/types/models/enums/BaseClasses.d.ts @@ -107,6 +107,6 @@ export declare enum BaseClasses { RECEIVER = "55818a304bdc2db5418b457d", BARREL = "555ef6e44bdc2de9068b457e", CHARGING_HANDLE = "55818a6f4bdc2db9688b456b", - COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569 ", + COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569", HIDEOUT_AREA_CONTAINER = "63da6da4784a55176c018dba" } diff --git a/TypeScript/19UseExternalLibraries/types/models/enums/DogtagExchangeSide.d.ts b/TypeScript/19UseExternalLibraries/types/models/enums/DogtagExchangeSide.d.ts new file mode 100644 index 0000000..de3d4df --- /dev/null +++ b/TypeScript/19UseExternalLibraries/types/models/enums/DogtagExchangeSide.d.ts @@ -0,0 +1,5 @@ +export declare enum DogtagExchangeSide { + USEC = "Usec", + BEAR = "Bear", + ANY = "Any" +} diff --git a/TypeScript/19UseExternalLibraries/types/models/spt/server/ExhaustableArray.d.ts b/TypeScript/19UseExternalLibraries/types/models/spt/server/ExhaustableArray.d.ts index c27f41f..50a6b68 100644 --- a/TypeScript/19UseExternalLibraries/types/models/spt/server/ExhaustableArray.d.ts +++ b/TypeScript/19UseExternalLibraries/types/models/spt/server/ExhaustableArray.d.ts @@ -1,5 +1,5 @@ -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ExhaustableArray implements IExhaustableArray { private itemPool; private randomUtil; diff --git a/TypeScript/19UseExternalLibraries/types/routers/EventOutputHolder.d.ts b/TypeScript/19UseExternalLibraries/types/routers/EventOutputHolder.d.ts index ef20706..148461a 100644 --- a/TypeScript/19UseExternalLibraries/types/routers/EventOutputHolder.d.ts +++ b/TypeScript/19UseExternalLibraries/types/routers/EventOutputHolder.d.ts @@ -3,8 +3,8 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IHideoutImprovement, Productive, TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; import { TraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class EventOutputHolder { protected profileHelper: ProfileHelper; protected timeUtil: TimeUtil; @@ -12,7 +12,7 @@ export declare class EventOutputHolder { /** * What has client been informed of this game session * Key = sessionId, then second key is prod id - */ + */ protected clientActiveSessionStorage: Record>; diff --git a/TypeScript/19UseExternalLibraries/types/servers/HttpServer.d.ts b/TypeScript/19UseExternalLibraries/types/servers/HttpServer.d.ts index b00fe68..0024ba3 100644 --- a/TypeScript/19UseExternalLibraries/types/servers/HttpServer.d.ts +++ b/TypeScript/19UseExternalLibraries/types/servers/HttpServer.d.ts @@ -6,8 +6,8 @@ import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; -import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { WebSocketServer } from "@spt/servers/WebSocketServer"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { LocalisationService } from "@spt/services/LocalisationService"; export declare class HttpServer { protected logger: ILogger; diff --git a/TypeScript/19UseExternalLibraries/types/servers/WebSocketServer.d.ts b/TypeScript/19UseExternalLibraries/types/servers/WebSocketServer.d.ts index f4e07bb..6121824 100644 --- a/TypeScript/19UseExternalLibraries/types/servers/WebSocketServer.d.ts +++ b/TypeScript/19UseExternalLibraries/types/servers/WebSocketServer.d.ts @@ -1,12 +1,12 @@ /// import http, { IncomingMessage } from "node:http"; -import { WebSocket, Server } from "ws"; import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { Server, WebSocket } from "ws"; export declare class WebSocketServer { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/19UseExternalLibraries/types/servers/ws/SptWebSocketConnectionHandler.d.ts b/TypeScript/19UseExternalLibraries/types/servers/ws/SptWebSocketConnectionHandler.d.ts index 98d0898..70fc96a 100644 --- a/TypeScript/19UseExternalLibraries/types/servers/ws/SptWebSocketConnectionHandler.d.ts +++ b/TypeScript/19UseExternalLibraries/types/servers/ws/SptWebSocketConnectionHandler.d.ts @@ -1,7 +1,6 @@ /// /// import { IncomingMessage } from "http"; -import { WebSocket } from "ws"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; @@ -11,6 +10,7 @@ import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectio import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; +import { WebSocket } from "ws"; export declare class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler { protected logger: ILogger; protected profileHelper: ProfileHelper; diff --git a/TypeScript/19UseExternalLibraries/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts b/TypeScript/19UseExternalLibraries/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts index d5247ec..5556129 100644 --- a/TypeScript/19UseExternalLibraries/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts +++ b/TypeScript/19UseExternalLibraries/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts @@ -1,6 +1,6 @@ -import { RawData, WebSocket } from "ws"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; +import { RawData, WebSocket } from "ws"; export declare class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler { protected logger: ILogger; constructor(logger: ILogger); diff --git a/TypeScript/19UseExternalLibraries/types/services/FenceService.d.ts b/TypeScript/19UseExternalLibraries/types/services/FenceService.d.ts index c156122..58dc076 100644 --- a/TypeScript/19UseExternalLibraries/types/services/FenceService.d.ts +++ b/TypeScript/19UseExternalLibraries/types/services/FenceService.d.ts @@ -13,9 +13,9 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Handle actions surrounding Fence * e.g. generating or refreshing assorts / get next refresh time diff --git a/TypeScript/19UseExternalLibraries/types/services/InsuranceService.d.ts b/TypeScript/19UseExternalLibraries/types/services/InsuranceService.d.ts index 0000e66..f799102 100644 --- a/TypeScript/19UseExternalLibraries/types/services/InsuranceService.d.ts +++ b/TypeScript/19UseExternalLibraries/types/services/InsuranceService.d.ts @@ -18,10 +18,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceService { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/19UseExternalLibraries/types/services/LocalisationService.d.ts b/TypeScript/19UseExternalLibraries/types/services/LocalisationService.d.ts index 42dfa4e..855c138 100644 --- a/TypeScript/19UseExternalLibraries/types/services/LocalisationService.d.ts +++ b/TypeScript/19UseExternalLibraries/types/services/LocalisationService.d.ts @@ -1,8 +1,8 @@ -import { I18n } from "i18n"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { LocaleService } from "@spt/services/LocaleService"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { I18n } from "i18n"; /** * Handles translating server text into different langauges */ diff --git a/TypeScript/19UseExternalLibraries/types/services/ProfileFixerService.d.ts b/TypeScript/19UseExternalLibraries/types/services/ProfileFixerService.d.ts index 525b867..91e4780 100644 --- a/TypeScript/19UseExternalLibraries/types/services/ProfileFixerService.d.ts +++ b/TypeScript/19UseExternalLibraries/types/services/ProfileFixerService.d.ts @@ -8,7 +8,7 @@ import { Bonus, HideoutSlot } from "@spt/models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea"; -import { ISptProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; +import { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; @@ -16,11 +16,11 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileFixerService { protected logger: ILogger; protected watermark: Watermark; @@ -73,6 +73,7 @@ export declare class ProfileFixerService { */ protected removeDanglingTaskConditionCounters(pmcProfile: IPmcData): void; protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullRagfairRatings(pmcProfile: IPmcData): void; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; /** diff --git a/TypeScript/19UseExternalLibraries/types/services/RagfairOfferService.d.ts b/TypeScript/19UseExternalLibraries/types/services/RagfairOfferService.d.ts index 6c13b1d..98dd179 100644 --- a/TypeScript/19UseExternalLibraries/types/services/RagfairOfferService.d.ts +++ b/TypeScript/19UseExternalLibraries/types/services/RagfairOfferService.d.ts @@ -10,10 +10,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/19UseExternalLibraries/types/services/mod/CustomItemService.d.ts b/TypeScript/19UseExternalLibraries/types/services/mod/CustomItemService.d.ts index 1926bed..f112872 100644 --- a/TypeScript/19UseExternalLibraries/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/19UseExternalLibraries/types/services/mod/CustomItemService.d.ts @@ -4,8 +4,8 @@ import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetail import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/19UseExternalLibraries/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/19UseExternalLibraries/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts index 3c9d955..91c84d9 100644 --- a/TypeScript/19UseExternalLibraries/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts +++ b/TypeScript/19UseExternalLibraries/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class DynamicRouterModService { private container; constructor(container: DependencyContainer); diff --git a/TypeScript/19UseExternalLibraries/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/19UseExternalLibraries/types/services/mod/staticRouter/StaticRouterModService.d.ts index f60432d..0c3d4d8 100644 --- a/TypeScript/19UseExternalLibraries/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/TypeScript/19UseExternalLibraries/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class StaticRouterModService { protected container: DependencyContainer; constructor(container: DependencyContainer); diff --git a/TypeScript/19UseExternalLibraries/types/utils/JsonUtil.d.ts b/TypeScript/19UseExternalLibraries/types/utils/JsonUtil.d.ts index b30822c..4419228 100644 --- a/TypeScript/19UseExternalLibraries/types/utils/JsonUtil.d.ts +++ b/TypeScript/19UseExternalLibraries/types/utils/JsonUtil.d.ts @@ -1,7 +1,7 @@ -import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { HashUtil } from "@spt/utils/HashUtil"; import { VFS } from "@spt/utils/VFS"; +import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; export declare class JsonUtil { protected vfs: VFS; protected hashUtil: HashUtil; diff --git a/TypeScript/19UseExternalLibraries/types/utils/RandomUtil.d.ts b/TypeScript/19UseExternalLibraries/types/utils/RandomUtil.d.ts index 49f242d..0da184f 100644 --- a/TypeScript/19UseExternalLibraries/types/utils/RandomUtil.d.ts +++ b/TypeScript/19UseExternalLibraries/types/utils/RandomUtil.d.ts @@ -1,6 +1,6 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects * based on the relative probability of each of its elements. diff --git a/TypeScript/19UseExternalLibraries/types/utils/logging/AbstractWinstonLogger.d.ts b/TypeScript/19UseExternalLibraries/types/utils/logging/AbstractWinstonLogger.d.ts index 7098f85..ef54434 100644 --- a/TypeScript/19UseExternalLibraries/types/utils/logging/AbstractWinstonLogger.d.ts +++ b/TypeScript/19UseExternalLibraries/types/utils/logging/AbstractWinstonLogger.d.ts @@ -1,12 +1,12 @@ /// import fs from "node:fs"; -import winston from "winston"; import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; import { SptLogger } from "@spt/models/spt/logging/SptLogger"; import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; import { ILogger } from "@spt/models/spt/utils/ILogger"; +import winston from "winston"; export declare abstract class AbstractWinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected showDebugInConsole: boolean; diff --git a/TypeScript/1LogToConsole/types/controllers/BotController.d.ts b/TypeScript/1LogToConsole/types/controllers/BotController.d.ts index 6431fca..475f51b 100644 --- a/TypeScript/1LogToConsole/types/controllers/BotController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/BotController.d.ts @@ -20,8 +20,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/1LogToConsole/types/controllers/BuildController.d.ts b/TypeScript/1LogToConsole/types/controllers/BuildController.d.ts index ed8adf6..2cb9c59 100644 --- a/TypeScript/1LogToConsole/types/controllers/BuildController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/BuildController.d.ts @@ -9,8 +9,8 @@ import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BuildController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/1LogToConsole/types/controllers/GameController.d.ts b/TypeScript/1LogToConsole/types/controllers/GameController.d.ts index 533a81c..e219c04 100644 --- a/TypeScript/1LogToConsole/types/controllers/GameController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/GameController.d.ts @@ -34,10 +34,10 @@ import { ProfileActivityService } from "@spt/services/ProfileActivityService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GameController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/1LogToConsole/types/controllers/HealthController.d.ts b/TypeScript/1LogToConsole/types/controllers/HealthController.d.ts index 5482283..5a0a0a6 100644 --- a/TypeScript/1LogToConsole/types/controllers/HealthController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/HealthController.d.ts @@ -12,8 +12,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthController { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/1LogToConsole/types/controllers/HideoutController.d.ts b/TypeScript/1LogToConsole/types/controllers/HideoutController.d.ts index e9d1ed9..89a428c 100644 --- a/TypeScript/1LogToConsole/types/controllers/HideoutController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/HideoutController.d.ts @@ -35,11 +35,11 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; import { ProfileActivityService } from "@spt/services/ProfileActivityService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/1LogToConsole/types/controllers/InraidController.d.ts b/TypeScript/1LogToConsole/types/controllers/InraidController.d.ts index 87f419b..9f0c409 100644 --- a/TypeScript/1LogToConsole/types/controllers/InraidController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/InraidController.d.ts @@ -13,6 +13,7 @@ import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRe import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState"; import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig"; import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; @@ -31,7 +32,6 @@ import { PmcChatResponseService } from "@spt/services/PmcChatResponseService"; import { TraderServicesService } from "@spt/services/TraderServicesService"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; -import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; /** * Logic for handling In Raid callbacks */ diff --git a/TypeScript/1LogToConsole/types/controllers/InsuranceController.d.ts b/TypeScript/1LogToConsole/types/controllers/InsuranceController.d.ts index f921b83..543e915 100644 --- a/TypeScript/1LogToConsole/types/controllers/InsuranceController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/InsuranceController.d.ts @@ -21,11 +21,11 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PaymentService } from "@spt/services/PaymentService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceController { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/1LogToConsole/types/controllers/InventoryController.d.ts b/TypeScript/1LogToConsole/types/controllers/InventoryController.d.ts index 40bb084..c986ce8 100644 --- a/TypeScript/1LogToConsole/types/controllers/InventoryController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/InventoryController.d.ts @@ -37,10 +37,10 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MapMarkerService } from "@spt/services/MapMarkerService"; import { PlayerService } from "@spt/services/PlayerService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/1LogToConsole/types/controllers/LocationController.d.ts b/TypeScript/1LogToConsole/types/controllers/LocationController.d.ts index 727a8c8..a541b9c 100644 --- a/TypeScript/1LogToConsole/types/controllers/LocationController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/LocationController.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class LocationController { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; diff --git a/TypeScript/1LogToConsole/types/controllers/ProfileController.d.ts b/TypeScript/1LogToConsole/types/controllers/ProfileController.d.ts index e8dae73..7e6d35c 100644 --- a/TypeScript/1LogToConsole/types/controllers/ProfileController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/ProfileController.d.ts @@ -26,9 +26,9 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/1LogToConsole/types/controllers/QuestController.d.ts b/TypeScript/1LogToConsole/types/controllers/QuestController.d.ts index 3cdce00..6a5b415 100644 --- a/TypeScript/1LogToConsole/types/controllers/QuestController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/QuestController.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/1LogToConsole/types/controllers/RepeatableQuestController.d.ts b/TypeScript/1LogToConsole/types/controllers/RepeatableQuestController.d.ts index 74f39eb..016f8c6 100644 --- a/TypeScript/1LogToConsole/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/RepeatableQuestController.d.ts @@ -18,11 +18,11 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/1LogToConsole/types/controllers/TradeController.d.ts b/TypeScript/1LogToConsole/types/controllers/TradeController.d.ts index bc72e92..842a97b 100644 --- a/TypeScript/1LogToConsole/types/controllers/TradeController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/TradeController.d.ts @@ -1,5 +1,6 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper"; import { TradeHelper } from "@spt/helpers/TradeHelper"; import { TraderHelper } from "@spt/helpers/TraderHelper"; import { IPmcData } from "@spt/models/eft/common/IPmcData"; @@ -35,6 +36,7 @@ export declare class TradeController { protected hashUtil: HashUtil; protected itemHelper: ItemHelper; protected profileHelper: ProfileHelper; + protected ragfairOfferHelper: RagfairOfferHelper; protected traderHelper: TraderHelper; protected ragfairServer: RagfairServer; protected httpResponse: HttpResponseUtil; @@ -44,7 +46,7 @@ export declare class TradeController { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairOfferHelper: RagfairOfferHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); /** Handle TradingConfirm event */ confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; /** Handle RagFairBuyOffer event */ @@ -67,10 +69,17 @@ export declare class TradeController { * @param output Output to send back to client */ protected buyPmcItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void; + /** + * Is the provided offerid and ownerid from a player made offer + * @param offerId Id of the offer + * @param offerOwnerId Owner id + * @returns true if offer was made by a player + */ + protected isPlayerOffer(offerId: string, offerOwnerId: string): boolean; /** * Does Player have necessary trader loyalty to purchase flea offer * @param sellerIsTrader is seller trader - * @param fleaOffer FLea offer being bought + * @param fleaOffer Flea offer being bought * @param pmcData Player profile * @returns True if player can buy offer */ diff --git a/TypeScript/1LogToConsole/types/controllers/TraderController.d.ts b/TypeScript/1LogToConsole/types/controllers/TraderController.d.ts index 7fc6d78..3592fc6 100644 --- a/TypeScript/1LogToConsole/types/controllers/TraderController.d.ts +++ b/TypeScript/1LogToConsole/types/controllers/TraderController.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/1LogToConsole/types/generators/BotEquipmentModGenerator.d.ts b/TypeScript/1LogToConsole/types/generators/BotEquipmentModGenerator.d.ts index 419120f..3952293 100644 --- a/TypeScript/1LogToConsole/types/generators/BotEquipmentModGenerator.d.ts +++ b/TypeScript/1LogToConsole/types/generators/BotEquipmentModGenerator.d.ts @@ -25,9 +25,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotEquipmentModGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -65,7 +65,7 @@ export declare class BotEquipmentModGenerator { * @param settings Bot equipment generation settings * @param modSlot Armor slot being filtered * @param existingPlateTplPool Plates tpls to choose from - * @param armorItem + * @param armorItem The armor items db template * @returns Array of plate tpls to choose from */ protected filterPlateModsForSlotByLevel(settings: IGenerateEquipmentProperties, modSlot: string, existingPlateTplPool: string[], armorItem: ITemplateItem): IFilterPlateModsForSlotByLevelResult; diff --git a/TypeScript/1LogToConsole/types/generators/BotGenerator.d.ts b/TypeScript/1LogToConsole/types/generators/BotGenerator.d.ts index 8ab4371..ebb8a59 100644 --- a/TypeScript/1LogToConsole/types/generators/BotGenerator.d.ts +++ b/TypeScript/1LogToConsole/types/generators/BotGenerator.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/1LogToConsole/types/generators/BotLevelGenerator.d.ts b/TypeScript/1LogToConsole/types/generators/BotLevelGenerator.d.ts index dee61e2..a8a8895 100644 --- a/TypeScript/1LogToConsole/types/generators/BotLevelGenerator.d.ts +++ b/TypeScript/1LogToConsole/types/generators/BotLevelGenerator.d.ts @@ -4,12 +4,14 @@ import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; +import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class BotLevelGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; protected databaseService: DatabaseService; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService); + protected mathUtil: MathUtil; + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, mathUtil: MathUtil); /** * Return a randomised bot level and exp value * @param levelDetails Min and max of level for bot @@ -18,6 +20,7 @@ export declare class BotLevelGenerator { * @returns IRandomisedBotLevelResult object */ generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult; + protected chooseBotLevel(min: number, max: number, shift: number, number: number): number; /** * Get the highest level a bot can be relative to the players level, but no further than the max size from globals.exp_table * @param botGenerationDetails Details to help generate a bot diff --git a/TypeScript/1LogToConsole/types/generators/BotLootGenerator.d.ts b/TypeScript/1LogToConsole/types/generators/BotLootGenerator.d.ts index fee56ce..c0583c6 100644 --- a/TypeScript/1LogToConsole/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/1LogToConsole/types/generators/BotLootGenerator.d.ts @@ -18,9 +18,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/1LogToConsole/types/generators/BotWeaponGenerator.d.ts b/TypeScript/1LogToConsole/types/generators/BotWeaponGenerator.d.ts index 5559bfa..8e03b35 100644 --- a/TypeScript/1LogToConsole/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/1LogToConsole/types/generators/BotWeaponGenerator.d.ts @@ -18,9 +18,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RepairService } from "@spt/services/RepairService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotWeaponGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/1LogToConsole/types/generators/LocationGenerator.d.ts b/TypeScript/1LogToConsole/types/generators/LocationGenerator.d.ts index 222b0ab..9a2b0c4 100644 --- a/TypeScript/1LogToConsole/types/generators/LocationGenerator.d.ts +++ b/TypeScript/1LogToConsole/types/generators/LocationGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export interface IContainerItem { items: Item[]; width: number; diff --git a/TypeScript/1LogToConsole/types/generators/PlayerScavGenerator.d.ts b/TypeScript/1LogToConsole/types/generators/PlayerScavGenerator.d.ts index 2414150..e317bf6 100644 --- a/TypeScript/1LogToConsole/types/generators/PlayerScavGenerator.d.ts +++ b/TypeScript/1LogToConsole/types/generators/PlayerScavGenerator.d.ts @@ -14,9 +14,9 @@ import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class PlayerScavGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/1LogToConsole/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/1LogToConsole/types/generators/RagfairOfferGenerator.d.ts index 9435390..ca09729 100644 --- a/TypeScript/1LogToConsole/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/1LogToConsole/types/generators/RagfairOfferGenerator.d.ts @@ -19,10 +19,10 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/1LogToConsole/types/generators/RepeatableQuestGenerator.d.ts b/TypeScript/1LogToConsole/types/generators/RepeatableQuestGenerator.d.ts index 77c4e79..339f322 100644 --- a/TypeScript/1LogToConsole/types/generators/RepeatableQuestGenerator.d.ts +++ b/TypeScript/1LogToConsole/types/generators/RepeatableQuestGenerator.d.ts @@ -11,10 +11,10 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/1LogToConsole/types/generators/RepeatableQuestRewardGenerator.d.ts b/TypeScript/1LogToConsole/types/generators/RepeatableQuestRewardGenerator.d.ts index 1e09994..713a394 100644 --- a/TypeScript/1LogToConsole/types/generators/RepeatableQuestRewardGenerator.d.ts +++ b/TypeScript/1LogToConsole/types/generators/RepeatableQuestRewardGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestRewardGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/1LogToConsole/types/helpers/BotDifficultyHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/BotDifficultyHelper.d.ts index 63572a5..2348bd3 100644 --- a/TypeScript/1LogToConsole/types/helpers/BotDifficultyHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/BotDifficultyHelper.d.ts @@ -5,8 +5,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotDifficultyHelper { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/1LogToConsole/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/1LogToConsole/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index c51bf7e..c38f0a0 100644 --- a/TypeScript/1LogToConsole/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GiveSptCommand implements ISptCommand { protected logger: ILogger; protected itemHelper: ItemHelper; diff --git a/TypeScript/1LogToConsole/types/helpers/HealthHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/HealthHelper.d.ts index 650f633..a164285 100644 --- a/TypeScript/1LogToConsole/types/helpers/HealthHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/HealthHelper.d.ts @@ -5,8 +5,8 @@ import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/1LogToConsole/types/helpers/HideoutHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/HideoutHelper.d.ts index c4aaa4c..df0376b 100644 --- a/TypeScript/1LogToConsole/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/HideoutHelper.d.ts @@ -18,10 +18,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/1LogToConsole/types/helpers/InRaidHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/InRaidHelper.d.ts index 449be9f..987c9ec 100644 --- a/TypeScript/1LogToConsole/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/InRaidHelper.d.ts @@ -15,9 +15,9 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InRaidHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/1LogToConsole/types/helpers/InventoryHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/InventoryHelper.d.ts index f0ff69a..92bb49c 100644 --- a/TypeScript/1LogToConsole/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/InventoryHelper.d.ts @@ -23,9 +23,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/1LogToConsole/types/helpers/ItemHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/ItemHelper.d.ts index da5dd11..c304cee 100644 --- a/TypeScript/1LogToConsole/types/helpers/ItemHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/ItemHelper.d.ts @@ -11,13 +11,13 @@ import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { CompareUtil } from "@spt/utils/CompareUtil"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ItemHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/1LogToConsole/types/helpers/ProfileHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/ProfileHelper.d.ts index 0671179..cdab870 100644 --- a/TypeScript/1LogToConsole/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/ProfileHelper.d.ts @@ -11,10 +11,10 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/1LogToConsole/types/helpers/QuestHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/QuestHelper.d.ts index 2b84b8f..2d5730d 100644 --- a/TypeScript/1LogToConsole/types/helpers/QuestHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/QuestHelper.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/1LogToConsole/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/RagfairOfferHelper.d.ts index b526554..2386316 100644 --- a/TypeScript/1LogToConsole/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/RagfairOfferHelper.d.ts @@ -151,7 +151,7 @@ export declare class RagfairOfferHelper { * @param boughtAmount Amount item was purchased for * @returns IItemEventRouterResponse */ - protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; + completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; /** * Get a localised message for when players offer has sold on flea * @param itemTpl Item sold diff --git a/TypeScript/1LogToConsole/types/helpers/RagfairServerHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/RagfairServerHelper.d.ts index 927caf5..3e1fea9 100644 --- a/TypeScript/1LogToConsole/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/RagfairServerHelper.d.ts @@ -12,9 +12,9 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Helper class for common ragfair server actions */ diff --git a/TypeScript/1LogToConsole/types/helpers/RepairHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/RepairHelper.d.ts index 99a21da..63c78c9 100644 --- a/TypeScript/1LogToConsole/types/helpers/RepairHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/RepairHelper.d.ts @@ -4,8 +4,8 @@ import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/1LogToConsole/types/helpers/RepeatableQuestHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/RepeatableQuestHelper.d.ts index d92657e..8c65f40 100644 --- a/TypeScript/1LogToConsole/types/helpers/RepeatableQuestHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/RepeatableQuestHelper.d.ts @@ -1,8 +1,8 @@ import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestHelper { protected mathUtil: MathUtil; protected configServer: ConfigServer; diff --git a/TypeScript/1LogToConsole/types/helpers/TradeHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/TradeHelper.d.ts index f994fda..6e6f3a2 100644 --- a/TypeScript/1LogToConsole/types/helpers/TradeHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/TradeHelper.d.ts @@ -17,8 +17,8 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TradeHelper { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/1LogToConsole/types/helpers/TraderAssortHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/TraderAssortHelper.d.ts index 8f8f802..f1ecd3b 100644 --- a/TypeScript/1LogToConsole/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/TraderAssortHelper.d.ts @@ -14,9 +14,9 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; diff --git a/TypeScript/1LogToConsole/types/loaders/BundleLoader.d.ts b/TypeScript/1LogToConsole/types/loaders/BundleLoader.d.ts index e270988..8c0ed4d 100644 --- a/TypeScript/1LogToConsole/types/loaders/BundleLoader.d.ts +++ b/TypeScript/1LogToConsole/types/loaders/BundleLoader.d.ts @@ -1,8 +1,8 @@ import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BundleInfo { modpath: string; filename: string; diff --git a/TypeScript/1LogToConsole/types/loaders/PostDBModLoader.d.ts b/TypeScript/1LogToConsole/types/loaders/PostDBModLoader.d.ts index b0c4bf4..a8bb6a9 100644 --- a/TypeScript/1LogToConsole/types/loaders/PostDBModLoader.d.ts +++ b/TypeScript/1LogToConsole/types/loaders/PostDBModLoader.d.ts @@ -1,10 +1,10 @@ -import { DependencyContainer } from "tsyringe"; import { OnLoad } from "@spt/di/OnLoad"; import { BundleLoader } from "@spt/loaders/BundleLoader"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostDBModLoader implements OnLoad { protected logger: ILogger; protected bundleLoader: BundleLoader; diff --git a/TypeScript/1LogToConsole/types/loaders/PostSptModLoader.d.ts b/TypeScript/1LogToConsole/types/loaders/PostSptModLoader.d.ts index fb54579..2603497 100644 --- a/TypeScript/1LogToConsole/types/loaders/PostSptModLoader.d.ts +++ b/TypeScript/1LogToConsole/types/loaders/PostSptModLoader.d.ts @@ -1,9 +1,9 @@ -import { DependencyContainer } from "tsyringe"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { IModLoader } from "@spt/models/spt/mod/IModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostSptModLoader implements IModLoader { protected logger: ILogger; protected preSptModLoader: PreSptModLoader; diff --git a/TypeScript/1LogToConsole/types/loaders/PreSptModLoader.d.ts b/TypeScript/1LogToConsole/types/loaders/PreSptModLoader.d.ts index bc846c8..8814525 100644 --- a/TypeScript/1LogToConsole/types/loaders/PreSptModLoader.d.ts +++ b/TypeScript/1LogToConsole/types/loaders/PreSptModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { ModDetails } from "@spt/models/eft/profile/ISptProfile"; @@ -11,6 +10,7 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { ModCompilerService } from "@spt/services/ModCompilerService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { DependencyContainer } from "tsyringe"; export declare class PreSptModLoader implements IModLoader { protected logger: ILogger; protected vfs: VFS; diff --git a/TypeScript/1LogToConsole/types/models/eft/common/IEmptyRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/IEmptyRequestData.d.ts index 284d16e..52a7b12 100644 --- a/TypeScript/1LogToConsole/types/models/eft/common/IEmptyRequestData.d.ts +++ b/TypeScript/1LogToConsole/types/models/eft/common/IEmptyRequestData.d.ts @@ -1,2 +1 @@ -export interface IEmptyRequestData { -} +export type IEmptyRequestData = {}; diff --git a/TypeScript/1LogToConsole/types/models/eft/common/tables/IBotBase.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/tables/IBotBase.d.ts index a7fe1ca..be37845 100644 --- a/TypeScript/1LogToConsole/types/models/eft/common/tables/IBotBase.d.ts +++ b/TypeScript/1LogToConsole/types/models/eft/common/tables/IBotBase.d.ts @@ -373,8 +373,7 @@ export interface LastCompleted { export interface Notes { Notes: Note[]; } -export interface CarExtractCounts { -} +export type CarExtractCounts = {}; export declare enum SurvivorClass { UNKNOWN = 0, NEUTRALIZER = 1, diff --git a/TypeScript/1LogToConsole/types/models/eft/common/tables/ILocationsBase.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/tables/ILocationsBase.d.ts index 2c96af3..16bca24 100644 --- a/TypeScript/1LogToConsole/types/models/eft/common/tables/ILocationsBase.d.ts +++ b/TypeScript/1LogToConsole/types/models/eft/common/tables/ILocationsBase.d.ts @@ -2,8 +2,7 @@ export interface ILocationsBase { locations: Locations; paths: Path[]; } -export interface Locations { -} +export type Locations = {}; export interface Path { Source: string; Destination: string; diff --git a/TypeScript/1LogToConsole/types/models/eft/common/tables/IProfileTemplate.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/tables/IProfileTemplate.d.ts index 20923bc..6ba9221 100644 --- a/TypeScript/1LogToConsole/types/models/eft/common/tables/IProfileTemplate.d.ts +++ b/TypeScript/1LogToConsole/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -1,12 +1,12 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { Dialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; export interface IProfileTemplates { - "Standard": IProfileSides; + Standard: IProfileSides; "Left Behind": IProfileSides; "Prepare To Escape": IProfileSides; "Edge Of Darkness": IProfileSides; - "Unheard": IProfileSides; - "Tournament": IProfileSides; + Unheard: IProfileSides; + Tournament: IProfileSides; "SPT Developer": IProfileSides; "SPT Easy start": IProfileSides; "SPT Zero to hero": IProfileSides; diff --git a/TypeScript/1LogToConsole/types/models/eft/common/tables/ITrader.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/tables/ITrader.d.ts index 14ab409..40cf004 100644 --- a/TypeScript/1LogToConsole/types/models/eft/common/tables/ITrader.d.ts +++ b/TypeScript/1LogToConsole/types/models/eft/common/tables/ITrader.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; export interface ITrader { assort?: ITraderAssort; @@ -78,6 +79,8 @@ export interface IBarterScheme { _tpl: string; onlyFunctional?: boolean; sptQuestLocked?: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface ISuit { _id: string; diff --git a/TypeScript/1LogToConsole/types/models/eft/hideout/IQteData.d.ts b/TypeScript/1LogToConsole/types/models/eft/hideout/IQteData.d.ts index 7f507e1..fe6cce6 100644 --- a/TypeScript/1LogToConsole/types/models/eft/hideout/IQteData.d.ts +++ b/TypeScript/1LogToConsole/types/models/eft/hideout/IQteData.d.ts @@ -1,14 +1,14 @@ import { Effect } from "@spt/models/eft/health/Effect"; import { BodyPart } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; import { QteActivityType } from "@spt/models/enums/hideout/QteActivityType"; import { QteEffectType } from "@spt/models/enums/hideout/QteEffectType"; import { QteResultType } from "@spt/models/enums/hideout/QteResultType"; import { QteRewardType } from "@spt/models/enums/hideout/QteRewardType"; import { QteType } from "@spt/models/enums/hideout/QteType"; import { RequirementType } from "@spt/models/enums/hideout/RequirementType"; -import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt/models/enums/SkillTypes"; -import { Traders } from "@spt/models/enums/Traders"; export interface IQteData { id: string; type: QteActivityType; diff --git a/TypeScript/1LogToConsole/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index f1123c1..5971372 100644 --- a/TypeScript/1LogToConsole/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/TypeScript/1LogToConsole/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -15,7 +15,5 @@ export interface Items { change: any[]; del: any[]; } -export interface Production { -} -export interface TraderRelations { -} +export type Production = {}; +export type TraderRelations = {}; diff --git a/TypeScript/1LogToConsole/types/models/eft/profile/ISptProfile.d.ts b/TypeScript/1LogToConsole/types/models/eft/profile/ISptProfile.d.ts index a8e742a..dd7aea6 100644 --- a/TypeScript/1LogToConsole/types/models/eft/profile/ISptProfile.d.ts +++ b/TypeScript/1LogToConsole/types/models/eft/profile/ISptProfile.d.ts @@ -209,12 +209,9 @@ export interface Effects { LeftLeg: LeftLeg; RightLeg: RightLeg; } -export interface Head { -} -export interface Chest { -} -export interface Stomach { -} +export type Head = {}; +export type Chest = {}; +export type Stomach = {}; export interface LeftArm { Fracture?: number; } diff --git a/TypeScript/1LogToConsole/types/models/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/1LogToConsole/types/models/eft/ragfair/IRagfairOffer.d.ts index eeeb79d..f6c07fc 100644 --- a/TypeScript/1LogToConsole/types/models/eft/ragfair/IRagfairOffer.d.ts +++ b/TypeScript/1LogToConsole/types/models/eft/ragfair/IRagfairOffer.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface IRagfairOffer { sellResult?: SellResult[]; @@ -28,6 +29,8 @@ export interface OfferRequirement { _tpl: string; count: number; onlyFunctional: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface IRagfairOfferUser { id: string; diff --git a/TypeScript/1LogToConsole/types/models/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/1LogToConsole/types/models/eft/ragfair/ISearchRequestData.d.ts index 8261c5b..c631de8 100644 --- a/TypeScript/1LogToConsole/types/models/eft/ragfair/ISearchRequestData.d.ts +++ b/TypeScript/1LogToConsole/types/models/eft/ragfair/ISearchRequestData.d.ts @@ -29,5 +29,4 @@ export declare enum OfferOwnerType { TRADEROWNERTYPE = 1, PLAYEROWNERTYPE = 2 } -export interface BuildItems { -} +export type BuildItems = {}; diff --git a/TypeScript/1LogToConsole/types/models/enums/BaseClasses.d.ts b/TypeScript/1LogToConsole/types/models/enums/BaseClasses.d.ts index 65fc95e..32ebf7c 100644 --- a/TypeScript/1LogToConsole/types/models/enums/BaseClasses.d.ts +++ b/TypeScript/1LogToConsole/types/models/enums/BaseClasses.d.ts @@ -107,6 +107,6 @@ export declare enum BaseClasses { RECEIVER = "55818a304bdc2db5418b457d", BARREL = "555ef6e44bdc2de9068b457e", CHARGING_HANDLE = "55818a6f4bdc2db9688b456b", - COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569 ", + COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569", HIDEOUT_AREA_CONTAINER = "63da6da4784a55176c018dba" } diff --git a/TypeScript/1LogToConsole/types/models/enums/DogtagExchangeSide.d.ts b/TypeScript/1LogToConsole/types/models/enums/DogtagExchangeSide.d.ts new file mode 100644 index 0000000..de3d4df --- /dev/null +++ b/TypeScript/1LogToConsole/types/models/enums/DogtagExchangeSide.d.ts @@ -0,0 +1,5 @@ +export declare enum DogtagExchangeSide { + USEC = "Usec", + BEAR = "Bear", + ANY = "Any" +} diff --git a/TypeScript/1LogToConsole/types/models/spt/server/ExhaustableArray.d.ts b/TypeScript/1LogToConsole/types/models/spt/server/ExhaustableArray.d.ts index c27f41f..50a6b68 100644 --- a/TypeScript/1LogToConsole/types/models/spt/server/ExhaustableArray.d.ts +++ b/TypeScript/1LogToConsole/types/models/spt/server/ExhaustableArray.d.ts @@ -1,5 +1,5 @@ -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ExhaustableArray implements IExhaustableArray { private itemPool; private randomUtil; diff --git a/TypeScript/1LogToConsole/types/routers/EventOutputHolder.d.ts b/TypeScript/1LogToConsole/types/routers/EventOutputHolder.d.ts index ef20706..148461a 100644 --- a/TypeScript/1LogToConsole/types/routers/EventOutputHolder.d.ts +++ b/TypeScript/1LogToConsole/types/routers/EventOutputHolder.d.ts @@ -3,8 +3,8 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IHideoutImprovement, Productive, TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; import { TraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class EventOutputHolder { protected profileHelper: ProfileHelper; protected timeUtil: TimeUtil; @@ -12,7 +12,7 @@ export declare class EventOutputHolder { /** * What has client been informed of this game session * Key = sessionId, then second key is prod id - */ + */ protected clientActiveSessionStorage: Record>; diff --git a/TypeScript/1LogToConsole/types/servers/HttpServer.d.ts b/TypeScript/1LogToConsole/types/servers/HttpServer.d.ts index b00fe68..0024ba3 100644 --- a/TypeScript/1LogToConsole/types/servers/HttpServer.d.ts +++ b/TypeScript/1LogToConsole/types/servers/HttpServer.d.ts @@ -6,8 +6,8 @@ import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; -import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { WebSocketServer } from "@spt/servers/WebSocketServer"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { LocalisationService } from "@spt/services/LocalisationService"; export declare class HttpServer { protected logger: ILogger; diff --git a/TypeScript/1LogToConsole/types/servers/WebSocketServer.d.ts b/TypeScript/1LogToConsole/types/servers/WebSocketServer.d.ts index f4e07bb..6121824 100644 --- a/TypeScript/1LogToConsole/types/servers/WebSocketServer.d.ts +++ b/TypeScript/1LogToConsole/types/servers/WebSocketServer.d.ts @@ -1,12 +1,12 @@ /// import http, { IncomingMessage } from "node:http"; -import { WebSocket, Server } from "ws"; import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { Server, WebSocket } from "ws"; export declare class WebSocketServer { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/1LogToConsole/types/servers/ws/SptWebSocketConnectionHandler.d.ts b/TypeScript/1LogToConsole/types/servers/ws/SptWebSocketConnectionHandler.d.ts index 98d0898..70fc96a 100644 --- a/TypeScript/1LogToConsole/types/servers/ws/SptWebSocketConnectionHandler.d.ts +++ b/TypeScript/1LogToConsole/types/servers/ws/SptWebSocketConnectionHandler.d.ts @@ -1,7 +1,6 @@ /// /// import { IncomingMessage } from "http"; -import { WebSocket } from "ws"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; @@ -11,6 +10,7 @@ import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectio import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; +import { WebSocket } from "ws"; export declare class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler { protected logger: ILogger; protected profileHelper: ProfileHelper; diff --git a/TypeScript/1LogToConsole/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts b/TypeScript/1LogToConsole/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts index d5247ec..5556129 100644 --- a/TypeScript/1LogToConsole/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts +++ b/TypeScript/1LogToConsole/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts @@ -1,6 +1,6 @@ -import { RawData, WebSocket } from "ws"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; +import { RawData, WebSocket } from "ws"; export declare class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler { protected logger: ILogger; constructor(logger: ILogger); diff --git a/TypeScript/1LogToConsole/types/services/FenceService.d.ts b/TypeScript/1LogToConsole/types/services/FenceService.d.ts index c156122..58dc076 100644 --- a/TypeScript/1LogToConsole/types/services/FenceService.d.ts +++ b/TypeScript/1LogToConsole/types/services/FenceService.d.ts @@ -13,9 +13,9 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Handle actions surrounding Fence * e.g. generating or refreshing assorts / get next refresh time diff --git a/TypeScript/1LogToConsole/types/services/InsuranceService.d.ts b/TypeScript/1LogToConsole/types/services/InsuranceService.d.ts index 0000e66..f799102 100644 --- a/TypeScript/1LogToConsole/types/services/InsuranceService.d.ts +++ b/TypeScript/1LogToConsole/types/services/InsuranceService.d.ts @@ -18,10 +18,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceService { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/1LogToConsole/types/services/LocalisationService.d.ts b/TypeScript/1LogToConsole/types/services/LocalisationService.d.ts index 42dfa4e..855c138 100644 --- a/TypeScript/1LogToConsole/types/services/LocalisationService.d.ts +++ b/TypeScript/1LogToConsole/types/services/LocalisationService.d.ts @@ -1,8 +1,8 @@ -import { I18n } from "i18n"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { LocaleService } from "@spt/services/LocaleService"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { I18n } from "i18n"; /** * Handles translating server text into different langauges */ diff --git a/TypeScript/1LogToConsole/types/services/ProfileFixerService.d.ts b/TypeScript/1LogToConsole/types/services/ProfileFixerService.d.ts index 525b867..91e4780 100644 --- a/TypeScript/1LogToConsole/types/services/ProfileFixerService.d.ts +++ b/TypeScript/1LogToConsole/types/services/ProfileFixerService.d.ts @@ -8,7 +8,7 @@ import { Bonus, HideoutSlot } from "@spt/models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea"; -import { ISptProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; +import { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; @@ -16,11 +16,11 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileFixerService { protected logger: ILogger; protected watermark: Watermark; @@ -73,6 +73,7 @@ export declare class ProfileFixerService { */ protected removeDanglingTaskConditionCounters(pmcProfile: IPmcData): void; protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullRagfairRatings(pmcProfile: IPmcData): void; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; /** diff --git a/TypeScript/1LogToConsole/types/services/RagfairOfferService.d.ts b/TypeScript/1LogToConsole/types/services/RagfairOfferService.d.ts index 6c13b1d..98dd179 100644 --- a/TypeScript/1LogToConsole/types/services/RagfairOfferService.d.ts +++ b/TypeScript/1LogToConsole/types/services/RagfairOfferService.d.ts @@ -10,10 +10,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/1LogToConsole/types/services/mod/CustomItemService.d.ts b/TypeScript/1LogToConsole/types/services/mod/CustomItemService.d.ts index 1926bed..f112872 100644 --- a/TypeScript/1LogToConsole/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/1LogToConsole/types/services/mod/CustomItemService.d.ts @@ -4,8 +4,8 @@ import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetail import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/1LogToConsole/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/1LogToConsole/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts index 3c9d955..91c84d9 100644 --- a/TypeScript/1LogToConsole/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts +++ b/TypeScript/1LogToConsole/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class DynamicRouterModService { private container; constructor(container: DependencyContainer); diff --git a/TypeScript/1LogToConsole/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/1LogToConsole/types/services/mod/staticRouter/StaticRouterModService.d.ts index f60432d..0c3d4d8 100644 --- a/TypeScript/1LogToConsole/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/TypeScript/1LogToConsole/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class StaticRouterModService { protected container: DependencyContainer; constructor(container: DependencyContainer); diff --git a/TypeScript/1LogToConsole/types/utils/JsonUtil.d.ts b/TypeScript/1LogToConsole/types/utils/JsonUtil.d.ts index b30822c..4419228 100644 --- a/TypeScript/1LogToConsole/types/utils/JsonUtil.d.ts +++ b/TypeScript/1LogToConsole/types/utils/JsonUtil.d.ts @@ -1,7 +1,7 @@ -import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { HashUtil } from "@spt/utils/HashUtil"; import { VFS } from "@spt/utils/VFS"; +import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; export declare class JsonUtil { protected vfs: VFS; protected hashUtil: HashUtil; diff --git a/TypeScript/1LogToConsole/types/utils/RandomUtil.d.ts b/TypeScript/1LogToConsole/types/utils/RandomUtil.d.ts index 49f242d..0da184f 100644 --- a/TypeScript/1LogToConsole/types/utils/RandomUtil.d.ts +++ b/TypeScript/1LogToConsole/types/utils/RandomUtil.d.ts @@ -1,6 +1,6 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects * based on the relative probability of each of its elements. diff --git a/TypeScript/1LogToConsole/types/utils/logging/AbstractWinstonLogger.d.ts b/TypeScript/1LogToConsole/types/utils/logging/AbstractWinstonLogger.d.ts index 7098f85..ef54434 100644 --- a/TypeScript/1LogToConsole/types/utils/logging/AbstractWinstonLogger.d.ts +++ b/TypeScript/1LogToConsole/types/utils/logging/AbstractWinstonLogger.d.ts @@ -1,12 +1,12 @@ /// import fs from "node:fs"; -import winston from "winston"; import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; import { SptLogger } from "@spt/models/spt/logging/SptLogger"; import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; import { ILogger } from "@spt/models/spt/utils/ILogger"; +import winston from "winston"; export declare abstract class AbstractWinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected showDebugInConsole: boolean; diff --git a/TypeScript/20CustomChatBot/types/controllers/BotController.d.ts b/TypeScript/20CustomChatBot/types/controllers/BotController.d.ts index 6431fca..475f51b 100644 --- a/TypeScript/20CustomChatBot/types/controllers/BotController.d.ts +++ b/TypeScript/20CustomChatBot/types/controllers/BotController.d.ts @@ -20,8 +20,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/20CustomChatBot/types/controllers/BuildController.d.ts b/TypeScript/20CustomChatBot/types/controllers/BuildController.d.ts index ed8adf6..2cb9c59 100644 --- a/TypeScript/20CustomChatBot/types/controllers/BuildController.d.ts +++ b/TypeScript/20CustomChatBot/types/controllers/BuildController.d.ts @@ -9,8 +9,8 @@ import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BuildController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/20CustomChatBot/types/controllers/GameController.d.ts b/TypeScript/20CustomChatBot/types/controllers/GameController.d.ts index 533a81c..e219c04 100644 --- a/TypeScript/20CustomChatBot/types/controllers/GameController.d.ts +++ b/TypeScript/20CustomChatBot/types/controllers/GameController.d.ts @@ -34,10 +34,10 @@ import { ProfileActivityService } from "@spt/services/ProfileActivityService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GameController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/20CustomChatBot/types/controllers/HealthController.d.ts b/TypeScript/20CustomChatBot/types/controllers/HealthController.d.ts index 5482283..5a0a0a6 100644 --- a/TypeScript/20CustomChatBot/types/controllers/HealthController.d.ts +++ b/TypeScript/20CustomChatBot/types/controllers/HealthController.d.ts @@ -12,8 +12,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthController { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/20CustomChatBot/types/controllers/HideoutController.d.ts b/TypeScript/20CustomChatBot/types/controllers/HideoutController.d.ts index e9d1ed9..89a428c 100644 --- a/TypeScript/20CustomChatBot/types/controllers/HideoutController.d.ts +++ b/TypeScript/20CustomChatBot/types/controllers/HideoutController.d.ts @@ -35,11 +35,11 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; import { ProfileActivityService } from "@spt/services/ProfileActivityService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/20CustomChatBot/types/controllers/InraidController.d.ts b/TypeScript/20CustomChatBot/types/controllers/InraidController.d.ts index 87f419b..9f0c409 100644 --- a/TypeScript/20CustomChatBot/types/controllers/InraidController.d.ts +++ b/TypeScript/20CustomChatBot/types/controllers/InraidController.d.ts @@ -13,6 +13,7 @@ import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRe import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState"; import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig"; import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; @@ -31,7 +32,6 @@ import { PmcChatResponseService } from "@spt/services/PmcChatResponseService"; import { TraderServicesService } from "@spt/services/TraderServicesService"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; -import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; /** * Logic for handling In Raid callbacks */ diff --git a/TypeScript/20CustomChatBot/types/controllers/InsuranceController.d.ts b/TypeScript/20CustomChatBot/types/controllers/InsuranceController.d.ts index f921b83..543e915 100644 --- a/TypeScript/20CustomChatBot/types/controllers/InsuranceController.d.ts +++ b/TypeScript/20CustomChatBot/types/controllers/InsuranceController.d.ts @@ -21,11 +21,11 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PaymentService } from "@spt/services/PaymentService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceController { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/20CustomChatBot/types/controllers/InventoryController.d.ts b/TypeScript/20CustomChatBot/types/controllers/InventoryController.d.ts index 40bb084..c986ce8 100644 --- a/TypeScript/20CustomChatBot/types/controllers/InventoryController.d.ts +++ b/TypeScript/20CustomChatBot/types/controllers/InventoryController.d.ts @@ -37,10 +37,10 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MapMarkerService } from "@spt/services/MapMarkerService"; import { PlayerService } from "@spt/services/PlayerService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/20CustomChatBot/types/controllers/LocationController.d.ts b/TypeScript/20CustomChatBot/types/controllers/LocationController.d.ts index 727a8c8..a541b9c 100644 --- a/TypeScript/20CustomChatBot/types/controllers/LocationController.d.ts +++ b/TypeScript/20CustomChatBot/types/controllers/LocationController.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class LocationController { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; diff --git a/TypeScript/20CustomChatBot/types/controllers/ProfileController.d.ts b/TypeScript/20CustomChatBot/types/controllers/ProfileController.d.ts index e8dae73..7e6d35c 100644 --- a/TypeScript/20CustomChatBot/types/controllers/ProfileController.d.ts +++ b/TypeScript/20CustomChatBot/types/controllers/ProfileController.d.ts @@ -26,9 +26,9 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/20CustomChatBot/types/controllers/QuestController.d.ts b/TypeScript/20CustomChatBot/types/controllers/QuestController.d.ts index 3cdce00..6a5b415 100644 --- a/TypeScript/20CustomChatBot/types/controllers/QuestController.d.ts +++ b/TypeScript/20CustomChatBot/types/controllers/QuestController.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/20CustomChatBot/types/controllers/RepeatableQuestController.d.ts b/TypeScript/20CustomChatBot/types/controllers/RepeatableQuestController.d.ts index 74f39eb..016f8c6 100644 --- a/TypeScript/20CustomChatBot/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/20CustomChatBot/types/controllers/RepeatableQuestController.d.ts @@ -18,11 +18,11 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/20CustomChatBot/types/controllers/TradeController.d.ts b/TypeScript/20CustomChatBot/types/controllers/TradeController.d.ts index bc72e92..842a97b 100644 --- a/TypeScript/20CustomChatBot/types/controllers/TradeController.d.ts +++ b/TypeScript/20CustomChatBot/types/controllers/TradeController.d.ts @@ -1,5 +1,6 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper"; import { TradeHelper } from "@spt/helpers/TradeHelper"; import { TraderHelper } from "@spt/helpers/TraderHelper"; import { IPmcData } from "@spt/models/eft/common/IPmcData"; @@ -35,6 +36,7 @@ export declare class TradeController { protected hashUtil: HashUtil; protected itemHelper: ItemHelper; protected profileHelper: ProfileHelper; + protected ragfairOfferHelper: RagfairOfferHelper; protected traderHelper: TraderHelper; protected ragfairServer: RagfairServer; protected httpResponse: HttpResponseUtil; @@ -44,7 +46,7 @@ export declare class TradeController { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairOfferHelper: RagfairOfferHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); /** Handle TradingConfirm event */ confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; /** Handle RagFairBuyOffer event */ @@ -67,10 +69,17 @@ export declare class TradeController { * @param output Output to send back to client */ protected buyPmcItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void; + /** + * Is the provided offerid and ownerid from a player made offer + * @param offerId Id of the offer + * @param offerOwnerId Owner id + * @returns true if offer was made by a player + */ + protected isPlayerOffer(offerId: string, offerOwnerId: string): boolean; /** * Does Player have necessary trader loyalty to purchase flea offer * @param sellerIsTrader is seller trader - * @param fleaOffer FLea offer being bought + * @param fleaOffer Flea offer being bought * @param pmcData Player profile * @returns True if player can buy offer */ diff --git a/TypeScript/20CustomChatBot/types/controllers/TraderController.d.ts b/TypeScript/20CustomChatBot/types/controllers/TraderController.d.ts index 7fc6d78..3592fc6 100644 --- a/TypeScript/20CustomChatBot/types/controllers/TraderController.d.ts +++ b/TypeScript/20CustomChatBot/types/controllers/TraderController.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/20CustomChatBot/types/generators/BotEquipmentModGenerator.d.ts b/TypeScript/20CustomChatBot/types/generators/BotEquipmentModGenerator.d.ts index 419120f..3952293 100644 --- a/TypeScript/20CustomChatBot/types/generators/BotEquipmentModGenerator.d.ts +++ b/TypeScript/20CustomChatBot/types/generators/BotEquipmentModGenerator.d.ts @@ -25,9 +25,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotEquipmentModGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -65,7 +65,7 @@ export declare class BotEquipmentModGenerator { * @param settings Bot equipment generation settings * @param modSlot Armor slot being filtered * @param existingPlateTplPool Plates tpls to choose from - * @param armorItem + * @param armorItem The armor items db template * @returns Array of plate tpls to choose from */ protected filterPlateModsForSlotByLevel(settings: IGenerateEquipmentProperties, modSlot: string, existingPlateTplPool: string[], armorItem: ITemplateItem): IFilterPlateModsForSlotByLevelResult; diff --git a/TypeScript/20CustomChatBot/types/generators/BotGenerator.d.ts b/TypeScript/20CustomChatBot/types/generators/BotGenerator.d.ts index 8ab4371..ebb8a59 100644 --- a/TypeScript/20CustomChatBot/types/generators/BotGenerator.d.ts +++ b/TypeScript/20CustomChatBot/types/generators/BotGenerator.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/20CustomChatBot/types/generators/BotLevelGenerator.d.ts b/TypeScript/20CustomChatBot/types/generators/BotLevelGenerator.d.ts index dee61e2..a8a8895 100644 --- a/TypeScript/20CustomChatBot/types/generators/BotLevelGenerator.d.ts +++ b/TypeScript/20CustomChatBot/types/generators/BotLevelGenerator.d.ts @@ -4,12 +4,14 @@ import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; +import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class BotLevelGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; protected databaseService: DatabaseService; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService); + protected mathUtil: MathUtil; + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, mathUtil: MathUtil); /** * Return a randomised bot level and exp value * @param levelDetails Min and max of level for bot @@ -18,6 +20,7 @@ export declare class BotLevelGenerator { * @returns IRandomisedBotLevelResult object */ generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult; + protected chooseBotLevel(min: number, max: number, shift: number, number: number): number; /** * Get the highest level a bot can be relative to the players level, but no further than the max size from globals.exp_table * @param botGenerationDetails Details to help generate a bot diff --git a/TypeScript/20CustomChatBot/types/generators/BotLootGenerator.d.ts b/TypeScript/20CustomChatBot/types/generators/BotLootGenerator.d.ts index fee56ce..c0583c6 100644 --- a/TypeScript/20CustomChatBot/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/20CustomChatBot/types/generators/BotLootGenerator.d.ts @@ -18,9 +18,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/20CustomChatBot/types/generators/BotWeaponGenerator.d.ts b/TypeScript/20CustomChatBot/types/generators/BotWeaponGenerator.d.ts index 5559bfa..8e03b35 100644 --- a/TypeScript/20CustomChatBot/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/20CustomChatBot/types/generators/BotWeaponGenerator.d.ts @@ -18,9 +18,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RepairService } from "@spt/services/RepairService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotWeaponGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/20CustomChatBot/types/generators/LocationGenerator.d.ts b/TypeScript/20CustomChatBot/types/generators/LocationGenerator.d.ts index 222b0ab..9a2b0c4 100644 --- a/TypeScript/20CustomChatBot/types/generators/LocationGenerator.d.ts +++ b/TypeScript/20CustomChatBot/types/generators/LocationGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export interface IContainerItem { items: Item[]; width: number; diff --git a/TypeScript/20CustomChatBot/types/generators/PlayerScavGenerator.d.ts b/TypeScript/20CustomChatBot/types/generators/PlayerScavGenerator.d.ts index 2414150..e317bf6 100644 --- a/TypeScript/20CustomChatBot/types/generators/PlayerScavGenerator.d.ts +++ b/TypeScript/20CustomChatBot/types/generators/PlayerScavGenerator.d.ts @@ -14,9 +14,9 @@ import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class PlayerScavGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/20CustomChatBot/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/20CustomChatBot/types/generators/RagfairOfferGenerator.d.ts index 9435390..ca09729 100644 --- a/TypeScript/20CustomChatBot/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/20CustomChatBot/types/generators/RagfairOfferGenerator.d.ts @@ -19,10 +19,10 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/20CustomChatBot/types/generators/RepeatableQuestGenerator.d.ts b/TypeScript/20CustomChatBot/types/generators/RepeatableQuestGenerator.d.ts index 77c4e79..339f322 100644 --- a/TypeScript/20CustomChatBot/types/generators/RepeatableQuestGenerator.d.ts +++ b/TypeScript/20CustomChatBot/types/generators/RepeatableQuestGenerator.d.ts @@ -11,10 +11,10 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/20CustomChatBot/types/generators/RepeatableQuestRewardGenerator.d.ts b/TypeScript/20CustomChatBot/types/generators/RepeatableQuestRewardGenerator.d.ts index 1e09994..713a394 100644 --- a/TypeScript/20CustomChatBot/types/generators/RepeatableQuestRewardGenerator.d.ts +++ b/TypeScript/20CustomChatBot/types/generators/RepeatableQuestRewardGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestRewardGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/20CustomChatBot/types/helpers/BotDifficultyHelper.d.ts b/TypeScript/20CustomChatBot/types/helpers/BotDifficultyHelper.d.ts index 63572a5..2348bd3 100644 --- a/TypeScript/20CustomChatBot/types/helpers/BotDifficultyHelper.d.ts +++ b/TypeScript/20CustomChatBot/types/helpers/BotDifficultyHelper.d.ts @@ -5,8 +5,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotDifficultyHelper { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/20CustomChatBot/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/20CustomChatBot/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index c51bf7e..c38f0a0 100644 --- a/TypeScript/20CustomChatBot/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/20CustomChatBot/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GiveSptCommand implements ISptCommand { protected logger: ILogger; protected itemHelper: ItemHelper; diff --git a/TypeScript/20CustomChatBot/types/helpers/HealthHelper.d.ts b/TypeScript/20CustomChatBot/types/helpers/HealthHelper.d.ts index 650f633..a164285 100644 --- a/TypeScript/20CustomChatBot/types/helpers/HealthHelper.d.ts +++ b/TypeScript/20CustomChatBot/types/helpers/HealthHelper.d.ts @@ -5,8 +5,8 @@ import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/20CustomChatBot/types/helpers/HideoutHelper.d.ts b/TypeScript/20CustomChatBot/types/helpers/HideoutHelper.d.ts index c4aaa4c..df0376b 100644 --- a/TypeScript/20CustomChatBot/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/20CustomChatBot/types/helpers/HideoutHelper.d.ts @@ -18,10 +18,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/20CustomChatBot/types/helpers/InRaidHelper.d.ts b/TypeScript/20CustomChatBot/types/helpers/InRaidHelper.d.ts index 449be9f..987c9ec 100644 --- a/TypeScript/20CustomChatBot/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/20CustomChatBot/types/helpers/InRaidHelper.d.ts @@ -15,9 +15,9 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InRaidHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/20CustomChatBot/types/helpers/InventoryHelper.d.ts b/TypeScript/20CustomChatBot/types/helpers/InventoryHelper.d.ts index f0ff69a..92bb49c 100644 --- a/TypeScript/20CustomChatBot/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/20CustomChatBot/types/helpers/InventoryHelper.d.ts @@ -23,9 +23,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/20CustomChatBot/types/helpers/ItemHelper.d.ts b/TypeScript/20CustomChatBot/types/helpers/ItemHelper.d.ts index da5dd11..c304cee 100644 --- a/TypeScript/20CustomChatBot/types/helpers/ItemHelper.d.ts +++ b/TypeScript/20CustomChatBot/types/helpers/ItemHelper.d.ts @@ -11,13 +11,13 @@ import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { CompareUtil } from "@spt/utils/CompareUtil"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ItemHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/20CustomChatBot/types/helpers/ProfileHelper.d.ts b/TypeScript/20CustomChatBot/types/helpers/ProfileHelper.d.ts index 0671179..cdab870 100644 --- a/TypeScript/20CustomChatBot/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/20CustomChatBot/types/helpers/ProfileHelper.d.ts @@ -11,10 +11,10 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/20CustomChatBot/types/helpers/QuestHelper.d.ts b/TypeScript/20CustomChatBot/types/helpers/QuestHelper.d.ts index 2b84b8f..2d5730d 100644 --- a/TypeScript/20CustomChatBot/types/helpers/QuestHelper.d.ts +++ b/TypeScript/20CustomChatBot/types/helpers/QuestHelper.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/20CustomChatBot/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/20CustomChatBot/types/helpers/RagfairOfferHelper.d.ts index b526554..2386316 100644 --- a/TypeScript/20CustomChatBot/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/20CustomChatBot/types/helpers/RagfairOfferHelper.d.ts @@ -151,7 +151,7 @@ export declare class RagfairOfferHelper { * @param boughtAmount Amount item was purchased for * @returns IItemEventRouterResponse */ - protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; + completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; /** * Get a localised message for when players offer has sold on flea * @param itemTpl Item sold diff --git a/TypeScript/20CustomChatBot/types/helpers/RagfairServerHelper.d.ts b/TypeScript/20CustomChatBot/types/helpers/RagfairServerHelper.d.ts index 927caf5..3e1fea9 100644 --- a/TypeScript/20CustomChatBot/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/20CustomChatBot/types/helpers/RagfairServerHelper.d.ts @@ -12,9 +12,9 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Helper class for common ragfair server actions */ diff --git a/TypeScript/20CustomChatBot/types/helpers/RepairHelper.d.ts b/TypeScript/20CustomChatBot/types/helpers/RepairHelper.d.ts index 99a21da..63c78c9 100644 --- a/TypeScript/20CustomChatBot/types/helpers/RepairHelper.d.ts +++ b/TypeScript/20CustomChatBot/types/helpers/RepairHelper.d.ts @@ -4,8 +4,8 @@ import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/20CustomChatBot/types/helpers/RepeatableQuestHelper.d.ts b/TypeScript/20CustomChatBot/types/helpers/RepeatableQuestHelper.d.ts index d92657e..8c65f40 100644 --- a/TypeScript/20CustomChatBot/types/helpers/RepeatableQuestHelper.d.ts +++ b/TypeScript/20CustomChatBot/types/helpers/RepeatableQuestHelper.d.ts @@ -1,8 +1,8 @@ import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestHelper { protected mathUtil: MathUtil; protected configServer: ConfigServer; diff --git a/TypeScript/20CustomChatBot/types/helpers/TradeHelper.d.ts b/TypeScript/20CustomChatBot/types/helpers/TradeHelper.d.ts index f994fda..6e6f3a2 100644 --- a/TypeScript/20CustomChatBot/types/helpers/TradeHelper.d.ts +++ b/TypeScript/20CustomChatBot/types/helpers/TradeHelper.d.ts @@ -17,8 +17,8 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TradeHelper { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/20CustomChatBot/types/helpers/TraderAssortHelper.d.ts b/TypeScript/20CustomChatBot/types/helpers/TraderAssortHelper.d.ts index 8f8f802..f1ecd3b 100644 --- a/TypeScript/20CustomChatBot/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/20CustomChatBot/types/helpers/TraderAssortHelper.d.ts @@ -14,9 +14,9 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; diff --git a/TypeScript/20CustomChatBot/types/loaders/BundleLoader.d.ts b/TypeScript/20CustomChatBot/types/loaders/BundleLoader.d.ts index e270988..8c0ed4d 100644 --- a/TypeScript/20CustomChatBot/types/loaders/BundleLoader.d.ts +++ b/TypeScript/20CustomChatBot/types/loaders/BundleLoader.d.ts @@ -1,8 +1,8 @@ import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BundleInfo { modpath: string; filename: string; diff --git a/TypeScript/20CustomChatBot/types/loaders/PostDBModLoader.d.ts b/TypeScript/20CustomChatBot/types/loaders/PostDBModLoader.d.ts index b0c4bf4..a8bb6a9 100644 --- a/TypeScript/20CustomChatBot/types/loaders/PostDBModLoader.d.ts +++ b/TypeScript/20CustomChatBot/types/loaders/PostDBModLoader.d.ts @@ -1,10 +1,10 @@ -import { DependencyContainer } from "tsyringe"; import { OnLoad } from "@spt/di/OnLoad"; import { BundleLoader } from "@spt/loaders/BundleLoader"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostDBModLoader implements OnLoad { protected logger: ILogger; protected bundleLoader: BundleLoader; diff --git a/TypeScript/20CustomChatBot/types/loaders/PostSptModLoader.d.ts b/TypeScript/20CustomChatBot/types/loaders/PostSptModLoader.d.ts index fb54579..2603497 100644 --- a/TypeScript/20CustomChatBot/types/loaders/PostSptModLoader.d.ts +++ b/TypeScript/20CustomChatBot/types/loaders/PostSptModLoader.d.ts @@ -1,9 +1,9 @@ -import { DependencyContainer } from "tsyringe"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { IModLoader } from "@spt/models/spt/mod/IModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostSptModLoader implements IModLoader { protected logger: ILogger; protected preSptModLoader: PreSptModLoader; diff --git a/TypeScript/20CustomChatBot/types/loaders/PreSptModLoader.d.ts b/TypeScript/20CustomChatBot/types/loaders/PreSptModLoader.d.ts index bc846c8..8814525 100644 --- a/TypeScript/20CustomChatBot/types/loaders/PreSptModLoader.d.ts +++ b/TypeScript/20CustomChatBot/types/loaders/PreSptModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { ModDetails } from "@spt/models/eft/profile/ISptProfile"; @@ -11,6 +10,7 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { ModCompilerService } from "@spt/services/ModCompilerService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { DependencyContainer } from "tsyringe"; export declare class PreSptModLoader implements IModLoader { protected logger: ILogger; protected vfs: VFS; diff --git a/TypeScript/20CustomChatBot/types/models/eft/common/IEmptyRequestData.d.ts b/TypeScript/20CustomChatBot/types/models/eft/common/IEmptyRequestData.d.ts index 284d16e..52a7b12 100644 --- a/TypeScript/20CustomChatBot/types/models/eft/common/IEmptyRequestData.d.ts +++ b/TypeScript/20CustomChatBot/types/models/eft/common/IEmptyRequestData.d.ts @@ -1,2 +1 @@ -export interface IEmptyRequestData { -} +export type IEmptyRequestData = {}; diff --git a/TypeScript/20CustomChatBot/types/models/eft/common/tables/IBotBase.d.ts b/TypeScript/20CustomChatBot/types/models/eft/common/tables/IBotBase.d.ts index a7fe1ca..be37845 100644 --- a/TypeScript/20CustomChatBot/types/models/eft/common/tables/IBotBase.d.ts +++ b/TypeScript/20CustomChatBot/types/models/eft/common/tables/IBotBase.d.ts @@ -373,8 +373,7 @@ export interface LastCompleted { export interface Notes { Notes: Note[]; } -export interface CarExtractCounts { -} +export type CarExtractCounts = {}; export declare enum SurvivorClass { UNKNOWN = 0, NEUTRALIZER = 1, diff --git a/TypeScript/20CustomChatBot/types/models/eft/common/tables/ILocationsBase.d.ts b/TypeScript/20CustomChatBot/types/models/eft/common/tables/ILocationsBase.d.ts index 2c96af3..16bca24 100644 --- a/TypeScript/20CustomChatBot/types/models/eft/common/tables/ILocationsBase.d.ts +++ b/TypeScript/20CustomChatBot/types/models/eft/common/tables/ILocationsBase.d.ts @@ -2,8 +2,7 @@ export interface ILocationsBase { locations: Locations; paths: Path[]; } -export interface Locations { -} +export type Locations = {}; export interface Path { Source: string; Destination: string; diff --git a/TypeScript/20CustomChatBot/types/models/eft/common/tables/IProfileTemplate.d.ts b/TypeScript/20CustomChatBot/types/models/eft/common/tables/IProfileTemplate.d.ts index 20923bc..6ba9221 100644 --- a/TypeScript/20CustomChatBot/types/models/eft/common/tables/IProfileTemplate.d.ts +++ b/TypeScript/20CustomChatBot/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -1,12 +1,12 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { Dialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; export interface IProfileTemplates { - "Standard": IProfileSides; + Standard: IProfileSides; "Left Behind": IProfileSides; "Prepare To Escape": IProfileSides; "Edge Of Darkness": IProfileSides; - "Unheard": IProfileSides; - "Tournament": IProfileSides; + Unheard: IProfileSides; + Tournament: IProfileSides; "SPT Developer": IProfileSides; "SPT Easy start": IProfileSides; "SPT Zero to hero": IProfileSides; diff --git a/TypeScript/20CustomChatBot/types/models/eft/common/tables/ITrader.d.ts b/TypeScript/20CustomChatBot/types/models/eft/common/tables/ITrader.d.ts index 14ab409..40cf004 100644 --- a/TypeScript/20CustomChatBot/types/models/eft/common/tables/ITrader.d.ts +++ b/TypeScript/20CustomChatBot/types/models/eft/common/tables/ITrader.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; export interface ITrader { assort?: ITraderAssort; @@ -78,6 +79,8 @@ export interface IBarterScheme { _tpl: string; onlyFunctional?: boolean; sptQuestLocked?: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface ISuit { _id: string; diff --git a/TypeScript/20CustomChatBot/types/models/eft/hideout/IQteData.d.ts b/TypeScript/20CustomChatBot/types/models/eft/hideout/IQteData.d.ts index 7f507e1..fe6cce6 100644 --- a/TypeScript/20CustomChatBot/types/models/eft/hideout/IQteData.d.ts +++ b/TypeScript/20CustomChatBot/types/models/eft/hideout/IQteData.d.ts @@ -1,14 +1,14 @@ import { Effect } from "@spt/models/eft/health/Effect"; import { BodyPart } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; import { QteActivityType } from "@spt/models/enums/hideout/QteActivityType"; import { QteEffectType } from "@spt/models/enums/hideout/QteEffectType"; import { QteResultType } from "@spt/models/enums/hideout/QteResultType"; import { QteRewardType } from "@spt/models/enums/hideout/QteRewardType"; import { QteType } from "@spt/models/enums/hideout/QteType"; import { RequirementType } from "@spt/models/enums/hideout/RequirementType"; -import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt/models/enums/SkillTypes"; -import { Traders } from "@spt/models/enums/Traders"; export interface IQteData { id: string; type: QteActivityType; diff --git a/TypeScript/20CustomChatBot/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/20CustomChatBot/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index f1123c1..5971372 100644 --- a/TypeScript/20CustomChatBot/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/TypeScript/20CustomChatBot/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -15,7 +15,5 @@ export interface Items { change: any[]; del: any[]; } -export interface Production { -} -export interface TraderRelations { -} +export type Production = {}; +export type TraderRelations = {}; diff --git a/TypeScript/20CustomChatBot/types/models/eft/profile/ISptProfile.d.ts b/TypeScript/20CustomChatBot/types/models/eft/profile/ISptProfile.d.ts index a8e742a..dd7aea6 100644 --- a/TypeScript/20CustomChatBot/types/models/eft/profile/ISptProfile.d.ts +++ b/TypeScript/20CustomChatBot/types/models/eft/profile/ISptProfile.d.ts @@ -209,12 +209,9 @@ export interface Effects { LeftLeg: LeftLeg; RightLeg: RightLeg; } -export interface Head { -} -export interface Chest { -} -export interface Stomach { -} +export type Head = {}; +export type Chest = {}; +export type Stomach = {}; export interface LeftArm { Fracture?: number; } diff --git a/TypeScript/20CustomChatBot/types/models/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/20CustomChatBot/types/models/eft/ragfair/IRagfairOffer.d.ts index eeeb79d..f6c07fc 100644 --- a/TypeScript/20CustomChatBot/types/models/eft/ragfair/IRagfairOffer.d.ts +++ b/TypeScript/20CustomChatBot/types/models/eft/ragfair/IRagfairOffer.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface IRagfairOffer { sellResult?: SellResult[]; @@ -28,6 +29,8 @@ export interface OfferRequirement { _tpl: string; count: number; onlyFunctional: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface IRagfairOfferUser { id: string; diff --git a/TypeScript/20CustomChatBot/types/models/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/20CustomChatBot/types/models/eft/ragfair/ISearchRequestData.d.ts index 8261c5b..c631de8 100644 --- a/TypeScript/20CustomChatBot/types/models/eft/ragfair/ISearchRequestData.d.ts +++ b/TypeScript/20CustomChatBot/types/models/eft/ragfair/ISearchRequestData.d.ts @@ -29,5 +29,4 @@ export declare enum OfferOwnerType { TRADEROWNERTYPE = 1, PLAYEROWNERTYPE = 2 } -export interface BuildItems { -} +export type BuildItems = {}; diff --git a/TypeScript/20CustomChatBot/types/models/enums/BaseClasses.d.ts b/TypeScript/20CustomChatBot/types/models/enums/BaseClasses.d.ts index 65fc95e..32ebf7c 100644 --- a/TypeScript/20CustomChatBot/types/models/enums/BaseClasses.d.ts +++ b/TypeScript/20CustomChatBot/types/models/enums/BaseClasses.d.ts @@ -107,6 +107,6 @@ export declare enum BaseClasses { RECEIVER = "55818a304bdc2db5418b457d", BARREL = "555ef6e44bdc2de9068b457e", CHARGING_HANDLE = "55818a6f4bdc2db9688b456b", - COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569 ", + COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569", HIDEOUT_AREA_CONTAINER = "63da6da4784a55176c018dba" } diff --git a/TypeScript/20CustomChatBot/types/models/enums/DogtagExchangeSide.d.ts b/TypeScript/20CustomChatBot/types/models/enums/DogtagExchangeSide.d.ts new file mode 100644 index 0000000..de3d4df --- /dev/null +++ b/TypeScript/20CustomChatBot/types/models/enums/DogtagExchangeSide.d.ts @@ -0,0 +1,5 @@ +export declare enum DogtagExchangeSide { + USEC = "Usec", + BEAR = "Bear", + ANY = "Any" +} diff --git a/TypeScript/20CustomChatBot/types/models/spt/server/ExhaustableArray.d.ts b/TypeScript/20CustomChatBot/types/models/spt/server/ExhaustableArray.d.ts index c27f41f..50a6b68 100644 --- a/TypeScript/20CustomChatBot/types/models/spt/server/ExhaustableArray.d.ts +++ b/TypeScript/20CustomChatBot/types/models/spt/server/ExhaustableArray.d.ts @@ -1,5 +1,5 @@ -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ExhaustableArray implements IExhaustableArray { private itemPool; private randomUtil; diff --git a/TypeScript/20CustomChatBot/types/routers/EventOutputHolder.d.ts b/TypeScript/20CustomChatBot/types/routers/EventOutputHolder.d.ts index ef20706..148461a 100644 --- a/TypeScript/20CustomChatBot/types/routers/EventOutputHolder.d.ts +++ b/TypeScript/20CustomChatBot/types/routers/EventOutputHolder.d.ts @@ -3,8 +3,8 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IHideoutImprovement, Productive, TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; import { TraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class EventOutputHolder { protected profileHelper: ProfileHelper; protected timeUtil: TimeUtil; @@ -12,7 +12,7 @@ export declare class EventOutputHolder { /** * What has client been informed of this game session * Key = sessionId, then second key is prod id - */ + */ protected clientActiveSessionStorage: Record>; diff --git a/TypeScript/20CustomChatBot/types/servers/HttpServer.d.ts b/TypeScript/20CustomChatBot/types/servers/HttpServer.d.ts index b00fe68..0024ba3 100644 --- a/TypeScript/20CustomChatBot/types/servers/HttpServer.d.ts +++ b/TypeScript/20CustomChatBot/types/servers/HttpServer.d.ts @@ -6,8 +6,8 @@ import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; -import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { WebSocketServer } from "@spt/servers/WebSocketServer"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { LocalisationService } from "@spt/services/LocalisationService"; export declare class HttpServer { protected logger: ILogger; diff --git a/TypeScript/20CustomChatBot/types/servers/WebSocketServer.d.ts b/TypeScript/20CustomChatBot/types/servers/WebSocketServer.d.ts index f4e07bb..6121824 100644 --- a/TypeScript/20CustomChatBot/types/servers/WebSocketServer.d.ts +++ b/TypeScript/20CustomChatBot/types/servers/WebSocketServer.d.ts @@ -1,12 +1,12 @@ /// import http, { IncomingMessage } from "node:http"; -import { WebSocket, Server } from "ws"; import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { Server, WebSocket } from "ws"; export declare class WebSocketServer { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/20CustomChatBot/types/servers/ws/SptWebSocketConnectionHandler.d.ts b/TypeScript/20CustomChatBot/types/servers/ws/SptWebSocketConnectionHandler.d.ts index 98d0898..70fc96a 100644 --- a/TypeScript/20CustomChatBot/types/servers/ws/SptWebSocketConnectionHandler.d.ts +++ b/TypeScript/20CustomChatBot/types/servers/ws/SptWebSocketConnectionHandler.d.ts @@ -1,7 +1,6 @@ /// /// import { IncomingMessage } from "http"; -import { WebSocket } from "ws"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; @@ -11,6 +10,7 @@ import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectio import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; +import { WebSocket } from "ws"; export declare class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler { protected logger: ILogger; protected profileHelper: ProfileHelper; diff --git a/TypeScript/20CustomChatBot/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts b/TypeScript/20CustomChatBot/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts index d5247ec..5556129 100644 --- a/TypeScript/20CustomChatBot/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts +++ b/TypeScript/20CustomChatBot/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts @@ -1,6 +1,6 @@ -import { RawData, WebSocket } from "ws"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; +import { RawData, WebSocket } from "ws"; export declare class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler { protected logger: ILogger; constructor(logger: ILogger); diff --git a/TypeScript/20CustomChatBot/types/services/FenceService.d.ts b/TypeScript/20CustomChatBot/types/services/FenceService.d.ts index c156122..58dc076 100644 --- a/TypeScript/20CustomChatBot/types/services/FenceService.d.ts +++ b/TypeScript/20CustomChatBot/types/services/FenceService.d.ts @@ -13,9 +13,9 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Handle actions surrounding Fence * e.g. generating or refreshing assorts / get next refresh time diff --git a/TypeScript/20CustomChatBot/types/services/InsuranceService.d.ts b/TypeScript/20CustomChatBot/types/services/InsuranceService.d.ts index 0000e66..f799102 100644 --- a/TypeScript/20CustomChatBot/types/services/InsuranceService.d.ts +++ b/TypeScript/20CustomChatBot/types/services/InsuranceService.d.ts @@ -18,10 +18,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceService { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/20CustomChatBot/types/services/LocalisationService.d.ts b/TypeScript/20CustomChatBot/types/services/LocalisationService.d.ts index 42dfa4e..855c138 100644 --- a/TypeScript/20CustomChatBot/types/services/LocalisationService.d.ts +++ b/TypeScript/20CustomChatBot/types/services/LocalisationService.d.ts @@ -1,8 +1,8 @@ -import { I18n } from "i18n"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { LocaleService } from "@spt/services/LocaleService"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { I18n } from "i18n"; /** * Handles translating server text into different langauges */ diff --git a/TypeScript/20CustomChatBot/types/services/ProfileFixerService.d.ts b/TypeScript/20CustomChatBot/types/services/ProfileFixerService.d.ts index 525b867..91e4780 100644 --- a/TypeScript/20CustomChatBot/types/services/ProfileFixerService.d.ts +++ b/TypeScript/20CustomChatBot/types/services/ProfileFixerService.d.ts @@ -8,7 +8,7 @@ import { Bonus, HideoutSlot } from "@spt/models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea"; -import { ISptProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; +import { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; @@ -16,11 +16,11 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileFixerService { protected logger: ILogger; protected watermark: Watermark; @@ -73,6 +73,7 @@ export declare class ProfileFixerService { */ protected removeDanglingTaskConditionCounters(pmcProfile: IPmcData): void; protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullRagfairRatings(pmcProfile: IPmcData): void; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; /** diff --git a/TypeScript/20CustomChatBot/types/services/RagfairOfferService.d.ts b/TypeScript/20CustomChatBot/types/services/RagfairOfferService.d.ts index 6c13b1d..98dd179 100644 --- a/TypeScript/20CustomChatBot/types/services/RagfairOfferService.d.ts +++ b/TypeScript/20CustomChatBot/types/services/RagfairOfferService.d.ts @@ -10,10 +10,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/20CustomChatBot/types/services/mod/CustomItemService.d.ts b/TypeScript/20CustomChatBot/types/services/mod/CustomItemService.d.ts index 1926bed..f112872 100644 --- a/TypeScript/20CustomChatBot/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/20CustomChatBot/types/services/mod/CustomItemService.d.ts @@ -4,8 +4,8 @@ import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetail import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/20CustomChatBot/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/20CustomChatBot/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts index 3c9d955..91c84d9 100644 --- a/TypeScript/20CustomChatBot/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts +++ b/TypeScript/20CustomChatBot/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class DynamicRouterModService { private container; constructor(container: DependencyContainer); diff --git a/TypeScript/20CustomChatBot/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/20CustomChatBot/types/services/mod/staticRouter/StaticRouterModService.d.ts index f60432d..0c3d4d8 100644 --- a/TypeScript/20CustomChatBot/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/TypeScript/20CustomChatBot/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class StaticRouterModService { protected container: DependencyContainer; constructor(container: DependencyContainer); diff --git a/TypeScript/20CustomChatBot/types/utils/JsonUtil.d.ts b/TypeScript/20CustomChatBot/types/utils/JsonUtil.d.ts index b30822c..4419228 100644 --- a/TypeScript/20CustomChatBot/types/utils/JsonUtil.d.ts +++ b/TypeScript/20CustomChatBot/types/utils/JsonUtil.d.ts @@ -1,7 +1,7 @@ -import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { HashUtil } from "@spt/utils/HashUtil"; import { VFS } from "@spt/utils/VFS"; +import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; export declare class JsonUtil { protected vfs: VFS; protected hashUtil: HashUtil; diff --git a/TypeScript/20CustomChatBot/types/utils/RandomUtil.d.ts b/TypeScript/20CustomChatBot/types/utils/RandomUtil.d.ts index 49f242d..0da184f 100644 --- a/TypeScript/20CustomChatBot/types/utils/RandomUtil.d.ts +++ b/TypeScript/20CustomChatBot/types/utils/RandomUtil.d.ts @@ -1,6 +1,6 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects * based on the relative probability of each of its elements. diff --git a/TypeScript/20CustomChatBot/types/utils/logging/AbstractWinstonLogger.d.ts b/TypeScript/20CustomChatBot/types/utils/logging/AbstractWinstonLogger.d.ts index 7098f85..ef54434 100644 --- a/TypeScript/20CustomChatBot/types/utils/logging/AbstractWinstonLogger.d.ts +++ b/TypeScript/20CustomChatBot/types/utils/logging/AbstractWinstonLogger.d.ts @@ -1,12 +1,12 @@ /// import fs from "node:fs"; -import winston from "winston"; import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; import { SptLogger } from "@spt/models/spt/logging/SptLogger"; import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; import { ILogger } from "@spt/models/spt/utils/ILogger"; +import winston from "winston"; export declare abstract class AbstractWinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected showDebugInConsole: boolean; diff --git a/TypeScript/21CustomCommandoCommand/types/controllers/BotController.d.ts b/TypeScript/21CustomCommandoCommand/types/controllers/BotController.d.ts index 6431fca..475f51b 100644 --- a/TypeScript/21CustomCommandoCommand/types/controllers/BotController.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/controllers/BotController.d.ts @@ -20,8 +20,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/21CustomCommandoCommand/types/controllers/BuildController.d.ts b/TypeScript/21CustomCommandoCommand/types/controllers/BuildController.d.ts index ed8adf6..2cb9c59 100644 --- a/TypeScript/21CustomCommandoCommand/types/controllers/BuildController.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/controllers/BuildController.d.ts @@ -9,8 +9,8 @@ import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BuildController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/21CustomCommandoCommand/types/controllers/GameController.d.ts b/TypeScript/21CustomCommandoCommand/types/controllers/GameController.d.ts index 533a81c..e219c04 100644 --- a/TypeScript/21CustomCommandoCommand/types/controllers/GameController.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/controllers/GameController.d.ts @@ -34,10 +34,10 @@ import { ProfileActivityService } from "@spt/services/ProfileActivityService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GameController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/21CustomCommandoCommand/types/controllers/HealthController.d.ts b/TypeScript/21CustomCommandoCommand/types/controllers/HealthController.d.ts index 5482283..5a0a0a6 100644 --- a/TypeScript/21CustomCommandoCommand/types/controllers/HealthController.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/controllers/HealthController.d.ts @@ -12,8 +12,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthController { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/21CustomCommandoCommand/types/controllers/HideoutController.d.ts b/TypeScript/21CustomCommandoCommand/types/controllers/HideoutController.d.ts index e9d1ed9..89a428c 100644 --- a/TypeScript/21CustomCommandoCommand/types/controllers/HideoutController.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/controllers/HideoutController.d.ts @@ -35,11 +35,11 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; import { ProfileActivityService } from "@spt/services/ProfileActivityService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/21CustomCommandoCommand/types/controllers/InraidController.d.ts b/TypeScript/21CustomCommandoCommand/types/controllers/InraidController.d.ts index 87f419b..9f0c409 100644 --- a/TypeScript/21CustomCommandoCommand/types/controllers/InraidController.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/controllers/InraidController.d.ts @@ -13,6 +13,7 @@ import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRe import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState"; import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig"; import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; @@ -31,7 +32,6 @@ import { PmcChatResponseService } from "@spt/services/PmcChatResponseService"; import { TraderServicesService } from "@spt/services/TraderServicesService"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; -import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; /** * Logic for handling In Raid callbacks */ diff --git a/TypeScript/21CustomCommandoCommand/types/controllers/InsuranceController.d.ts b/TypeScript/21CustomCommandoCommand/types/controllers/InsuranceController.d.ts index f921b83..543e915 100644 --- a/TypeScript/21CustomCommandoCommand/types/controllers/InsuranceController.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/controllers/InsuranceController.d.ts @@ -21,11 +21,11 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PaymentService } from "@spt/services/PaymentService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceController { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/21CustomCommandoCommand/types/controllers/InventoryController.d.ts b/TypeScript/21CustomCommandoCommand/types/controllers/InventoryController.d.ts index 40bb084..c986ce8 100644 --- a/TypeScript/21CustomCommandoCommand/types/controllers/InventoryController.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/controllers/InventoryController.d.ts @@ -37,10 +37,10 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MapMarkerService } from "@spt/services/MapMarkerService"; import { PlayerService } from "@spt/services/PlayerService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/21CustomCommandoCommand/types/controllers/LocationController.d.ts b/TypeScript/21CustomCommandoCommand/types/controllers/LocationController.d.ts index 727a8c8..a541b9c 100644 --- a/TypeScript/21CustomCommandoCommand/types/controllers/LocationController.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/controllers/LocationController.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class LocationController { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; diff --git a/TypeScript/21CustomCommandoCommand/types/controllers/ProfileController.d.ts b/TypeScript/21CustomCommandoCommand/types/controllers/ProfileController.d.ts index e8dae73..7e6d35c 100644 --- a/TypeScript/21CustomCommandoCommand/types/controllers/ProfileController.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/controllers/ProfileController.d.ts @@ -26,9 +26,9 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/21CustomCommandoCommand/types/controllers/QuestController.d.ts b/TypeScript/21CustomCommandoCommand/types/controllers/QuestController.d.ts index 3cdce00..6a5b415 100644 --- a/TypeScript/21CustomCommandoCommand/types/controllers/QuestController.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/controllers/QuestController.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/21CustomCommandoCommand/types/controllers/RepeatableQuestController.d.ts b/TypeScript/21CustomCommandoCommand/types/controllers/RepeatableQuestController.d.ts index 74f39eb..016f8c6 100644 --- a/TypeScript/21CustomCommandoCommand/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/controllers/RepeatableQuestController.d.ts @@ -18,11 +18,11 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/21CustomCommandoCommand/types/controllers/TradeController.d.ts b/TypeScript/21CustomCommandoCommand/types/controllers/TradeController.d.ts index bc72e92..842a97b 100644 --- a/TypeScript/21CustomCommandoCommand/types/controllers/TradeController.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/controllers/TradeController.d.ts @@ -1,5 +1,6 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper"; import { TradeHelper } from "@spt/helpers/TradeHelper"; import { TraderHelper } from "@spt/helpers/TraderHelper"; import { IPmcData } from "@spt/models/eft/common/IPmcData"; @@ -35,6 +36,7 @@ export declare class TradeController { protected hashUtil: HashUtil; protected itemHelper: ItemHelper; protected profileHelper: ProfileHelper; + protected ragfairOfferHelper: RagfairOfferHelper; protected traderHelper: TraderHelper; protected ragfairServer: RagfairServer; protected httpResponse: HttpResponseUtil; @@ -44,7 +46,7 @@ export declare class TradeController { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairOfferHelper: RagfairOfferHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); /** Handle TradingConfirm event */ confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; /** Handle RagFairBuyOffer event */ @@ -67,10 +69,17 @@ export declare class TradeController { * @param output Output to send back to client */ protected buyPmcItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void; + /** + * Is the provided offerid and ownerid from a player made offer + * @param offerId Id of the offer + * @param offerOwnerId Owner id + * @returns true if offer was made by a player + */ + protected isPlayerOffer(offerId: string, offerOwnerId: string): boolean; /** * Does Player have necessary trader loyalty to purchase flea offer * @param sellerIsTrader is seller trader - * @param fleaOffer FLea offer being bought + * @param fleaOffer Flea offer being bought * @param pmcData Player profile * @returns True if player can buy offer */ diff --git a/TypeScript/21CustomCommandoCommand/types/controllers/TraderController.d.ts b/TypeScript/21CustomCommandoCommand/types/controllers/TraderController.d.ts index 7fc6d78..3592fc6 100644 --- a/TypeScript/21CustomCommandoCommand/types/controllers/TraderController.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/controllers/TraderController.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/21CustomCommandoCommand/types/generators/BotEquipmentModGenerator.d.ts b/TypeScript/21CustomCommandoCommand/types/generators/BotEquipmentModGenerator.d.ts index 419120f..3952293 100644 --- a/TypeScript/21CustomCommandoCommand/types/generators/BotEquipmentModGenerator.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/generators/BotEquipmentModGenerator.d.ts @@ -25,9 +25,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotEquipmentModGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -65,7 +65,7 @@ export declare class BotEquipmentModGenerator { * @param settings Bot equipment generation settings * @param modSlot Armor slot being filtered * @param existingPlateTplPool Plates tpls to choose from - * @param armorItem + * @param armorItem The armor items db template * @returns Array of plate tpls to choose from */ protected filterPlateModsForSlotByLevel(settings: IGenerateEquipmentProperties, modSlot: string, existingPlateTplPool: string[], armorItem: ITemplateItem): IFilterPlateModsForSlotByLevelResult; diff --git a/TypeScript/21CustomCommandoCommand/types/generators/BotGenerator.d.ts b/TypeScript/21CustomCommandoCommand/types/generators/BotGenerator.d.ts index 8ab4371..ebb8a59 100644 --- a/TypeScript/21CustomCommandoCommand/types/generators/BotGenerator.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/generators/BotGenerator.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/21CustomCommandoCommand/types/generators/BotLevelGenerator.d.ts b/TypeScript/21CustomCommandoCommand/types/generators/BotLevelGenerator.d.ts index dee61e2..a8a8895 100644 --- a/TypeScript/21CustomCommandoCommand/types/generators/BotLevelGenerator.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/generators/BotLevelGenerator.d.ts @@ -4,12 +4,14 @@ import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; +import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class BotLevelGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; protected databaseService: DatabaseService; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService); + protected mathUtil: MathUtil; + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, mathUtil: MathUtil); /** * Return a randomised bot level and exp value * @param levelDetails Min and max of level for bot @@ -18,6 +20,7 @@ export declare class BotLevelGenerator { * @returns IRandomisedBotLevelResult object */ generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult; + protected chooseBotLevel(min: number, max: number, shift: number, number: number): number; /** * Get the highest level a bot can be relative to the players level, but no further than the max size from globals.exp_table * @param botGenerationDetails Details to help generate a bot diff --git a/TypeScript/21CustomCommandoCommand/types/generators/BotLootGenerator.d.ts b/TypeScript/21CustomCommandoCommand/types/generators/BotLootGenerator.d.ts index fee56ce..c0583c6 100644 --- a/TypeScript/21CustomCommandoCommand/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/generators/BotLootGenerator.d.ts @@ -18,9 +18,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/21CustomCommandoCommand/types/generators/BotWeaponGenerator.d.ts b/TypeScript/21CustomCommandoCommand/types/generators/BotWeaponGenerator.d.ts index 5559bfa..8e03b35 100644 --- a/TypeScript/21CustomCommandoCommand/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/generators/BotWeaponGenerator.d.ts @@ -18,9 +18,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RepairService } from "@spt/services/RepairService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotWeaponGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/21CustomCommandoCommand/types/generators/LocationGenerator.d.ts b/TypeScript/21CustomCommandoCommand/types/generators/LocationGenerator.d.ts index 222b0ab..9a2b0c4 100644 --- a/TypeScript/21CustomCommandoCommand/types/generators/LocationGenerator.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/generators/LocationGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export interface IContainerItem { items: Item[]; width: number; diff --git a/TypeScript/21CustomCommandoCommand/types/generators/PlayerScavGenerator.d.ts b/TypeScript/21CustomCommandoCommand/types/generators/PlayerScavGenerator.d.ts index 2414150..e317bf6 100644 --- a/TypeScript/21CustomCommandoCommand/types/generators/PlayerScavGenerator.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/generators/PlayerScavGenerator.d.ts @@ -14,9 +14,9 @@ import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class PlayerScavGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/21CustomCommandoCommand/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/21CustomCommandoCommand/types/generators/RagfairOfferGenerator.d.ts index 9435390..ca09729 100644 --- a/TypeScript/21CustomCommandoCommand/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/generators/RagfairOfferGenerator.d.ts @@ -19,10 +19,10 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/21CustomCommandoCommand/types/generators/RepeatableQuestGenerator.d.ts b/TypeScript/21CustomCommandoCommand/types/generators/RepeatableQuestGenerator.d.ts index 77c4e79..339f322 100644 --- a/TypeScript/21CustomCommandoCommand/types/generators/RepeatableQuestGenerator.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/generators/RepeatableQuestGenerator.d.ts @@ -11,10 +11,10 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/21CustomCommandoCommand/types/generators/RepeatableQuestRewardGenerator.d.ts b/TypeScript/21CustomCommandoCommand/types/generators/RepeatableQuestRewardGenerator.d.ts index 1e09994..713a394 100644 --- a/TypeScript/21CustomCommandoCommand/types/generators/RepeatableQuestRewardGenerator.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/generators/RepeatableQuestRewardGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestRewardGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/21CustomCommandoCommand/types/helpers/BotDifficultyHelper.d.ts b/TypeScript/21CustomCommandoCommand/types/helpers/BotDifficultyHelper.d.ts index 63572a5..2348bd3 100644 --- a/TypeScript/21CustomCommandoCommand/types/helpers/BotDifficultyHelper.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/helpers/BotDifficultyHelper.d.ts @@ -5,8 +5,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotDifficultyHelper { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/21CustomCommandoCommand/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/21CustomCommandoCommand/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index c51bf7e..c38f0a0 100644 --- a/TypeScript/21CustomCommandoCommand/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GiveSptCommand implements ISptCommand { protected logger: ILogger; protected itemHelper: ItemHelper; diff --git a/TypeScript/21CustomCommandoCommand/types/helpers/HealthHelper.d.ts b/TypeScript/21CustomCommandoCommand/types/helpers/HealthHelper.d.ts index 650f633..a164285 100644 --- a/TypeScript/21CustomCommandoCommand/types/helpers/HealthHelper.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/helpers/HealthHelper.d.ts @@ -5,8 +5,8 @@ import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/21CustomCommandoCommand/types/helpers/HideoutHelper.d.ts b/TypeScript/21CustomCommandoCommand/types/helpers/HideoutHelper.d.ts index c4aaa4c..df0376b 100644 --- a/TypeScript/21CustomCommandoCommand/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/helpers/HideoutHelper.d.ts @@ -18,10 +18,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/21CustomCommandoCommand/types/helpers/InRaidHelper.d.ts b/TypeScript/21CustomCommandoCommand/types/helpers/InRaidHelper.d.ts index 449be9f..987c9ec 100644 --- a/TypeScript/21CustomCommandoCommand/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/helpers/InRaidHelper.d.ts @@ -15,9 +15,9 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InRaidHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/21CustomCommandoCommand/types/helpers/InventoryHelper.d.ts b/TypeScript/21CustomCommandoCommand/types/helpers/InventoryHelper.d.ts index f0ff69a..92bb49c 100644 --- a/TypeScript/21CustomCommandoCommand/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/helpers/InventoryHelper.d.ts @@ -23,9 +23,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/21CustomCommandoCommand/types/helpers/ItemHelper.d.ts b/TypeScript/21CustomCommandoCommand/types/helpers/ItemHelper.d.ts index da5dd11..c304cee 100644 --- a/TypeScript/21CustomCommandoCommand/types/helpers/ItemHelper.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/helpers/ItemHelper.d.ts @@ -11,13 +11,13 @@ import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { CompareUtil } from "@spt/utils/CompareUtil"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ItemHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/21CustomCommandoCommand/types/helpers/ProfileHelper.d.ts b/TypeScript/21CustomCommandoCommand/types/helpers/ProfileHelper.d.ts index 0671179..cdab870 100644 --- a/TypeScript/21CustomCommandoCommand/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/helpers/ProfileHelper.d.ts @@ -11,10 +11,10 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/21CustomCommandoCommand/types/helpers/QuestHelper.d.ts b/TypeScript/21CustomCommandoCommand/types/helpers/QuestHelper.d.ts index 2b84b8f..2d5730d 100644 --- a/TypeScript/21CustomCommandoCommand/types/helpers/QuestHelper.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/helpers/QuestHelper.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/21CustomCommandoCommand/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/21CustomCommandoCommand/types/helpers/RagfairOfferHelper.d.ts index b526554..2386316 100644 --- a/TypeScript/21CustomCommandoCommand/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/helpers/RagfairOfferHelper.d.ts @@ -151,7 +151,7 @@ export declare class RagfairOfferHelper { * @param boughtAmount Amount item was purchased for * @returns IItemEventRouterResponse */ - protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; + completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; /** * Get a localised message for when players offer has sold on flea * @param itemTpl Item sold diff --git a/TypeScript/21CustomCommandoCommand/types/helpers/RagfairServerHelper.d.ts b/TypeScript/21CustomCommandoCommand/types/helpers/RagfairServerHelper.d.ts index 927caf5..3e1fea9 100644 --- a/TypeScript/21CustomCommandoCommand/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/helpers/RagfairServerHelper.d.ts @@ -12,9 +12,9 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Helper class for common ragfair server actions */ diff --git a/TypeScript/21CustomCommandoCommand/types/helpers/RepairHelper.d.ts b/TypeScript/21CustomCommandoCommand/types/helpers/RepairHelper.d.ts index 99a21da..63c78c9 100644 --- a/TypeScript/21CustomCommandoCommand/types/helpers/RepairHelper.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/helpers/RepairHelper.d.ts @@ -4,8 +4,8 @@ import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/21CustomCommandoCommand/types/helpers/RepeatableQuestHelper.d.ts b/TypeScript/21CustomCommandoCommand/types/helpers/RepeatableQuestHelper.d.ts index d92657e..8c65f40 100644 --- a/TypeScript/21CustomCommandoCommand/types/helpers/RepeatableQuestHelper.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/helpers/RepeatableQuestHelper.d.ts @@ -1,8 +1,8 @@ import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestHelper { protected mathUtil: MathUtil; protected configServer: ConfigServer; diff --git a/TypeScript/21CustomCommandoCommand/types/helpers/TradeHelper.d.ts b/TypeScript/21CustomCommandoCommand/types/helpers/TradeHelper.d.ts index f994fda..6e6f3a2 100644 --- a/TypeScript/21CustomCommandoCommand/types/helpers/TradeHelper.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/helpers/TradeHelper.d.ts @@ -17,8 +17,8 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TradeHelper { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/21CustomCommandoCommand/types/helpers/TraderAssortHelper.d.ts b/TypeScript/21CustomCommandoCommand/types/helpers/TraderAssortHelper.d.ts index 8f8f802..f1ecd3b 100644 --- a/TypeScript/21CustomCommandoCommand/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/helpers/TraderAssortHelper.d.ts @@ -14,9 +14,9 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; diff --git a/TypeScript/21CustomCommandoCommand/types/loaders/BundleLoader.d.ts b/TypeScript/21CustomCommandoCommand/types/loaders/BundleLoader.d.ts index e270988..8c0ed4d 100644 --- a/TypeScript/21CustomCommandoCommand/types/loaders/BundleLoader.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/loaders/BundleLoader.d.ts @@ -1,8 +1,8 @@ import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BundleInfo { modpath: string; filename: string; diff --git a/TypeScript/21CustomCommandoCommand/types/loaders/PostDBModLoader.d.ts b/TypeScript/21CustomCommandoCommand/types/loaders/PostDBModLoader.d.ts index b0c4bf4..a8bb6a9 100644 --- a/TypeScript/21CustomCommandoCommand/types/loaders/PostDBModLoader.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/loaders/PostDBModLoader.d.ts @@ -1,10 +1,10 @@ -import { DependencyContainer } from "tsyringe"; import { OnLoad } from "@spt/di/OnLoad"; import { BundleLoader } from "@spt/loaders/BundleLoader"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostDBModLoader implements OnLoad { protected logger: ILogger; protected bundleLoader: BundleLoader; diff --git a/TypeScript/21CustomCommandoCommand/types/loaders/PostSptModLoader.d.ts b/TypeScript/21CustomCommandoCommand/types/loaders/PostSptModLoader.d.ts index fb54579..2603497 100644 --- a/TypeScript/21CustomCommandoCommand/types/loaders/PostSptModLoader.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/loaders/PostSptModLoader.d.ts @@ -1,9 +1,9 @@ -import { DependencyContainer } from "tsyringe"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { IModLoader } from "@spt/models/spt/mod/IModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostSptModLoader implements IModLoader { protected logger: ILogger; protected preSptModLoader: PreSptModLoader; diff --git a/TypeScript/21CustomCommandoCommand/types/loaders/PreSptModLoader.d.ts b/TypeScript/21CustomCommandoCommand/types/loaders/PreSptModLoader.d.ts index bc846c8..8814525 100644 --- a/TypeScript/21CustomCommandoCommand/types/loaders/PreSptModLoader.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/loaders/PreSptModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { ModDetails } from "@spt/models/eft/profile/ISptProfile"; @@ -11,6 +10,7 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { ModCompilerService } from "@spt/services/ModCompilerService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { DependencyContainer } from "tsyringe"; export declare class PreSptModLoader implements IModLoader { protected logger: ILogger; protected vfs: VFS; diff --git a/TypeScript/21CustomCommandoCommand/types/models/eft/common/IEmptyRequestData.d.ts b/TypeScript/21CustomCommandoCommand/types/models/eft/common/IEmptyRequestData.d.ts index 284d16e..52a7b12 100644 --- a/TypeScript/21CustomCommandoCommand/types/models/eft/common/IEmptyRequestData.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/models/eft/common/IEmptyRequestData.d.ts @@ -1,2 +1 @@ -export interface IEmptyRequestData { -} +export type IEmptyRequestData = {}; diff --git a/TypeScript/21CustomCommandoCommand/types/models/eft/common/tables/IBotBase.d.ts b/TypeScript/21CustomCommandoCommand/types/models/eft/common/tables/IBotBase.d.ts index a7fe1ca..be37845 100644 --- a/TypeScript/21CustomCommandoCommand/types/models/eft/common/tables/IBotBase.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/models/eft/common/tables/IBotBase.d.ts @@ -373,8 +373,7 @@ export interface LastCompleted { export interface Notes { Notes: Note[]; } -export interface CarExtractCounts { -} +export type CarExtractCounts = {}; export declare enum SurvivorClass { UNKNOWN = 0, NEUTRALIZER = 1, diff --git a/TypeScript/21CustomCommandoCommand/types/models/eft/common/tables/ILocationsBase.d.ts b/TypeScript/21CustomCommandoCommand/types/models/eft/common/tables/ILocationsBase.d.ts index 2c96af3..16bca24 100644 --- a/TypeScript/21CustomCommandoCommand/types/models/eft/common/tables/ILocationsBase.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/models/eft/common/tables/ILocationsBase.d.ts @@ -2,8 +2,7 @@ export interface ILocationsBase { locations: Locations; paths: Path[]; } -export interface Locations { -} +export type Locations = {}; export interface Path { Source: string; Destination: string; diff --git a/TypeScript/21CustomCommandoCommand/types/models/eft/common/tables/IProfileTemplate.d.ts b/TypeScript/21CustomCommandoCommand/types/models/eft/common/tables/IProfileTemplate.d.ts index 20923bc..6ba9221 100644 --- a/TypeScript/21CustomCommandoCommand/types/models/eft/common/tables/IProfileTemplate.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -1,12 +1,12 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { Dialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; export interface IProfileTemplates { - "Standard": IProfileSides; + Standard: IProfileSides; "Left Behind": IProfileSides; "Prepare To Escape": IProfileSides; "Edge Of Darkness": IProfileSides; - "Unheard": IProfileSides; - "Tournament": IProfileSides; + Unheard: IProfileSides; + Tournament: IProfileSides; "SPT Developer": IProfileSides; "SPT Easy start": IProfileSides; "SPT Zero to hero": IProfileSides; diff --git a/TypeScript/21CustomCommandoCommand/types/models/eft/common/tables/ITrader.d.ts b/TypeScript/21CustomCommandoCommand/types/models/eft/common/tables/ITrader.d.ts index 14ab409..40cf004 100644 --- a/TypeScript/21CustomCommandoCommand/types/models/eft/common/tables/ITrader.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/models/eft/common/tables/ITrader.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; export interface ITrader { assort?: ITraderAssort; @@ -78,6 +79,8 @@ export interface IBarterScheme { _tpl: string; onlyFunctional?: boolean; sptQuestLocked?: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface ISuit { _id: string; diff --git a/TypeScript/21CustomCommandoCommand/types/models/eft/hideout/IQteData.d.ts b/TypeScript/21CustomCommandoCommand/types/models/eft/hideout/IQteData.d.ts index 7f507e1..fe6cce6 100644 --- a/TypeScript/21CustomCommandoCommand/types/models/eft/hideout/IQteData.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/models/eft/hideout/IQteData.d.ts @@ -1,14 +1,14 @@ import { Effect } from "@spt/models/eft/health/Effect"; import { BodyPart } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; import { QteActivityType } from "@spt/models/enums/hideout/QteActivityType"; import { QteEffectType } from "@spt/models/enums/hideout/QteEffectType"; import { QteResultType } from "@spt/models/enums/hideout/QteResultType"; import { QteRewardType } from "@spt/models/enums/hideout/QteRewardType"; import { QteType } from "@spt/models/enums/hideout/QteType"; import { RequirementType } from "@spt/models/enums/hideout/RequirementType"; -import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt/models/enums/SkillTypes"; -import { Traders } from "@spt/models/enums/Traders"; export interface IQteData { id: string; type: QteActivityType; diff --git a/TypeScript/21CustomCommandoCommand/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/21CustomCommandoCommand/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index f1123c1..5971372 100644 --- a/TypeScript/21CustomCommandoCommand/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -15,7 +15,5 @@ export interface Items { change: any[]; del: any[]; } -export interface Production { -} -export interface TraderRelations { -} +export type Production = {}; +export type TraderRelations = {}; diff --git a/TypeScript/21CustomCommandoCommand/types/models/eft/profile/ISptProfile.d.ts b/TypeScript/21CustomCommandoCommand/types/models/eft/profile/ISptProfile.d.ts index a8e742a..dd7aea6 100644 --- a/TypeScript/21CustomCommandoCommand/types/models/eft/profile/ISptProfile.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/models/eft/profile/ISptProfile.d.ts @@ -209,12 +209,9 @@ export interface Effects { LeftLeg: LeftLeg; RightLeg: RightLeg; } -export interface Head { -} -export interface Chest { -} -export interface Stomach { -} +export type Head = {}; +export type Chest = {}; +export type Stomach = {}; export interface LeftArm { Fracture?: number; } diff --git a/TypeScript/21CustomCommandoCommand/types/models/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/21CustomCommandoCommand/types/models/eft/ragfair/IRagfairOffer.d.ts index eeeb79d..f6c07fc 100644 --- a/TypeScript/21CustomCommandoCommand/types/models/eft/ragfair/IRagfairOffer.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/models/eft/ragfair/IRagfairOffer.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface IRagfairOffer { sellResult?: SellResult[]; @@ -28,6 +29,8 @@ export interface OfferRequirement { _tpl: string; count: number; onlyFunctional: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface IRagfairOfferUser { id: string; diff --git a/TypeScript/21CustomCommandoCommand/types/models/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/21CustomCommandoCommand/types/models/eft/ragfair/ISearchRequestData.d.ts index 8261c5b..c631de8 100644 --- a/TypeScript/21CustomCommandoCommand/types/models/eft/ragfair/ISearchRequestData.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/models/eft/ragfair/ISearchRequestData.d.ts @@ -29,5 +29,4 @@ export declare enum OfferOwnerType { TRADEROWNERTYPE = 1, PLAYEROWNERTYPE = 2 } -export interface BuildItems { -} +export type BuildItems = {}; diff --git a/TypeScript/21CustomCommandoCommand/types/models/enums/BaseClasses.d.ts b/TypeScript/21CustomCommandoCommand/types/models/enums/BaseClasses.d.ts index 65fc95e..32ebf7c 100644 --- a/TypeScript/21CustomCommandoCommand/types/models/enums/BaseClasses.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/models/enums/BaseClasses.d.ts @@ -107,6 +107,6 @@ export declare enum BaseClasses { RECEIVER = "55818a304bdc2db5418b457d", BARREL = "555ef6e44bdc2de9068b457e", CHARGING_HANDLE = "55818a6f4bdc2db9688b456b", - COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569 ", + COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569", HIDEOUT_AREA_CONTAINER = "63da6da4784a55176c018dba" } diff --git a/TypeScript/21CustomCommandoCommand/types/models/enums/DogtagExchangeSide.d.ts b/TypeScript/21CustomCommandoCommand/types/models/enums/DogtagExchangeSide.d.ts new file mode 100644 index 0000000..de3d4df --- /dev/null +++ b/TypeScript/21CustomCommandoCommand/types/models/enums/DogtagExchangeSide.d.ts @@ -0,0 +1,5 @@ +export declare enum DogtagExchangeSide { + USEC = "Usec", + BEAR = "Bear", + ANY = "Any" +} diff --git a/TypeScript/21CustomCommandoCommand/types/models/spt/server/ExhaustableArray.d.ts b/TypeScript/21CustomCommandoCommand/types/models/spt/server/ExhaustableArray.d.ts index c27f41f..50a6b68 100644 --- a/TypeScript/21CustomCommandoCommand/types/models/spt/server/ExhaustableArray.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/models/spt/server/ExhaustableArray.d.ts @@ -1,5 +1,5 @@ -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ExhaustableArray implements IExhaustableArray { private itemPool; private randomUtil; diff --git a/TypeScript/21CustomCommandoCommand/types/routers/EventOutputHolder.d.ts b/TypeScript/21CustomCommandoCommand/types/routers/EventOutputHolder.d.ts index ef20706..148461a 100644 --- a/TypeScript/21CustomCommandoCommand/types/routers/EventOutputHolder.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/routers/EventOutputHolder.d.ts @@ -3,8 +3,8 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IHideoutImprovement, Productive, TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; import { TraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class EventOutputHolder { protected profileHelper: ProfileHelper; protected timeUtil: TimeUtil; @@ -12,7 +12,7 @@ export declare class EventOutputHolder { /** * What has client been informed of this game session * Key = sessionId, then second key is prod id - */ + */ protected clientActiveSessionStorage: Record>; diff --git a/TypeScript/21CustomCommandoCommand/types/servers/HttpServer.d.ts b/TypeScript/21CustomCommandoCommand/types/servers/HttpServer.d.ts index b00fe68..0024ba3 100644 --- a/TypeScript/21CustomCommandoCommand/types/servers/HttpServer.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/servers/HttpServer.d.ts @@ -6,8 +6,8 @@ import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; -import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { WebSocketServer } from "@spt/servers/WebSocketServer"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { LocalisationService } from "@spt/services/LocalisationService"; export declare class HttpServer { protected logger: ILogger; diff --git a/TypeScript/21CustomCommandoCommand/types/servers/WebSocketServer.d.ts b/TypeScript/21CustomCommandoCommand/types/servers/WebSocketServer.d.ts index f4e07bb..6121824 100644 --- a/TypeScript/21CustomCommandoCommand/types/servers/WebSocketServer.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/servers/WebSocketServer.d.ts @@ -1,12 +1,12 @@ /// import http, { IncomingMessage } from "node:http"; -import { WebSocket, Server } from "ws"; import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { Server, WebSocket } from "ws"; export declare class WebSocketServer { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/21CustomCommandoCommand/types/servers/ws/SptWebSocketConnectionHandler.d.ts b/TypeScript/21CustomCommandoCommand/types/servers/ws/SptWebSocketConnectionHandler.d.ts index 98d0898..70fc96a 100644 --- a/TypeScript/21CustomCommandoCommand/types/servers/ws/SptWebSocketConnectionHandler.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/servers/ws/SptWebSocketConnectionHandler.d.ts @@ -1,7 +1,6 @@ /// /// import { IncomingMessage } from "http"; -import { WebSocket } from "ws"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; @@ -11,6 +10,7 @@ import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectio import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; +import { WebSocket } from "ws"; export declare class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler { protected logger: ILogger; protected profileHelper: ProfileHelper; diff --git a/TypeScript/21CustomCommandoCommand/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts b/TypeScript/21CustomCommandoCommand/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts index d5247ec..5556129 100644 --- a/TypeScript/21CustomCommandoCommand/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts @@ -1,6 +1,6 @@ -import { RawData, WebSocket } from "ws"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; +import { RawData, WebSocket } from "ws"; export declare class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler { protected logger: ILogger; constructor(logger: ILogger); diff --git a/TypeScript/21CustomCommandoCommand/types/services/FenceService.d.ts b/TypeScript/21CustomCommandoCommand/types/services/FenceService.d.ts index c156122..58dc076 100644 --- a/TypeScript/21CustomCommandoCommand/types/services/FenceService.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/services/FenceService.d.ts @@ -13,9 +13,9 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Handle actions surrounding Fence * e.g. generating or refreshing assorts / get next refresh time diff --git a/TypeScript/21CustomCommandoCommand/types/services/InsuranceService.d.ts b/TypeScript/21CustomCommandoCommand/types/services/InsuranceService.d.ts index 0000e66..f799102 100644 --- a/TypeScript/21CustomCommandoCommand/types/services/InsuranceService.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/services/InsuranceService.d.ts @@ -18,10 +18,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceService { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/21CustomCommandoCommand/types/services/LocalisationService.d.ts b/TypeScript/21CustomCommandoCommand/types/services/LocalisationService.d.ts index 42dfa4e..855c138 100644 --- a/TypeScript/21CustomCommandoCommand/types/services/LocalisationService.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/services/LocalisationService.d.ts @@ -1,8 +1,8 @@ -import { I18n } from "i18n"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { LocaleService } from "@spt/services/LocaleService"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { I18n } from "i18n"; /** * Handles translating server text into different langauges */ diff --git a/TypeScript/21CustomCommandoCommand/types/services/ProfileFixerService.d.ts b/TypeScript/21CustomCommandoCommand/types/services/ProfileFixerService.d.ts index 525b867..91e4780 100644 --- a/TypeScript/21CustomCommandoCommand/types/services/ProfileFixerService.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/services/ProfileFixerService.d.ts @@ -8,7 +8,7 @@ import { Bonus, HideoutSlot } from "@spt/models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea"; -import { ISptProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; +import { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; @@ -16,11 +16,11 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileFixerService { protected logger: ILogger; protected watermark: Watermark; @@ -73,6 +73,7 @@ export declare class ProfileFixerService { */ protected removeDanglingTaskConditionCounters(pmcProfile: IPmcData): void; protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullRagfairRatings(pmcProfile: IPmcData): void; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; /** diff --git a/TypeScript/21CustomCommandoCommand/types/services/RagfairOfferService.d.ts b/TypeScript/21CustomCommandoCommand/types/services/RagfairOfferService.d.ts index 6c13b1d..98dd179 100644 --- a/TypeScript/21CustomCommandoCommand/types/services/RagfairOfferService.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/services/RagfairOfferService.d.ts @@ -10,10 +10,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/21CustomCommandoCommand/types/services/mod/CustomItemService.d.ts b/TypeScript/21CustomCommandoCommand/types/services/mod/CustomItemService.d.ts index 1926bed..f112872 100644 --- a/TypeScript/21CustomCommandoCommand/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/services/mod/CustomItemService.d.ts @@ -4,8 +4,8 @@ import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetail import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/21CustomCommandoCommand/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/21CustomCommandoCommand/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts index 3c9d955..91c84d9 100644 --- a/TypeScript/21CustomCommandoCommand/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class DynamicRouterModService { private container; constructor(container: DependencyContainer); diff --git a/TypeScript/21CustomCommandoCommand/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/21CustomCommandoCommand/types/services/mod/staticRouter/StaticRouterModService.d.ts index f60432d..0c3d4d8 100644 --- a/TypeScript/21CustomCommandoCommand/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class StaticRouterModService { protected container: DependencyContainer; constructor(container: DependencyContainer); diff --git a/TypeScript/21CustomCommandoCommand/types/utils/JsonUtil.d.ts b/TypeScript/21CustomCommandoCommand/types/utils/JsonUtil.d.ts index b30822c..4419228 100644 --- a/TypeScript/21CustomCommandoCommand/types/utils/JsonUtil.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/utils/JsonUtil.d.ts @@ -1,7 +1,7 @@ -import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { HashUtil } from "@spt/utils/HashUtil"; import { VFS } from "@spt/utils/VFS"; +import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; export declare class JsonUtil { protected vfs: VFS; protected hashUtil: HashUtil; diff --git a/TypeScript/21CustomCommandoCommand/types/utils/RandomUtil.d.ts b/TypeScript/21CustomCommandoCommand/types/utils/RandomUtil.d.ts index 49f242d..0da184f 100644 --- a/TypeScript/21CustomCommandoCommand/types/utils/RandomUtil.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/utils/RandomUtil.d.ts @@ -1,6 +1,6 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects * based on the relative probability of each of its elements. diff --git a/TypeScript/21CustomCommandoCommand/types/utils/logging/AbstractWinstonLogger.d.ts b/TypeScript/21CustomCommandoCommand/types/utils/logging/AbstractWinstonLogger.d.ts index 7098f85..ef54434 100644 --- a/TypeScript/21CustomCommandoCommand/types/utils/logging/AbstractWinstonLogger.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/utils/logging/AbstractWinstonLogger.d.ts @@ -1,12 +1,12 @@ /// import fs from "node:fs"; -import winston from "winston"; import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; import { SptLogger } from "@spt/models/spt/logging/SptLogger"; import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; import { ILogger } from "@spt/models/spt/utils/ILogger"; +import winston from "winston"; export declare abstract class AbstractWinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected showDebugInConsole: boolean; diff --git a/TypeScript/22CustomAkiCommand/types/controllers/BotController.d.ts b/TypeScript/22CustomAkiCommand/types/controllers/BotController.d.ts index 6431fca..475f51b 100644 --- a/TypeScript/22CustomAkiCommand/types/controllers/BotController.d.ts +++ b/TypeScript/22CustomAkiCommand/types/controllers/BotController.d.ts @@ -20,8 +20,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/22CustomAkiCommand/types/controllers/BuildController.d.ts b/TypeScript/22CustomAkiCommand/types/controllers/BuildController.d.ts index ed8adf6..2cb9c59 100644 --- a/TypeScript/22CustomAkiCommand/types/controllers/BuildController.d.ts +++ b/TypeScript/22CustomAkiCommand/types/controllers/BuildController.d.ts @@ -9,8 +9,8 @@ import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BuildController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/22CustomAkiCommand/types/controllers/GameController.d.ts b/TypeScript/22CustomAkiCommand/types/controllers/GameController.d.ts index 533a81c..e219c04 100644 --- a/TypeScript/22CustomAkiCommand/types/controllers/GameController.d.ts +++ b/TypeScript/22CustomAkiCommand/types/controllers/GameController.d.ts @@ -34,10 +34,10 @@ import { ProfileActivityService } from "@spt/services/ProfileActivityService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GameController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/22CustomAkiCommand/types/controllers/HealthController.d.ts b/TypeScript/22CustomAkiCommand/types/controllers/HealthController.d.ts index 5482283..5a0a0a6 100644 --- a/TypeScript/22CustomAkiCommand/types/controllers/HealthController.d.ts +++ b/TypeScript/22CustomAkiCommand/types/controllers/HealthController.d.ts @@ -12,8 +12,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthController { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/22CustomAkiCommand/types/controllers/HideoutController.d.ts b/TypeScript/22CustomAkiCommand/types/controllers/HideoutController.d.ts index e9d1ed9..89a428c 100644 --- a/TypeScript/22CustomAkiCommand/types/controllers/HideoutController.d.ts +++ b/TypeScript/22CustomAkiCommand/types/controllers/HideoutController.d.ts @@ -35,11 +35,11 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; import { ProfileActivityService } from "@spt/services/ProfileActivityService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/22CustomAkiCommand/types/controllers/InraidController.d.ts b/TypeScript/22CustomAkiCommand/types/controllers/InraidController.d.ts index 87f419b..9f0c409 100644 --- a/TypeScript/22CustomAkiCommand/types/controllers/InraidController.d.ts +++ b/TypeScript/22CustomAkiCommand/types/controllers/InraidController.d.ts @@ -13,6 +13,7 @@ import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRe import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState"; import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig"; import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; @@ -31,7 +32,6 @@ import { PmcChatResponseService } from "@spt/services/PmcChatResponseService"; import { TraderServicesService } from "@spt/services/TraderServicesService"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; -import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; /** * Logic for handling In Raid callbacks */ diff --git a/TypeScript/22CustomAkiCommand/types/controllers/InsuranceController.d.ts b/TypeScript/22CustomAkiCommand/types/controllers/InsuranceController.d.ts index f921b83..543e915 100644 --- a/TypeScript/22CustomAkiCommand/types/controllers/InsuranceController.d.ts +++ b/TypeScript/22CustomAkiCommand/types/controllers/InsuranceController.d.ts @@ -21,11 +21,11 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PaymentService } from "@spt/services/PaymentService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceController { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/22CustomAkiCommand/types/controllers/InventoryController.d.ts b/TypeScript/22CustomAkiCommand/types/controllers/InventoryController.d.ts index 40bb084..c986ce8 100644 --- a/TypeScript/22CustomAkiCommand/types/controllers/InventoryController.d.ts +++ b/TypeScript/22CustomAkiCommand/types/controllers/InventoryController.d.ts @@ -37,10 +37,10 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MapMarkerService } from "@spt/services/MapMarkerService"; import { PlayerService } from "@spt/services/PlayerService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/22CustomAkiCommand/types/controllers/LocationController.d.ts b/TypeScript/22CustomAkiCommand/types/controllers/LocationController.d.ts index 727a8c8..a541b9c 100644 --- a/TypeScript/22CustomAkiCommand/types/controllers/LocationController.d.ts +++ b/TypeScript/22CustomAkiCommand/types/controllers/LocationController.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class LocationController { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; diff --git a/TypeScript/22CustomAkiCommand/types/controllers/ProfileController.d.ts b/TypeScript/22CustomAkiCommand/types/controllers/ProfileController.d.ts index e8dae73..7e6d35c 100644 --- a/TypeScript/22CustomAkiCommand/types/controllers/ProfileController.d.ts +++ b/TypeScript/22CustomAkiCommand/types/controllers/ProfileController.d.ts @@ -26,9 +26,9 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/22CustomAkiCommand/types/controllers/QuestController.d.ts b/TypeScript/22CustomAkiCommand/types/controllers/QuestController.d.ts index 3cdce00..6a5b415 100644 --- a/TypeScript/22CustomAkiCommand/types/controllers/QuestController.d.ts +++ b/TypeScript/22CustomAkiCommand/types/controllers/QuestController.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/22CustomAkiCommand/types/controllers/RepeatableQuestController.d.ts b/TypeScript/22CustomAkiCommand/types/controllers/RepeatableQuestController.d.ts index 74f39eb..016f8c6 100644 --- a/TypeScript/22CustomAkiCommand/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/22CustomAkiCommand/types/controllers/RepeatableQuestController.d.ts @@ -18,11 +18,11 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/22CustomAkiCommand/types/controllers/TradeController.d.ts b/TypeScript/22CustomAkiCommand/types/controllers/TradeController.d.ts index bc72e92..842a97b 100644 --- a/TypeScript/22CustomAkiCommand/types/controllers/TradeController.d.ts +++ b/TypeScript/22CustomAkiCommand/types/controllers/TradeController.d.ts @@ -1,5 +1,6 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper"; import { TradeHelper } from "@spt/helpers/TradeHelper"; import { TraderHelper } from "@spt/helpers/TraderHelper"; import { IPmcData } from "@spt/models/eft/common/IPmcData"; @@ -35,6 +36,7 @@ export declare class TradeController { protected hashUtil: HashUtil; protected itemHelper: ItemHelper; protected profileHelper: ProfileHelper; + protected ragfairOfferHelper: RagfairOfferHelper; protected traderHelper: TraderHelper; protected ragfairServer: RagfairServer; protected httpResponse: HttpResponseUtil; @@ -44,7 +46,7 @@ export declare class TradeController { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairOfferHelper: RagfairOfferHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); /** Handle TradingConfirm event */ confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; /** Handle RagFairBuyOffer event */ @@ -67,10 +69,17 @@ export declare class TradeController { * @param output Output to send back to client */ protected buyPmcItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void; + /** + * Is the provided offerid and ownerid from a player made offer + * @param offerId Id of the offer + * @param offerOwnerId Owner id + * @returns true if offer was made by a player + */ + protected isPlayerOffer(offerId: string, offerOwnerId: string): boolean; /** * Does Player have necessary trader loyalty to purchase flea offer * @param sellerIsTrader is seller trader - * @param fleaOffer FLea offer being bought + * @param fleaOffer Flea offer being bought * @param pmcData Player profile * @returns True if player can buy offer */ diff --git a/TypeScript/22CustomAkiCommand/types/controllers/TraderController.d.ts b/TypeScript/22CustomAkiCommand/types/controllers/TraderController.d.ts index 7fc6d78..3592fc6 100644 --- a/TypeScript/22CustomAkiCommand/types/controllers/TraderController.d.ts +++ b/TypeScript/22CustomAkiCommand/types/controllers/TraderController.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/22CustomAkiCommand/types/generators/BotEquipmentModGenerator.d.ts b/TypeScript/22CustomAkiCommand/types/generators/BotEquipmentModGenerator.d.ts index 419120f..3952293 100644 --- a/TypeScript/22CustomAkiCommand/types/generators/BotEquipmentModGenerator.d.ts +++ b/TypeScript/22CustomAkiCommand/types/generators/BotEquipmentModGenerator.d.ts @@ -25,9 +25,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotEquipmentModGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -65,7 +65,7 @@ export declare class BotEquipmentModGenerator { * @param settings Bot equipment generation settings * @param modSlot Armor slot being filtered * @param existingPlateTplPool Plates tpls to choose from - * @param armorItem + * @param armorItem The armor items db template * @returns Array of plate tpls to choose from */ protected filterPlateModsForSlotByLevel(settings: IGenerateEquipmentProperties, modSlot: string, existingPlateTplPool: string[], armorItem: ITemplateItem): IFilterPlateModsForSlotByLevelResult; diff --git a/TypeScript/22CustomAkiCommand/types/generators/BotGenerator.d.ts b/TypeScript/22CustomAkiCommand/types/generators/BotGenerator.d.ts index 8ab4371..ebb8a59 100644 --- a/TypeScript/22CustomAkiCommand/types/generators/BotGenerator.d.ts +++ b/TypeScript/22CustomAkiCommand/types/generators/BotGenerator.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/22CustomAkiCommand/types/generators/BotLevelGenerator.d.ts b/TypeScript/22CustomAkiCommand/types/generators/BotLevelGenerator.d.ts index dee61e2..a8a8895 100644 --- a/TypeScript/22CustomAkiCommand/types/generators/BotLevelGenerator.d.ts +++ b/TypeScript/22CustomAkiCommand/types/generators/BotLevelGenerator.d.ts @@ -4,12 +4,14 @@ import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; +import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class BotLevelGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; protected databaseService: DatabaseService; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService); + protected mathUtil: MathUtil; + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, mathUtil: MathUtil); /** * Return a randomised bot level and exp value * @param levelDetails Min and max of level for bot @@ -18,6 +20,7 @@ export declare class BotLevelGenerator { * @returns IRandomisedBotLevelResult object */ generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult; + protected chooseBotLevel(min: number, max: number, shift: number, number: number): number; /** * Get the highest level a bot can be relative to the players level, but no further than the max size from globals.exp_table * @param botGenerationDetails Details to help generate a bot diff --git a/TypeScript/22CustomAkiCommand/types/generators/BotLootGenerator.d.ts b/TypeScript/22CustomAkiCommand/types/generators/BotLootGenerator.d.ts index fee56ce..c0583c6 100644 --- a/TypeScript/22CustomAkiCommand/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/22CustomAkiCommand/types/generators/BotLootGenerator.d.ts @@ -18,9 +18,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/22CustomAkiCommand/types/generators/BotWeaponGenerator.d.ts b/TypeScript/22CustomAkiCommand/types/generators/BotWeaponGenerator.d.ts index 5559bfa..8e03b35 100644 --- a/TypeScript/22CustomAkiCommand/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/22CustomAkiCommand/types/generators/BotWeaponGenerator.d.ts @@ -18,9 +18,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RepairService } from "@spt/services/RepairService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotWeaponGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/22CustomAkiCommand/types/generators/LocationGenerator.d.ts b/TypeScript/22CustomAkiCommand/types/generators/LocationGenerator.d.ts index 222b0ab..9a2b0c4 100644 --- a/TypeScript/22CustomAkiCommand/types/generators/LocationGenerator.d.ts +++ b/TypeScript/22CustomAkiCommand/types/generators/LocationGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export interface IContainerItem { items: Item[]; width: number; diff --git a/TypeScript/22CustomAkiCommand/types/generators/PlayerScavGenerator.d.ts b/TypeScript/22CustomAkiCommand/types/generators/PlayerScavGenerator.d.ts index 2414150..e317bf6 100644 --- a/TypeScript/22CustomAkiCommand/types/generators/PlayerScavGenerator.d.ts +++ b/TypeScript/22CustomAkiCommand/types/generators/PlayerScavGenerator.d.ts @@ -14,9 +14,9 @@ import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class PlayerScavGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/22CustomAkiCommand/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/22CustomAkiCommand/types/generators/RagfairOfferGenerator.d.ts index 9435390..ca09729 100644 --- a/TypeScript/22CustomAkiCommand/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/22CustomAkiCommand/types/generators/RagfairOfferGenerator.d.ts @@ -19,10 +19,10 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/22CustomAkiCommand/types/generators/RepeatableQuestGenerator.d.ts b/TypeScript/22CustomAkiCommand/types/generators/RepeatableQuestGenerator.d.ts index 77c4e79..339f322 100644 --- a/TypeScript/22CustomAkiCommand/types/generators/RepeatableQuestGenerator.d.ts +++ b/TypeScript/22CustomAkiCommand/types/generators/RepeatableQuestGenerator.d.ts @@ -11,10 +11,10 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/22CustomAkiCommand/types/generators/RepeatableQuestRewardGenerator.d.ts b/TypeScript/22CustomAkiCommand/types/generators/RepeatableQuestRewardGenerator.d.ts index 1e09994..713a394 100644 --- a/TypeScript/22CustomAkiCommand/types/generators/RepeatableQuestRewardGenerator.d.ts +++ b/TypeScript/22CustomAkiCommand/types/generators/RepeatableQuestRewardGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestRewardGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/22CustomAkiCommand/types/helpers/BotDifficultyHelper.d.ts b/TypeScript/22CustomAkiCommand/types/helpers/BotDifficultyHelper.d.ts index 63572a5..2348bd3 100644 --- a/TypeScript/22CustomAkiCommand/types/helpers/BotDifficultyHelper.d.ts +++ b/TypeScript/22CustomAkiCommand/types/helpers/BotDifficultyHelper.d.ts @@ -5,8 +5,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotDifficultyHelper { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/22CustomAkiCommand/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/22CustomAkiCommand/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index c51bf7e..c38f0a0 100644 --- a/TypeScript/22CustomAkiCommand/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/22CustomAkiCommand/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GiveSptCommand implements ISptCommand { protected logger: ILogger; protected itemHelper: ItemHelper; diff --git a/TypeScript/22CustomAkiCommand/types/helpers/HealthHelper.d.ts b/TypeScript/22CustomAkiCommand/types/helpers/HealthHelper.d.ts index 650f633..a164285 100644 --- a/TypeScript/22CustomAkiCommand/types/helpers/HealthHelper.d.ts +++ b/TypeScript/22CustomAkiCommand/types/helpers/HealthHelper.d.ts @@ -5,8 +5,8 @@ import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/22CustomAkiCommand/types/helpers/HideoutHelper.d.ts b/TypeScript/22CustomAkiCommand/types/helpers/HideoutHelper.d.ts index c4aaa4c..df0376b 100644 --- a/TypeScript/22CustomAkiCommand/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/22CustomAkiCommand/types/helpers/HideoutHelper.d.ts @@ -18,10 +18,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/22CustomAkiCommand/types/helpers/InRaidHelper.d.ts b/TypeScript/22CustomAkiCommand/types/helpers/InRaidHelper.d.ts index 449be9f..987c9ec 100644 --- a/TypeScript/22CustomAkiCommand/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/22CustomAkiCommand/types/helpers/InRaidHelper.d.ts @@ -15,9 +15,9 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InRaidHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/22CustomAkiCommand/types/helpers/InventoryHelper.d.ts b/TypeScript/22CustomAkiCommand/types/helpers/InventoryHelper.d.ts index f0ff69a..92bb49c 100644 --- a/TypeScript/22CustomAkiCommand/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/22CustomAkiCommand/types/helpers/InventoryHelper.d.ts @@ -23,9 +23,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/22CustomAkiCommand/types/helpers/ItemHelper.d.ts b/TypeScript/22CustomAkiCommand/types/helpers/ItemHelper.d.ts index da5dd11..c304cee 100644 --- a/TypeScript/22CustomAkiCommand/types/helpers/ItemHelper.d.ts +++ b/TypeScript/22CustomAkiCommand/types/helpers/ItemHelper.d.ts @@ -11,13 +11,13 @@ import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { CompareUtil } from "@spt/utils/CompareUtil"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ItemHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/22CustomAkiCommand/types/helpers/ProfileHelper.d.ts b/TypeScript/22CustomAkiCommand/types/helpers/ProfileHelper.d.ts index 0671179..cdab870 100644 --- a/TypeScript/22CustomAkiCommand/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/22CustomAkiCommand/types/helpers/ProfileHelper.d.ts @@ -11,10 +11,10 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/22CustomAkiCommand/types/helpers/QuestHelper.d.ts b/TypeScript/22CustomAkiCommand/types/helpers/QuestHelper.d.ts index 2b84b8f..2d5730d 100644 --- a/TypeScript/22CustomAkiCommand/types/helpers/QuestHelper.d.ts +++ b/TypeScript/22CustomAkiCommand/types/helpers/QuestHelper.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/22CustomAkiCommand/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/22CustomAkiCommand/types/helpers/RagfairOfferHelper.d.ts index b526554..2386316 100644 --- a/TypeScript/22CustomAkiCommand/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/22CustomAkiCommand/types/helpers/RagfairOfferHelper.d.ts @@ -151,7 +151,7 @@ export declare class RagfairOfferHelper { * @param boughtAmount Amount item was purchased for * @returns IItemEventRouterResponse */ - protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; + completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; /** * Get a localised message for when players offer has sold on flea * @param itemTpl Item sold diff --git a/TypeScript/22CustomAkiCommand/types/helpers/RagfairServerHelper.d.ts b/TypeScript/22CustomAkiCommand/types/helpers/RagfairServerHelper.d.ts index 927caf5..3e1fea9 100644 --- a/TypeScript/22CustomAkiCommand/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/22CustomAkiCommand/types/helpers/RagfairServerHelper.d.ts @@ -12,9 +12,9 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Helper class for common ragfair server actions */ diff --git a/TypeScript/22CustomAkiCommand/types/helpers/RepairHelper.d.ts b/TypeScript/22CustomAkiCommand/types/helpers/RepairHelper.d.ts index 99a21da..63c78c9 100644 --- a/TypeScript/22CustomAkiCommand/types/helpers/RepairHelper.d.ts +++ b/TypeScript/22CustomAkiCommand/types/helpers/RepairHelper.d.ts @@ -4,8 +4,8 @@ import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/22CustomAkiCommand/types/helpers/RepeatableQuestHelper.d.ts b/TypeScript/22CustomAkiCommand/types/helpers/RepeatableQuestHelper.d.ts index d92657e..8c65f40 100644 --- a/TypeScript/22CustomAkiCommand/types/helpers/RepeatableQuestHelper.d.ts +++ b/TypeScript/22CustomAkiCommand/types/helpers/RepeatableQuestHelper.d.ts @@ -1,8 +1,8 @@ import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestHelper { protected mathUtil: MathUtil; protected configServer: ConfigServer; diff --git a/TypeScript/22CustomAkiCommand/types/helpers/TradeHelper.d.ts b/TypeScript/22CustomAkiCommand/types/helpers/TradeHelper.d.ts index f994fda..6e6f3a2 100644 --- a/TypeScript/22CustomAkiCommand/types/helpers/TradeHelper.d.ts +++ b/TypeScript/22CustomAkiCommand/types/helpers/TradeHelper.d.ts @@ -17,8 +17,8 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TradeHelper { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/22CustomAkiCommand/types/helpers/TraderAssortHelper.d.ts b/TypeScript/22CustomAkiCommand/types/helpers/TraderAssortHelper.d.ts index 8f8f802..f1ecd3b 100644 --- a/TypeScript/22CustomAkiCommand/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/22CustomAkiCommand/types/helpers/TraderAssortHelper.d.ts @@ -14,9 +14,9 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; diff --git a/TypeScript/22CustomAkiCommand/types/loaders/BundleLoader.d.ts b/TypeScript/22CustomAkiCommand/types/loaders/BundleLoader.d.ts index e270988..8c0ed4d 100644 --- a/TypeScript/22CustomAkiCommand/types/loaders/BundleLoader.d.ts +++ b/TypeScript/22CustomAkiCommand/types/loaders/BundleLoader.d.ts @@ -1,8 +1,8 @@ import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BundleInfo { modpath: string; filename: string; diff --git a/TypeScript/22CustomAkiCommand/types/loaders/PostDBModLoader.d.ts b/TypeScript/22CustomAkiCommand/types/loaders/PostDBModLoader.d.ts index b0c4bf4..a8bb6a9 100644 --- a/TypeScript/22CustomAkiCommand/types/loaders/PostDBModLoader.d.ts +++ b/TypeScript/22CustomAkiCommand/types/loaders/PostDBModLoader.d.ts @@ -1,10 +1,10 @@ -import { DependencyContainer } from "tsyringe"; import { OnLoad } from "@spt/di/OnLoad"; import { BundleLoader } from "@spt/loaders/BundleLoader"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostDBModLoader implements OnLoad { protected logger: ILogger; protected bundleLoader: BundleLoader; diff --git a/TypeScript/22CustomAkiCommand/types/loaders/PostSptModLoader.d.ts b/TypeScript/22CustomAkiCommand/types/loaders/PostSptModLoader.d.ts index fb54579..2603497 100644 --- a/TypeScript/22CustomAkiCommand/types/loaders/PostSptModLoader.d.ts +++ b/TypeScript/22CustomAkiCommand/types/loaders/PostSptModLoader.d.ts @@ -1,9 +1,9 @@ -import { DependencyContainer } from "tsyringe"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { IModLoader } from "@spt/models/spt/mod/IModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostSptModLoader implements IModLoader { protected logger: ILogger; protected preSptModLoader: PreSptModLoader; diff --git a/TypeScript/22CustomAkiCommand/types/loaders/PreSptModLoader.d.ts b/TypeScript/22CustomAkiCommand/types/loaders/PreSptModLoader.d.ts index bc846c8..8814525 100644 --- a/TypeScript/22CustomAkiCommand/types/loaders/PreSptModLoader.d.ts +++ b/TypeScript/22CustomAkiCommand/types/loaders/PreSptModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { ModDetails } from "@spt/models/eft/profile/ISptProfile"; @@ -11,6 +10,7 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { ModCompilerService } from "@spt/services/ModCompilerService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { DependencyContainer } from "tsyringe"; export declare class PreSptModLoader implements IModLoader { protected logger: ILogger; protected vfs: VFS; diff --git a/TypeScript/22CustomAkiCommand/types/models/eft/common/IEmptyRequestData.d.ts b/TypeScript/22CustomAkiCommand/types/models/eft/common/IEmptyRequestData.d.ts index 284d16e..52a7b12 100644 --- a/TypeScript/22CustomAkiCommand/types/models/eft/common/IEmptyRequestData.d.ts +++ b/TypeScript/22CustomAkiCommand/types/models/eft/common/IEmptyRequestData.d.ts @@ -1,2 +1 @@ -export interface IEmptyRequestData { -} +export type IEmptyRequestData = {}; diff --git a/TypeScript/22CustomAkiCommand/types/models/eft/common/tables/IBotBase.d.ts b/TypeScript/22CustomAkiCommand/types/models/eft/common/tables/IBotBase.d.ts index a7fe1ca..be37845 100644 --- a/TypeScript/22CustomAkiCommand/types/models/eft/common/tables/IBotBase.d.ts +++ b/TypeScript/22CustomAkiCommand/types/models/eft/common/tables/IBotBase.d.ts @@ -373,8 +373,7 @@ export interface LastCompleted { export interface Notes { Notes: Note[]; } -export interface CarExtractCounts { -} +export type CarExtractCounts = {}; export declare enum SurvivorClass { UNKNOWN = 0, NEUTRALIZER = 1, diff --git a/TypeScript/22CustomAkiCommand/types/models/eft/common/tables/ILocationsBase.d.ts b/TypeScript/22CustomAkiCommand/types/models/eft/common/tables/ILocationsBase.d.ts index 2c96af3..16bca24 100644 --- a/TypeScript/22CustomAkiCommand/types/models/eft/common/tables/ILocationsBase.d.ts +++ b/TypeScript/22CustomAkiCommand/types/models/eft/common/tables/ILocationsBase.d.ts @@ -2,8 +2,7 @@ export interface ILocationsBase { locations: Locations; paths: Path[]; } -export interface Locations { -} +export type Locations = {}; export interface Path { Source: string; Destination: string; diff --git a/TypeScript/22CustomAkiCommand/types/models/eft/common/tables/IProfileTemplate.d.ts b/TypeScript/22CustomAkiCommand/types/models/eft/common/tables/IProfileTemplate.d.ts index 20923bc..6ba9221 100644 --- a/TypeScript/22CustomAkiCommand/types/models/eft/common/tables/IProfileTemplate.d.ts +++ b/TypeScript/22CustomAkiCommand/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -1,12 +1,12 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { Dialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; export interface IProfileTemplates { - "Standard": IProfileSides; + Standard: IProfileSides; "Left Behind": IProfileSides; "Prepare To Escape": IProfileSides; "Edge Of Darkness": IProfileSides; - "Unheard": IProfileSides; - "Tournament": IProfileSides; + Unheard: IProfileSides; + Tournament: IProfileSides; "SPT Developer": IProfileSides; "SPT Easy start": IProfileSides; "SPT Zero to hero": IProfileSides; diff --git a/TypeScript/22CustomAkiCommand/types/models/eft/common/tables/ITrader.d.ts b/TypeScript/22CustomAkiCommand/types/models/eft/common/tables/ITrader.d.ts index 14ab409..40cf004 100644 --- a/TypeScript/22CustomAkiCommand/types/models/eft/common/tables/ITrader.d.ts +++ b/TypeScript/22CustomAkiCommand/types/models/eft/common/tables/ITrader.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; export interface ITrader { assort?: ITraderAssort; @@ -78,6 +79,8 @@ export interface IBarterScheme { _tpl: string; onlyFunctional?: boolean; sptQuestLocked?: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface ISuit { _id: string; diff --git a/TypeScript/22CustomAkiCommand/types/models/eft/hideout/IQteData.d.ts b/TypeScript/22CustomAkiCommand/types/models/eft/hideout/IQteData.d.ts index 7f507e1..fe6cce6 100644 --- a/TypeScript/22CustomAkiCommand/types/models/eft/hideout/IQteData.d.ts +++ b/TypeScript/22CustomAkiCommand/types/models/eft/hideout/IQteData.d.ts @@ -1,14 +1,14 @@ import { Effect } from "@spt/models/eft/health/Effect"; import { BodyPart } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; import { QteActivityType } from "@spt/models/enums/hideout/QteActivityType"; import { QteEffectType } from "@spt/models/enums/hideout/QteEffectType"; import { QteResultType } from "@spt/models/enums/hideout/QteResultType"; import { QteRewardType } from "@spt/models/enums/hideout/QteRewardType"; import { QteType } from "@spt/models/enums/hideout/QteType"; import { RequirementType } from "@spt/models/enums/hideout/RequirementType"; -import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt/models/enums/SkillTypes"; -import { Traders } from "@spt/models/enums/Traders"; export interface IQteData { id: string; type: QteActivityType; diff --git a/TypeScript/22CustomAkiCommand/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/22CustomAkiCommand/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index f1123c1..5971372 100644 --- a/TypeScript/22CustomAkiCommand/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/TypeScript/22CustomAkiCommand/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -15,7 +15,5 @@ export interface Items { change: any[]; del: any[]; } -export interface Production { -} -export interface TraderRelations { -} +export type Production = {}; +export type TraderRelations = {}; diff --git a/TypeScript/22CustomAkiCommand/types/models/eft/profile/ISptProfile.d.ts b/TypeScript/22CustomAkiCommand/types/models/eft/profile/ISptProfile.d.ts index a8e742a..dd7aea6 100644 --- a/TypeScript/22CustomAkiCommand/types/models/eft/profile/ISptProfile.d.ts +++ b/TypeScript/22CustomAkiCommand/types/models/eft/profile/ISptProfile.d.ts @@ -209,12 +209,9 @@ export interface Effects { LeftLeg: LeftLeg; RightLeg: RightLeg; } -export interface Head { -} -export interface Chest { -} -export interface Stomach { -} +export type Head = {}; +export type Chest = {}; +export type Stomach = {}; export interface LeftArm { Fracture?: number; } diff --git a/TypeScript/22CustomAkiCommand/types/models/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/22CustomAkiCommand/types/models/eft/ragfair/IRagfairOffer.d.ts index eeeb79d..f6c07fc 100644 --- a/TypeScript/22CustomAkiCommand/types/models/eft/ragfair/IRagfairOffer.d.ts +++ b/TypeScript/22CustomAkiCommand/types/models/eft/ragfair/IRagfairOffer.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface IRagfairOffer { sellResult?: SellResult[]; @@ -28,6 +29,8 @@ export interface OfferRequirement { _tpl: string; count: number; onlyFunctional: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface IRagfairOfferUser { id: string; diff --git a/TypeScript/22CustomAkiCommand/types/models/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/22CustomAkiCommand/types/models/eft/ragfair/ISearchRequestData.d.ts index 8261c5b..c631de8 100644 --- a/TypeScript/22CustomAkiCommand/types/models/eft/ragfair/ISearchRequestData.d.ts +++ b/TypeScript/22CustomAkiCommand/types/models/eft/ragfair/ISearchRequestData.d.ts @@ -29,5 +29,4 @@ export declare enum OfferOwnerType { TRADEROWNERTYPE = 1, PLAYEROWNERTYPE = 2 } -export interface BuildItems { -} +export type BuildItems = {}; diff --git a/TypeScript/22CustomAkiCommand/types/models/enums/BaseClasses.d.ts b/TypeScript/22CustomAkiCommand/types/models/enums/BaseClasses.d.ts index 65fc95e..32ebf7c 100644 --- a/TypeScript/22CustomAkiCommand/types/models/enums/BaseClasses.d.ts +++ b/TypeScript/22CustomAkiCommand/types/models/enums/BaseClasses.d.ts @@ -107,6 +107,6 @@ export declare enum BaseClasses { RECEIVER = "55818a304bdc2db5418b457d", BARREL = "555ef6e44bdc2de9068b457e", CHARGING_HANDLE = "55818a6f4bdc2db9688b456b", - COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569 ", + COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569", HIDEOUT_AREA_CONTAINER = "63da6da4784a55176c018dba" } diff --git a/TypeScript/22CustomAkiCommand/types/models/enums/DogtagExchangeSide.d.ts b/TypeScript/22CustomAkiCommand/types/models/enums/DogtagExchangeSide.d.ts new file mode 100644 index 0000000..de3d4df --- /dev/null +++ b/TypeScript/22CustomAkiCommand/types/models/enums/DogtagExchangeSide.d.ts @@ -0,0 +1,5 @@ +export declare enum DogtagExchangeSide { + USEC = "Usec", + BEAR = "Bear", + ANY = "Any" +} diff --git a/TypeScript/22CustomAkiCommand/types/models/spt/server/ExhaustableArray.d.ts b/TypeScript/22CustomAkiCommand/types/models/spt/server/ExhaustableArray.d.ts index c27f41f..50a6b68 100644 --- a/TypeScript/22CustomAkiCommand/types/models/spt/server/ExhaustableArray.d.ts +++ b/TypeScript/22CustomAkiCommand/types/models/spt/server/ExhaustableArray.d.ts @@ -1,5 +1,5 @@ -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ExhaustableArray implements IExhaustableArray { private itemPool; private randomUtil; diff --git a/TypeScript/22CustomAkiCommand/types/routers/EventOutputHolder.d.ts b/TypeScript/22CustomAkiCommand/types/routers/EventOutputHolder.d.ts index ef20706..148461a 100644 --- a/TypeScript/22CustomAkiCommand/types/routers/EventOutputHolder.d.ts +++ b/TypeScript/22CustomAkiCommand/types/routers/EventOutputHolder.d.ts @@ -3,8 +3,8 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IHideoutImprovement, Productive, TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; import { TraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class EventOutputHolder { protected profileHelper: ProfileHelper; protected timeUtil: TimeUtil; @@ -12,7 +12,7 @@ export declare class EventOutputHolder { /** * What has client been informed of this game session * Key = sessionId, then second key is prod id - */ + */ protected clientActiveSessionStorage: Record>; diff --git a/TypeScript/22CustomAkiCommand/types/servers/HttpServer.d.ts b/TypeScript/22CustomAkiCommand/types/servers/HttpServer.d.ts index b00fe68..0024ba3 100644 --- a/TypeScript/22CustomAkiCommand/types/servers/HttpServer.d.ts +++ b/TypeScript/22CustomAkiCommand/types/servers/HttpServer.d.ts @@ -6,8 +6,8 @@ import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; -import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { WebSocketServer } from "@spt/servers/WebSocketServer"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { LocalisationService } from "@spt/services/LocalisationService"; export declare class HttpServer { protected logger: ILogger; diff --git a/TypeScript/22CustomAkiCommand/types/servers/WebSocketServer.d.ts b/TypeScript/22CustomAkiCommand/types/servers/WebSocketServer.d.ts index f4e07bb..6121824 100644 --- a/TypeScript/22CustomAkiCommand/types/servers/WebSocketServer.d.ts +++ b/TypeScript/22CustomAkiCommand/types/servers/WebSocketServer.d.ts @@ -1,12 +1,12 @@ /// import http, { IncomingMessage } from "node:http"; -import { WebSocket, Server } from "ws"; import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { Server, WebSocket } from "ws"; export declare class WebSocketServer { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/22CustomAkiCommand/types/servers/ws/SptWebSocketConnectionHandler.d.ts b/TypeScript/22CustomAkiCommand/types/servers/ws/SptWebSocketConnectionHandler.d.ts index 98d0898..70fc96a 100644 --- a/TypeScript/22CustomAkiCommand/types/servers/ws/SptWebSocketConnectionHandler.d.ts +++ b/TypeScript/22CustomAkiCommand/types/servers/ws/SptWebSocketConnectionHandler.d.ts @@ -1,7 +1,6 @@ /// /// import { IncomingMessage } from "http"; -import { WebSocket } from "ws"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; @@ -11,6 +10,7 @@ import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectio import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; +import { WebSocket } from "ws"; export declare class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler { protected logger: ILogger; protected profileHelper: ProfileHelper; diff --git a/TypeScript/22CustomAkiCommand/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts b/TypeScript/22CustomAkiCommand/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts index d5247ec..5556129 100644 --- a/TypeScript/22CustomAkiCommand/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts +++ b/TypeScript/22CustomAkiCommand/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts @@ -1,6 +1,6 @@ -import { RawData, WebSocket } from "ws"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; +import { RawData, WebSocket } from "ws"; export declare class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler { protected logger: ILogger; constructor(logger: ILogger); diff --git a/TypeScript/22CustomAkiCommand/types/services/FenceService.d.ts b/TypeScript/22CustomAkiCommand/types/services/FenceService.d.ts index c156122..58dc076 100644 --- a/TypeScript/22CustomAkiCommand/types/services/FenceService.d.ts +++ b/TypeScript/22CustomAkiCommand/types/services/FenceService.d.ts @@ -13,9 +13,9 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Handle actions surrounding Fence * e.g. generating or refreshing assorts / get next refresh time diff --git a/TypeScript/22CustomAkiCommand/types/services/InsuranceService.d.ts b/TypeScript/22CustomAkiCommand/types/services/InsuranceService.d.ts index 0000e66..f799102 100644 --- a/TypeScript/22CustomAkiCommand/types/services/InsuranceService.d.ts +++ b/TypeScript/22CustomAkiCommand/types/services/InsuranceService.d.ts @@ -18,10 +18,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceService { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/22CustomAkiCommand/types/services/LocalisationService.d.ts b/TypeScript/22CustomAkiCommand/types/services/LocalisationService.d.ts index 42dfa4e..855c138 100644 --- a/TypeScript/22CustomAkiCommand/types/services/LocalisationService.d.ts +++ b/TypeScript/22CustomAkiCommand/types/services/LocalisationService.d.ts @@ -1,8 +1,8 @@ -import { I18n } from "i18n"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { LocaleService } from "@spt/services/LocaleService"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { I18n } from "i18n"; /** * Handles translating server text into different langauges */ diff --git a/TypeScript/22CustomAkiCommand/types/services/ProfileFixerService.d.ts b/TypeScript/22CustomAkiCommand/types/services/ProfileFixerService.d.ts index 525b867..91e4780 100644 --- a/TypeScript/22CustomAkiCommand/types/services/ProfileFixerService.d.ts +++ b/TypeScript/22CustomAkiCommand/types/services/ProfileFixerService.d.ts @@ -8,7 +8,7 @@ import { Bonus, HideoutSlot } from "@spt/models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea"; -import { ISptProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; +import { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; @@ -16,11 +16,11 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileFixerService { protected logger: ILogger; protected watermark: Watermark; @@ -73,6 +73,7 @@ export declare class ProfileFixerService { */ protected removeDanglingTaskConditionCounters(pmcProfile: IPmcData): void; protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullRagfairRatings(pmcProfile: IPmcData): void; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; /** diff --git a/TypeScript/22CustomAkiCommand/types/services/RagfairOfferService.d.ts b/TypeScript/22CustomAkiCommand/types/services/RagfairOfferService.d.ts index 6c13b1d..98dd179 100644 --- a/TypeScript/22CustomAkiCommand/types/services/RagfairOfferService.d.ts +++ b/TypeScript/22CustomAkiCommand/types/services/RagfairOfferService.d.ts @@ -10,10 +10,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/22CustomAkiCommand/types/services/mod/CustomItemService.d.ts b/TypeScript/22CustomAkiCommand/types/services/mod/CustomItemService.d.ts index 1926bed..f112872 100644 --- a/TypeScript/22CustomAkiCommand/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/22CustomAkiCommand/types/services/mod/CustomItemService.d.ts @@ -4,8 +4,8 @@ import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetail import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/22CustomAkiCommand/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/22CustomAkiCommand/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts index 3c9d955..91c84d9 100644 --- a/TypeScript/22CustomAkiCommand/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts +++ b/TypeScript/22CustomAkiCommand/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class DynamicRouterModService { private container; constructor(container: DependencyContainer); diff --git a/TypeScript/22CustomAkiCommand/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/22CustomAkiCommand/types/services/mod/staticRouter/StaticRouterModService.d.ts index f60432d..0c3d4d8 100644 --- a/TypeScript/22CustomAkiCommand/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/TypeScript/22CustomAkiCommand/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class StaticRouterModService { protected container: DependencyContainer; constructor(container: DependencyContainer); diff --git a/TypeScript/22CustomAkiCommand/types/utils/JsonUtil.d.ts b/TypeScript/22CustomAkiCommand/types/utils/JsonUtil.d.ts index b30822c..4419228 100644 --- a/TypeScript/22CustomAkiCommand/types/utils/JsonUtil.d.ts +++ b/TypeScript/22CustomAkiCommand/types/utils/JsonUtil.d.ts @@ -1,7 +1,7 @@ -import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { HashUtil } from "@spt/utils/HashUtil"; import { VFS } from "@spt/utils/VFS"; +import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; export declare class JsonUtil { protected vfs: VFS; protected hashUtil: HashUtil; diff --git a/TypeScript/22CustomAkiCommand/types/utils/RandomUtil.d.ts b/TypeScript/22CustomAkiCommand/types/utils/RandomUtil.d.ts index 49f242d..0da184f 100644 --- a/TypeScript/22CustomAkiCommand/types/utils/RandomUtil.d.ts +++ b/TypeScript/22CustomAkiCommand/types/utils/RandomUtil.d.ts @@ -1,6 +1,6 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects * based on the relative probability of each of its elements. diff --git a/TypeScript/22CustomAkiCommand/types/utils/logging/AbstractWinstonLogger.d.ts b/TypeScript/22CustomAkiCommand/types/utils/logging/AbstractWinstonLogger.d.ts index 7098f85..ef54434 100644 --- a/TypeScript/22CustomAkiCommand/types/utils/logging/AbstractWinstonLogger.d.ts +++ b/TypeScript/22CustomAkiCommand/types/utils/logging/AbstractWinstonLogger.d.ts @@ -1,12 +1,12 @@ /// import fs from "node:fs"; -import winston from "winston"; import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; import { SptLogger } from "@spt/models/spt/logging/SptLogger"; import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; import { ILogger } from "@spt/models/spt/utils/ILogger"; +import winston from "winston"; export declare abstract class AbstractWinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected showDebugInConsole: boolean; diff --git a/TypeScript/23CustomAbstractChatBot/types/controllers/BotController.d.ts b/TypeScript/23CustomAbstractChatBot/types/controllers/BotController.d.ts index 6431fca..475f51b 100644 --- a/TypeScript/23CustomAbstractChatBot/types/controllers/BotController.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/controllers/BotController.d.ts @@ -20,8 +20,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/23CustomAbstractChatBot/types/controllers/BuildController.d.ts b/TypeScript/23CustomAbstractChatBot/types/controllers/BuildController.d.ts index ed8adf6..2cb9c59 100644 --- a/TypeScript/23CustomAbstractChatBot/types/controllers/BuildController.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/controllers/BuildController.d.ts @@ -9,8 +9,8 @@ import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BuildController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/23CustomAbstractChatBot/types/controllers/GameController.d.ts b/TypeScript/23CustomAbstractChatBot/types/controllers/GameController.d.ts index 533a81c..e219c04 100644 --- a/TypeScript/23CustomAbstractChatBot/types/controllers/GameController.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/controllers/GameController.d.ts @@ -34,10 +34,10 @@ import { ProfileActivityService } from "@spt/services/ProfileActivityService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GameController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/23CustomAbstractChatBot/types/controllers/HealthController.d.ts b/TypeScript/23CustomAbstractChatBot/types/controllers/HealthController.d.ts index 5482283..5a0a0a6 100644 --- a/TypeScript/23CustomAbstractChatBot/types/controllers/HealthController.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/controllers/HealthController.d.ts @@ -12,8 +12,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthController { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/23CustomAbstractChatBot/types/controllers/HideoutController.d.ts b/TypeScript/23CustomAbstractChatBot/types/controllers/HideoutController.d.ts index e9d1ed9..89a428c 100644 --- a/TypeScript/23CustomAbstractChatBot/types/controllers/HideoutController.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/controllers/HideoutController.d.ts @@ -35,11 +35,11 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; import { ProfileActivityService } from "@spt/services/ProfileActivityService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/23CustomAbstractChatBot/types/controllers/InraidController.d.ts b/TypeScript/23CustomAbstractChatBot/types/controllers/InraidController.d.ts index 87f419b..9f0c409 100644 --- a/TypeScript/23CustomAbstractChatBot/types/controllers/InraidController.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/controllers/InraidController.d.ts @@ -13,6 +13,7 @@ import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRe import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState"; import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig"; import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; @@ -31,7 +32,6 @@ import { PmcChatResponseService } from "@spt/services/PmcChatResponseService"; import { TraderServicesService } from "@spt/services/TraderServicesService"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; -import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; /** * Logic for handling In Raid callbacks */ diff --git a/TypeScript/23CustomAbstractChatBot/types/controllers/InsuranceController.d.ts b/TypeScript/23CustomAbstractChatBot/types/controllers/InsuranceController.d.ts index f921b83..543e915 100644 --- a/TypeScript/23CustomAbstractChatBot/types/controllers/InsuranceController.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/controllers/InsuranceController.d.ts @@ -21,11 +21,11 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PaymentService } from "@spt/services/PaymentService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceController { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/23CustomAbstractChatBot/types/controllers/InventoryController.d.ts b/TypeScript/23CustomAbstractChatBot/types/controllers/InventoryController.d.ts index 40bb084..c986ce8 100644 --- a/TypeScript/23CustomAbstractChatBot/types/controllers/InventoryController.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/controllers/InventoryController.d.ts @@ -37,10 +37,10 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MapMarkerService } from "@spt/services/MapMarkerService"; import { PlayerService } from "@spt/services/PlayerService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/23CustomAbstractChatBot/types/controllers/LocationController.d.ts b/TypeScript/23CustomAbstractChatBot/types/controllers/LocationController.d.ts index 727a8c8..a541b9c 100644 --- a/TypeScript/23CustomAbstractChatBot/types/controllers/LocationController.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/controllers/LocationController.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class LocationController { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; diff --git a/TypeScript/23CustomAbstractChatBot/types/controllers/ProfileController.d.ts b/TypeScript/23CustomAbstractChatBot/types/controllers/ProfileController.d.ts index e8dae73..7e6d35c 100644 --- a/TypeScript/23CustomAbstractChatBot/types/controllers/ProfileController.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/controllers/ProfileController.d.ts @@ -26,9 +26,9 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/23CustomAbstractChatBot/types/controllers/QuestController.d.ts b/TypeScript/23CustomAbstractChatBot/types/controllers/QuestController.d.ts index 3cdce00..6a5b415 100644 --- a/TypeScript/23CustomAbstractChatBot/types/controllers/QuestController.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/controllers/QuestController.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/23CustomAbstractChatBot/types/controllers/RepeatableQuestController.d.ts b/TypeScript/23CustomAbstractChatBot/types/controllers/RepeatableQuestController.d.ts index 74f39eb..016f8c6 100644 --- a/TypeScript/23CustomAbstractChatBot/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/controllers/RepeatableQuestController.d.ts @@ -18,11 +18,11 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/23CustomAbstractChatBot/types/controllers/TradeController.d.ts b/TypeScript/23CustomAbstractChatBot/types/controllers/TradeController.d.ts index bc72e92..842a97b 100644 --- a/TypeScript/23CustomAbstractChatBot/types/controllers/TradeController.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/controllers/TradeController.d.ts @@ -1,5 +1,6 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper"; import { TradeHelper } from "@spt/helpers/TradeHelper"; import { TraderHelper } from "@spt/helpers/TraderHelper"; import { IPmcData } from "@spt/models/eft/common/IPmcData"; @@ -35,6 +36,7 @@ export declare class TradeController { protected hashUtil: HashUtil; protected itemHelper: ItemHelper; protected profileHelper: ProfileHelper; + protected ragfairOfferHelper: RagfairOfferHelper; protected traderHelper: TraderHelper; protected ragfairServer: RagfairServer; protected httpResponse: HttpResponseUtil; @@ -44,7 +46,7 @@ export declare class TradeController { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairOfferHelper: RagfairOfferHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); /** Handle TradingConfirm event */ confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; /** Handle RagFairBuyOffer event */ @@ -67,10 +69,17 @@ export declare class TradeController { * @param output Output to send back to client */ protected buyPmcItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void; + /** + * Is the provided offerid and ownerid from a player made offer + * @param offerId Id of the offer + * @param offerOwnerId Owner id + * @returns true if offer was made by a player + */ + protected isPlayerOffer(offerId: string, offerOwnerId: string): boolean; /** * Does Player have necessary trader loyalty to purchase flea offer * @param sellerIsTrader is seller trader - * @param fleaOffer FLea offer being bought + * @param fleaOffer Flea offer being bought * @param pmcData Player profile * @returns True if player can buy offer */ diff --git a/TypeScript/23CustomAbstractChatBot/types/controllers/TraderController.d.ts b/TypeScript/23CustomAbstractChatBot/types/controllers/TraderController.d.ts index 7fc6d78..3592fc6 100644 --- a/TypeScript/23CustomAbstractChatBot/types/controllers/TraderController.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/controllers/TraderController.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/23CustomAbstractChatBot/types/generators/BotEquipmentModGenerator.d.ts b/TypeScript/23CustomAbstractChatBot/types/generators/BotEquipmentModGenerator.d.ts index 419120f..3952293 100644 --- a/TypeScript/23CustomAbstractChatBot/types/generators/BotEquipmentModGenerator.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/generators/BotEquipmentModGenerator.d.ts @@ -25,9 +25,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotEquipmentModGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -65,7 +65,7 @@ export declare class BotEquipmentModGenerator { * @param settings Bot equipment generation settings * @param modSlot Armor slot being filtered * @param existingPlateTplPool Plates tpls to choose from - * @param armorItem + * @param armorItem The armor items db template * @returns Array of plate tpls to choose from */ protected filterPlateModsForSlotByLevel(settings: IGenerateEquipmentProperties, modSlot: string, existingPlateTplPool: string[], armorItem: ITemplateItem): IFilterPlateModsForSlotByLevelResult; diff --git a/TypeScript/23CustomAbstractChatBot/types/generators/BotGenerator.d.ts b/TypeScript/23CustomAbstractChatBot/types/generators/BotGenerator.d.ts index 8ab4371..ebb8a59 100644 --- a/TypeScript/23CustomAbstractChatBot/types/generators/BotGenerator.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/generators/BotGenerator.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/23CustomAbstractChatBot/types/generators/BotLevelGenerator.d.ts b/TypeScript/23CustomAbstractChatBot/types/generators/BotLevelGenerator.d.ts index dee61e2..a8a8895 100644 --- a/TypeScript/23CustomAbstractChatBot/types/generators/BotLevelGenerator.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/generators/BotLevelGenerator.d.ts @@ -4,12 +4,14 @@ import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; +import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class BotLevelGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; protected databaseService: DatabaseService; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService); + protected mathUtil: MathUtil; + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, mathUtil: MathUtil); /** * Return a randomised bot level and exp value * @param levelDetails Min and max of level for bot @@ -18,6 +20,7 @@ export declare class BotLevelGenerator { * @returns IRandomisedBotLevelResult object */ generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult; + protected chooseBotLevel(min: number, max: number, shift: number, number: number): number; /** * Get the highest level a bot can be relative to the players level, but no further than the max size from globals.exp_table * @param botGenerationDetails Details to help generate a bot diff --git a/TypeScript/23CustomAbstractChatBot/types/generators/BotLootGenerator.d.ts b/TypeScript/23CustomAbstractChatBot/types/generators/BotLootGenerator.d.ts index fee56ce..c0583c6 100644 --- a/TypeScript/23CustomAbstractChatBot/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/generators/BotLootGenerator.d.ts @@ -18,9 +18,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/23CustomAbstractChatBot/types/generators/BotWeaponGenerator.d.ts b/TypeScript/23CustomAbstractChatBot/types/generators/BotWeaponGenerator.d.ts index 5559bfa..8e03b35 100644 --- a/TypeScript/23CustomAbstractChatBot/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/generators/BotWeaponGenerator.d.ts @@ -18,9 +18,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RepairService } from "@spt/services/RepairService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotWeaponGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/23CustomAbstractChatBot/types/generators/LocationGenerator.d.ts b/TypeScript/23CustomAbstractChatBot/types/generators/LocationGenerator.d.ts index 222b0ab..9a2b0c4 100644 --- a/TypeScript/23CustomAbstractChatBot/types/generators/LocationGenerator.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/generators/LocationGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export interface IContainerItem { items: Item[]; width: number; diff --git a/TypeScript/23CustomAbstractChatBot/types/generators/PlayerScavGenerator.d.ts b/TypeScript/23CustomAbstractChatBot/types/generators/PlayerScavGenerator.d.ts index 2414150..e317bf6 100644 --- a/TypeScript/23CustomAbstractChatBot/types/generators/PlayerScavGenerator.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/generators/PlayerScavGenerator.d.ts @@ -14,9 +14,9 @@ import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class PlayerScavGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/23CustomAbstractChatBot/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/23CustomAbstractChatBot/types/generators/RagfairOfferGenerator.d.ts index 9435390..ca09729 100644 --- a/TypeScript/23CustomAbstractChatBot/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/generators/RagfairOfferGenerator.d.ts @@ -19,10 +19,10 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/23CustomAbstractChatBot/types/generators/RepeatableQuestGenerator.d.ts b/TypeScript/23CustomAbstractChatBot/types/generators/RepeatableQuestGenerator.d.ts index 77c4e79..339f322 100644 --- a/TypeScript/23CustomAbstractChatBot/types/generators/RepeatableQuestGenerator.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/generators/RepeatableQuestGenerator.d.ts @@ -11,10 +11,10 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/23CustomAbstractChatBot/types/generators/RepeatableQuestRewardGenerator.d.ts b/TypeScript/23CustomAbstractChatBot/types/generators/RepeatableQuestRewardGenerator.d.ts index 1e09994..713a394 100644 --- a/TypeScript/23CustomAbstractChatBot/types/generators/RepeatableQuestRewardGenerator.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/generators/RepeatableQuestRewardGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestRewardGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/23CustomAbstractChatBot/types/helpers/BotDifficultyHelper.d.ts b/TypeScript/23CustomAbstractChatBot/types/helpers/BotDifficultyHelper.d.ts index 63572a5..2348bd3 100644 --- a/TypeScript/23CustomAbstractChatBot/types/helpers/BotDifficultyHelper.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/helpers/BotDifficultyHelper.d.ts @@ -5,8 +5,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotDifficultyHelper { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/23CustomAbstractChatBot/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/23CustomAbstractChatBot/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index c51bf7e..c38f0a0 100644 --- a/TypeScript/23CustomAbstractChatBot/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GiveSptCommand implements ISptCommand { protected logger: ILogger; protected itemHelper: ItemHelper; diff --git a/TypeScript/23CustomAbstractChatBot/types/helpers/HealthHelper.d.ts b/TypeScript/23CustomAbstractChatBot/types/helpers/HealthHelper.d.ts index 650f633..a164285 100644 --- a/TypeScript/23CustomAbstractChatBot/types/helpers/HealthHelper.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/helpers/HealthHelper.d.ts @@ -5,8 +5,8 @@ import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/23CustomAbstractChatBot/types/helpers/HideoutHelper.d.ts b/TypeScript/23CustomAbstractChatBot/types/helpers/HideoutHelper.d.ts index c4aaa4c..df0376b 100644 --- a/TypeScript/23CustomAbstractChatBot/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/helpers/HideoutHelper.d.ts @@ -18,10 +18,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/23CustomAbstractChatBot/types/helpers/InRaidHelper.d.ts b/TypeScript/23CustomAbstractChatBot/types/helpers/InRaidHelper.d.ts index 449be9f..987c9ec 100644 --- a/TypeScript/23CustomAbstractChatBot/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/helpers/InRaidHelper.d.ts @@ -15,9 +15,9 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InRaidHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/23CustomAbstractChatBot/types/helpers/InventoryHelper.d.ts b/TypeScript/23CustomAbstractChatBot/types/helpers/InventoryHelper.d.ts index f0ff69a..92bb49c 100644 --- a/TypeScript/23CustomAbstractChatBot/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/helpers/InventoryHelper.d.ts @@ -23,9 +23,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/23CustomAbstractChatBot/types/helpers/ItemHelper.d.ts b/TypeScript/23CustomAbstractChatBot/types/helpers/ItemHelper.d.ts index da5dd11..c304cee 100644 --- a/TypeScript/23CustomAbstractChatBot/types/helpers/ItemHelper.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/helpers/ItemHelper.d.ts @@ -11,13 +11,13 @@ import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { CompareUtil } from "@spt/utils/CompareUtil"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ItemHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/23CustomAbstractChatBot/types/helpers/ProfileHelper.d.ts b/TypeScript/23CustomAbstractChatBot/types/helpers/ProfileHelper.d.ts index 0671179..cdab870 100644 --- a/TypeScript/23CustomAbstractChatBot/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/helpers/ProfileHelper.d.ts @@ -11,10 +11,10 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/23CustomAbstractChatBot/types/helpers/QuestHelper.d.ts b/TypeScript/23CustomAbstractChatBot/types/helpers/QuestHelper.d.ts index 2b84b8f..2d5730d 100644 --- a/TypeScript/23CustomAbstractChatBot/types/helpers/QuestHelper.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/helpers/QuestHelper.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/23CustomAbstractChatBot/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/23CustomAbstractChatBot/types/helpers/RagfairOfferHelper.d.ts index b526554..2386316 100644 --- a/TypeScript/23CustomAbstractChatBot/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/helpers/RagfairOfferHelper.d.ts @@ -151,7 +151,7 @@ export declare class RagfairOfferHelper { * @param boughtAmount Amount item was purchased for * @returns IItemEventRouterResponse */ - protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; + completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; /** * Get a localised message for when players offer has sold on flea * @param itemTpl Item sold diff --git a/TypeScript/23CustomAbstractChatBot/types/helpers/RagfairServerHelper.d.ts b/TypeScript/23CustomAbstractChatBot/types/helpers/RagfairServerHelper.d.ts index 927caf5..3e1fea9 100644 --- a/TypeScript/23CustomAbstractChatBot/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/helpers/RagfairServerHelper.d.ts @@ -12,9 +12,9 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Helper class for common ragfair server actions */ diff --git a/TypeScript/23CustomAbstractChatBot/types/helpers/RepairHelper.d.ts b/TypeScript/23CustomAbstractChatBot/types/helpers/RepairHelper.d.ts index 99a21da..63c78c9 100644 --- a/TypeScript/23CustomAbstractChatBot/types/helpers/RepairHelper.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/helpers/RepairHelper.d.ts @@ -4,8 +4,8 @@ import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/23CustomAbstractChatBot/types/helpers/RepeatableQuestHelper.d.ts b/TypeScript/23CustomAbstractChatBot/types/helpers/RepeatableQuestHelper.d.ts index d92657e..8c65f40 100644 --- a/TypeScript/23CustomAbstractChatBot/types/helpers/RepeatableQuestHelper.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/helpers/RepeatableQuestHelper.d.ts @@ -1,8 +1,8 @@ import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestHelper { protected mathUtil: MathUtil; protected configServer: ConfigServer; diff --git a/TypeScript/23CustomAbstractChatBot/types/helpers/TradeHelper.d.ts b/TypeScript/23CustomAbstractChatBot/types/helpers/TradeHelper.d.ts index f994fda..6e6f3a2 100644 --- a/TypeScript/23CustomAbstractChatBot/types/helpers/TradeHelper.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/helpers/TradeHelper.d.ts @@ -17,8 +17,8 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TradeHelper { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/23CustomAbstractChatBot/types/helpers/TraderAssortHelper.d.ts b/TypeScript/23CustomAbstractChatBot/types/helpers/TraderAssortHelper.d.ts index 8f8f802..f1ecd3b 100644 --- a/TypeScript/23CustomAbstractChatBot/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/helpers/TraderAssortHelper.d.ts @@ -14,9 +14,9 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; diff --git a/TypeScript/23CustomAbstractChatBot/types/loaders/BundleLoader.d.ts b/TypeScript/23CustomAbstractChatBot/types/loaders/BundleLoader.d.ts index e270988..8c0ed4d 100644 --- a/TypeScript/23CustomAbstractChatBot/types/loaders/BundleLoader.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/loaders/BundleLoader.d.ts @@ -1,8 +1,8 @@ import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BundleInfo { modpath: string; filename: string; diff --git a/TypeScript/23CustomAbstractChatBot/types/loaders/PostDBModLoader.d.ts b/TypeScript/23CustomAbstractChatBot/types/loaders/PostDBModLoader.d.ts index b0c4bf4..a8bb6a9 100644 --- a/TypeScript/23CustomAbstractChatBot/types/loaders/PostDBModLoader.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/loaders/PostDBModLoader.d.ts @@ -1,10 +1,10 @@ -import { DependencyContainer } from "tsyringe"; import { OnLoad } from "@spt/di/OnLoad"; import { BundleLoader } from "@spt/loaders/BundleLoader"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostDBModLoader implements OnLoad { protected logger: ILogger; protected bundleLoader: BundleLoader; diff --git a/TypeScript/23CustomAbstractChatBot/types/loaders/PostSptModLoader.d.ts b/TypeScript/23CustomAbstractChatBot/types/loaders/PostSptModLoader.d.ts index fb54579..2603497 100644 --- a/TypeScript/23CustomAbstractChatBot/types/loaders/PostSptModLoader.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/loaders/PostSptModLoader.d.ts @@ -1,9 +1,9 @@ -import { DependencyContainer } from "tsyringe"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { IModLoader } from "@spt/models/spt/mod/IModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostSptModLoader implements IModLoader { protected logger: ILogger; protected preSptModLoader: PreSptModLoader; diff --git a/TypeScript/23CustomAbstractChatBot/types/loaders/PreSptModLoader.d.ts b/TypeScript/23CustomAbstractChatBot/types/loaders/PreSptModLoader.d.ts index bc846c8..8814525 100644 --- a/TypeScript/23CustomAbstractChatBot/types/loaders/PreSptModLoader.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/loaders/PreSptModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { ModDetails } from "@spt/models/eft/profile/ISptProfile"; @@ -11,6 +10,7 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { ModCompilerService } from "@spt/services/ModCompilerService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { DependencyContainer } from "tsyringe"; export declare class PreSptModLoader implements IModLoader { protected logger: ILogger; protected vfs: VFS; diff --git a/TypeScript/23CustomAbstractChatBot/types/models/eft/common/IEmptyRequestData.d.ts b/TypeScript/23CustomAbstractChatBot/types/models/eft/common/IEmptyRequestData.d.ts index 284d16e..52a7b12 100644 --- a/TypeScript/23CustomAbstractChatBot/types/models/eft/common/IEmptyRequestData.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/models/eft/common/IEmptyRequestData.d.ts @@ -1,2 +1 @@ -export interface IEmptyRequestData { -} +export type IEmptyRequestData = {}; diff --git a/TypeScript/23CustomAbstractChatBot/types/models/eft/common/tables/IBotBase.d.ts b/TypeScript/23CustomAbstractChatBot/types/models/eft/common/tables/IBotBase.d.ts index a7fe1ca..be37845 100644 --- a/TypeScript/23CustomAbstractChatBot/types/models/eft/common/tables/IBotBase.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/models/eft/common/tables/IBotBase.d.ts @@ -373,8 +373,7 @@ export interface LastCompleted { export interface Notes { Notes: Note[]; } -export interface CarExtractCounts { -} +export type CarExtractCounts = {}; export declare enum SurvivorClass { UNKNOWN = 0, NEUTRALIZER = 1, diff --git a/TypeScript/23CustomAbstractChatBot/types/models/eft/common/tables/ILocationsBase.d.ts b/TypeScript/23CustomAbstractChatBot/types/models/eft/common/tables/ILocationsBase.d.ts index 2c96af3..16bca24 100644 --- a/TypeScript/23CustomAbstractChatBot/types/models/eft/common/tables/ILocationsBase.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/models/eft/common/tables/ILocationsBase.d.ts @@ -2,8 +2,7 @@ export interface ILocationsBase { locations: Locations; paths: Path[]; } -export interface Locations { -} +export type Locations = {}; export interface Path { Source: string; Destination: string; diff --git a/TypeScript/23CustomAbstractChatBot/types/models/eft/common/tables/IProfileTemplate.d.ts b/TypeScript/23CustomAbstractChatBot/types/models/eft/common/tables/IProfileTemplate.d.ts index 20923bc..6ba9221 100644 --- a/TypeScript/23CustomAbstractChatBot/types/models/eft/common/tables/IProfileTemplate.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -1,12 +1,12 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { Dialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; export interface IProfileTemplates { - "Standard": IProfileSides; + Standard: IProfileSides; "Left Behind": IProfileSides; "Prepare To Escape": IProfileSides; "Edge Of Darkness": IProfileSides; - "Unheard": IProfileSides; - "Tournament": IProfileSides; + Unheard: IProfileSides; + Tournament: IProfileSides; "SPT Developer": IProfileSides; "SPT Easy start": IProfileSides; "SPT Zero to hero": IProfileSides; diff --git a/TypeScript/23CustomAbstractChatBot/types/models/eft/common/tables/ITrader.d.ts b/TypeScript/23CustomAbstractChatBot/types/models/eft/common/tables/ITrader.d.ts index 14ab409..40cf004 100644 --- a/TypeScript/23CustomAbstractChatBot/types/models/eft/common/tables/ITrader.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/models/eft/common/tables/ITrader.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; export interface ITrader { assort?: ITraderAssort; @@ -78,6 +79,8 @@ export interface IBarterScheme { _tpl: string; onlyFunctional?: boolean; sptQuestLocked?: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface ISuit { _id: string; diff --git a/TypeScript/23CustomAbstractChatBot/types/models/eft/hideout/IQteData.d.ts b/TypeScript/23CustomAbstractChatBot/types/models/eft/hideout/IQteData.d.ts index 7f507e1..fe6cce6 100644 --- a/TypeScript/23CustomAbstractChatBot/types/models/eft/hideout/IQteData.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/models/eft/hideout/IQteData.d.ts @@ -1,14 +1,14 @@ import { Effect } from "@spt/models/eft/health/Effect"; import { BodyPart } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; import { QteActivityType } from "@spt/models/enums/hideout/QteActivityType"; import { QteEffectType } from "@spt/models/enums/hideout/QteEffectType"; import { QteResultType } from "@spt/models/enums/hideout/QteResultType"; import { QteRewardType } from "@spt/models/enums/hideout/QteRewardType"; import { QteType } from "@spt/models/enums/hideout/QteType"; import { RequirementType } from "@spt/models/enums/hideout/RequirementType"; -import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt/models/enums/SkillTypes"; -import { Traders } from "@spt/models/enums/Traders"; export interface IQteData { id: string; type: QteActivityType; diff --git a/TypeScript/23CustomAbstractChatBot/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/23CustomAbstractChatBot/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index f1123c1..5971372 100644 --- a/TypeScript/23CustomAbstractChatBot/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -15,7 +15,5 @@ export interface Items { change: any[]; del: any[]; } -export interface Production { -} -export interface TraderRelations { -} +export type Production = {}; +export type TraderRelations = {}; diff --git a/TypeScript/23CustomAbstractChatBot/types/models/eft/profile/ISptProfile.d.ts b/TypeScript/23CustomAbstractChatBot/types/models/eft/profile/ISptProfile.d.ts index a8e742a..dd7aea6 100644 --- a/TypeScript/23CustomAbstractChatBot/types/models/eft/profile/ISptProfile.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/models/eft/profile/ISptProfile.d.ts @@ -209,12 +209,9 @@ export interface Effects { LeftLeg: LeftLeg; RightLeg: RightLeg; } -export interface Head { -} -export interface Chest { -} -export interface Stomach { -} +export type Head = {}; +export type Chest = {}; +export type Stomach = {}; export interface LeftArm { Fracture?: number; } diff --git a/TypeScript/23CustomAbstractChatBot/types/models/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/23CustomAbstractChatBot/types/models/eft/ragfair/IRagfairOffer.d.ts index eeeb79d..f6c07fc 100644 --- a/TypeScript/23CustomAbstractChatBot/types/models/eft/ragfair/IRagfairOffer.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/models/eft/ragfair/IRagfairOffer.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface IRagfairOffer { sellResult?: SellResult[]; @@ -28,6 +29,8 @@ export interface OfferRequirement { _tpl: string; count: number; onlyFunctional: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface IRagfairOfferUser { id: string; diff --git a/TypeScript/23CustomAbstractChatBot/types/models/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/23CustomAbstractChatBot/types/models/eft/ragfair/ISearchRequestData.d.ts index 8261c5b..c631de8 100644 --- a/TypeScript/23CustomAbstractChatBot/types/models/eft/ragfair/ISearchRequestData.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/models/eft/ragfair/ISearchRequestData.d.ts @@ -29,5 +29,4 @@ export declare enum OfferOwnerType { TRADEROWNERTYPE = 1, PLAYEROWNERTYPE = 2 } -export interface BuildItems { -} +export type BuildItems = {}; diff --git a/TypeScript/23CustomAbstractChatBot/types/models/enums/BaseClasses.d.ts b/TypeScript/23CustomAbstractChatBot/types/models/enums/BaseClasses.d.ts index 65fc95e..32ebf7c 100644 --- a/TypeScript/23CustomAbstractChatBot/types/models/enums/BaseClasses.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/models/enums/BaseClasses.d.ts @@ -107,6 +107,6 @@ export declare enum BaseClasses { RECEIVER = "55818a304bdc2db5418b457d", BARREL = "555ef6e44bdc2de9068b457e", CHARGING_HANDLE = "55818a6f4bdc2db9688b456b", - COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569 ", + COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569", HIDEOUT_AREA_CONTAINER = "63da6da4784a55176c018dba" } diff --git a/TypeScript/23CustomAbstractChatBot/types/models/enums/DogtagExchangeSide.d.ts b/TypeScript/23CustomAbstractChatBot/types/models/enums/DogtagExchangeSide.d.ts new file mode 100644 index 0000000..de3d4df --- /dev/null +++ b/TypeScript/23CustomAbstractChatBot/types/models/enums/DogtagExchangeSide.d.ts @@ -0,0 +1,5 @@ +export declare enum DogtagExchangeSide { + USEC = "Usec", + BEAR = "Bear", + ANY = "Any" +} diff --git a/TypeScript/23CustomAbstractChatBot/types/models/spt/server/ExhaustableArray.d.ts b/TypeScript/23CustomAbstractChatBot/types/models/spt/server/ExhaustableArray.d.ts index c27f41f..50a6b68 100644 --- a/TypeScript/23CustomAbstractChatBot/types/models/spt/server/ExhaustableArray.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/models/spt/server/ExhaustableArray.d.ts @@ -1,5 +1,5 @@ -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ExhaustableArray implements IExhaustableArray { private itemPool; private randomUtil; diff --git a/TypeScript/23CustomAbstractChatBot/types/routers/EventOutputHolder.d.ts b/TypeScript/23CustomAbstractChatBot/types/routers/EventOutputHolder.d.ts index ef20706..148461a 100644 --- a/TypeScript/23CustomAbstractChatBot/types/routers/EventOutputHolder.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/routers/EventOutputHolder.d.ts @@ -3,8 +3,8 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IHideoutImprovement, Productive, TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; import { TraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class EventOutputHolder { protected profileHelper: ProfileHelper; protected timeUtil: TimeUtil; @@ -12,7 +12,7 @@ export declare class EventOutputHolder { /** * What has client been informed of this game session * Key = sessionId, then second key is prod id - */ + */ protected clientActiveSessionStorage: Record>; diff --git a/TypeScript/23CustomAbstractChatBot/types/servers/HttpServer.d.ts b/TypeScript/23CustomAbstractChatBot/types/servers/HttpServer.d.ts index b00fe68..0024ba3 100644 --- a/TypeScript/23CustomAbstractChatBot/types/servers/HttpServer.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/servers/HttpServer.d.ts @@ -6,8 +6,8 @@ import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; -import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { WebSocketServer } from "@spt/servers/WebSocketServer"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { LocalisationService } from "@spt/services/LocalisationService"; export declare class HttpServer { protected logger: ILogger; diff --git a/TypeScript/23CustomAbstractChatBot/types/servers/WebSocketServer.d.ts b/TypeScript/23CustomAbstractChatBot/types/servers/WebSocketServer.d.ts index f4e07bb..6121824 100644 --- a/TypeScript/23CustomAbstractChatBot/types/servers/WebSocketServer.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/servers/WebSocketServer.d.ts @@ -1,12 +1,12 @@ /// import http, { IncomingMessage } from "node:http"; -import { WebSocket, Server } from "ws"; import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { Server, WebSocket } from "ws"; export declare class WebSocketServer { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/23CustomAbstractChatBot/types/servers/ws/SptWebSocketConnectionHandler.d.ts b/TypeScript/23CustomAbstractChatBot/types/servers/ws/SptWebSocketConnectionHandler.d.ts index 98d0898..70fc96a 100644 --- a/TypeScript/23CustomAbstractChatBot/types/servers/ws/SptWebSocketConnectionHandler.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/servers/ws/SptWebSocketConnectionHandler.d.ts @@ -1,7 +1,6 @@ /// /// import { IncomingMessage } from "http"; -import { WebSocket } from "ws"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; @@ -11,6 +10,7 @@ import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectio import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; +import { WebSocket } from "ws"; export declare class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler { protected logger: ILogger; protected profileHelper: ProfileHelper; diff --git a/TypeScript/23CustomAbstractChatBot/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts b/TypeScript/23CustomAbstractChatBot/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts index d5247ec..5556129 100644 --- a/TypeScript/23CustomAbstractChatBot/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts @@ -1,6 +1,6 @@ -import { RawData, WebSocket } from "ws"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; +import { RawData, WebSocket } from "ws"; export declare class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler { protected logger: ILogger; constructor(logger: ILogger); diff --git a/TypeScript/23CustomAbstractChatBot/types/services/FenceService.d.ts b/TypeScript/23CustomAbstractChatBot/types/services/FenceService.d.ts index c156122..58dc076 100644 --- a/TypeScript/23CustomAbstractChatBot/types/services/FenceService.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/services/FenceService.d.ts @@ -13,9 +13,9 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Handle actions surrounding Fence * e.g. generating or refreshing assorts / get next refresh time diff --git a/TypeScript/23CustomAbstractChatBot/types/services/InsuranceService.d.ts b/TypeScript/23CustomAbstractChatBot/types/services/InsuranceService.d.ts index 0000e66..f799102 100644 --- a/TypeScript/23CustomAbstractChatBot/types/services/InsuranceService.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/services/InsuranceService.d.ts @@ -18,10 +18,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceService { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/23CustomAbstractChatBot/types/services/LocalisationService.d.ts b/TypeScript/23CustomAbstractChatBot/types/services/LocalisationService.d.ts index 42dfa4e..855c138 100644 --- a/TypeScript/23CustomAbstractChatBot/types/services/LocalisationService.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/services/LocalisationService.d.ts @@ -1,8 +1,8 @@ -import { I18n } from "i18n"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { LocaleService } from "@spt/services/LocaleService"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { I18n } from "i18n"; /** * Handles translating server text into different langauges */ diff --git a/TypeScript/23CustomAbstractChatBot/types/services/ProfileFixerService.d.ts b/TypeScript/23CustomAbstractChatBot/types/services/ProfileFixerService.d.ts index 525b867..91e4780 100644 --- a/TypeScript/23CustomAbstractChatBot/types/services/ProfileFixerService.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/services/ProfileFixerService.d.ts @@ -8,7 +8,7 @@ import { Bonus, HideoutSlot } from "@spt/models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea"; -import { ISptProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; +import { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; @@ -16,11 +16,11 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileFixerService { protected logger: ILogger; protected watermark: Watermark; @@ -73,6 +73,7 @@ export declare class ProfileFixerService { */ protected removeDanglingTaskConditionCounters(pmcProfile: IPmcData): void; protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullRagfairRatings(pmcProfile: IPmcData): void; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; /** diff --git a/TypeScript/23CustomAbstractChatBot/types/services/RagfairOfferService.d.ts b/TypeScript/23CustomAbstractChatBot/types/services/RagfairOfferService.d.ts index 6c13b1d..98dd179 100644 --- a/TypeScript/23CustomAbstractChatBot/types/services/RagfairOfferService.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/services/RagfairOfferService.d.ts @@ -10,10 +10,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/23CustomAbstractChatBot/types/services/mod/CustomItemService.d.ts b/TypeScript/23CustomAbstractChatBot/types/services/mod/CustomItemService.d.ts index 1926bed..f112872 100644 --- a/TypeScript/23CustomAbstractChatBot/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/services/mod/CustomItemService.d.ts @@ -4,8 +4,8 @@ import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetail import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/23CustomAbstractChatBot/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/23CustomAbstractChatBot/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts index 3c9d955..91c84d9 100644 --- a/TypeScript/23CustomAbstractChatBot/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class DynamicRouterModService { private container; constructor(container: DependencyContainer); diff --git a/TypeScript/23CustomAbstractChatBot/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/23CustomAbstractChatBot/types/services/mod/staticRouter/StaticRouterModService.d.ts index f60432d..0c3d4d8 100644 --- a/TypeScript/23CustomAbstractChatBot/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class StaticRouterModService { protected container: DependencyContainer; constructor(container: DependencyContainer); diff --git a/TypeScript/23CustomAbstractChatBot/types/utils/JsonUtil.d.ts b/TypeScript/23CustomAbstractChatBot/types/utils/JsonUtil.d.ts index b30822c..4419228 100644 --- a/TypeScript/23CustomAbstractChatBot/types/utils/JsonUtil.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/utils/JsonUtil.d.ts @@ -1,7 +1,7 @@ -import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { HashUtil } from "@spt/utils/HashUtil"; import { VFS } from "@spt/utils/VFS"; +import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; export declare class JsonUtil { protected vfs: VFS; protected hashUtil: HashUtil; diff --git a/TypeScript/23CustomAbstractChatBot/types/utils/RandomUtil.d.ts b/TypeScript/23CustomAbstractChatBot/types/utils/RandomUtil.d.ts index 49f242d..0da184f 100644 --- a/TypeScript/23CustomAbstractChatBot/types/utils/RandomUtil.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/utils/RandomUtil.d.ts @@ -1,6 +1,6 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects * based on the relative probability of each of its elements. diff --git a/TypeScript/23CustomAbstractChatBot/types/utils/logging/AbstractWinstonLogger.d.ts b/TypeScript/23CustomAbstractChatBot/types/utils/logging/AbstractWinstonLogger.d.ts index 7098f85..ef54434 100644 --- a/TypeScript/23CustomAbstractChatBot/types/utils/logging/AbstractWinstonLogger.d.ts +++ b/TypeScript/23CustomAbstractChatBot/types/utils/logging/AbstractWinstonLogger.d.ts @@ -1,12 +1,12 @@ /// import fs from "node:fs"; -import winston from "winston"; import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; import { SptLogger } from "@spt/models/spt/logging/SptLogger"; import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; import { ILogger } from "@spt/models/spt/utils/ILogger"; +import winston from "winston"; export declare abstract class AbstractWinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected showDebugInConsole: boolean; diff --git a/TypeScript/24WebSocket/types/controllers/BotController.d.ts b/TypeScript/24WebSocket/types/controllers/BotController.d.ts index 6431fca..475f51b 100644 --- a/TypeScript/24WebSocket/types/controllers/BotController.d.ts +++ b/TypeScript/24WebSocket/types/controllers/BotController.d.ts @@ -20,8 +20,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/24WebSocket/types/controllers/BuildController.d.ts b/TypeScript/24WebSocket/types/controllers/BuildController.d.ts index ed8adf6..2cb9c59 100644 --- a/TypeScript/24WebSocket/types/controllers/BuildController.d.ts +++ b/TypeScript/24WebSocket/types/controllers/BuildController.d.ts @@ -9,8 +9,8 @@ import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BuildController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/24WebSocket/types/controllers/GameController.d.ts b/TypeScript/24WebSocket/types/controllers/GameController.d.ts index 533a81c..e219c04 100644 --- a/TypeScript/24WebSocket/types/controllers/GameController.d.ts +++ b/TypeScript/24WebSocket/types/controllers/GameController.d.ts @@ -34,10 +34,10 @@ import { ProfileActivityService } from "@spt/services/ProfileActivityService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GameController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/24WebSocket/types/controllers/HealthController.d.ts b/TypeScript/24WebSocket/types/controllers/HealthController.d.ts index 5482283..5a0a0a6 100644 --- a/TypeScript/24WebSocket/types/controllers/HealthController.d.ts +++ b/TypeScript/24WebSocket/types/controllers/HealthController.d.ts @@ -12,8 +12,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthController { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/24WebSocket/types/controllers/HideoutController.d.ts b/TypeScript/24WebSocket/types/controllers/HideoutController.d.ts index e9d1ed9..89a428c 100644 --- a/TypeScript/24WebSocket/types/controllers/HideoutController.d.ts +++ b/TypeScript/24WebSocket/types/controllers/HideoutController.d.ts @@ -35,11 +35,11 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; import { ProfileActivityService } from "@spt/services/ProfileActivityService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/24WebSocket/types/controllers/InraidController.d.ts b/TypeScript/24WebSocket/types/controllers/InraidController.d.ts index 87f419b..9f0c409 100644 --- a/TypeScript/24WebSocket/types/controllers/InraidController.d.ts +++ b/TypeScript/24WebSocket/types/controllers/InraidController.d.ts @@ -13,6 +13,7 @@ import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRe import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState"; import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig"; import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; @@ -31,7 +32,6 @@ import { PmcChatResponseService } from "@spt/services/PmcChatResponseService"; import { TraderServicesService } from "@spt/services/TraderServicesService"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; -import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; /** * Logic for handling In Raid callbacks */ diff --git a/TypeScript/24WebSocket/types/controllers/InsuranceController.d.ts b/TypeScript/24WebSocket/types/controllers/InsuranceController.d.ts index f921b83..543e915 100644 --- a/TypeScript/24WebSocket/types/controllers/InsuranceController.d.ts +++ b/TypeScript/24WebSocket/types/controllers/InsuranceController.d.ts @@ -21,11 +21,11 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PaymentService } from "@spt/services/PaymentService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceController { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/24WebSocket/types/controllers/InventoryController.d.ts b/TypeScript/24WebSocket/types/controllers/InventoryController.d.ts index 40bb084..c986ce8 100644 --- a/TypeScript/24WebSocket/types/controllers/InventoryController.d.ts +++ b/TypeScript/24WebSocket/types/controllers/InventoryController.d.ts @@ -37,10 +37,10 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MapMarkerService } from "@spt/services/MapMarkerService"; import { PlayerService } from "@spt/services/PlayerService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/24WebSocket/types/controllers/LocationController.d.ts b/TypeScript/24WebSocket/types/controllers/LocationController.d.ts index 727a8c8..a541b9c 100644 --- a/TypeScript/24WebSocket/types/controllers/LocationController.d.ts +++ b/TypeScript/24WebSocket/types/controllers/LocationController.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class LocationController { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; diff --git a/TypeScript/24WebSocket/types/controllers/ProfileController.d.ts b/TypeScript/24WebSocket/types/controllers/ProfileController.d.ts index e8dae73..7e6d35c 100644 --- a/TypeScript/24WebSocket/types/controllers/ProfileController.d.ts +++ b/TypeScript/24WebSocket/types/controllers/ProfileController.d.ts @@ -26,9 +26,9 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/24WebSocket/types/controllers/QuestController.d.ts b/TypeScript/24WebSocket/types/controllers/QuestController.d.ts index 3cdce00..6a5b415 100644 --- a/TypeScript/24WebSocket/types/controllers/QuestController.d.ts +++ b/TypeScript/24WebSocket/types/controllers/QuestController.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/24WebSocket/types/controllers/RepeatableQuestController.d.ts b/TypeScript/24WebSocket/types/controllers/RepeatableQuestController.d.ts index 74f39eb..016f8c6 100644 --- a/TypeScript/24WebSocket/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/24WebSocket/types/controllers/RepeatableQuestController.d.ts @@ -18,11 +18,11 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/24WebSocket/types/controllers/TradeController.d.ts b/TypeScript/24WebSocket/types/controllers/TradeController.d.ts index bc72e92..842a97b 100644 --- a/TypeScript/24WebSocket/types/controllers/TradeController.d.ts +++ b/TypeScript/24WebSocket/types/controllers/TradeController.d.ts @@ -1,5 +1,6 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper"; import { TradeHelper } from "@spt/helpers/TradeHelper"; import { TraderHelper } from "@spt/helpers/TraderHelper"; import { IPmcData } from "@spt/models/eft/common/IPmcData"; @@ -35,6 +36,7 @@ export declare class TradeController { protected hashUtil: HashUtil; protected itemHelper: ItemHelper; protected profileHelper: ProfileHelper; + protected ragfairOfferHelper: RagfairOfferHelper; protected traderHelper: TraderHelper; protected ragfairServer: RagfairServer; protected httpResponse: HttpResponseUtil; @@ -44,7 +46,7 @@ export declare class TradeController { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairOfferHelper: RagfairOfferHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); /** Handle TradingConfirm event */ confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; /** Handle RagFairBuyOffer event */ @@ -67,10 +69,17 @@ export declare class TradeController { * @param output Output to send back to client */ protected buyPmcItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void; + /** + * Is the provided offerid and ownerid from a player made offer + * @param offerId Id of the offer + * @param offerOwnerId Owner id + * @returns true if offer was made by a player + */ + protected isPlayerOffer(offerId: string, offerOwnerId: string): boolean; /** * Does Player have necessary trader loyalty to purchase flea offer * @param sellerIsTrader is seller trader - * @param fleaOffer FLea offer being bought + * @param fleaOffer Flea offer being bought * @param pmcData Player profile * @returns True if player can buy offer */ diff --git a/TypeScript/24WebSocket/types/controllers/TraderController.d.ts b/TypeScript/24WebSocket/types/controllers/TraderController.d.ts index 7fc6d78..3592fc6 100644 --- a/TypeScript/24WebSocket/types/controllers/TraderController.d.ts +++ b/TypeScript/24WebSocket/types/controllers/TraderController.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/24WebSocket/types/generators/BotEquipmentModGenerator.d.ts b/TypeScript/24WebSocket/types/generators/BotEquipmentModGenerator.d.ts index 419120f..3952293 100644 --- a/TypeScript/24WebSocket/types/generators/BotEquipmentModGenerator.d.ts +++ b/TypeScript/24WebSocket/types/generators/BotEquipmentModGenerator.d.ts @@ -25,9 +25,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotEquipmentModGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -65,7 +65,7 @@ export declare class BotEquipmentModGenerator { * @param settings Bot equipment generation settings * @param modSlot Armor slot being filtered * @param existingPlateTplPool Plates tpls to choose from - * @param armorItem + * @param armorItem The armor items db template * @returns Array of plate tpls to choose from */ protected filterPlateModsForSlotByLevel(settings: IGenerateEquipmentProperties, modSlot: string, existingPlateTplPool: string[], armorItem: ITemplateItem): IFilterPlateModsForSlotByLevelResult; diff --git a/TypeScript/24WebSocket/types/generators/BotGenerator.d.ts b/TypeScript/24WebSocket/types/generators/BotGenerator.d.ts index 8ab4371..ebb8a59 100644 --- a/TypeScript/24WebSocket/types/generators/BotGenerator.d.ts +++ b/TypeScript/24WebSocket/types/generators/BotGenerator.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/24WebSocket/types/generators/BotLevelGenerator.d.ts b/TypeScript/24WebSocket/types/generators/BotLevelGenerator.d.ts index dee61e2..a8a8895 100644 --- a/TypeScript/24WebSocket/types/generators/BotLevelGenerator.d.ts +++ b/TypeScript/24WebSocket/types/generators/BotLevelGenerator.d.ts @@ -4,12 +4,14 @@ import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; +import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class BotLevelGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; protected databaseService: DatabaseService; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService); + protected mathUtil: MathUtil; + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, mathUtil: MathUtil); /** * Return a randomised bot level and exp value * @param levelDetails Min and max of level for bot @@ -18,6 +20,7 @@ export declare class BotLevelGenerator { * @returns IRandomisedBotLevelResult object */ generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult; + protected chooseBotLevel(min: number, max: number, shift: number, number: number): number; /** * Get the highest level a bot can be relative to the players level, but no further than the max size from globals.exp_table * @param botGenerationDetails Details to help generate a bot diff --git a/TypeScript/24WebSocket/types/generators/BotLootGenerator.d.ts b/TypeScript/24WebSocket/types/generators/BotLootGenerator.d.ts index fee56ce..c0583c6 100644 --- a/TypeScript/24WebSocket/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/24WebSocket/types/generators/BotLootGenerator.d.ts @@ -18,9 +18,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/24WebSocket/types/generators/BotWeaponGenerator.d.ts b/TypeScript/24WebSocket/types/generators/BotWeaponGenerator.d.ts index 5559bfa..8e03b35 100644 --- a/TypeScript/24WebSocket/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/24WebSocket/types/generators/BotWeaponGenerator.d.ts @@ -18,9 +18,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RepairService } from "@spt/services/RepairService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotWeaponGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/24WebSocket/types/generators/LocationGenerator.d.ts b/TypeScript/24WebSocket/types/generators/LocationGenerator.d.ts index 222b0ab..9a2b0c4 100644 --- a/TypeScript/24WebSocket/types/generators/LocationGenerator.d.ts +++ b/TypeScript/24WebSocket/types/generators/LocationGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export interface IContainerItem { items: Item[]; width: number; diff --git a/TypeScript/24WebSocket/types/generators/PlayerScavGenerator.d.ts b/TypeScript/24WebSocket/types/generators/PlayerScavGenerator.d.ts index 2414150..e317bf6 100644 --- a/TypeScript/24WebSocket/types/generators/PlayerScavGenerator.d.ts +++ b/TypeScript/24WebSocket/types/generators/PlayerScavGenerator.d.ts @@ -14,9 +14,9 @@ import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class PlayerScavGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/24WebSocket/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/24WebSocket/types/generators/RagfairOfferGenerator.d.ts index 9435390..ca09729 100644 --- a/TypeScript/24WebSocket/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/24WebSocket/types/generators/RagfairOfferGenerator.d.ts @@ -19,10 +19,10 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/24WebSocket/types/generators/RepeatableQuestGenerator.d.ts b/TypeScript/24WebSocket/types/generators/RepeatableQuestGenerator.d.ts index 77c4e79..339f322 100644 --- a/TypeScript/24WebSocket/types/generators/RepeatableQuestGenerator.d.ts +++ b/TypeScript/24WebSocket/types/generators/RepeatableQuestGenerator.d.ts @@ -11,10 +11,10 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/24WebSocket/types/generators/RepeatableQuestRewardGenerator.d.ts b/TypeScript/24WebSocket/types/generators/RepeatableQuestRewardGenerator.d.ts index 1e09994..713a394 100644 --- a/TypeScript/24WebSocket/types/generators/RepeatableQuestRewardGenerator.d.ts +++ b/TypeScript/24WebSocket/types/generators/RepeatableQuestRewardGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestRewardGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/24WebSocket/types/helpers/BotDifficultyHelper.d.ts b/TypeScript/24WebSocket/types/helpers/BotDifficultyHelper.d.ts index 63572a5..2348bd3 100644 --- a/TypeScript/24WebSocket/types/helpers/BotDifficultyHelper.d.ts +++ b/TypeScript/24WebSocket/types/helpers/BotDifficultyHelper.d.ts @@ -5,8 +5,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotDifficultyHelper { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/24WebSocket/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/24WebSocket/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index c51bf7e..c38f0a0 100644 --- a/TypeScript/24WebSocket/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/24WebSocket/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GiveSptCommand implements ISptCommand { protected logger: ILogger; protected itemHelper: ItemHelper; diff --git a/TypeScript/24WebSocket/types/helpers/HealthHelper.d.ts b/TypeScript/24WebSocket/types/helpers/HealthHelper.d.ts index 650f633..a164285 100644 --- a/TypeScript/24WebSocket/types/helpers/HealthHelper.d.ts +++ b/TypeScript/24WebSocket/types/helpers/HealthHelper.d.ts @@ -5,8 +5,8 @@ import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/24WebSocket/types/helpers/HideoutHelper.d.ts b/TypeScript/24WebSocket/types/helpers/HideoutHelper.d.ts index c4aaa4c..df0376b 100644 --- a/TypeScript/24WebSocket/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/24WebSocket/types/helpers/HideoutHelper.d.ts @@ -18,10 +18,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/24WebSocket/types/helpers/InRaidHelper.d.ts b/TypeScript/24WebSocket/types/helpers/InRaidHelper.d.ts index 449be9f..987c9ec 100644 --- a/TypeScript/24WebSocket/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/24WebSocket/types/helpers/InRaidHelper.d.ts @@ -15,9 +15,9 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InRaidHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/24WebSocket/types/helpers/InventoryHelper.d.ts b/TypeScript/24WebSocket/types/helpers/InventoryHelper.d.ts index f0ff69a..92bb49c 100644 --- a/TypeScript/24WebSocket/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/24WebSocket/types/helpers/InventoryHelper.d.ts @@ -23,9 +23,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/24WebSocket/types/helpers/ItemHelper.d.ts b/TypeScript/24WebSocket/types/helpers/ItemHelper.d.ts index da5dd11..c304cee 100644 --- a/TypeScript/24WebSocket/types/helpers/ItemHelper.d.ts +++ b/TypeScript/24WebSocket/types/helpers/ItemHelper.d.ts @@ -11,13 +11,13 @@ import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { CompareUtil } from "@spt/utils/CompareUtil"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ItemHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/24WebSocket/types/helpers/ProfileHelper.d.ts b/TypeScript/24WebSocket/types/helpers/ProfileHelper.d.ts index 0671179..cdab870 100644 --- a/TypeScript/24WebSocket/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/24WebSocket/types/helpers/ProfileHelper.d.ts @@ -11,10 +11,10 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/24WebSocket/types/helpers/QuestHelper.d.ts b/TypeScript/24WebSocket/types/helpers/QuestHelper.d.ts index 2b84b8f..2d5730d 100644 --- a/TypeScript/24WebSocket/types/helpers/QuestHelper.d.ts +++ b/TypeScript/24WebSocket/types/helpers/QuestHelper.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/24WebSocket/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/24WebSocket/types/helpers/RagfairOfferHelper.d.ts index b526554..2386316 100644 --- a/TypeScript/24WebSocket/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/24WebSocket/types/helpers/RagfairOfferHelper.d.ts @@ -151,7 +151,7 @@ export declare class RagfairOfferHelper { * @param boughtAmount Amount item was purchased for * @returns IItemEventRouterResponse */ - protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; + completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; /** * Get a localised message for when players offer has sold on flea * @param itemTpl Item sold diff --git a/TypeScript/24WebSocket/types/helpers/RagfairServerHelper.d.ts b/TypeScript/24WebSocket/types/helpers/RagfairServerHelper.d.ts index 927caf5..3e1fea9 100644 --- a/TypeScript/24WebSocket/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/24WebSocket/types/helpers/RagfairServerHelper.d.ts @@ -12,9 +12,9 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Helper class for common ragfair server actions */ diff --git a/TypeScript/24WebSocket/types/helpers/RepairHelper.d.ts b/TypeScript/24WebSocket/types/helpers/RepairHelper.d.ts index 99a21da..63c78c9 100644 --- a/TypeScript/24WebSocket/types/helpers/RepairHelper.d.ts +++ b/TypeScript/24WebSocket/types/helpers/RepairHelper.d.ts @@ -4,8 +4,8 @@ import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/24WebSocket/types/helpers/RepeatableQuestHelper.d.ts b/TypeScript/24WebSocket/types/helpers/RepeatableQuestHelper.d.ts index d92657e..8c65f40 100644 --- a/TypeScript/24WebSocket/types/helpers/RepeatableQuestHelper.d.ts +++ b/TypeScript/24WebSocket/types/helpers/RepeatableQuestHelper.d.ts @@ -1,8 +1,8 @@ import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestHelper { protected mathUtil: MathUtil; protected configServer: ConfigServer; diff --git a/TypeScript/24WebSocket/types/helpers/TradeHelper.d.ts b/TypeScript/24WebSocket/types/helpers/TradeHelper.d.ts index f994fda..6e6f3a2 100644 --- a/TypeScript/24WebSocket/types/helpers/TradeHelper.d.ts +++ b/TypeScript/24WebSocket/types/helpers/TradeHelper.d.ts @@ -17,8 +17,8 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TradeHelper { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/24WebSocket/types/helpers/TraderAssortHelper.d.ts b/TypeScript/24WebSocket/types/helpers/TraderAssortHelper.d.ts index 8f8f802..f1ecd3b 100644 --- a/TypeScript/24WebSocket/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/24WebSocket/types/helpers/TraderAssortHelper.d.ts @@ -14,9 +14,9 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; diff --git a/TypeScript/24WebSocket/types/loaders/BundleLoader.d.ts b/TypeScript/24WebSocket/types/loaders/BundleLoader.d.ts index e270988..8c0ed4d 100644 --- a/TypeScript/24WebSocket/types/loaders/BundleLoader.d.ts +++ b/TypeScript/24WebSocket/types/loaders/BundleLoader.d.ts @@ -1,8 +1,8 @@ import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BundleInfo { modpath: string; filename: string; diff --git a/TypeScript/24WebSocket/types/loaders/PostDBModLoader.d.ts b/TypeScript/24WebSocket/types/loaders/PostDBModLoader.d.ts index b0c4bf4..a8bb6a9 100644 --- a/TypeScript/24WebSocket/types/loaders/PostDBModLoader.d.ts +++ b/TypeScript/24WebSocket/types/loaders/PostDBModLoader.d.ts @@ -1,10 +1,10 @@ -import { DependencyContainer } from "tsyringe"; import { OnLoad } from "@spt/di/OnLoad"; import { BundleLoader } from "@spt/loaders/BundleLoader"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostDBModLoader implements OnLoad { protected logger: ILogger; protected bundleLoader: BundleLoader; diff --git a/TypeScript/24WebSocket/types/loaders/PostSptModLoader.d.ts b/TypeScript/24WebSocket/types/loaders/PostSptModLoader.d.ts index fb54579..2603497 100644 --- a/TypeScript/24WebSocket/types/loaders/PostSptModLoader.d.ts +++ b/TypeScript/24WebSocket/types/loaders/PostSptModLoader.d.ts @@ -1,9 +1,9 @@ -import { DependencyContainer } from "tsyringe"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { IModLoader } from "@spt/models/spt/mod/IModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostSptModLoader implements IModLoader { protected logger: ILogger; protected preSptModLoader: PreSptModLoader; diff --git a/TypeScript/24WebSocket/types/loaders/PreSptModLoader.d.ts b/TypeScript/24WebSocket/types/loaders/PreSptModLoader.d.ts index bc846c8..8814525 100644 --- a/TypeScript/24WebSocket/types/loaders/PreSptModLoader.d.ts +++ b/TypeScript/24WebSocket/types/loaders/PreSptModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { ModDetails } from "@spt/models/eft/profile/ISptProfile"; @@ -11,6 +10,7 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { ModCompilerService } from "@spt/services/ModCompilerService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { DependencyContainer } from "tsyringe"; export declare class PreSptModLoader implements IModLoader { protected logger: ILogger; protected vfs: VFS; diff --git a/TypeScript/24WebSocket/types/models/eft/common/IEmptyRequestData.d.ts b/TypeScript/24WebSocket/types/models/eft/common/IEmptyRequestData.d.ts index 284d16e..52a7b12 100644 --- a/TypeScript/24WebSocket/types/models/eft/common/IEmptyRequestData.d.ts +++ b/TypeScript/24WebSocket/types/models/eft/common/IEmptyRequestData.d.ts @@ -1,2 +1 @@ -export interface IEmptyRequestData { -} +export type IEmptyRequestData = {}; diff --git a/TypeScript/24WebSocket/types/models/eft/common/tables/IBotBase.d.ts b/TypeScript/24WebSocket/types/models/eft/common/tables/IBotBase.d.ts index a7fe1ca..be37845 100644 --- a/TypeScript/24WebSocket/types/models/eft/common/tables/IBotBase.d.ts +++ b/TypeScript/24WebSocket/types/models/eft/common/tables/IBotBase.d.ts @@ -373,8 +373,7 @@ export interface LastCompleted { export interface Notes { Notes: Note[]; } -export interface CarExtractCounts { -} +export type CarExtractCounts = {}; export declare enum SurvivorClass { UNKNOWN = 0, NEUTRALIZER = 1, diff --git a/TypeScript/24WebSocket/types/models/eft/common/tables/ILocationsBase.d.ts b/TypeScript/24WebSocket/types/models/eft/common/tables/ILocationsBase.d.ts index 2c96af3..16bca24 100644 --- a/TypeScript/24WebSocket/types/models/eft/common/tables/ILocationsBase.d.ts +++ b/TypeScript/24WebSocket/types/models/eft/common/tables/ILocationsBase.d.ts @@ -2,8 +2,7 @@ export interface ILocationsBase { locations: Locations; paths: Path[]; } -export interface Locations { -} +export type Locations = {}; export interface Path { Source: string; Destination: string; diff --git a/TypeScript/24WebSocket/types/models/eft/common/tables/IProfileTemplate.d.ts b/TypeScript/24WebSocket/types/models/eft/common/tables/IProfileTemplate.d.ts index 20923bc..6ba9221 100644 --- a/TypeScript/24WebSocket/types/models/eft/common/tables/IProfileTemplate.d.ts +++ b/TypeScript/24WebSocket/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -1,12 +1,12 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { Dialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; export interface IProfileTemplates { - "Standard": IProfileSides; + Standard: IProfileSides; "Left Behind": IProfileSides; "Prepare To Escape": IProfileSides; "Edge Of Darkness": IProfileSides; - "Unheard": IProfileSides; - "Tournament": IProfileSides; + Unheard: IProfileSides; + Tournament: IProfileSides; "SPT Developer": IProfileSides; "SPT Easy start": IProfileSides; "SPT Zero to hero": IProfileSides; diff --git a/TypeScript/24WebSocket/types/models/eft/common/tables/ITrader.d.ts b/TypeScript/24WebSocket/types/models/eft/common/tables/ITrader.d.ts index 14ab409..40cf004 100644 --- a/TypeScript/24WebSocket/types/models/eft/common/tables/ITrader.d.ts +++ b/TypeScript/24WebSocket/types/models/eft/common/tables/ITrader.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; export interface ITrader { assort?: ITraderAssort; @@ -78,6 +79,8 @@ export interface IBarterScheme { _tpl: string; onlyFunctional?: boolean; sptQuestLocked?: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface ISuit { _id: string; diff --git a/TypeScript/24WebSocket/types/models/eft/hideout/IQteData.d.ts b/TypeScript/24WebSocket/types/models/eft/hideout/IQteData.d.ts index 7f507e1..fe6cce6 100644 --- a/TypeScript/24WebSocket/types/models/eft/hideout/IQteData.d.ts +++ b/TypeScript/24WebSocket/types/models/eft/hideout/IQteData.d.ts @@ -1,14 +1,14 @@ import { Effect } from "@spt/models/eft/health/Effect"; import { BodyPart } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; import { QteActivityType } from "@spt/models/enums/hideout/QteActivityType"; import { QteEffectType } from "@spt/models/enums/hideout/QteEffectType"; import { QteResultType } from "@spt/models/enums/hideout/QteResultType"; import { QteRewardType } from "@spt/models/enums/hideout/QteRewardType"; import { QteType } from "@spt/models/enums/hideout/QteType"; import { RequirementType } from "@spt/models/enums/hideout/RequirementType"; -import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt/models/enums/SkillTypes"; -import { Traders } from "@spt/models/enums/Traders"; export interface IQteData { id: string; type: QteActivityType; diff --git a/TypeScript/24WebSocket/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/24WebSocket/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index f1123c1..5971372 100644 --- a/TypeScript/24WebSocket/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/TypeScript/24WebSocket/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -15,7 +15,5 @@ export interface Items { change: any[]; del: any[]; } -export interface Production { -} -export interface TraderRelations { -} +export type Production = {}; +export type TraderRelations = {}; diff --git a/TypeScript/24WebSocket/types/models/eft/profile/ISptProfile.d.ts b/TypeScript/24WebSocket/types/models/eft/profile/ISptProfile.d.ts index a8e742a..dd7aea6 100644 --- a/TypeScript/24WebSocket/types/models/eft/profile/ISptProfile.d.ts +++ b/TypeScript/24WebSocket/types/models/eft/profile/ISptProfile.d.ts @@ -209,12 +209,9 @@ export interface Effects { LeftLeg: LeftLeg; RightLeg: RightLeg; } -export interface Head { -} -export interface Chest { -} -export interface Stomach { -} +export type Head = {}; +export type Chest = {}; +export type Stomach = {}; export interface LeftArm { Fracture?: number; } diff --git a/TypeScript/24WebSocket/types/models/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/24WebSocket/types/models/eft/ragfair/IRagfairOffer.d.ts index eeeb79d..f6c07fc 100644 --- a/TypeScript/24WebSocket/types/models/eft/ragfair/IRagfairOffer.d.ts +++ b/TypeScript/24WebSocket/types/models/eft/ragfair/IRagfairOffer.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface IRagfairOffer { sellResult?: SellResult[]; @@ -28,6 +29,8 @@ export interface OfferRequirement { _tpl: string; count: number; onlyFunctional: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface IRagfairOfferUser { id: string; diff --git a/TypeScript/24WebSocket/types/models/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/24WebSocket/types/models/eft/ragfair/ISearchRequestData.d.ts index 8261c5b..c631de8 100644 --- a/TypeScript/24WebSocket/types/models/eft/ragfair/ISearchRequestData.d.ts +++ b/TypeScript/24WebSocket/types/models/eft/ragfair/ISearchRequestData.d.ts @@ -29,5 +29,4 @@ export declare enum OfferOwnerType { TRADEROWNERTYPE = 1, PLAYEROWNERTYPE = 2 } -export interface BuildItems { -} +export type BuildItems = {}; diff --git a/TypeScript/24WebSocket/types/models/enums/BaseClasses.d.ts b/TypeScript/24WebSocket/types/models/enums/BaseClasses.d.ts index 65fc95e..32ebf7c 100644 --- a/TypeScript/24WebSocket/types/models/enums/BaseClasses.d.ts +++ b/TypeScript/24WebSocket/types/models/enums/BaseClasses.d.ts @@ -107,6 +107,6 @@ export declare enum BaseClasses { RECEIVER = "55818a304bdc2db5418b457d", BARREL = "555ef6e44bdc2de9068b457e", CHARGING_HANDLE = "55818a6f4bdc2db9688b456b", - COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569 ", + COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569", HIDEOUT_AREA_CONTAINER = "63da6da4784a55176c018dba" } diff --git a/TypeScript/24WebSocket/types/models/enums/DogtagExchangeSide.d.ts b/TypeScript/24WebSocket/types/models/enums/DogtagExchangeSide.d.ts new file mode 100644 index 0000000..de3d4df --- /dev/null +++ b/TypeScript/24WebSocket/types/models/enums/DogtagExchangeSide.d.ts @@ -0,0 +1,5 @@ +export declare enum DogtagExchangeSide { + USEC = "Usec", + BEAR = "Bear", + ANY = "Any" +} diff --git a/TypeScript/24WebSocket/types/models/spt/server/ExhaustableArray.d.ts b/TypeScript/24WebSocket/types/models/spt/server/ExhaustableArray.d.ts index c27f41f..50a6b68 100644 --- a/TypeScript/24WebSocket/types/models/spt/server/ExhaustableArray.d.ts +++ b/TypeScript/24WebSocket/types/models/spt/server/ExhaustableArray.d.ts @@ -1,5 +1,5 @@ -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ExhaustableArray implements IExhaustableArray { private itemPool; private randomUtil; diff --git a/TypeScript/24WebSocket/types/routers/EventOutputHolder.d.ts b/TypeScript/24WebSocket/types/routers/EventOutputHolder.d.ts index ef20706..148461a 100644 --- a/TypeScript/24WebSocket/types/routers/EventOutputHolder.d.ts +++ b/TypeScript/24WebSocket/types/routers/EventOutputHolder.d.ts @@ -3,8 +3,8 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IHideoutImprovement, Productive, TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; import { TraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class EventOutputHolder { protected profileHelper: ProfileHelper; protected timeUtil: TimeUtil; @@ -12,7 +12,7 @@ export declare class EventOutputHolder { /** * What has client been informed of this game session * Key = sessionId, then second key is prod id - */ + */ protected clientActiveSessionStorage: Record>; diff --git a/TypeScript/24WebSocket/types/servers/HttpServer.d.ts b/TypeScript/24WebSocket/types/servers/HttpServer.d.ts index b00fe68..0024ba3 100644 --- a/TypeScript/24WebSocket/types/servers/HttpServer.d.ts +++ b/TypeScript/24WebSocket/types/servers/HttpServer.d.ts @@ -6,8 +6,8 @@ import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; -import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { WebSocketServer } from "@spt/servers/WebSocketServer"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { LocalisationService } from "@spt/services/LocalisationService"; export declare class HttpServer { protected logger: ILogger; diff --git a/TypeScript/24WebSocket/types/servers/WebSocketServer.d.ts b/TypeScript/24WebSocket/types/servers/WebSocketServer.d.ts index f4e07bb..6121824 100644 --- a/TypeScript/24WebSocket/types/servers/WebSocketServer.d.ts +++ b/TypeScript/24WebSocket/types/servers/WebSocketServer.d.ts @@ -1,12 +1,12 @@ /// import http, { IncomingMessage } from "node:http"; -import { WebSocket, Server } from "ws"; import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { Server, WebSocket } from "ws"; export declare class WebSocketServer { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/24WebSocket/types/servers/ws/SptWebSocketConnectionHandler.d.ts b/TypeScript/24WebSocket/types/servers/ws/SptWebSocketConnectionHandler.d.ts index 98d0898..70fc96a 100644 --- a/TypeScript/24WebSocket/types/servers/ws/SptWebSocketConnectionHandler.d.ts +++ b/TypeScript/24WebSocket/types/servers/ws/SptWebSocketConnectionHandler.d.ts @@ -1,7 +1,6 @@ /// /// import { IncomingMessage } from "http"; -import { WebSocket } from "ws"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; @@ -11,6 +10,7 @@ import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectio import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; +import { WebSocket } from "ws"; export declare class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler { protected logger: ILogger; protected profileHelper: ProfileHelper; diff --git a/TypeScript/24WebSocket/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts b/TypeScript/24WebSocket/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts index d5247ec..5556129 100644 --- a/TypeScript/24WebSocket/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts +++ b/TypeScript/24WebSocket/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts @@ -1,6 +1,6 @@ -import { RawData, WebSocket } from "ws"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; +import { RawData, WebSocket } from "ws"; export declare class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler { protected logger: ILogger; constructor(logger: ILogger); diff --git a/TypeScript/24WebSocket/types/services/FenceService.d.ts b/TypeScript/24WebSocket/types/services/FenceService.d.ts index c156122..58dc076 100644 --- a/TypeScript/24WebSocket/types/services/FenceService.d.ts +++ b/TypeScript/24WebSocket/types/services/FenceService.d.ts @@ -13,9 +13,9 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Handle actions surrounding Fence * e.g. generating or refreshing assorts / get next refresh time diff --git a/TypeScript/24WebSocket/types/services/InsuranceService.d.ts b/TypeScript/24WebSocket/types/services/InsuranceService.d.ts index 0000e66..f799102 100644 --- a/TypeScript/24WebSocket/types/services/InsuranceService.d.ts +++ b/TypeScript/24WebSocket/types/services/InsuranceService.d.ts @@ -18,10 +18,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceService { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/24WebSocket/types/services/LocalisationService.d.ts b/TypeScript/24WebSocket/types/services/LocalisationService.d.ts index 42dfa4e..855c138 100644 --- a/TypeScript/24WebSocket/types/services/LocalisationService.d.ts +++ b/TypeScript/24WebSocket/types/services/LocalisationService.d.ts @@ -1,8 +1,8 @@ -import { I18n } from "i18n"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { LocaleService } from "@spt/services/LocaleService"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { I18n } from "i18n"; /** * Handles translating server text into different langauges */ diff --git a/TypeScript/24WebSocket/types/services/ProfileFixerService.d.ts b/TypeScript/24WebSocket/types/services/ProfileFixerService.d.ts index 525b867..91e4780 100644 --- a/TypeScript/24WebSocket/types/services/ProfileFixerService.d.ts +++ b/TypeScript/24WebSocket/types/services/ProfileFixerService.d.ts @@ -8,7 +8,7 @@ import { Bonus, HideoutSlot } from "@spt/models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea"; -import { ISptProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; +import { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; @@ -16,11 +16,11 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileFixerService { protected logger: ILogger; protected watermark: Watermark; @@ -73,6 +73,7 @@ export declare class ProfileFixerService { */ protected removeDanglingTaskConditionCounters(pmcProfile: IPmcData): void; protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullRagfairRatings(pmcProfile: IPmcData): void; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; /** diff --git a/TypeScript/24WebSocket/types/services/RagfairOfferService.d.ts b/TypeScript/24WebSocket/types/services/RagfairOfferService.d.ts index 6c13b1d..98dd179 100644 --- a/TypeScript/24WebSocket/types/services/RagfairOfferService.d.ts +++ b/TypeScript/24WebSocket/types/services/RagfairOfferService.d.ts @@ -10,10 +10,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/24WebSocket/types/services/mod/CustomItemService.d.ts b/TypeScript/24WebSocket/types/services/mod/CustomItemService.d.ts index 1926bed..f112872 100644 --- a/TypeScript/24WebSocket/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/24WebSocket/types/services/mod/CustomItemService.d.ts @@ -4,8 +4,8 @@ import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetail import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/24WebSocket/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/24WebSocket/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts index 3c9d955..91c84d9 100644 --- a/TypeScript/24WebSocket/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts +++ b/TypeScript/24WebSocket/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class DynamicRouterModService { private container; constructor(container: DependencyContainer); diff --git a/TypeScript/24WebSocket/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/24WebSocket/types/services/mod/staticRouter/StaticRouterModService.d.ts index f60432d..0c3d4d8 100644 --- a/TypeScript/24WebSocket/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/TypeScript/24WebSocket/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class StaticRouterModService { protected container: DependencyContainer; constructor(container: DependencyContainer); diff --git a/TypeScript/24WebSocket/types/utils/JsonUtil.d.ts b/TypeScript/24WebSocket/types/utils/JsonUtil.d.ts index b30822c..4419228 100644 --- a/TypeScript/24WebSocket/types/utils/JsonUtil.d.ts +++ b/TypeScript/24WebSocket/types/utils/JsonUtil.d.ts @@ -1,7 +1,7 @@ -import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { HashUtil } from "@spt/utils/HashUtil"; import { VFS } from "@spt/utils/VFS"; +import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; export declare class JsonUtil { protected vfs: VFS; protected hashUtil: HashUtil; diff --git a/TypeScript/24WebSocket/types/utils/RandomUtil.d.ts b/TypeScript/24WebSocket/types/utils/RandomUtil.d.ts index 49f242d..0da184f 100644 --- a/TypeScript/24WebSocket/types/utils/RandomUtil.d.ts +++ b/TypeScript/24WebSocket/types/utils/RandomUtil.d.ts @@ -1,6 +1,6 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects * based on the relative probability of each of its elements. diff --git a/TypeScript/24WebSocket/types/utils/logging/AbstractWinstonLogger.d.ts b/TypeScript/24WebSocket/types/utils/logging/AbstractWinstonLogger.d.ts index 7098f85..ef54434 100644 --- a/TypeScript/24WebSocket/types/utils/logging/AbstractWinstonLogger.d.ts +++ b/TypeScript/24WebSocket/types/utils/logging/AbstractWinstonLogger.d.ts @@ -1,12 +1,12 @@ /// import fs from "node:fs"; -import winston from "winston"; import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; import { SptLogger } from "@spt/models/spt/logging/SptLogger"; import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; import { ILogger } from "@spt/models/spt/utils/ILogger"; +import winston from "winston"; export declare abstract class AbstractWinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected showDebugInConsole: boolean; diff --git a/TypeScript/2EditDatabase/types/controllers/BotController.d.ts b/TypeScript/2EditDatabase/types/controllers/BotController.d.ts index 6431fca..475f51b 100644 --- a/TypeScript/2EditDatabase/types/controllers/BotController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/BotController.d.ts @@ -20,8 +20,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/2EditDatabase/types/controllers/BuildController.d.ts b/TypeScript/2EditDatabase/types/controllers/BuildController.d.ts index ed8adf6..2cb9c59 100644 --- a/TypeScript/2EditDatabase/types/controllers/BuildController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/BuildController.d.ts @@ -9,8 +9,8 @@ import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BuildController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/2EditDatabase/types/controllers/GameController.d.ts b/TypeScript/2EditDatabase/types/controllers/GameController.d.ts index 533a81c..e219c04 100644 --- a/TypeScript/2EditDatabase/types/controllers/GameController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/GameController.d.ts @@ -34,10 +34,10 @@ import { ProfileActivityService } from "@spt/services/ProfileActivityService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GameController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/2EditDatabase/types/controllers/HealthController.d.ts b/TypeScript/2EditDatabase/types/controllers/HealthController.d.ts index 5482283..5a0a0a6 100644 --- a/TypeScript/2EditDatabase/types/controllers/HealthController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/HealthController.d.ts @@ -12,8 +12,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthController { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/2EditDatabase/types/controllers/HideoutController.d.ts b/TypeScript/2EditDatabase/types/controllers/HideoutController.d.ts index e9d1ed9..89a428c 100644 --- a/TypeScript/2EditDatabase/types/controllers/HideoutController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/HideoutController.d.ts @@ -35,11 +35,11 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; import { ProfileActivityService } from "@spt/services/ProfileActivityService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/2EditDatabase/types/controllers/InraidController.d.ts b/TypeScript/2EditDatabase/types/controllers/InraidController.d.ts index 87f419b..9f0c409 100644 --- a/TypeScript/2EditDatabase/types/controllers/InraidController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/InraidController.d.ts @@ -13,6 +13,7 @@ import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRe import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState"; import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig"; import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; @@ -31,7 +32,6 @@ import { PmcChatResponseService } from "@spt/services/PmcChatResponseService"; import { TraderServicesService } from "@spt/services/TraderServicesService"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; -import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; /** * Logic for handling In Raid callbacks */ diff --git a/TypeScript/2EditDatabase/types/controllers/InsuranceController.d.ts b/TypeScript/2EditDatabase/types/controllers/InsuranceController.d.ts index f921b83..543e915 100644 --- a/TypeScript/2EditDatabase/types/controllers/InsuranceController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/InsuranceController.d.ts @@ -21,11 +21,11 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PaymentService } from "@spt/services/PaymentService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceController { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/2EditDatabase/types/controllers/InventoryController.d.ts b/TypeScript/2EditDatabase/types/controllers/InventoryController.d.ts index 40bb084..c986ce8 100644 --- a/TypeScript/2EditDatabase/types/controllers/InventoryController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/InventoryController.d.ts @@ -37,10 +37,10 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MapMarkerService } from "@spt/services/MapMarkerService"; import { PlayerService } from "@spt/services/PlayerService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/2EditDatabase/types/controllers/LocationController.d.ts b/TypeScript/2EditDatabase/types/controllers/LocationController.d.ts index 727a8c8..a541b9c 100644 --- a/TypeScript/2EditDatabase/types/controllers/LocationController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/LocationController.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class LocationController { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; diff --git a/TypeScript/2EditDatabase/types/controllers/ProfileController.d.ts b/TypeScript/2EditDatabase/types/controllers/ProfileController.d.ts index e8dae73..7e6d35c 100644 --- a/TypeScript/2EditDatabase/types/controllers/ProfileController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/ProfileController.d.ts @@ -26,9 +26,9 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/2EditDatabase/types/controllers/QuestController.d.ts b/TypeScript/2EditDatabase/types/controllers/QuestController.d.ts index 3cdce00..6a5b415 100644 --- a/TypeScript/2EditDatabase/types/controllers/QuestController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/QuestController.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/2EditDatabase/types/controllers/RepeatableQuestController.d.ts b/TypeScript/2EditDatabase/types/controllers/RepeatableQuestController.d.ts index 74f39eb..016f8c6 100644 --- a/TypeScript/2EditDatabase/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/RepeatableQuestController.d.ts @@ -18,11 +18,11 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/2EditDatabase/types/controllers/TradeController.d.ts b/TypeScript/2EditDatabase/types/controllers/TradeController.d.ts index bc72e92..842a97b 100644 --- a/TypeScript/2EditDatabase/types/controllers/TradeController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/TradeController.d.ts @@ -1,5 +1,6 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper"; import { TradeHelper } from "@spt/helpers/TradeHelper"; import { TraderHelper } from "@spt/helpers/TraderHelper"; import { IPmcData } from "@spt/models/eft/common/IPmcData"; @@ -35,6 +36,7 @@ export declare class TradeController { protected hashUtil: HashUtil; protected itemHelper: ItemHelper; protected profileHelper: ProfileHelper; + protected ragfairOfferHelper: RagfairOfferHelper; protected traderHelper: TraderHelper; protected ragfairServer: RagfairServer; protected httpResponse: HttpResponseUtil; @@ -44,7 +46,7 @@ export declare class TradeController { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairOfferHelper: RagfairOfferHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); /** Handle TradingConfirm event */ confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; /** Handle RagFairBuyOffer event */ @@ -67,10 +69,17 @@ export declare class TradeController { * @param output Output to send back to client */ protected buyPmcItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void; + /** + * Is the provided offerid and ownerid from a player made offer + * @param offerId Id of the offer + * @param offerOwnerId Owner id + * @returns true if offer was made by a player + */ + protected isPlayerOffer(offerId: string, offerOwnerId: string): boolean; /** * Does Player have necessary trader loyalty to purchase flea offer * @param sellerIsTrader is seller trader - * @param fleaOffer FLea offer being bought + * @param fleaOffer Flea offer being bought * @param pmcData Player profile * @returns True if player can buy offer */ diff --git a/TypeScript/2EditDatabase/types/controllers/TraderController.d.ts b/TypeScript/2EditDatabase/types/controllers/TraderController.d.ts index 7fc6d78..3592fc6 100644 --- a/TypeScript/2EditDatabase/types/controllers/TraderController.d.ts +++ b/TypeScript/2EditDatabase/types/controllers/TraderController.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/2EditDatabase/types/generators/BotEquipmentModGenerator.d.ts b/TypeScript/2EditDatabase/types/generators/BotEquipmentModGenerator.d.ts index 419120f..3952293 100644 --- a/TypeScript/2EditDatabase/types/generators/BotEquipmentModGenerator.d.ts +++ b/TypeScript/2EditDatabase/types/generators/BotEquipmentModGenerator.d.ts @@ -25,9 +25,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotEquipmentModGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -65,7 +65,7 @@ export declare class BotEquipmentModGenerator { * @param settings Bot equipment generation settings * @param modSlot Armor slot being filtered * @param existingPlateTplPool Plates tpls to choose from - * @param armorItem + * @param armorItem The armor items db template * @returns Array of plate tpls to choose from */ protected filterPlateModsForSlotByLevel(settings: IGenerateEquipmentProperties, modSlot: string, existingPlateTplPool: string[], armorItem: ITemplateItem): IFilterPlateModsForSlotByLevelResult; diff --git a/TypeScript/2EditDatabase/types/generators/BotGenerator.d.ts b/TypeScript/2EditDatabase/types/generators/BotGenerator.d.ts index 8ab4371..ebb8a59 100644 --- a/TypeScript/2EditDatabase/types/generators/BotGenerator.d.ts +++ b/TypeScript/2EditDatabase/types/generators/BotGenerator.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/2EditDatabase/types/generators/BotLevelGenerator.d.ts b/TypeScript/2EditDatabase/types/generators/BotLevelGenerator.d.ts index dee61e2..a8a8895 100644 --- a/TypeScript/2EditDatabase/types/generators/BotLevelGenerator.d.ts +++ b/TypeScript/2EditDatabase/types/generators/BotLevelGenerator.d.ts @@ -4,12 +4,14 @@ import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; +import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class BotLevelGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; protected databaseService: DatabaseService; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService); + protected mathUtil: MathUtil; + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, mathUtil: MathUtil); /** * Return a randomised bot level and exp value * @param levelDetails Min and max of level for bot @@ -18,6 +20,7 @@ export declare class BotLevelGenerator { * @returns IRandomisedBotLevelResult object */ generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult; + protected chooseBotLevel(min: number, max: number, shift: number, number: number): number; /** * Get the highest level a bot can be relative to the players level, but no further than the max size from globals.exp_table * @param botGenerationDetails Details to help generate a bot diff --git a/TypeScript/2EditDatabase/types/generators/BotLootGenerator.d.ts b/TypeScript/2EditDatabase/types/generators/BotLootGenerator.d.ts index fee56ce..c0583c6 100644 --- a/TypeScript/2EditDatabase/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/2EditDatabase/types/generators/BotLootGenerator.d.ts @@ -18,9 +18,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/2EditDatabase/types/generators/BotWeaponGenerator.d.ts b/TypeScript/2EditDatabase/types/generators/BotWeaponGenerator.d.ts index 5559bfa..8e03b35 100644 --- a/TypeScript/2EditDatabase/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/2EditDatabase/types/generators/BotWeaponGenerator.d.ts @@ -18,9 +18,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RepairService } from "@spt/services/RepairService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotWeaponGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/2EditDatabase/types/generators/LocationGenerator.d.ts b/TypeScript/2EditDatabase/types/generators/LocationGenerator.d.ts index 222b0ab..9a2b0c4 100644 --- a/TypeScript/2EditDatabase/types/generators/LocationGenerator.d.ts +++ b/TypeScript/2EditDatabase/types/generators/LocationGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export interface IContainerItem { items: Item[]; width: number; diff --git a/TypeScript/2EditDatabase/types/generators/PlayerScavGenerator.d.ts b/TypeScript/2EditDatabase/types/generators/PlayerScavGenerator.d.ts index 2414150..e317bf6 100644 --- a/TypeScript/2EditDatabase/types/generators/PlayerScavGenerator.d.ts +++ b/TypeScript/2EditDatabase/types/generators/PlayerScavGenerator.d.ts @@ -14,9 +14,9 @@ import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class PlayerScavGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/2EditDatabase/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/2EditDatabase/types/generators/RagfairOfferGenerator.d.ts index 9435390..ca09729 100644 --- a/TypeScript/2EditDatabase/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/2EditDatabase/types/generators/RagfairOfferGenerator.d.ts @@ -19,10 +19,10 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/2EditDatabase/types/generators/RepeatableQuestGenerator.d.ts b/TypeScript/2EditDatabase/types/generators/RepeatableQuestGenerator.d.ts index 77c4e79..339f322 100644 --- a/TypeScript/2EditDatabase/types/generators/RepeatableQuestGenerator.d.ts +++ b/TypeScript/2EditDatabase/types/generators/RepeatableQuestGenerator.d.ts @@ -11,10 +11,10 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/2EditDatabase/types/generators/RepeatableQuestRewardGenerator.d.ts b/TypeScript/2EditDatabase/types/generators/RepeatableQuestRewardGenerator.d.ts index 1e09994..713a394 100644 --- a/TypeScript/2EditDatabase/types/generators/RepeatableQuestRewardGenerator.d.ts +++ b/TypeScript/2EditDatabase/types/generators/RepeatableQuestRewardGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestRewardGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/2EditDatabase/types/helpers/BotDifficultyHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/BotDifficultyHelper.d.ts index 63572a5..2348bd3 100644 --- a/TypeScript/2EditDatabase/types/helpers/BotDifficultyHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/BotDifficultyHelper.d.ts @@ -5,8 +5,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotDifficultyHelper { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/2EditDatabase/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/2EditDatabase/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index c51bf7e..c38f0a0 100644 --- a/TypeScript/2EditDatabase/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GiveSptCommand implements ISptCommand { protected logger: ILogger; protected itemHelper: ItemHelper; diff --git a/TypeScript/2EditDatabase/types/helpers/HealthHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/HealthHelper.d.ts index 650f633..a164285 100644 --- a/TypeScript/2EditDatabase/types/helpers/HealthHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/HealthHelper.d.ts @@ -5,8 +5,8 @@ import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/2EditDatabase/types/helpers/HideoutHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/HideoutHelper.d.ts index c4aaa4c..df0376b 100644 --- a/TypeScript/2EditDatabase/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/HideoutHelper.d.ts @@ -18,10 +18,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/2EditDatabase/types/helpers/InRaidHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/InRaidHelper.d.ts index 449be9f..987c9ec 100644 --- a/TypeScript/2EditDatabase/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/InRaidHelper.d.ts @@ -15,9 +15,9 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InRaidHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/2EditDatabase/types/helpers/InventoryHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/InventoryHelper.d.ts index f0ff69a..92bb49c 100644 --- a/TypeScript/2EditDatabase/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/InventoryHelper.d.ts @@ -23,9 +23,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/2EditDatabase/types/helpers/ItemHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/ItemHelper.d.ts index da5dd11..c304cee 100644 --- a/TypeScript/2EditDatabase/types/helpers/ItemHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/ItemHelper.d.ts @@ -11,13 +11,13 @@ import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { CompareUtil } from "@spt/utils/CompareUtil"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ItemHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/2EditDatabase/types/helpers/ProfileHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/ProfileHelper.d.ts index 0671179..cdab870 100644 --- a/TypeScript/2EditDatabase/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/ProfileHelper.d.ts @@ -11,10 +11,10 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/2EditDatabase/types/helpers/QuestHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/QuestHelper.d.ts index 2b84b8f..2d5730d 100644 --- a/TypeScript/2EditDatabase/types/helpers/QuestHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/QuestHelper.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/2EditDatabase/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/RagfairOfferHelper.d.ts index b526554..2386316 100644 --- a/TypeScript/2EditDatabase/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/RagfairOfferHelper.d.ts @@ -151,7 +151,7 @@ export declare class RagfairOfferHelper { * @param boughtAmount Amount item was purchased for * @returns IItemEventRouterResponse */ - protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; + completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; /** * Get a localised message for when players offer has sold on flea * @param itemTpl Item sold diff --git a/TypeScript/2EditDatabase/types/helpers/RagfairServerHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/RagfairServerHelper.d.ts index 927caf5..3e1fea9 100644 --- a/TypeScript/2EditDatabase/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/RagfairServerHelper.d.ts @@ -12,9 +12,9 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Helper class for common ragfair server actions */ diff --git a/TypeScript/2EditDatabase/types/helpers/RepairHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/RepairHelper.d.ts index 99a21da..63c78c9 100644 --- a/TypeScript/2EditDatabase/types/helpers/RepairHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/RepairHelper.d.ts @@ -4,8 +4,8 @@ import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/2EditDatabase/types/helpers/RepeatableQuestHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/RepeatableQuestHelper.d.ts index d92657e..8c65f40 100644 --- a/TypeScript/2EditDatabase/types/helpers/RepeatableQuestHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/RepeatableQuestHelper.d.ts @@ -1,8 +1,8 @@ import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestHelper { protected mathUtil: MathUtil; protected configServer: ConfigServer; diff --git a/TypeScript/2EditDatabase/types/helpers/TradeHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/TradeHelper.d.ts index f994fda..6e6f3a2 100644 --- a/TypeScript/2EditDatabase/types/helpers/TradeHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/TradeHelper.d.ts @@ -17,8 +17,8 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TradeHelper { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/2EditDatabase/types/helpers/TraderAssortHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/TraderAssortHelper.d.ts index 8f8f802..f1ecd3b 100644 --- a/TypeScript/2EditDatabase/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/TraderAssortHelper.d.ts @@ -14,9 +14,9 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; diff --git a/TypeScript/2EditDatabase/types/loaders/BundleLoader.d.ts b/TypeScript/2EditDatabase/types/loaders/BundleLoader.d.ts index e270988..8c0ed4d 100644 --- a/TypeScript/2EditDatabase/types/loaders/BundleLoader.d.ts +++ b/TypeScript/2EditDatabase/types/loaders/BundleLoader.d.ts @@ -1,8 +1,8 @@ import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BundleInfo { modpath: string; filename: string; diff --git a/TypeScript/2EditDatabase/types/loaders/PostDBModLoader.d.ts b/TypeScript/2EditDatabase/types/loaders/PostDBModLoader.d.ts index b0c4bf4..a8bb6a9 100644 --- a/TypeScript/2EditDatabase/types/loaders/PostDBModLoader.d.ts +++ b/TypeScript/2EditDatabase/types/loaders/PostDBModLoader.d.ts @@ -1,10 +1,10 @@ -import { DependencyContainer } from "tsyringe"; import { OnLoad } from "@spt/di/OnLoad"; import { BundleLoader } from "@spt/loaders/BundleLoader"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostDBModLoader implements OnLoad { protected logger: ILogger; protected bundleLoader: BundleLoader; diff --git a/TypeScript/2EditDatabase/types/loaders/PostSptModLoader.d.ts b/TypeScript/2EditDatabase/types/loaders/PostSptModLoader.d.ts index fb54579..2603497 100644 --- a/TypeScript/2EditDatabase/types/loaders/PostSptModLoader.d.ts +++ b/TypeScript/2EditDatabase/types/loaders/PostSptModLoader.d.ts @@ -1,9 +1,9 @@ -import { DependencyContainer } from "tsyringe"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { IModLoader } from "@spt/models/spt/mod/IModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostSptModLoader implements IModLoader { protected logger: ILogger; protected preSptModLoader: PreSptModLoader; diff --git a/TypeScript/2EditDatabase/types/loaders/PreSptModLoader.d.ts b/TypeScript/2EditDatabase/types/loaders/PreSptModLoader.d.ts index bc846c8..8814525 100644 --- a/TypeScript/2EditDatabase/types/loaders/PreSptModLoader.d.ts +++ b/TypeScript/2EditDatabase/types/loaders/PreSptModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { ModDetails } from "@spt/models/eft/profile/ISptProfile"; @@ -11,6 +10,7 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { ModCompilerService } from "@spt/services/ModCompilerService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { DependencyContainer } from "tsyringe"; export declare class PreSptModLoader implements IModLoader { protected logger: ILogger; protected vfs: VFS; diff --git a/TypeScript/2EditDatabase/types/models/eft/common/IEmptyRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/IEmptyRequestData.d.ts index 284d16e..52a7b12 100644 --- a/TypeScript/2EditDatabase/types/models/eft/common/IEmptyRequestData.d.ts +++ b/TypeScript/2EditDatabase/types/models/eft/common/IEmptyRequestData.d.ts @@ -1,2 +1 @@ -export interface IEmptyRequestData { -} +export type IEmptyRequestData = {}; diff --git a/TypeScript/2EditDatabase/types/models/eft/common/tables/IBotBase.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/tables/IBotBase.d.ts index a7fe1ca..be37845 100644 --- a/TypeScript/2EditDatabase/types/models/eft/common/tables/IBotBase.d.ts +++ b/TypeScript/2EditDatabase/types/models/eft/common/tables/IBotBase.d.ts @@ -373,8 +373,7 @@ export interface LastCompleted { export interface Notes { Notes: Note[]; } -export interface CarExtractCounts { -} +export type CarExtractCounts = {}; export declare enum SurvivorClass { UNKNOWN = 0, NEUTRALIZER = 1, diff --git a/TypeScript/2EditDatabase/types/models/eft/common/tables/ILocationsBase.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/tables/ILocationsBase.d.ts index 2c96af3..16bca24 100644 --- a/TypeScript/2EditDatabase/types/models/eft/common/tables/ILocationsBase.d.ts +++ b/TypeScript/2EditDatabase/types/models/eft/common/tables/ILocationsBase.d.ts @@ -2,8 +2,7 @@ export interface ILocationsBase { locations: Locations; paths: Path[]; } -export interface Locations { -} +export type Locations = {}; export interface Path { Source: string; Destination: string; diff --git a/TypeScript/2EditDatabase/types/models/eft/common/tables/IProfileTemplate.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/tables/IProfileTemplate.d.ts index 20923bc..6ba9221 100644 --- a/TypeScript/2EditDatabase/types/models/eft/common/tables/IProfileTemplate.d.ts +++ b/TypeScript/2EditDatabase/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -1,12 +1,12 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { Dialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; export interface IProfileTemplates { - "Standard": IProfileSides; + Standard: IProfileSides; "Left Behind": IProfileSides; "Prepare To Escape": IProfileSides; "Edge Of Darkness": IProfileSides; - "Unheard": IProfileSides; - "Tournament": IProfileSides; + Unheard: IProfileSides; + Tournament: IProfileSides; "SPT Developer": IProfileSides; "SPT Easy start": IProfileSides; "SPT Zero to hero": IProfileSides; diff --git a/TypeScript/2EditDatabase/types/models/eft/common/tables/ITrader.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/tables/ITrader.d.ts index 14ab409..40cf004 100644 --- a/TypeScript/2EditDatabase/types/models/eft/common/tables/ITrader.d.ts +++ b/TypeScript/2EditDatabase/types/models/eft/common/tables/ITrader.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; export interface ITrader { assort?: ITraderAssort; @@ -78,6 +79,8 @@ export interface IBarterScheme { _tpl: string; onlyFunctional?: boolean; sptQuestLocked?: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface ISuit { _id: string; diff --git a/TypeScript/2EditDatabase/types/models/eft/hideout/IQteData.d.ts b/TypeScript/2EditDatabase/types/models/eft/hideout/IQteData.d.ts index 7f507e1..fe6cce6 100644 --- a/TypeScript/2EditDatabase/types/models/eft/hideout/IQteData.d.ts +++ b/TypeScript/2EditDatabase/types/models/eft/hideout/IQteData.d.ts @@ -1,14 +1,14 @@ import { Effect } from "@spt/models/eft/health/Effect"; import { BodyPart } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; import { QteActivityType } from "@spt/models/enums/hideout/QteActivityType"; import { QteEffectType } from "@spt/models/enums/hideout/QteEffectType"; import { QteResultType } from "@spt/models/enums/hideout/QteResultType"; import { QteRewardType } from "@spt/models/enums/hideout/QteRewardType"; import { QteType } from "@spt/models/enums/hideout/QteType"; import { RequirementType } from "@spt/models/enums/hideout/RequirementType"; -import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt/models/enums/SkillTypes"; -import { Traders } from "@spt/models/enums/Traders"; export interface IQteData { id: string; type: QteActivityType; diff --git a/TypeScript/2EditDatabase/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index f1123c1..5971372 100644 --- a/TypeScript/2EditDatabase/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/TypeScript/2EditDatabase/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -15,7 +15,5 @@ export interface Items { change: any[]; del: any[]; } -export interface Production { -} -export interface TraderRelations { -} +export type Production = {}; +export type TraderRelations = {}; diff --git a/TypeScript/2EditDatabase/types/models/eft/profile/ISptProfile.d.ts b/TypeScript/2EditDatabase/types/models/eft/profile/ISptProfile.d.ts index a8e742a..dd7aea6 100644 --- a/TypeScript/2EditDatabase/types/models/eft/profile/ISptProfile.d.ts +++ b/TypeScript/2EditDatabase/types/models/eft/profile/ISptProfile.d.ts @@ -209,12 +209,9 @@ export interface Effects { LeftLeg: LeftLeg; RightLeg: RightLeg; } -export interface Head { -} -export interface Chest { -} -export interface Stomach { -} +export type Head = {}; +export type Chest = {}; +export type Stomach = {}; export interface LeftArm { Fracture?: number; } diff --git a/TypeScript/2EditDatabase/types/models/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/2EditDatabase/types/models/eft/ragfair/IRagfairOffer.d.ts index eeeb79d..f6c07fc 100644 --- a/TypeScript/2EditDatabase/types/models/eft/ragfair/IRagfairOffer.d.ts +++ b/TypeScript/2EditDatabase/types/models/eft/ragfair/IRagfairOffer.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface IRagfairOffer { sellResult?: SellResult[]; @@ -28,6 +29,8 @@ export interface OfferRequirement { _tpl: string; count: number; onlyFunctional: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface IRagfairOfferUser { id: string; diff --git a/TypeScript/2EditDatabase/types/models/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/2EditDatabase/types/models/eft/ragfair/ISearchRequestData.d.ts index 8261c5b..c631de8 100644 --- a/TypeScript/2EditDatabase/types/models/eft/ragfair/ISearchRequestData.d.ts +++ b/TypeScript/2EditDatabase/types/models/eft/ragfair/ISearchRequestData.d.ts @@ -29,5 +29,4 @@ export declare enum OfferOwnerType { TRADEROWNERTYPE = 1, PLAYEROWNERTYPE = 2 } -export interface BuildItems { -} +export type BuildItems = {}; diff --git a/TypeScript/2EditDatabase/types/models/enums/BaseClasses.d.ts b/TypeScript/2EditDatabase/types/models/enums/BaseClasses.d.ts index 65fc95e..32ebf7c 100644 --- a/TypeScript/2EditDatabase/types/models/enums/BaseClasses.d.ts +++ b/TypeScript/2EditDatabase/types/models/enums/BaseClasses.d.ts @@ -107,6 +107,6 @@ export declare enum BaseClasses { RECEIVER = "55818a304bdc2db5418b457d", BARREL = "555ef6e44bdc2de9068b457e", CHARGING_HANDLE = "55818a6f4bdc2db9688b456b", - COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569 ", + COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569", HIDEOUT_AREA_CONTAINER = "63da6da4784a55176c018dba" } diff --git a/TypeScript/2EditDatabase/types/models/enums/DogtagExchangeSide.d.ts b/TypeScript/2EditDatabase/types/models/enums/DogtagExchangeSide.d.ts new file mode 100644 index 0000000..de3d4df --- /dev/null +++ b/TypeScript/2EditDatabase/types/models/enums/DogtagExchangeSide.d.ts @@ -0,0 +1,5 @@ +export declare enum DogtagExchangeSide { + USEC = "Usec", + BEAR = "Bear", + ANY = "Any" +} diff --git a/TypeScript/2EditDatabase/types/models/spt/server/ExhaustableArray.d.ts b/TypeScript/2EditDatabase/types/models/spt/server/ExhaustableArray.d.ts index c27f41f..50a6b68 100644 --- a/TypeScript/2EditDatabase/types/models/spt/server/ExhaustableArray.d.ts +++ b/TypeScript/2EditDatabase/types/models/spt/server/ExhaustableArray.d.ts @@ -1,5 +1,5 @@ -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ExhaustableArray implements IExhaustableArray { private itemPool; private randomUtil; diff --git a/TypeScript/2EditDatabase/types/routers/EventOutputHolder.d.ts b/TypeScript/2EditDatabase/types/routers/EventOutputHolder.d.ts index ef20706..148461a 100644 --- a/TypeScript/2EditDatabase/types/routers/EventOutputHolder.d.ts +++ b/TypeScript/2EditDatabase/types/routers/EventOutputHolder.d.ts @@ -3,8 +3,8 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IHideoutImprovement, Productive, TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; import { TraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class EventOutputHolder { protected profileHelper: ProfileHelper; protected timeUtil: TimeUtil; @@ -12,7 +12,7 @@ export declare class EventOutputHolder { /** * What has client been informed of this game session * Key = sessionId, then second key is prod id - */ + */ protected clientActiveSessionStorage: Record>; diff --git a/TypeScript/2EditDatabase/types/servers/HttpServer.d.ts b/TypeScript/2EditDatabase/types/servers/HttpServer.d.ts index b00fe68..0024ba3 100644 --- a/TypeScript/2EditDatabase/types/servers/HttpServer.d.ts +++ b/TypeScript/2EditDatabase/types/servers/HttpServer.d.ts @@ -6,8 +6,8 @@ import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; -import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { WebSocketServer } from "@spt/servers/WebSocketServer"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { LocalisationService } from "@spt/services/LocalisationService"; export declare class HttpServer { protected logger: ILogger; diff --git a/TypeScript/2EditDatabase/types/servers/WebSocketServer.d.ts b/TypeScript/2EditDatabase/types/servers/WebSocketServer.d.ts index f4e07bb..6121824 100644 --- a/TypeScript/2EditDatabase/types/servers/WebSocketServer.d.ts +++ b/TypeScript/2EditDatabase/types/servers/WebSocketServer.d.ts @@ -1,12 +1,12 @@ /// import http, { IncomingMessage } from "node:http"; -import { WebSocket, Server } from "ws"; import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { Server, WebSocket } from "ws"; export declare class WebSocketServer { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/2EditDatabase/types/servers/ws/SptWebSocketConnectionHandler.d.ts b/TypeScript/2EditDatabase/types/servers/ws/SptWebSocketConnectionHandler.d.ts index 98d0898..70fc96a 100644 --- a/TypeScript/2EditDatabase/types/servers/ws/SptWebSocketConnectionHandler.d.ts +++ b/TypeScript/2EditDatabase/types/servers/ws/SptWebSocketConnectionHandler.d.ts @@ -1,7 +1,6 @@ /// /// import { IncomingMessage } from "http"; -import { WebSocket } from "ws"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; @@ -11,6 +10,7 @@ import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectio import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; +import { WebSocket } from "ws"; export declare class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler { protected logger: ILogger; protected profileHelper: ProfileHelper; diff --git a/TypeScript/2EditDatabase/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts b/TypeScript/2EditDatabase/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts index d5247ec..5556129 100644 --- a/TypeScript/2EditDatabase/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts +++ b/TypeScript/2EditDatabase/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts @@ -1,6 +1,6 @@ -import { RawData, WebSocket } from "ws"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; +import { RawData, WebSocket } from "ws"; export declare class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler { protected logger: ILogger; constructor(logger: ILogger); diff --git a/TypeScript/2EditDatabase/types/services/FenceService.d.ts b/TypeScript/2EditDatabase/types/services/FenceService.d.ts index c156122..58dc076 100644 --- a/TypeScript/2EditDatabase/types/services/FenceService.d.ts +++ b/TypeScript/2EditDatabase/types/services/FenceService.d.ts @@ -13,9 +13,9 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Handle actions surrounding Fence * e.g. generating or refreshing assorts / get next refresh time diff --git a/TypeScript/2EditDatabase/types/services/InsuranceService.d.ts b/TypeScript/2EditDatabase/types/services/InsuranceService.d.ts index 0000e66..f799102 100644 --- a/TypeScript/2EditDatabase/types/services/InsuranceService.d.ts +++ b/TypeScript/2EditDatabase/types/services/InsuranceService.d.ts @@ -18,10 +18,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceService { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/2EditDatabase/types/services/LocalisationService.d.ts b/TypeScript/2EditDatabase/types/services/LocalisationService.d.ts index 42dfa4e..855c138 100644 --- a/TypeScript/2EditDatabase/types/services/LocalisationService.d.ts +++ b/TypeScript/2EditDatabase/types/services/LocalisationService.d.ts @@ -1,8 +1,8 @@ -import { I18n } from "i18n"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { LocaleService } from "@spt/services/LocaleService"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { I18n } from "i18n"; /** * Handles translating server text into different langauges */ diff --git a/TypeScript/2EditDatabase/types/services/ProfileFixerService.d.ts b/TypeScript/2EditDatabase/types/services/ProfileFixerService.d.ts index 525b867..91e4780 100644 --- a/TypeScript/2EditDatabase/types/services/ProfileFixerService.d.ts +++ b/TypeScript/2EditDatabase/types/services/ProfileFixerService.d.ts @@ -8,7 +8,7 @@ import { Bonus, HideoutSlot } from "@spt/models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea"; -import { ISptProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; +import { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; @@ -16,11 +16,11 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileFixerService { protected logger: ILogger; protected watermark: Watermark; @@ -73,6 +73,7 @@ export declare class ProfileFixerService { */ protected removeDanglingTaskConditionCounters(pmcProfile: IPmcData): void; protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullRagfairRatings(pmcProfile: IPmcData): void; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; /** diff --git a/TypeScript/2EditDatabase/types/services/RagfairOfferService.d.ts b/TypeScript/2EditDatabase/types/services/RagfairOfferService.d.ts index 6c13b1d..98dd179 100644 --- a/TypeScript/2EditDatabase/types/services/RagfairOfferService.d.ts +++ b/TypeScript/2EditDatabase/types/services/RagfairOfferService.d.ts @@ -10,10 +10,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/2EditDatabase/types/services/mod/CustomItemService.d.ts b/TypeScript/2EditDatabase/types/services/mod/CustomItemService.d.ts index 1926bed..f112872 100644 --- a/TypeScript/2EditDatabase/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/2EditDatabase/types/services/mod/CustomItemService.d.ts @@ -4,8 +4,8 @@ import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetail import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/2EditDatabase/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/2EditDatabase/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts index 3c9d955..91c84d9 100644 --- a/TypeScript/2EditDatabase/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts +++ b/TypeScript/2EditDatabase/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class DynamicRouterModService { private container; constructor(container: DependencyContainer); diff --git a/TypeScript/2EditDatabase/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/2EditDatabase/types/services/mod/staticRouter/StaticRouterModService.d.ts index f60432d..0c3d4d8 100644 --- a/TypeScript/2EditDatabase/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/TypeScript/2EditDatabase/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class StaticRouterModService { protected container: DependencyContainer; constructor(container: DependencyContainer); diff --git a/TypeScript/2EditDatabase/types/utils/JsonUtil.d.ts b/TypeScript/2EditDatabase/types/utils/JsonUtil.d.ts index b30822c..4419228 100644 --- a/TypeScript/2EditDatabase/types/utils/JsonUtil.d.ts +++ b/TypeScript/2EditDatabase/types/utils/JsonUtil.d.ts @@ -1,7 +1,7 @@ -import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { HashUtil } from "@spt/utils/HashUtil"; import { VFS } from "@spt/utils/VFS"; +import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; export declare class JsonUtil { protected vfs: VFS; protected hashUtil: HashUtil; diff --git a/TypeScript/2EditDatabase/types/utils/RandomUtil.d.ts b/TypeScript/2EditDatabase/types/utils/RandomUtil.d.ts index 49f242d..0da184f 100644 --- a/TypeScript/2EditDatabase/types/utils/RandomUtil.d.ts +++ b/TypeScript/2EditDatabase/types/utils/RandomUtil.d.ts @@ -1,6 +1,6 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects * based on the relative probability of each of its elements. diff --git a/TypeScript/2EditDatabase/types/utils/logging/AbstractWinstonLogger.d.ts b/TypeScript/2EditDatabase/types/utils/logging/AbstractWinstonLogger.d.ts index 7098f85..ef54434 100644 --- a/TypeScript/2EditDatabase/types/utils/logging/AbstractWinstonLogger.d.ts +++ b/TypeScript/2EditDatabase/types/utils/logging/AbstractWinstonLogger.d.ts @@ -1,12 +1,12 @@ /// import fs from "node:fs"; -import winston from "winston"; import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; import { SptLogger } from "@spt/models/spt/logging/SptLogger"; import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; import { ILogger } from "@spt/models/spt/utils/ILogger"; +import winston from "winston"; export declare abstract class AbstractWinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected showDebugInConsole: boolean; diff --git a/TypeScript/3GetSptConfigFile/types/controllers/BotController.d.ts b/TypeScript/3GetSptConfigFile/types/controllers/BotController.d.ts index 6431fca..475f51b 100644 --- a/TypeScript/3GetSptConfigFile/types/controllers/BotController.d.ts +++ b/TypeScript/3GetSptConfigFile/types/controllers/BotController.d.ts @@ -20,8 +20,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/3GetSptConfigFile/types/controllers/BuildController.d.ts b/TypeScript/3GetSptConfigFile/types/controllers/BuildController.d.ts index ed8adf6..2cb9c59 100644 --- a/TypeScript/3GetSptConfigFile/types/controllers/BuildController.d.ts +++ b/TypeScript/3GetSptConfigFile/types/controllers/BuildController.d.ts @@ -9,8 +9,8 @@ import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BuildController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/3GetSptConfigFile/types/controllers/GameController.d.ts b/TypeScript/3GetSptConfigFile/types/controllers/GameController.d.ts index 533a81c..e219c04 100644 --- a/TypeScript/3GetSptConfigFile/types/controllers/GameController.d.ts +++ b/TypeScript/3GetSptConfigFile/types/controllers/GameController.d.ts @@ -34,10 +34,10 @@ import { ProfileActivityService } from "@spt/services/ProfileActivityService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GameController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/3GetSptConfigFile/types/controllers/HealthController.d.ts b/TypeScript/3GetSptConfigFile/types/controllers/HealthController.d.ts index 5482283..5a0a0a6 100644 --- a/TypeScript/3GetSptConfigFile/types/controllers/HealthController.d.ts +++ b/TypeScript/3GetSptConfigFile/types/controllers/HealthController.d.ts @@ -12,8 +12,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthController { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/3GetSptConfigFile/types/controllers/HideoutController.d.ts b/TypeScript/3GetSptConfigFile/types/controllers/HideoutController.d.ts index e9d1ed9..89a428c 100644 --- a/TypeScript/3GetSptConfigFile/types/controllers/HideoutController.d.ts +++ b/TypeScript/3GetSptConfigFile/types/controllers/HideoutController.d.ts @@ -35,11 +35,11 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; import { ProfileActivityService } from "@spt/services/ProfileActivityService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/3GetSptConfigFile/types/controllers/InraidController.d.ts b/TypeScript/3GetSptConfigFile/types/controllers/InraidController.d.ts index 87f419b..9f0c409 100644 --- a/TypeScript/3GetSptConfigFile/types/controllers/InraidController.d.ts +++ b/TypeScript/3GetSptConfigFile/types/controllers/InraidController.d.ts @@ -13,6 +13,7 @@ import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRe import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState"; import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig"; import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; @@ -31,7 +32,6 @@ import { PmcChatResponseService } from "@spt/services/PmcChatResponseService"; import { TraderServicesService } from "@spt/services/TraderServicesService"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; -import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; /** * Logic for handling In Raid callbacks */ diff --git a/TypeScript/3GetSptConfigFile/types/controllers/InsuranceController.d.ts b/TypeScript/3GetSptConfigFile/types/controllers/InsuranceController.d.ts index f921b83..543e915 100644 --- a/TypeScript/3GetSptConfigFile/types/controllers/InsuranceController.d.ts +++ b/TypeScript/3GetSptConfigFile/types/controllers/InsuranceController.d.ts @@ -21,11 +21,11 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PaymentService } from "@spt/services/PaymentService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceController { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/3GetSptConfigFile/types/controllers/InventoryController.d.ts b/TypeScript/3GetSptConfigFile/types/controllers/InventoryController.d.ts index 40bb084..c986ce8 100644 --- a/TypeScript/3GetSptConfigFile/types/controllers/InventoryController.d.ts +++ b/TypeScript/3GetSptConfigFile/types/controllers/InventoryController.d.ts @@ -37,10 +37,10 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MapMarkerService } from "@spt/services/MapMarkerService"; import { PlayerService } from "@spt/services/PlayerService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/3GetSptConfigFile/types/controllers/LocationController.d.ts b/TypeScript/3GetSptConfigFile/types/controllers/LocationController.d.ts index 727a8c8..a541b9c 100644 --- a/TypeScript/3GetSptConfigFile/types/controllers/LocationController.d.ts +++ b/TypeScript/3GetSptConfigFile/types/controllers/LocationController.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class LocationController { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; diff --git a/TypeScript/3GetSptConfigFile/types/controllers/ProfileController.d.ts b/TypeScript/3GetSptConfigFile/types/controllers/ProfileController.d.ts index e8dae73..7e6d35c 100644 --- a/TypeScript/3GetSptConfigFile/types/controllers/ProfileController.d.ts +++ b/TypeScript/3GetSptConfigFile/types/controllers/ProfileController.d.ts @@ -26,9 +26,9 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/3GetSptConfigFile/types/controllers/QuestController.d.ts b/TypeScript/3GetSptConfigFile/types/controllers/QuestController.d.ts index 3cdce00..6a5b415 100644 --- a/TypeScript/3GetSptConfigFile/types/controllers/QuestController.d.ts +++ b/TypeScript/3GetSptConfigFile/types/controllers/QuestController.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/3GetSptConfigFile/types/controllers/RepeatableQuestController.d.ts b/TypeScript/3GetSptConfigFile/types/controllers/RepeatableQuestController.d.ts index 74f39eb..016f8c6 100644 --- a/TypeScript/3GetSptConfigFile/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/3GetSptConfigFile/types/controllers/RepeatableQuestController.d.ts @@ -18,11 +18,11 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/3GetSptConfigFile/types/controllers/TradeController.d.ts b/TypeScript/3GetSptConfigFile/types/controllers/TradeController.d.ts index bc72e92..842a97b 100644 --- a/TypeScript/3GetSptConfigFile/types/controllers/TradeController.d.ts +++ b/TypeScript/3GetSptConfigFile/types/controllers/TradeController.d.ts @@ -1,5 +1,6 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper"; import { TradeHelper } from "@spt/helpers/TradeHelper"; import { TraderHelper } from "@spt/helpers/TraderHelper"; import { IPmcData } from "@spt/models/eft/common/IPmcData"; @@ -35,6 +36,7 @@ export declare class TradeController { protected hashUtil: HashUtil; protected itemHelper: ItemHelper; protected profileHelper: ProfileHelper; + protected ragfairOfferHelper: RagfairOfferHelper; protected traderHelper: TraderHelper; protected ragfairServer: RagfairServer; protected httpResponse: HttpResponseUtil; @@ -44,7 +46,7 @@ export declare class TradeController { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairOfferHelper: RagfairOfferHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); /** Handle TradingConfirm event */ confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; /** Handle RagFairBuyOffer event */ @@ -67,10 +69,17 @@ export declare class TradeController { * @param output Output to send back to client */ protected buyPmcItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void; + /** + * Is the provided offerid and ownerid from a player made offer + * @param offerId Id of the offer + * @param offerOwnerId Owner id + * @returns true if offer was made by a player + */ + protected isPlayerOffer(offerId: string, offerOwnerId: string): boolean; /** * Does Player have necessary trader loyalty to purchase flea offer * @param sellerIsTrader is seller trader - * @param fleaOffer FLea offer being bought + * @param fleaOffer Flea offer being bought * @param pmcData Player profile * @returns True if player can buy offer */ diff --git a/TypeScript/3GetSptConfigFile/types/controllers/TraderController.d.ts b/TypeScript/3GetSptConfigFile/types/controllers/TraderController.d.ts index 7fc6d78..3592fc6 100644 --- a/TypeScript/3GetSptConfigFile/types/controllers/TraderController.d.ts +++ b/TypeScript/3GetSptConfigFile/types/controllers/TraderController.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/3GetSptConfigFile/types/generators/BotEquipmentModGenerator.d.ts b/TypeScript/3GetSptConfigFile/types/generators/BotEquipmentModGenerator.d.ts index 419120f..3952293 100644 --- a/TypeScript/3GetSptConfigFile/types/generators/BotEquipmentModGenerator.d.ts +++ b/TypeScript/3GetSptConfigFile/types/generators/BotEquipmentModGenerator.d.ts @@ -25,9 +25,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotEquipmentModGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -65,7 +65,7 @@ export declare class BotEquipmentModGenerator { * @param settings Bot equipment generation settings * @param modSlot Armor slot being filtered * @param existingPlateTplPool Plates tpls to choose from - * @param armorItem + * @param armorItem The armor items db template * @returns Array of plate tpls to choose from */ protected filterPlateModsForSlotByLevel(settings: IGenerateEquipmentProperties, modSlot: string, existingPlateTplPool: string[], armorItem: ITemplateItem): IFilterPlateModsForSlotByLevelResult; diff --git a/TypeScript/3GetSptConfigFile/types/generators/BotGenerator.d.ts b/TypeScript/3GetSptConfigFile/types/generators/BotGenerator.d.ts index 8ab4371..ebb8a59 100644 --- a/TypeScript/3GetSptConfigFile/types/generators/BotGenerator.d.ts +++ b/TypeScript/3GetSptConfigFile/types/generators/BotGenerator.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/3GetSptConfigFile/types/generators/BotLevelGenerator.d.ts b/TypeScript/3GetSptConfigFile/types/generators/BotLevelGenerator.d.ts index dee61e2..a8a8895 100644 --- a/TypeScript/3GetSptConfigFile/types/generators/BotLevelGenerator.d.ts +++ b/TypeScript/3GetSptConfigFile/types/generators/BotLevelGenerator.d.ts @@ -4,12 +4,14 @@ import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; +import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class BotLevelGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; protected databaseService: DatabaseService; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService); + protected mathUtil: MathUtil; + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, mathUtil: MathUtil); /** * Return a randomised bot level and exp value * @param levelDetails Min and max of level for bot @@ -18,6 +20,7 @@ export declare class BotLevelGenerator { * @returns IRandomisedBotLevelResult object */ generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult; + protected chooseBotLevel(min: number, max: number, shift: number, number: number): number; /** * Get the highest level a bot can be relative to the players level, but no further than the max size from globals.exp_table * @param botGenerationDetails Details to help generate a bot diff --git a/TypeScript/3GetSptConfigFile/types/generators/BotLootGenerator.d.ts b/TypeScript/3GetSptConfigFile/types/generators/BotLootGenerator.d.ts index fee56ce..c0583c6 100644 --- a/TypeScript/3GetSptConfigFile/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/3GetSptConfigFile/types/generators/BotLootGenerator.d.ts @@ -18,9 +18,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/3GetSptConfigFile/types/generators/BotWeaponGenerator.d.ts b/TypeScript/3GetSptConfigFile/types/generators/BotWeaponGenerator.d.ts index 5559bfa..8e03b35 100644 --- a/TypeScript/3GetSptConfigFile/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/3GetSptConfigFile/types/generators/BotWeaponGenerator.d.ts @@ -18,9 +18,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RepairService } from "@spt/services/RepairService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotWeaponGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/3GetSptConfigFile/types/generators/LocationGenerator.d.ts b/TypeScript/3GetSptConfigFile/types/generators/LocationGenerator.d.ts index 222b0ab..9a2b0c4 100644 --- a/TypeScript/3GetSptConfigFile/types/generators/LocationGenerator.d.ts +++ b/TypeScript/3GetSptConfigFile/types/generators/LocationGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export interface IContainerItem { items: Item[]; width: number; diff --git a/TypeScript/3GetSptConfigFile/types/generators/PlayerScavGenerator.d.ts b/TypeScript/3GetSptConfigFile/types/generators/PlayerScavGenerator.d.ts index 2414150..e317bf6 100644 --- a/TypeScript/3GetSptConfigFile/types/generators/PlayerScavGenerator.d.ts +++ b/TypeScript/3GetSptConfigFile/types/generators/PlayerScavGenerator.d.ts @@ -14,9 +14,9 @@ import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class PlayerScavGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/3GetSptConfigFile/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/3GetSptConfigFile/types/generators/RagfairOfferGenerator.d.ts index 9435390..ca09729 100644 --- a/TypeScript/3GetSptConfigFile/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/3GetSptConfigFile/types/generators/RagfairOfferGenerator.d.ts @@ -19,10 +19,10 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/3GetSptConfigFile/types/generators/RepeatableQuestGenerator.d.ts b/TypeScript/3GetSptConfigFile/types/generators/RepeatableQuestGenerator.d.ts index 77c4e79..339f322 100644 --- a/TypeScript/3GetSptConfigFile/types/generators/RepeatableQuestGenerator.d.ts +++ b/TypeScript/3GetSptConfigFile/types/generators/RepeatableQuestGenerator.d.ts @@ -11,10 +11,10 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/3GetSptConfigFile/types/generators/RepeatableQuestRewardGenerator.d.ts b/TypeScript/3GetSptConfigFile/types/generators/RepeatableQuestRewardGenerator.d.ts index 1e09994..713a394 100644 --- a/TypeScript/3GetSptConfigFile/types/generators/RepeatableQuestRewardGenerator.d.ts +++ b/TypeScript/3GetSptConfigFile/types/generators/RepeatableQuestRewardGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestRewardGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/3GetSptConfigFile/types/helpers/BotDifficultyHelper.d.ts b/TypeScript/3GetSptConfigFile/types/helpers/BotDifficultyHelper.d.ts index 63572a5..2348bd3 100644 --- a/TypeScript/3GetSptConfigFile/types/helpers/BotDifficultyHelper.d.ts +++ b/TypeScript/3GetSptConfigFile/types/helpers/BotDifficultyHelper.d.ts @@ -5,8 +5,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotDifficultyHelper { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/3GetSptConfigFile/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/3GetSptConfigFile/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index c51bf7e..c38f0a0 100644 --- a/TypeScript/3GetSptConfigFile/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/3GetSptConfigFile/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GiveSptCommand implements ISptCommand { protected logger: ILogger; protected itemHelper: ItemHelper; diff --git a/TypeScript/3GetSptConfigFile/types/helpers/HealthHelper.d.ts b/TypeScript/3GetSptConfigFile/types/helpers/HealthHelper.d.ts index 650f633..a164285 100644 --- a/TypeScript/3GetSptConfigFile/types/helpers/HealthHelper.d.ts +++ b/TypeScript/3GetSptConfigFile/types/helpers/HealthHelper.d.ts @@ -5,8 +5,8 @@ import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/3GetSptConfigFile/types/helpers/HideoutHelper.d.ts b/TypeScript/3GetSptConfigFile/types/helpers/HideoutHelper.d.ts index c4aaa4c..df0376b 100644 --- a/TypeScript/3GetSptConfigFile/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/3GetSptConfigFile/types/helpers/HideoutHelper.d.ts @@ -18,10 +18,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/3GetSptConfigFile/types/helpers/InRaidHelper.d.ts b/TypeScript/3GetSptConfigFile/types/helpers/InRaidHelper.d.ts index 449be9f..987c9ec 100644 --- a/TypeScript/3GetSptConfigFile/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/3GetSptConfigFile/types/helpers/InRaidHelper.d.ts @@ -15,9 +15,9 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InRaidHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/3GetSptConfigFile/types/helpers/InventoryHelper.d.ts b/TypeScript/3GetSptConfigFile/types/helpers/InventoryHelper.d.ts index f0ff69a..92bb49c 100644 --- a/TypeScript/3GetSptConfigFile/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/3GetSptConfigFile/types/helpers/InventoryHelper.d.ts @@ -23,9 +23,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/3GetSptConfigFile/types/helpers/ItemHelper.d.ts b/TypeScript/3GetSptConfigFile/types/helpers/ItemHelper.d.ts index da5dd11..c304cee 100644 --- a/TypeScript/3GetSptConfigFile/types/helpers/ItemHelper.d.ts +++ b/TypeScript/3GetSptConfigFile/types/helpers/ItemHelper.d.ts @@ -11,13 +11,13 @@ import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { CompareUtil } from "@spt/utils/CompareUtil"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ItemHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/3GetSptConfigFile/types/helpers/ProfileHelper.d.ts b/TypeScript/3GetSptConfigFile/types/helpers/ProfileHelper.d.ts index 0671179..cdab870 100644 --- a/TypeScript/3GetSptConfigFile/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/3GetSptConfigFile/types/helpers/ProfileHelper.d.ts @@ -11,10 +11,10 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/3GetSptConfigFile/types/helpers/QuestHelper.d.ts b/TypeScript/3GetSptConfigFile/types/helpers/QuestHelper.d.ts index 2b84b8f..2d5730d 100644 --- a/TypeScript/3GetSptConfigFile/types/helpers/QuestHelper.d.ts +++ b/TypeScript/3GetSptConfigFile/types/helpers/QuestHelper.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/3GetSptConfigFile/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/3GetSptConfigFile/types/helpers/RagfairOfferHelper.d.ts index b526554..2386316 100644 --- a/TypeScript/3GetSptConfigFile/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/3GetSptConfigFile/types/helpers/RagfairOfferHelper.d.ts @@ -151,7 +151,7 @@ export declare class RagfairOfferHelper { * @param boughtAmount Amount item was purchased for * @returns IItemEventRouterResponse */ - protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; + completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; /** * Get a localised message for when players offer has sold on flea * @param itemTpl Item sold diff --git a/TypeScript/3GetSptConfigFile/types/helpers/RagfairServerHelper.d.ts b/TypeScript/3GetSptConfigFile/types/helpers/RagfairServerHelper.d.ts index 927caf5..3e1fea9 100644 --- a/TypeScript/3GetSptConfigFile/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/3GetSptConfigFile/types/helpers/RagfairServerHelper.d.ts @@ -12,9 +12,9 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Helper class for common ragfair server actions */ diff --git a/TypeScript/3GetSptConfigFile/types/helpers/RepairHelper.d.ts b/TypeScript/3GetSptConfigFile/types/helpers/RepairHelper.d.ts index 99a21da..63c78c9 100644 --- a/TypeScript/3GetSptConfigFile/types/helpers/RepairHelper.d.ts +++ b/TypeScript/3GetSptConfigFile/types/helpers/RepairHelper.d.ts @@ -4,8 +4,8 @@ import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/3GetSptConfigFile/types/helpers/RepeatableQuestHelper.d.ts b/TypeScript/3GetSptConfigFile/types/helpers/RepeatableQuestHelper.d.ts index d92657e..8c65f40 100644 --- a/TypeScript/3GetSptConfigFile/types/helpers/RepeatableQuestHelper.d.ts +++ b/TypeScript/3GetSptConfigFile/types/helpers/RepeatableQuestHelper.d.ts @@ -1,8 +1,8 @@ import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestHelper { protected mathUtil: MathUtil; protected configServer: ConfigServer; diff --git a/TypeScript/3GetSptConfigFile/types/helpers/TradeHelper.d.ts b/TypeScript/3GetSptConfigFile/types/helpers/TradeHelper.d.ts index f994fda..6e6f3a2 100644 --- a/TypeScript/3GetSptConfigFile/types/helpers/TradeHelper.d.ts +++ b/TypeScript/3GetSptConfigFile/types/helpers/TradeHelper.d.ts @@ -17,8 +17,8 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TradeHelper { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/3GetSptConfigFile/types/helpers/TraderAssortHelper.d.ts b/TypeScript/3GetSptConfigFile/types/helpers/TraderAssortHelper.d.ts index 8f8f802..f1ecd3b 100644 --- a/TypeScript/3GetSptConfigFile/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/3GetSptConfigFile/types/helpers/TraderAssortHelper.d.ts @@ -14,9 +14,9 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; diff --git a/TypeScript/3GetSptConfigFile/types/loaders/BundleLoader.d.ts b/TypeScript/3GetSptConfigFile/types/loaders/BundleLoader.d.ts index e270988..8c0ed4d 100644 --- a/TypeScript/3GetSptConfigFile/types/loaders/BundleLoader.d.ts +++ b/TypeScript/3GetSptConfigFile/types/loaders/BundleLoader.d.ts @@ -1,8 +1,8 @@ import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BundleInfo { modpath: string; filename: string; diff --git a/TypeScript/3GetSptConfigFile/types/loaders/PostDBModLoader.d.ts b/TypeScript/3GetSptConfigFile/types/loaders/PostDBModLoader.d.ts index b0c4bf4..a8bb6a9 100644 --- a/TypeScript/3GetSptConfigFile/types/loaders/PostDBModLoader.d.ts +++ b/TypeScript/3GetSptConfigFile/types/loaders/PostDBModLoader.d.ts @@ -1,10 +1,10 @@ -import { DependencyContainer } from "tsyringe"; import { OnLoad } from "@spt/di/OnLoad"; import { BundleLoader } from "@spt/loaders/BundleLoader"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostDBModLoader implements OnLoad { protected logger: ILogger; protected bundleLoader: BundleLoader; diff --git a/TypeScript/3GetSptConfigFile/types/loaders/PostSptModLoader.d.ts b/TypeScript/3GetSptConfigFile/types/loaders/PostSptModLoader.d.ts index fb54579..2603497 100644 --- a/TypeScript/3GetSptConfigFile/types/loaders/PostSptModLoader.d.ts +++ b/TypeScript/3GetSptConfigFile/types/loaders/PostSptModLoader.d.ts @@ -1,9 +1,9 @@ -import { DependencyContainer } from "tsyringe"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { IModLoader } from "@spt/models/spt/mod/IModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostSptModLoader implements IModLoader { protected logger: ILogger; protected preSptModLoader: PreSptModLoader; diff --git a/TypeScript/3GetSptConfigFile/types/loaders/PreSptModLoader.d.ts b/TypeScript/3GetSptConfigFile/types/loaders/PreSptModLoader.d.ts index bc846c8..8814525 100644 --- a/TypeScript/3GetSptConfigFile/types/loaders/PreSptModLoader.d.ts +++ b/TypeScript/3GetSptConfigFile/types/loaders/PreSptModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { ModDetails } from "@spt/models/eft/profile/ISptProfile"; @@ -11,6 +10,7 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { ModCompilerService } from "@spt/services/ModCompilerService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { DependencyContainer } from "tsyringe"; export declare class PreSptModLoader implements IModLoader { protected logger: ILogger; protected vfs: VFS; diff --git a/TypeScript/3GetSptConfigFile/types/models/eft/common/IEmptyRequestData.d.ts b/TypeScript/3GetSptConfigFile/types/models/eft/common/IEmptyRequestData.d.ts index 284d16e..52a7b12 100644 --- a/TypeScript/3GetSptConfigFile/types/models/eft/common/IEmptyRequestData.d.ts +++ b/TypeScript/3GetSptConfigFile/types/models/eft/common/IEmptyRequestData.d.ts @@ -1,2 +1 @@ -export interface IEmptyRequestData { -} +export type IEmptyRequestData = {}; diff --git a/TypeScript/3GetSptConfigFile/types/models/eft/common/tables/IBotBase.d.ts b/TypeScript/3GetSptConfigFile/types/models/eft/common/tables/IBotBase.d.ts index a7fe1ca..be37845 100644 --- a/TypeScript/3GetSptConfigFile/types/models/eft/common/tables/IBotBase.d.ts +++ b/TypeScript/3GetSptConfigFile/types/models/eft/common/tables/IBotBase.d.ts @@ -373,8 +373,7 @@ export interface LastCompleted { export interface Notes { Notes: Note[]; } -export interface CarExtractCounts { -} +export type CarExtractCounts = {}; export declare enum SurvivorClass { UNKNOWN = 0, NEUTRALIZER = 1, diff --git a/TypeScript/3GetSptConfigFile/types/models/eft/common/tables/ILocationsBase.d.ts b/TypeScript/3GetSptConfigFile/types/models/eft/common/tables/ILocationsBase.d.ts index 2c96af3..16bca24 100644 --- a/TypeScript/3GetSptConfigFile/types/models/eft/common/tables/ILocationsBase.d.ts +++ b/TypeScript/3GetSptConfigFile/types/models/eft/common/tables/ILocationsBase.d.ts @@ -2,8 +2,7 @@ export interface ILocationsBase { locations: Locations; paths: Path[]; } -export interface Locations { -} +export type Locations = {}; export interface Path { Source: string; Destination: string; diff --git a/TypeScript/3GetSptConfigFile/types/models/eft/common/tables/IProfileTemplate.d.ts b/TypeScript/3GetSptConfigFile/types/models/eft/common/tables/IProfileTemplate.d.ts index 20923bc..6ba9221 100644 --- a/TypeScript/3GetSptConfigFile/types/models/eft/common/tables/IProfileTemplate.d.ts +++ b/TypeScript/3GetSptConfigFile/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -1,12 +1,12 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { Dialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; export interface IProfileTemplates { - "Standard": IProfileSides; + Standard: IProfileSides; "Left Behind": IProfileSides; "Prepare To Escape": IProfileSides; "Edge Of Darkness": IProfileSides; - "Unheard": IProfileSides; - "Tournament": IProfileSides; + Unheard: IProfileSides; + Tournament: IProfileSides; "SPT Developer": IProfileSides; "SPT Easy start": IProfileSides; "SPT Zero to hero": IProfileSides; diff --git a/TypeScript/3GetSptConfigFile/types/models/eft/common/tables/ITrader.d.ts b/TypeScript/3GetSptConfigFile/types/models/eft/common/tables/ITrader.d.ts index 14ab409..40cf004 100644 --- a/TypeScript/3GetSptConfigFile/types/models/eft/common/tables/ITrader.d.ts +++ b/TypeScript/3GetSptConfigFile/types/models/eft/common/tables/ITrader.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; export interface ITrader { assort?: ITraderAssort; @@ -78,6 +79,8 @@ export interface IBarterScheme { _tpl: string; onlyFunctional?: boolean; sptQuestLocked?: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface ISuit { _id: string; diff --git a/TypeScript/3GetSptConfigFile/types/models/eft/hideout/IQteData.d.ts b/TypeScript/3GetSptConfigFile/types/models/eft/hideout/IQteData.d.ts index 7f507e1..fe6cce6 100644 --- a/TypeScript/3GetSptConfigFile/types/models/eft/hideout/IQteData.d.ts +++ b/TypeScript/3GetSptConfigFile/types/models/eft/hideout/IQteData.d.ts @@ -1,14 +1,14 @@ import { Effect } from "@spt/models/eft/health/Effect"; import { BodyPart } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; import { QteActivityType } from "@spt/models/enums/hideout/QteActivityType"; import { QteEffectType } from "@spt/models/enums/hideout/QteEffectType"; import { QteResultType } from "@spt/models/enums/hideout/QteResultType"; import { QteRewardType } from "@spt/models/enums/hideout/QteRewardType"; import { QteType } from "@spt/models/enums/hideout/QteType"; import { RequirementType } from "@spt/models/enums/hideout/RequirementType"; -import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt/models/enums/SkillTypes"; -import { Traders } from "@spt/models/enums/Traders"; export interface IQteData { id: string; type: QteActivityType; diff --git a/TypeScript/3GetSptConfigFile/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/3GetSptConfigFile/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index f1123c1..5971372 100644 --- a/TypeScript/3GetSptConfigFile/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/TypeScript/3GetSptConfigFile/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -15,7 +15,5 @@ export interface Items { change: any[]; del: any[]; } -export interface Production { -} -export interface TraderRelations { -} +export type Production = {}; +export type TraderRelations = {}; diff --git a/TypeScript/3GetSptConfigFile/types/models/eft/profile/ISptProfile.d.ts b/TypeScript/3GetSptConfigFile/types/models/eft/profile/ISptProfile.d.ts index a8e742a..dd7aea6 100644 --- a/TypeScript/3GetSptConfigFile/types/models/eft/profile/ISptProfile.d.ts +++ b/TypeScript/3GetSptConfigFile/types/models/eft/profile/ISptProfile.d.ts @@ -209,12 +209,9 @@ export interface Effects { LeftLeg: LeftLeg; RightLeg: RightLeg; } -export interface Head { -} -export interface Chest { -} -export interface Stomach { -} +export type Head = {}; +export type Chest = {}; +export type Stomach = {}; export interface LeftArm { Fracture?: number; } diff --git a/TypeScript/3GetSptConfigFile/types/models/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/3GetSptConfigFile/types/models/eft/ragfair/IRagfairOffer.d.ts index eeeb79d..f6c07fc 100644 --- a/TypeScript/3GetSptConfigFile/types/models/eft/ragfair/IRagfairOffer.d.ts +++ b/TypeScript/3GetSptConfigFile/types/models/eft/ragfair/IRagfairOffer.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface IRagfairOffer { sellResult?: SellResult[]; @@ -28,6 +29,8 @@ export interface OfferRequirement { _tpl: string; count: number; onlyFunctional: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface IRagfairOfferUser { id: string; diff --git a/TypeScript/3GetSptConfigFile/types/models/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/3GetSptConfigFile/types/models/eft/ragfair/ISearchRequestData.d.ts index 8261c5b..c631de8 100644 --- a/TypeScript/3GetSptConfigFile/types/models/eft/ragfair/ISearchRequestData.d.ts +++ b/TypeScript/3GetSptConfigFile/types/models/eft/ragfair/ISearchRequestData.d.ts @@ -29,5 +29,4 @@ export declare enum OfferOwnerType { TRADEROWNERTYPE = 1, PLAYEROWNERTYPE = 2 } -export interface BuildItems { -} +export type BuildItems = {}; diff --git a/TypeScript/3GetSptConfigFile/types/models/enums/BaseClasses.d.ts b/TypeScript/3GetSptConfigFile/types/models/enums/BaseClasses.d.ts index 65fc95e..32ebf7c 100644 --- a/TypeScript/3GetSptConfigFile/types/models/enums/BaseClasses.d.ts +++ b/TypeScript/3GetSptConfigFile/types/models/enums/BaseClasses.d.ts @@ -107,6 +107,6 @@ export declare enum BaseClasses { RECEIVER = "55818a304bdc2db5418b457d", BARREL = "555ef6e44bdc2de9068b457e", CHARGING_HANDLE = "55818a6f4bdc2db9688b456b", - COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569 ", + COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569", HIDEOUT_AREA_CONTAINER = "63da6da4784a55176c018dba" } diff --git a/TypeScript/3GetSptConfigFile/types/models/enums/DogtagExchangeSide.d.ts b/TypeScript/3GetSptConfigFile/types/models/enums/DogtagExchangeSide.d.ts new file mode 100644 index 0000000..de3d4df --- /dev/null +++ b/TypeScript/3GetSptConfigFile/types/models/enums/DogtagExchangeSide.d.ts @@ -0,0 +1,5 @@ +export declare enum DogtagExchangeSide { + USEC = "Usec", + BEAR = "Bear", + ANY = "Any" +} diff --git a/TypeScript/3GetSptConfigFile/types/models/spt/server/ExhaustableArray.d.ts b/TypeScript/3GetSptConfigFile/types/models/spt/server/ExhaustableArray.d.ts index c27f41f..50a6b68 100644 --- a/TypeScript/3GetSptConfigFile/types/models/spt/server/ExhaustableArray.d.ts +++ b/TypeScript/3GetSptConfigFile/types/models/spt/server/ExhaustableArray.d.ts @@ -1,5 +1,5 @@ -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ExhaustableArray implements IExhaustableArray { private itemPool; private randomUtil; diff --git a/TypeScript/3GetSptConfigFile/types/routers/EventOutputHolder.d.ts b/TypeScript/3GetSptConfigFile/types/routers/EventOutputHolder.d.ts index ef20706..148461a 100644 --- a/TypeScript/3GetSptConfigFile/types/routers/EventOutputHolder.d.ts +++ b/TypeScript/3GetSptConfigFile/types/routers/EventOutputHolder.d.ts @@ -3,8 +3,8 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IHideoutImprovement, Productive, TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; import { TraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class EventOutputHolder { protected profileHelper: ProfileHelper; protected timeUtil: TimeUtil; @@ -12,7 +12,7 @@ export declare class EventOutputHolder { /** * What has client been informed of this game session * Key = sessionId, then second key is prod id - */ + */ protected clientActiveSessionStorage: Record>; diff --git a/TypeScript/3GetSptConfigFile/types/servers/HttpServer.d.ts b/TypeScript/3GetSptConfigFile/types/servers/HttpServer.d.ts index b00fe68..0024ba3 100644 --- a/TypeScript/3GetSptConfigFile/types/servers/HttpServer.d.ts +++ b/TypeScript/3GetSptConfigFile/types/servers/HttpServer.d.ts @@ -6,8 +6,8 @@ import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; -import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { WebSocketServer } from "@spt/servers/WebSocketServer"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { LocalisationService } from "@spt/services/LocalisationService"; export declare class HttpServer { protected logger: ILogger; diff --git a/TypeScript/3GetSptConfigFile/types/servers/WebSocketServer.d.ts b/TypeScript/3GetSptConfigFile/types/servers/WebSocketServer.d.ts index f4e07bb..6121824 100644 --- a/TypeScript/3GetSptConfigFile/types/servers/WebSocketServer.d.ts +++ b/TypeScript/3GetSptConfigFile/types/servers/WebSocketServer.d.ts @@ -1,12 +1,12 @@ /// import http, { IncomingMessage } from "node:http"; -import { WebSocket, Server } from "ws"; import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { Server, WebSocket } from "ws"; export declare class WebSocketServer { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/3GetSptConfigFile/types/servers/ws/SptWebSocketConnectionHandler.d.ts b/TypeScript/3GetSptConfigFile/types/servers/ws/SptWebSocketConnectionHandler.d.ts index 98d0898..70fc96a 100644 --- a/TypeScript/3GetSptConfigFile/types/servers/ws/SptWebSocketConnectionHandler.d.ts +++ b/TypeScript/3GetSptConfigFile/types/servers/ws/SptWebSocketConnectionHandler.d.ts @@ -1,7 +1,6 @@ /// /// import { IncomingMessage } from "http"; -import { WebSocket } from "ws"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; @@ -11,6 +10,7 @@ import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectio import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; +import { WebSocket } from "ws"; export declare class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler { protected logger: ILogger; protected profileHelper: ProfileHelper; diff --git a/TypeScript/3GetSptConfigFile/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts b/TypeScript/3GetSptConfigFile/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts index d5247ec..5556129 100644 --- a/TypeScript/3GetSptConfigFile/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts +++ b/TypeScript/3GetSptConfigFile/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts @@ -1,6 +1,6 @@ -import { RawData, WebSocket } from "ws"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; +import { RawData, WebSocket } from "ws"; export declare class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler { protected logger: ILogger; constructor(logger: ILogger); diff --git a/TypeScript/3GetSptConfigFile/types/services/FenceService.d.ts b/TypeScript/3GetSptConfigFile/types/services/FenceService.d.ts index c156122..58dc076 100644 --- a/TypeScript/3GetSptConfigFile/types/services/FenceService.d.ts +++ b/TypeScript/3GetSptConfigFile/types/services/FenceService.d.ts @@ -13,9 +13,9 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Handle actions surrounding Fence * e.g. generating or refreshing assorts / get next refresh time diff --git a/TypeScript/3GetSptConfigFile/types/services/InsuranceService.d.ts b/TypeScript/3GetSptConfigFile/types/services/InsuranceService.d.ts index 0000e66..f799102 100644 --- a/TypeScript/3GetSptConfigFile/types/services/InsuranceService.d.ts +++ b/TypeScript/3GetSptConfigFile/types/services/InsuranceService.d.ts @@ -18,10 +18,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceService { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/3GetSptConfigFile/types/services/LocalisationService.d.ts b/TypeScript/3GetSptConfigFile/types/services/LocalisationService.d.ts index 42dfa4e..855c138 100644 --- a/TypeScript/3GetSptConfigFile/types/services/LocalisationService.d.ts +++ b/TypeScript/3GetSptConfigFile/types/services/LocalisationService.d.ts @@ -1,8 +1,8 @@ -import { I18n } from "i18n"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { LocaleService } from "@spt/services/LocaleService"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { I18n } from "i18n"; /** * Handles translating server text into different langauges */ diff --git a/TypeScript/3GetSptConfigFile/types/services/ProfileFixerService.d.ts b/TypeScript/3GetSptConfigFile/types/services/ProfileFixerService.d.ts index 525b867..91e4780 100644 --- a/TypeScript/3GetSptConfigFile/types/services/ProfileFixerService.d.ts +++ b/TypeScript/3GetSptConfigFile/types/services/ProfileFixerService.d.ts @@ -8,7 +8,7 @@ import { Bonus, HideoutSlot } from "@spt/models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea"; -import { ISptProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; +import { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; @@ -16,11 +16,11 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileFixerService { protected logger: ILogger; protected watermark: Watermark; @@ -73,6 +73,7 @@ export declare class ProfileFixerService { */ protected removeDanglingTaskConditionCounters(pmcProfile: IPmcData): void; protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullRagfairRatings(pmcProfile: IPmcData): void; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; /** diff --git a/TypeScript/3GetSptConfigFile/types/services/RagfairOfferService.d.ts b/TypeScript/3GetSptConfigFile/types/services/RagfairOfferService.d.ts index 6c13b1d..98dd179 100644 --- a/TypeScript/3GetSptConfigFile/types/services/RagfairOfferService.d.ts +++ b/TypeScript/3GetSptConfigFile/types/services/RagfairOfferService.d.ts @@ -10,10 +10,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/3GetSptConfigFile/types/services/mod/CustomItemService.d.ts b/TypeScript/3GetSptConfigFile/types/services/mod/CustomItemService.d.ts index 1926bed..f112872 100644 --- a/TypeScript/3GetSptConfigFile/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/3GetSptConfigFile/types/services/mod/CustomItemService.d.ts @@ -4,8 +4,8 @@ import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetail import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/3GetSptConfigFile/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/3GetSptConfigFile/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts index 3c9d955..91c84d9 100644 --- a/TypeScript/3GetSptConfigFile/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts +++ b/TypeScript/3GetSptConfigFile/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class DynamicRouterModService { private container; constructor(container: DependencyContainer); diff --git a/TypeScript/3GetSptConfigFile/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/3GetSptConfigFile/types/services/mod/staticRouter/StaticRouterModService.d.ts index f60432d..0c3d4d8 100644 --- a/TypeScript/3GetSptConfigFile/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/TypeScript/3GetSptConfigFile/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class StaticRouterModService { protected container: DependencyContainer; constructor(container: DependencyContainer); diff --git a/TypeScript/3GetSptConfigFile/types/utils/JsonUtil.d.ts b/TypeScript/3GetSptConfigFile/types/utils/JsonUtil.d.ts index b30822c..4419228 100644 --- a/TypeScript/3GetSptConfigFile/types/utils/JsonUtil.d.ts +++ b/TypeScript/3GetSptConfigFile/types/utils/JsonUtil.d.ts @@ -1,7 +1,7 @@ -import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { HashUtil } from "@spt/utils/HashUtil"; import { VFS } from "@spt/utils/VFS"; +import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; export declare class JsonUtil { protected vfs: VFS; protected hashUtil: HashUtil; diff --git a/TypeScript/3GetSptConfigFile/types/utils/RandomUtil.d.ts b/TypeScript/3GetSptConfigFile/types/utils/RandomUtil.d.ts index 49f242d..0da184f 100644 --- a/TypeScript/3GetSptConfigFile/types/utils/RandomUtil.d.ts +++ b/TypeScript/3GetSptConfigFile/types/utils/RandomUtil.d.ts @@ -1,6 +1,6 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects * based on the relative probability of each of its elements. diff --git a/TypeScript/3GetSptConfigFile/types/utils/logging/AbstractWinstonLogger.d.ts b/TypeScript/3GetSptConfigFile/types/utils/logging/AbstractWinstonLogger.d.ts index 7098f85..ef54434 100644 --- a/TypeScript/3GetSptConfigFile/types/utils/logging/AbstractWinstonLogger.d.ts +++ b/TypeScript/3GetSptConfigFile/types/utils/logging/AbstractWinstonLogger.d.ts @@ -1,12 +1,12 @@ /// import fs from "node:fs"; -import winston from "winston"; import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; import { SptLogger } from "@spt/models/spt/logging/SptLogger"; import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; import { ILogger } from "@spt/models/spt/utils/ILogger"; +import winston from "winston"; export declare abstract class AbstractWinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected showDebugInConsole: boolean; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/BotController.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/BotController.d.ts index 6431fca..475f51b 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/BotController.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/BotController.d.ts @@ -20,8 +20,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/BuildController.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/BuildController.d.ts index ed8adf6..2cb9c59 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/BuildController.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/BuildController.d.ts @@ -9,8 +9,8 @@ import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BuildController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/GameController.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/GameController.d.ts index 533a81c..e219c04 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/GameController.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/GameController.d.ts @@ -34,10 +34,10 @@ import { ProfileActivityService } from "@spt/services/ProfileActivityService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GameController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/HealthController.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/HealthController.d.ts index 5482283..5a0a0a6 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/HealthController.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/HealthController.d.ts @@ -12,8 +12,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthController { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/HideoutController.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/HideoutController.d.ts index e9d1ed9..89a428c 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/HideoutController.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/HideoutController.d.ts @@ -35,11 +35,11 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; import { ProfileActivityService } from "@spt/services/ProfileActivityService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/InraidController.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/InraidController.d.ts index 87f419b..9f0c409 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/InraidController.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/InraidController.d.ts @@ -13,6 +13,7 @@ import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRe import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState"; import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig"; import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; @@ -31,7 +32,6 @@ import { PmcChatResponseService } from "@spt/services/PmcChatResponseService"; import { TraderServicesService } from "@spt/services/TraderServicesService"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; -import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; /** * Logic for handling In Raid callbacks */ diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/InsuranceController.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/InsuranceController.d.ts index f921b83..543e915 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/InsuranceController.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/InsuranceController.d.ts @@ -21,11 +21,11 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PaymentService } from "@spt/services/PaymentService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceController { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/InventoryController.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/InventoryController.d.ts index 40bb084..c986ce8 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/InventoryController.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/InventoryController.d.ts @@ -37,10 +37,10 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MapMarkerService } from "@spt/services/MapMarkerService"; import { PlayerService } from "@spt/services/PlayerService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/LocationController.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/LocationController.d.ts index 727a8c8..a541b9c 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/LocationController.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/LocationController.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class LocationController { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/ProfileController.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/ProfileController.d.ts index e8dae73..7e6d35c 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/ProfileController.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/ProfileController.d.ts @@ -26,9 +26,9 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/QuestController.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/QuestController.d.ts index 3cdce00..6a5b415 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/QuestController.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/QuestController.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/RepeatableQuestController.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/RepeatableQuestController.d.ts index 74f39eb..016f8c6 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/RepeatableQuestController.d.ts @@ -18,11 +18,11 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/TradeController.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/TradeController.d.ts index bc72e92..842a97b 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/TradeController.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/TradeController.d.ts @@ -1,5 +1,6 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper"; import { TradeHelper } from "@spt/helpers/TradeHelper"; import { TraderHelper } from "@spt/helpers/TraderHelper"; import { IPmcData } from "@spt/models/eft/common/IPmcData"; @@ -35,6 +36,7 @@ export declare class TradeController { protected hashUtil: HashUtil; protected itemHelper: ItemHelper; protected profileHelper: ProfileHelper; + protected ragfairOfferHelper: RagfairOfferHelper; protected traderHelper: TraderHelper; protected ragfairServer: RagfairServer; protected httpResponse: HttpResponseUtil; @@ -44,7 +46,7 @@ export declare class TradeController { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairOfferHelper: RagfairOfferHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); /** Handle TradingConfirm event */ confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; /** Handle RagFairBuyOffer event */ @@ -67,10 +69,17 @@ export declare class TradeController { * @param output Output to send back to client */ protected buyPmcItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void; + /** + * Is the provided offerid and ownerid from a player made offer + * @param offerId Id of the offer + * @param offerOwnerId Owner id + * @returns true if offer was made by a player + */ + protected isPlayerOffer(offerId: string, offerOwnerId: string): boolean; /** * Does Player have necessary trader loyalty to purchase flea offer * @param sellerIsTrader is seller trader - * @param fleaOffer FLea offer being bought + * @param fleaOffer Flea offer being bought * @param pmcData Player profile * @returns True if player can buy offer */ diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/TraderController.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/TraderController.d.ts index 7fc6d78..3592fc6 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/TraderController.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/controllers/TraderController.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/BotEquipmentModGenerator.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/BotEquipmentModGenerator.d.ts index 419120f..3952293 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/BotEquipmentModGenerator.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/BotEquipmentModGenerator.d.ts @@ -25,9 +25,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotEquipmentModGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -65,7 +65,7 @@ export declare class BotEquipmentModGenerator { * @param settings Bot equipment generation settings * @param modSlot Armor slot being filtered * @param existingPlateTplPool Plates tpls to choose from - * @param armorItem + * @param armorItem The armor items db template * @returns Array of plate tpls to choose from */ protected filterPlateModsForSlotByLevel(settings: IGenerateEquipmentProperties, modSlot: string, existingPlateTplPool: string[], armorItem: ITemplateItem): IFilterPlateModsForSlotByLevelResult; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/BotGenerator.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/BotGenerator.d.ts index 8ab4371..ebb8a59 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/BotGenerator.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/BotGenerator.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/BotLevelGenerator.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/BotLevelGenerator.d.ts index dee61e2..a8a8895 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/BotLevelGenerator.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/BotLevelGenerator.d.ts @@ -4,12 +4,14 @@ import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; +import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class BotLevelGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; protected databaseService: DatabaseService; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService); + protected mathUtil: MathUtil; + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, mathUtil: MathUtil); /** * Return a randomised bot level and exp value * @param levelDetails Min and max of level for bot @@ -18,6 +20,7 @@ export declare class BotLevelGenerator { * @returns IRandomisedBotLevelResult object */ generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult; + protected chooseBotLevel(min: number, max: number, shift: number, number: number): number; /** * Get the highest level a bot can be relative to the players level, but no further than the max size from globals.exp_table * @param botGenerationDetails Details to help generate a bot diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/BotLootGenerator.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/BotLootGenerator.d.ts index fee56ce..c0583c6 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/BotLootGenerator.d.ts @@ -18,9 +18,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/BotWeaponGenerator.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/BotWeaponGenerator.d.ts index 5559bfa..8e03b35 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/BotWeaponGenerator.d.ts @@ -18,9 +18,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RepairService } from "@spt/services/RepairService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotWeaponGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/LocationGenerator.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/LocationGenerator.d.ts index 222b0ab..9a2b0c4 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/LocationGenerator.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/LocationGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export interface IContainerItem { items: Item[]; width: number; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/PlayerScavGenerator.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/PlayerScavGenerator.d.ts index 2414150..e317bf6 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/PlayerScavGenerator.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/PlayerScavGenerator.d.ts @@ -14,9 +14,9 @@ import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class PlayerScavGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/RagfairOfferGenerator.d.ts index 9435390..ca09729 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/RagfairOfferGenerator.d.ts @@ -19,10 +19,10 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/RepeatableQuestGenerator.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/RepeatableQuestGenerator.d.ts index 77c4e79..339f322 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/RepeatableQuestGenerator.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/RepeatableQuestGenerator.d.ts @@ -11,10 +11,10 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/RepeatableQuestRewardGenerator.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/RepeatableQuestRewardGenerator.d.ts index 1e09994..713a394 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/RepeatableQuestRewardGenerator.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/generators/RepeatableQuestRewardGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestRewardGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/BotDifficultyHelper.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/BotDifficultyHelper.d.ts index 63572a5..2348bd3 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/BotDifficultyHelper.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/BotDifficultyHelper.d.ts @@ -5,8 +5,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotDifficultyHelper { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index c51bf7e..c38f0a0 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GiveSptCommand implements ISptCommand { protected logger: ILogger; protected itemHelper: ItemHelper; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/HealthHelper.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/HealthHelper.d.ts index 650f633..a164285 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/HealthHelper.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/HealthHelper.d.ts @@ -5,8 +5,8 @@ import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/HideoutHelper.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/HideoutHelper.d.ts index c4aaa4c..df0376b 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/HideoutHelper.d.ts @@ -18,10 +18,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/InRaidHelper.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/InRaidHelper.d.ts index 449be9f..987c9ec 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/InRaidHelper.d.ts @@ -15,9 +15,9 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InRaidHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/InventoryHelper.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/InventoryHelper.d.ts index f0ff69a..92bb49c 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/InventoryHelper.d.ts @@ -23,9 +23,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/ItemHelper.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/ItemHelper.d.ts index da5dd11..c304cee 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/ItemHelper.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/ItemHelper.d.ts @@ -11,13 +11,13 @@ import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { CompareUtil } from "@spt/utils/CompareUtil"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ItemHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/ProfileHelper.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/ProfileHelper.d.ts index 0671179..cdab870 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/ProfileHelper.d.ts @@ -11,10 +11,10 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/QuestHelper.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/QuestHelper.d.ts index 2b84b8f..2d5730d 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/QuestHelper.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/QuestHelper.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/RagfairOfferHelper.d.ts index b526554..2386316 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/RagfairOfferHelper.d.ts @@ -151,7 +151,7 @@ export declare class RagfairOfferHelper { * @param boughtAmount Amount item was purchased for * @returns IItemEventRouterResponse */ - protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; + completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; /** * Get a localised message for when players offer has sold on flea * @param itemTpl Item sold diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/RagfairServerHelper.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/RagfairServerHelper.d.ts index 927caf5..3e1fea9 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/RagfairServerHelper.d.ts @@ -12,9 +12,9 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Helper class for common ragfair server actions */ diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/RepairHelper.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/RepairHelper.d.ts index 99a21da..63c78c9 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/RepairHelper.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/RepairHelper.d.ts @@ -4,8 +4,8 @@ import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/RepeatableQuestHelper.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/RepeatableQuestHelper.d.ts index d92657e..8c65f40 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/RepeatableQuestHelper.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/RepeatableQuestHelper.d.ts @@ -1,8 +1,8 @@ import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestHelper { protected mathUtil: MathUtil; protected configServer: ConfigServer; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/TradeHelper.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/TradeHelper.d.ts index f994fda..6e6f3a2 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/TradeHelper.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/TradeHelper.d.ts @@ -17,8 +17,8 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TradeHelper { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/TraderAssortHelper.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/TraderAssortHelper.d.ts index 8f8f802..f1ecd3b 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/TraderAssortHelper.d.ts @@ -14,9 +14,9 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/loaders/BundleLoader.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/loaders/BundleLoader.d.ts index e270988..8c0ed4d 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/loaders/BundleLoader.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/loaders/BundleLoader.d.ts @@ -1,8 +1,8 @@ import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BundleInfo { modpath: string; filename: string; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/loaders/PostDBModLoader.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/loaders/PostDBModLoader.d.ts index b0c4bf4..a8bb6a9 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/loaders/PostDBModLoader.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/loaders/PostDBModLoader.d.ts @@ -1,10 +1,10 @@ -import { DependencyContainer } from "tsyringe"; import { OnLoad } from "@spt/di/OnLoad"; import { BundleLoader } from "@spt/loaders/BundleLoader"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostDBModLoader implements OnLoad { protected logger: ILogger; protected bundleLoader: BundleLoader; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/loaders/PostSptModLoader.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/loaders/PostSptModLoader.d.ts index fb54579..2603497 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/loaders/PostSptModLoader.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/loaders/PostSptModLoader.d.ts @@ -1,9 +1,9 @@ -import { DependencyContainer } from "tsyringe"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { IModLoader } from "@spt/models/spt/mod/IModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostSptModLoader implements IModLoader { protected logger: ILogger; protected preSptModLoader: PreSptModLoader; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/loaders/PreSptModLoader.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/loaders/PreSptModLoader.d.ts index bc846c8..8814525 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/loaders/PreSptModLoader.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/loaders/PreSptModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { ModDetails } from "@spt/models/eft/profile/ISptProfile"; @@ -11,6 +10,7 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { ModCompilerService } from "@spt/services/ModCompilerService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { DependencyContainer } from "tsyringe"; export declare class PreSptModLoader implements IModLoader { protected logger: ILogger; protected vfs: VFS; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/IEmptyRequestData.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/IEmptyRequestData.d.ts index 284d16e..52a7b12 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/IEmptyRequestData.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/IEmptyRequestData.d.ts @@ -1,2 +1 @@ -export interface IEmptyRequestData { -} +export type IEmptyRequestData = {}; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/tables/IBotBase.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/tables/IBotBase.d.ts index a7fe1ca..be37845 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/tables/IBotBase.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/tables/IBotBase.d.ts @@ -373,8 +373,7 @@ export interface LastCompleted { export interface Notes { Notes: Note[]; } -export interface CarExtractCounts { -} +export type CarExtractCounts = {}; export declare enum SurvivorClass { UNKNOWN = 0, NEUTRALIZER = 1, diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/tables/ILocationsBase.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/tables/ILocationsBase.d.ts index 2c96af3..16bca24 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/tables/ILocationsBase.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/tables/ILocationsBase.d.ts @@ -2,8 +2,7 @@ export interface ILocationsBase { locations: Locations; paths: Path[]; } -export interface Locations { -} +export type Locations = {}; export interface Path { Source: string; Destination: string; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/tables/IProfileTemplate.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/tables/IProfileTemplate.d.ts index 20923bc..6ba9221 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/tables/IProfileTemplate.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -1,12 +1,12 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { Dialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; export interface IProfileTemplates { - "Standard": IProfileSides; + Standard: IProfileSides; "Left Behind": IProfileSides; "Prepare To Escape": IProfileSides; "Edge Of Darkness": IProfileSides; - "Unheard": IProfileSides; - "Tournament": IProfileSides; + Unheard: IProfileSides; + Tournament: IProfileSides; "SPT Developer": IProfileSides; "SPT Easy start": IProfileSides; "SPT Zero to hero": IProfileSides; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/tables/ITrader.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/tables/ITrader.d.ts index 14ab409..40cf004 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/tables/ITrader.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/tables/ITrader.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; export interface ITrader { assort?: ITraderAssort; @@ -78,6 +79,8 @@ export interface IBarterScheme { _tpl: string; onlyFunctional?: boolean; sptQuestLocked?: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface ISuit { _id: string; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/hideout/IQteData.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/hideout/IQteData.d.ts index 7f507e1..fe6cce6 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/hideout/IQteData.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/hideout/IQteData.d.ts @@ -1,14 +1,14 @@ import { Effect } from "@spt/models/eft/health/Effect"; import { BodyPart } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; import { QteActivityType } from "@spt/models/enums/hideout/QteActivityType"; import { QteEffectType } from "@spt/models/enums/hideout/QteEffectType"; import { QteResultType } from "@spt/models/enums/hideout/QteResultType"; import { QteRewardType } from "@spt/models/enums/hideout/QteRewardType"; import { QteType } from "@spt/models/enums/hideout/QteType"; import { RequirementType } from "@spt/models/enums/hideout/RequirementType"; -import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt/models/enums/SkillTypes"; -import { Traders } from "@spt/models/enums/Traders"; export interface IQteData { id: string; type: QteActivityType; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index f1123c1..5971372 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -15,7 +15,5 @@ export interface Items { change: any[]; del: any[]; } -export interface Production { -} -export interface TraderRelations { -} +export type Production = {}; +export type TraderRelations = {}; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/profile/ISptProfile.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/profile/ISptProfile.d.ts index a8e742a..dd7aea6 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/profile/ISptProfile.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/profile/ISptProfile.d.ts @@ -209,12 +209,9 @@ export interface Effects { LeftLeg: LeftLeg; RightLeg: RightLeg; } -export interface Head { -} -export interface Chest { -} -export interface Stomach { -} +export type Head = {}; +export type Chest = {}; +export type Stomach = {}; export interface LeftArm { Fracture?: number; } diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/ragfair/IRagfairOffer.d.ts index eeeb79d..f6c07fc 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/ragfair/IRagfairOffer.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/ragfair/IRagfairOffer.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface IRagfairOffer { sellResult?: SellResult[]; @@ -28,6 +29,8 @@ export interface OfferRequirement { _tpl: string; count: number; onlyFunctional: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface IRagfairOfferUser { id: string; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/ragfair/ISearchRequestData.d.ts index 8261c5b..c631de8 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/ragfair/ISearchRequestData.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/ragfair/ISearchRequestData.d.ts @@ -29,5 +29,4 @@ export declare enum OfferOwnerType { TRADEROWNERTYPE = 1, PLAYEROWNERTYPE = 2 } -export interface BuildItems { -} +export type BuildItems = {}; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/enums/BaseClasses.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/enums/BaseClasses.d.ts index 65fc95e..32ebf7c 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/enums/BaseClasses.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/enums/BaseClasses.d.ts @@ -107,6 +107,6 @@ export declare enum BaseClasses { RECEIVER = "55818a304bdc2db5418b457d", BARREL = "555ef6e44bdc2de9068b457e", CHARGING_HANDLE = "55818a6f4bdc2db9688b456b", - COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569 ", + COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569", HIDEOUT_AREA_CONTAINER = "63da6da4784a55176c018dba" } diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/enums/DogtagExchangeSide.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/enums/DogtagExchangeSide.d.ts new file mode 100644 index 0000000..de3d4df --- /dev/null +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/enums/DogtagExchangeSide.d.ts @@ -0,0 +1,5 @@ +export declare enum DogtagExchangeSide { + USEC = "Usec", + BEAR = "Bear", + ANY = "Any" +} diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/spt/server/ExhaustableArray.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/spt/server/ExhaustableArray.d.ts index c27f41f..50a6b68 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/spt/server/ExhaustableArray.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/spt/server/ExhaustableArray.d.ts @@ -1,5 +1,5 @@ -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ExhaustableArray implements IExhaustableArray { private itemPool; private randomUtil; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/routers/EventOutputHolder.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/routers/EventOutputHolder.d.ts index ef20706..148461a 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/routers/EventOutputHolder.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/routers/EventOutputHolder.d.ts @@ -3,8 +3,8 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IHideoutImprovement, Productive, TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; import { TraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class EventOutputHolder { protected profileHelper: ProfileHelper; protected timeUtil: TimeUtil; @@ -12,7 +12,7 @@ export declare class EventOutputHolder { /** * What has client been informed of this game session * Key = sessionId, then second key is prod id - */ + */ protected clientActiveSessionStorage: Record>; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/servers/HttpServer.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/servers/HttpServer.d.ts index b00fe68..0024ba3 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/servers/HttpServer.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/servers/HttpServer.d.ts @@ -6,8 +6,8 @@ import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; -import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { WebSocketServer } from "@spt/servers/WebSocketServer"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { LocalisationService } from "@spt/services/LocalisationService"; export declare class HttpServer { protected logger: ILogger; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/servers/WebSocketServer.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/servers/WebSocketServer.d.ts index f4e07bb..6121824 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/servers/WebSocketServer.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/servers/WebSocketServer.d.ts @@ -1,12 +1,12 @@ /// import http, { IncomingMessage } from "node:http"; -import { WebSocket, Server } from "ws"; import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { Server, WebSocket } from "ws"; export declare class WebSocketServer { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/servers/ws/SptWebSocketConnectionHandler.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/servers/ws/SptWebSocketConnectionHandler.d.ts index 98d0898..70fc96a 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/servers/ws/SptWebSocketConnectionHandler.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/servers/ws/SptWebSocketConnectionHandler.d.ts @@ -1,7 +1,6 @@ /// /// import { IncomingMessage } from "http"; -import { WebSocket } from "ws"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; @@ -11,6 +10,7 @@ import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectio import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; +import { WebSocket } from "ws"; export declare class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler { protected logger: ILogger; protected profileHelper: ProfileHelper; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts index d5247ec..5556129 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts @@ -1,6 +1,6 @@ -import { RawData, WebSocket } from "ws"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; +import { RawData, WebSocket } from "ws"; export declare class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler { protected logger: ILogger; constructor(logger: ILogger); diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/FenceService.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/FenceService.d.ts index c156122..58dc076 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/FenceService.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/FenceService.d.ts @@ -13,9 +13,9 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Handle actions surrounding Fence * e.g. generating or refreshing assorts / get next refresh time diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/InsuranceService.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/InsuranceService.d.ts index 0000e66..f799102 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/InsuranceService.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/InsuranceService.d.ts @@ -18,10 +18,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceService { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/LocalisationService.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/LocalisationService.d.ts index 42dfa4e..855c138 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/LocalisationService.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/LocalisationService.d.ts @@ -1,8 +1,8 @@ -import { I18n } from "i18n"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { LocaleService } from "@spt/services/LocaleService"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { I18n } from "i18n"; /** * Handles translating server text into different langauges */ diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/ProfileFixerService.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/ProfileFixerService.d.ts index 525b867..91e4780 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/ProfileFixerService.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/ProfileFixerService.d.ts @@ -8,7 +8,7 @@ import { Bonus, HideoutSlot } from "@spt/models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea"; -import { ISptProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; +import { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; @@ -16,11 +16,11 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileFixerService { protected logger: ILogger; protected watermark: Watermark; @@ -73,6 +73,7 @@ export declare class ProfileFixerService { */ protected removeDanglingTaskConditionCounters(pmcProfile: IPmcData): void; protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullRagfairRatings(pmcProfile: IPmcData): void; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; /** diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/RagfairOfferService.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/RagfairOfferService.d.ts index 6c13b1d..98dd179 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/RagfairOfferService.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/RagfairOfferService.d.ts @@ -10,10 +10,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/mod/CustomItemService.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/mod/CustomItemService.d.ts index 1926bed..f112872 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/mod/CustomItemService.d.ts @@ -4,8 +4,8 @@ import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetail import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts index 3c9d955..91c84d9 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class DynamicRouterModService { private container; constructor(container: DependencyContainer); diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/mod/staticRouter/StaticRouterModService.d.ts index f60432d..0c3d4d8 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class StaticRouterModService { protected container: DependencyContainer; constructor(container: DependencyContainer); diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/utils/JsonUtil.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/utils/JsonUtil.d.ts index b30822c..4419228 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/utils/JsonUtil.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/utils/JsonUtil.d.ts @@ -1,7 +1,7 @@ -import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { HashUtil } from "@spt/utils/HashUtil"; import { VFS } from "@spt/utils/VFS"; +import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; export declare class JsonUtil { protected vfs: VFS; protected hashUtil: HashUtil; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/utils/RandomUtil.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/utils/RandomUtil.d.ts index 49f242d..0da184f 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/utils/RandomUtil.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/utils/RandomUtil.d.ts @@ -1,6 +1,6 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects * based on the relative probability of each of its elements. diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/utils/logging/AbstractWinstonLogger.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/utils/logging/AbstractWinstonLogger.d.ts index 7098f85..ef54434 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/utils/logging/AbstractWinstonLogger.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/utils/logging/AbstractWinstonLogger.d.ts @@ -1,12 +1,12 @@ /// import fs from "node:fs"; -import winston from "winston"; import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; import { SptLogger } from "@spt/models/spt/logging/SptLogger"; import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; import { ILogger } from "@spt/models/spt/utils/ILogger"; +import winston from "winston"; export declare abstract class AbstractWinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected showDebugInConsole: boolean; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/BotController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/BotController.d.ts index 6431fca..475f51b 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/BotController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/BotController.d.ts @@ -20,8 +20,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/BuildController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/BuildController.d.ts index ed8adf6..2cb9c59 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/BuildController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/BuildController.d.ts @@ -9,8 +9,8 @@ import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BuildController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/GameController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/GameController.d.ts index 533a81c..e219c04 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/GameController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/GameController.d.ts @@ -34,10 +34,10 @@ import { ProfileActivityService } from "@spt/services/ProfileActivityService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GameController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/HealthController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/HealthController.d.ts index 5482283..5a0a0a6 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/HealthController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/HealthController.d.ts @@ -12,8 +12,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthController { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/HideoutController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/HideoutController.d.ts index e9d1ed9..89a428c 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/HideoutController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/HideoutController.d.ts @@ -35,11 +35,11 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; import { ProfileActivityService } from "@spt/services/ProfileActivityService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/InraidController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/InraidController.d.ts index 87f419b..9f0c409 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/InraidController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/InraidController.d.ts @@ -13,6 +13,7 @@ import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRe import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState"; import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig"; import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; @@ -31,7 +32,6 @@ import { PmcChatResponseService } from "@spt/services/PmcChatResponseService"; import { TraderServicesService } from "@spt/services/TraderServicesService"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; -import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; /** * Logic for handling In Raid callbacks */ diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/InsuranceController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/InsuranceController.d.ts index f921b83..543e915 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/InsuranceController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/InsuranceController.d.ts @@ -21,11 +21,11 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PaymentService } from "@spt/services/PaymentService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceController { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/InventoryController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/InventoryController.d.ts index 40bb084..c986ce8 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/InventoryController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/InventoryController.d.ts @@ -37,10 +37,10 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MapMarkerService } from "@spt/services/MapMarkerService"; import { PlayerService } from "@spt/services/PlayerService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/LocationController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/LocationController.d.ts index 727a8c8..a541b9c 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/LocationController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/LocationController.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class LocationController { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/ProfileController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/ProfileController.d.ts index e8dae73..7e6d35c 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/ProfileController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/ProfileController.d.ts @@ -26,9 +26,9 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/QuestController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/QuestController.d.ts index 3cdce00..6a5b415 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/QuestController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/QuestController.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/RepeatableQuestController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/RepeatableQuestController.d.ts index 74f39eb..016f8c6 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/RepeatableQuestController.d.ts @@ -18,11 +18,11 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/TradeController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/TradeController.d.ts index bc72e92..842a97b 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/TradeController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/TradeController.d.ts @@ -1,5 +1,6 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper"; import { TradeHelper } from "@spt/helpers/TradeHelper"; import { TraderHelper } from "@spt/helpers/TraderHelper"; import { IPmcData } from "@spt/models/eft/common/IPmcData"; @@ -35,6 +36,7 @@ export declare class TradeController { protected hashUtil: HashUtil; protected itemHelper: ItemHelper; protected profileHelper: ProfileHelper; + protected ragfairOfferHelper: RagfairOfferHelper; protected traderHelper: TraderHelper; protected ragfairServer: RagfairServer; protected httpResponse: HttpResponseUtil; @@ -44,7 +46,7 @@ export declare class TradeController { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairOfferHelper: RagfairOfferHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); /** Handle TradingConfirm event */ confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; /** Handle RagFairBuyOffer event */ @@ -67,10 +69,17 @@ export declare class TradeController { * @param output Output to send back to client */ protected buyPmcItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void; + /** + * Is the provided offerid and ownerid from a player made offer + * @param offerId Id of the offer + * @param offerOwnerId Owner id + * @returns true if offer was made by a player + */ + protected isPlayerOffer(offerId: string, offerOwnerId: string): boolean; /** * Does Player have necessary trader loyalty to purchase flea offer * @param sellerIsTrader is seller trader - * @param fleaOffer FLea offer being bought + * @param fleaOffer Flea offer being bought * @param pmcData Player profile * @returns True if player can buy offer */ diff --git a/TypeScript/4UseACustomConfigFile/types/controllers/TraderController.d.ts b/TypeScript/4UseACustomConfigFile/types/controllers/TraderController.d.ts index 7fc6d78..3592fc6 100644 --- a/TypeScript/4UseACustomConfigFile/types/controllers/TraderController.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/controllers/TraderController.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/generators/BotEquipmentModGenerator.d.ts b/TypeScript/4UseACustomConfigFile/types/generators/BotEquipmentModGenerator.d.ts index 419120f..3952293 100644 --- a/TypeScript/4UseACustomConfigFile/types/generators/BotEquipmentModGenerator.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/generators/BotEquipmentModGenerator.d.ts @@ -25,9 +25,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotEquipmentModGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -65,7 +65,7 @@ export declare class BotEquipmentModGenerator { * @param settings Bot equipment generation settings * @param modSlot Armor slot being filtered * @param existingPlateTplPool Plates tpls to choose from - * @param armorItem + * @param armorItem The armor items db template * @returns Array of plate tpls to choose from */ protected filterPlateModsForSlotByLevel(settings: IGenerateEquipmentProperties, modSlot: string, existingPlateTplPool: string[], armorItem: ITemplateItem): IFilterPlateModsForSlotByLevelResult; diff --git a/TypeScript/4UseACustomConfigFile/types/generators/BotGenerator.d.ts b/TypeScript/4UseACustomConfigFile/types/generators/BotGenerator.d.ts index 8ab4371..ebb8a59 100644 --- a/TypeScript/4UseACustomConfigFile/types/generators/BotGenerator.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/generators/BotGenerator.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/generators/BotLevelGenerator.d.ts b/TypeScript/4UseACustomConfigFile/types/generators/BotLevelGenerator.d.ts index dee61e2..a8a8895 100644 --- a/TypeScript/4UseACustomConfigFile/types/generators/BotLevelGenerator.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/generators/BotLevelGenerator.d.ts @@ -4,12 +4,14 @@ import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; +import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class BotLevelGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; protected databaseService: DatabaseService; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService); + protected mathUtil: MathUtil; + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, mathUtil: MathUtil); /** * Return a randomised bot level and exp value * @param levelDetails Min and max of level for bot @@ -18,6 +20,7 @@ export declare class BotLevelGenerator { * @returns IRandomisedBotLevelResult object */ generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult; + protected chooseBotLevel(min: number, max: number, shift: number, number: number): number; /** * Get the highest level a bot can be relative to the players level, but no further than the max size from globals.exp_table * @param botGenerationDetails Details to help generate a bot diff --git a/TypeScript/4UseACustomConfigFile/types/generators/BotLootGenerator.d.ts b/TypeScript/4UseACustomConfigFile/types/generators/BotLootGenerator.d.ts index fee56ce..c0583c6 100644 --- a/TypeScript/4UseACustomConfigFile/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/generators/BotLootGenerator.d.ts @@ -18,9 +18,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/generators/BotWeaponGenerator.d.ts b/TypeScript/4UseACustomConfigFile/types/generators/BotWeaponGenerator.d.ts index 5559bfa..8e03b35 100644 --- a/TypeScript/4UseACustomConfigFile/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/generators/BotWeaponGenerator.d.ts @@ -18,9 +18,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RepairService } from "@spt/services/RepairService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotWeaponGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/generators/LocationGenerator.d.ts b/TypeScript/4UseACustomConfigFile/types/generators/LocationGenerator.d.ts index 222b0ab..9a2b0c4 100644 --- a/TypeScript/4UseACustomConfigFile/types/generators/LocationGenerator.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/generators/LocationGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export interface IContainerItem { items: Item[]; width: number; diff --git a/TypeScript/4UseACustomConfigFile/types/generators/PlayerScavGenerator.d.ts b/TypeScript/4UseACustomConfigFile/types/generators/PlayerScavGenerator.d.ts index 2414150..e317bf6 100644 --- a/TypeScript/4UseACustomConfigFile/types/generators/PlayerScavGenerator.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/generators/PlayerScavGenerator.d.ts @@ -14,9 +14,9 @@ import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class PlayerScavGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/4UseACustomConfigFile/types/generators/RagfairOfferGenerator.d.ts index 9435390..ca09729 100644 --- a/TypeScript/4UseACustomConfigFile/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/generators/RagfairOfferGenerator.d.ts @@ -19,10 +19,10 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/generators/RepeatableQuestGenerator.d.ts b/TypeScript/4UseACustomConfigFile/types/generators/RepeatableQuestGenerator.d.ts index 77c4e79..339f322 100644 --- a/TypeScript/4UseACustomConfigFile/types/generators/RepeatableQuestGenerator.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/generators/RepeatableQuestGenerator.d.ts @@ -11,10 +11,10 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/generators/RepeatableQuestRewardGenerator.d.ts b/TypeScript/4UseACustomConfigFile/types/generators/RepeatableQuestRewardGenerator.d.ts index 1e09994..713a394 100644 --- a/TypeScript/4UseACustomConfigFile/types/generators/RepeatableQuestRewardGenerator.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/generators/RepeatableQuestRewardGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestRewardGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/BotDifficultyHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/BotDifficultyHelper.d.ts index 63572a5..2348bd3 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/BotDifficultyHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/BotDifficultyHelper.d.ts @@ -5,8 +5,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotDifficultyHelper { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index c51bf7e..c38f0a0 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GiveSptCommand implements ISptCommand { protected logger: ILogger; protected itemHelper: ItemHelper; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/HealthHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/HealthHelper.d.ts index 650f633..a164285 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/HealthHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/HealthHelper.d.ts @@ -5,8 +5,8 @@ import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/HideoutHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/HideoutHelper.d.ts index c4aaa4c..df0376b 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/HideoutHelper.d.ts @@ -18,10 +18,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/InRaidHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/InRaidHelper.d.ts index 449be9f..987c9ec 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/InRaidHelper.d.ts @@ -15,9 +15,9 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InRaidHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/InventoryHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/InventoryHelper.d.ts index f0ff69a..92bb49c 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/InventoryHelper.d.ts @@ -23,9 +23,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/ItemHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/ItemHelper.d.ts index da5dd11..c304cee 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/ItemHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/ItemHelper.d.ts @@ -11,13 +11,13 @@ import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { CompareUtil } from "@spt/utils/CompareUtil"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ItemHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/ProfileHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/ProfileHelper.d.ts index 0671179..cdab870 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/ProfileHelper.d.ts @@ -11,10 +11,10 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/QuestHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/QuestHelper.d.ts index 2b84b8f..2d5730d 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/QuestHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/QuestHelper.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/RagfairOfferHelper.d.ts index b526554..2386316 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/RagfairOfferHelper.d.ts @@ -151,7 +151,7 @@ export declare class RagfairOfferHelper { * @param boughtAmount Amount item was purchased for * @returns IItemEventRouterResponse */ - protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; + completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; /** * Get a localised message for when players offer has sold on flea * @param itemTpl Item sold diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/RagfairServerHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/RagfairServerHelper.d.ts index 927caf5..3e1fea9 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/RagfairServerHelper.d.ts @@ -12,9 +12,9 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Helper class for common ragfair server actions */ diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/RepairHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/RepairHelper.d.ts index 99a21da..63c78c9 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/RepairHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/RepairHelper.d.ts @@ -4,8 +4,8 @@ import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/RepeatableQuestHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/RepeatableQuestHelper.d.ts index d92657e..8c65f40 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/RepeatableQuestHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/RepeatableQuestHelper.d.ts @@ -1,8 +1,8 @@ import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestHelper { protected mathUtil: MathUtil; protected configServer: ConfigServer; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/TradeHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/TradeHelper.d.ts index f994fda..6e6f3a2 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/TradeHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/TradeHelper.d.ts @@ -17,8 +17,8 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TradeHelper { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/TraderAssortHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/TraderAssortHelper.d.ts index 8f8f802..f1ecd3b 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/TraderAssortHelper.d.ts @@ -14,9 +14,9 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/loaders/BundleLoader.d.ts b/TypeScript/4UseACustomConfigFile/types/loaders/BundleLoader.d.ts index e270988..8c0ed4d 100644 --- a/TypeScript/4UseACustomConfigFile/types/loaders/BundleLoader.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/loaders/BundleLoader.d.ts @@ -1,8 +1,8 @@ import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BundleInfo { modpath: string; filename: string; diff --git a/TypeScript/4UseACustomConfigFile/types/loaders/PostDBModLoader.d.ts b/TypeScript/4UseACustomConfigFile/types/loaders/PostDBModLoader.d.ts index b0c4bf4..a8bb6a9 100644 --- a/TypeScript/4UseACustomConfigFile/types/loaders/PostDBModLoader.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/loaders/PostDBModLoader.d.ts @@ -1,10 +1,10 @@ -import { DependencyContainer } from "tsyringe"; import { OnLoad } from "@spt/di/OnLoad"; import { BundleLoader } from "@spt/loaders/BundleLoader"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostDBModLoader implements OnLoad { protected logger: ILogger; protected bundleLoader: BundleLoader; diff --git a/TypeScript/4UseACustomConfigFile/types/loaders/PostSptModLoader.d.ts b/TypeScript/4UseACustomConfigFile/types/loaders/PostSptModLoader.d.ts index fb54579..2603497 100644 --- a/TypeScript/4UseACustomConfigFile/types/loaders/PostSptModLoader.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/loaders/PostSptModLoader.d.ts @@ -1,9 +1,9 @@ -import { DependencyContainer } from "tsyringe"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { IModLoader } from "@spt/models/spt/mod/IModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostSptModLoader implements IModLoader { protected logger: ILogger; protected preSptModLoader: PreSptModLoader; diff --git a/TypeScript/4UseACustomConfigFile/types/loaders/PreSptModLoader.d.ts b/TypeScript/4UseACustomConfigFile/types/loaders/PreSptModLoader.d.ts index bc846c8..8814525 100644 --- a/TypeScript/4UseACustomConfigFile/types/loaders/PreSptModLoader.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/loaders/PreSptModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { ModDetails } from "@spt/models/eft/profile/ISptProfile"; @@ -11,6 +10,7 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { ModCompilerService } from "@spt/services/ModCompilerService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { DependencyContainer } from "tsyringe"; export declare class PreSptModLoader implements IModLoader { protected logger: ILogger; protected vfs: VFS; diff --git a/TypeScript/4UseACustomConfigFile/types/models/eft/common/IEmptyRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/IEmptyRequestData.d.ts index 284d16e..52a7b12 100644 --- a/TypeScript/4UseACustomConfigFile/types/models/eft/common/IEmptyRequestData.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/models/eft/common/IEmptyRequestData.d.ts @@ -1,2 +1 @@ -export interface IEmptyRequestData { -} +export type IEmptyRequestData = {}; diff --git a/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IBotBase.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IBotBase.d.ts index a7fe1ca..be37845 100644 --- a/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IBotBase.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IBotBase.d.ts @@ -373,8 +373,7 @@ export interface LastCompleted { export interface Notes { Notes: Note[]; } -export interface CarExtractCounts { -} +export type CarExtractCounts = {}; export declare enum SurvivorClass { UNKNOWN = 0, NEUTRALIZER = 1, diff --git a/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/ILocationsBase.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/ILocationsBase.d.ts index 2c96af3..16bca24 100644 --- a/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/ILocationsBase.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/ILocationsBase.d.ts @@ -2,8 +2,7 @@ export interface ILocationsBase { locations: Locations; paths: Path[]; } -export interface Locations { -} +export type Locations = {}; export interface Path { Source: string; Destination: string; diff --git a/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IProfileTemplate.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IProfileTemplate.d.ts index 20923bc..6ba9221 100644 --- a/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IProfileTemplate.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -1,12 +1,12 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { Dialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; export interface IProfileTemplates { - "Standard": IProfileSides; + Standard: IProfileSides; "Left Behind": IProfileSides; "Prepare To Escape": IProfileSides; "Edge Of Darkness": IProfileSides; - "Unheard": IProfileSides; - "Tournament": IProfileSides; + Unheard: IProfileSides; + Tournament: IProfileSides; "SPT Developer": IProfileSides; "SPT Easy start": IProfileSides; "SPT Zero to hero": IProfileSides; diff --git a/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/ITrader.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/ITrader.d.ts index 14ab409..40cf004 100644 --- a/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/ITrader.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/ITrader.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; export interface ITrader { assort?: ITraderAssort; @@ -78,6 +79,8 @@ export interface IBarterScheme { _tpl: string; onlyFunctional?: boolean; sptQuestLocked?: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface ISuit { _id: string; diff --git a/TypeScript/4UseACustomConfigFile/types/models/eft/hideout/IQteData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/hideout/IQteData.d.ts index 7f507e1..fe6cce6 100644 --- a/TypeScript/4UseACustomConfigFile/types/models/eft/hideout/IQteData.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/models/eft/hideout/IQteData.d.ts @@ -1,14 +1,14 @@ import { Effect } from "@spt/models/eft/health/Effect"; import { BodyPart } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; import { QteActivityType } from "@spt/models/enums/hideout/QteActivityType"; import { QteEffectType } from "@spt/models/enums/hideout/QteEffectType"; import { QteResultType } from "@spt/models/enums/hideout/QteResultType"; import { QteRewardType } from "@spt/models/enums/hideout/QteRewardType"; import { QteType } from "@spt/models/enums/hideout/QteType"; import { RequirementType } from "@spt/models/enums/hideout/RequirementType"; -import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt/models/enums/SkillTypes"; -import { Traders } from "@spt/models/enums/Traders"; export interface IQteData { id: string; type: QteActivityType; diff --git a/TypeScript/4UseACustomConfigFile/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index f1123c1..5971372 100644 --- a/TypeScript/4UseACustomConfigFile/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -15,7 +15,5 @@ export interface Items { change: any[]; del: any[]; } -export interface Production { -} -export interface TraderRelations { -} +export type Production = {}; +export type TraderRelations = {}; diff --git a/TypeScript/4UseACustomConfigFile/types/models/eft/profile/ISptProfile.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/profile/ISptProfile.d.ts index a8e742a..dd7aea6 100644 --- a/TypeScript/4UseACustomConfigFile/types/models/eft/profile/ISptProfile.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/models/eft/profile/ISptProfile.d.ts @@ -209,12 +209,9 @@ export interface Effects { LeftLeg: LeftLeg; RightLeg: RightLeg; } -export interface Head { -} -export interface Chest { -} -export interface Stomach { -} +export type Head = {}; +export type Chest = {}; +export type Stomach = {}; export interface LeftArm { Fracture?: number; } diff --git a/TypeScript/4UseACustomConfigFile/types/models/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/ragfair/IRagfairOffer.d.ts index eeeb79d..f6c07fc 100644 --- a/TypeScript/4UseACustomConfigFile/types/models/eft/ragfair/IRagfairOffer.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/models/eft/ragfair/IRagfairOffer.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface IRagfairOffer { sellResult?: SellResult[]; @@ -28,6 +29,8 @@ export interface OfferRequirement { _tpl: string; count: number; onlyFunctional: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface IRagfairOfferUser { id: string; diff --git a/TypeScript/4UseACustomConfigFile/types/models/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/ragfair/ISearchRequestData.d.ts index 8261c5b..c631de8 100644 --- a/TypeScript/4UseACustomConfigFile/types/models/eft/ragfair/ISearchRequestData.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/models/eft/ragfair/ISearchRequestData.d.ts @@ -29,5 +29,4 @@ export declare enum OfferOwnerType { TRADEROWNERTYPE = 1, PLAYEROWNERTYPE = 2 } -export interface BuildItems { -} +export type BuildItems = {}; diff --git a/TypeScript/4UseACustomConfigFile/types/models/enums/BaseClasses.d.ts b/TypeScript/4UseACustomConfigFile/types/models/enums/BaseClasses.d.ts index 65fc95e..32ebf7c 100644 --- a/TypeScript/4UseACustomConfigFile/types/models/enums/BaseClasses.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/models/enums/BaseClasses.d.ts @@ -107,6 +107,6 @@ export declare enum BaseClasses { RECEIVER = "55818a304bdc2db5418b457d", BARREL = "555ef6e44bdc2de9068b457e", CHARGING_HANDLE = "55818a6f4bdc2db9688b456b", - COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569 ", + COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569", HIDEOUT_AREA_CONTAINER = "63da6da4784a55176c018dba" } diff --git a/TypeScript/4UseACustomConfigFile/types/models/enums/DogtagExchangeSide.d.ts b/TypeScript/4UseACustomConfigFile/types/models/enums/DogtagExchangeSide.d.ts new file mode 100644 index 0000000..de3d4df --- /dev/null +++ b/TypeScript/4UseACustomConfigFile/types/models/enums/DogtagExchangeSide.d.ts @@ -0,0 +1,5 @@ +export declare enum DogtagExchangeSide { + USEC = "Usec", + BEAR = "Bear", + ANY = "Any" +} diff --git a/TypeScript/4UseACustomConfigFile/types/models/spt/server/ExhaustableArray.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/server/ExhaustableArray.d.ts index c27f41f..50a6b68 100644 --- a/TypeScript/4UseACustomConfigFile/types/models/spt/server/ExhaustableArray.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/models/spt/server/ExhaustableArray.d.ts @@ -1,5 +1,5 @@ -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ExhaustableArray implements IExhaustableArray { private itemPool; private randomUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/routers/EventOutputHolder.d.ts b/TypeScript/4UseACustomConfigFile/types/routers/EventOutputHolder.d.ts index ef20706..148461a 100644 --- a/TypeScript/4UseACustomConfigFile/types/routers/EventOutputHolder.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/routers/EventOutputHolder.d.ts @@ -3,8 +3,8 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IHideoutImprovement, Productive, TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; import { TraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class EventOutputHolder { protected profileHelper: ProfileHelper; protected timeUtil: TimeUtil; @@ -12,7 +12,7 @@ export declare class EventOutputHolder { /** * What has client been informed of this game session * Key = sessionId, then second key is prod id - */ + */ protected clientActiveSessionStorage: Record>; diff --git a/TypeScript/4UseACustomConfigFile/types/servers/HttpServer.d.ts b/TypeScript/4UseACustomConfigFile/types/servers/HttpServer.d.ts index b00fe68..0024ba3 100644 --- a/TypeScript/4UseACustomConfigFile/types/servers/HttpServer.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/servers/HttpServer.d.ts @@ -6,8 +6,8 @@ import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; -import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { WebSocketServer } from "@spt/servers/WebSocketServer"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { LocalisationService } from "@spt/services/LocalisationService"; export declare class HttpServer { protected logger: ILogger; diff --git a/TypeScript/4UseACustomConfigFile/types/servers/WebSocketServer.d.ts b/TypeScript/4UseACustomConfigFile/types/servers/WebSocketServer.d.ts index f4e07bb..6121824 100644 --- a/TypeScript/4UseACustomConfigFile/types/servers/WebSocketServer.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/servers/WebSocketServer.d.ts @@ -1,12 +1,12 @@ /// import http, { IncomingMessage } from "node:http"; -import { WebSocket, Server } from "ws"; import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { Server, WebSocket } from "ws"; export declare class WebSocketServer { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/servers/ws/SptWebSocketConnectionHandler.d.ts b/TypeScript/4UseACustomConfigFile/types/servers/ws/SptWebSocketConnectionHandler.d.ts index 98d0898..70fc96a 100644 --- a/TypeScript/4UseACustomConfigFile/types/servers/ws/SptWebSocketConnectionHandler.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/servers/ws/SptWebSocketConnectionHandler.d.ts @@ -1,7 +1,6 @@ /// /// import { IncomingMessage } from "http"; -import { WebSocket } from "ws"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; @@ -11,6 +10,7 @@ import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectio import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; +import { WebSocket } from "ws"; export declare class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler { protected logger: ILogger; protected profileHelper: ProfileHelper; diff --git a/TypeScript/4UseACustomConfigFile/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts b/TypeScript/4UseACustomConfigFile/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts index d5247ec..5556129 100644 --- a/TypeScript/4UseACustomConfigFile/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts @@ -1,6 +1,6 @@ -import { RawData, WebSocket } from "ws"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; +import { RawData, WebSocket } from "ws"; export declare class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler { protected logger: ILogger; constructor(logger: ILogger); diff --git a/TypeScript/4UseACustomConfigFile/types/services/FenceService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/FenceService.d.ts index c156122..58dc076 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/FenceService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/FenceService.d.ts @@ -13,9 +13,9 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Handle actions surrounding Fence * e.g. generating or refreshing assorts / get next refresh time diff --git a/TypeScript/4UseACustomConfigFile/types/services/InsuranceService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/InsuranceService.d.ts index 0000e66..f799102 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/InsuranceService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/InsuranceService.d.ts @@ -18,10 +18,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceService { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/4UseACustomConfigFile/types/services/LocalisationService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/LocalisationService.d.ts index 42dfa4e..855c138 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/LocalisationService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/LocalisationService.d.ts @@ -1,8 +1,8 @@ -import { I18n } from "i18n"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { LocaleService } from "@spt/services/LocaleService"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { I18n } from "i18n"; /** * Handles translating server text into different langauges */ diff --git a/TypeScript/4UseACustomConfigFile/types/services/ProfileFixerService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/ProfileFixerService.d.ts index 525b867..91e4780 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/ProfileFixerService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/ProfileFixerService.d.ts @@ -8,7 +8,7 @@ import { Bonus, HideoutSlot } from "@spt/models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea"; -import { ISptProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; +import { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; @@ -16,11 +16,11 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileFixerService { protected logger: ILogger; protected watermark: Watermark; @@ -73,6 +73,7 @@ export declare class ProfileFixerService { */ protected removeDanglingTaskConditionCounters(pmcProfile: IPmcData): void; protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullRagfairRatings(pmcProfile: IPmcData): void; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; /** diff --git a/TypeScript/4UseACustomConfigFile/types/services/RagfairOfferService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/RagfairOfferService.d.ts index 6c13b1d..98dd179 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/RagfairOfferService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/RagfairOfferService.d.ts @@ -10,10 +10,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/services/mod/CustomItemService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/mod/CustomItemService.d.ts index 1926bed..f112872 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/mod/CustomItemService.d.ts @@ -4,8 +4,8 @@ import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetail import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts index 3c9d955..91c84d9 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class DynamicRouterModService { private container; constructor(container: DependencyContainer); diff --git a/TypeScript/4UseACustomConfigFile/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/mod/staticRouter/StaticRouterModService.d.ts index f60432d..0c3d4d8 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class StaticRouterModService { protected container: DependencyContainer; constructor(container: DependencyContainer); diff --git a/TypeScript/4UseACustomConfigFile/types/utils/JsonUtil.d.ts b/TypeScript/4UseACustomConfigFile/types/utils/JsonUtil.d.ts index b30822c..4419228 100644 --- a/TypeScript/4UseACustomConfigFile/types/utils/JsonUtil.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/utils/JsonUtil.d.ts @@ -1,7 +1,7 @@ -import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { HashUtil } from "@spt/utils/HashUtil"; import { VFS } from "@spt/utils/VFS"; +import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; export declare class JsonUtil { protected vfs: VFS; protected hashUtil: HashUtil; diff --git a/TypeScript/4UseACustomConfigFile/types/utils/RandomUtil.d.ts b/TypeScript/4UseACustomConfigFile/types/utils/RandomUtil.d.ts index 49f242d..0da184f 100644 --- a/TypeScript/4UseACustomConfigFile/types/utils/RandomUtil.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/utils/RandomUtil.d.ts @@ -1,6 +1,6 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects * based on the relative probability of each of its elements. diff --git a/TypeScript/4UseACustomConfigFile/types/utils/logging/AbstractWinstonLogger.d.ts b/TypeScript/4UseACustomConfigFile/types/utils/logging/AbstractWinstonLogger.d.ts index 7098f85..ef54434 100644 --- a/TypeScript/4UseACustomConfigFile/types/utils/logging/AbstractWinstonLogger.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/utils/logging/AbstractWinstonLogger.d.ts @@ -1,12 +1,12 @@ /// import fs from "node:fs"; -import winston from "winston"; import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; import { SptLogger } from "@spt/models/spt/logging/SptLogger"; import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; import { ILogger } from "@spt/models/spt/utils/ILogger"; +import winston from "winston"; export declare abstract class AbstractWinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected showDebugInConsole: boolean; diff --git a/TypeScript/5ReplaceMethod/types/controllers/BotController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/BotController.d.ts index 6431fca..475f51b 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/BotController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/BotController.d.ts @@ -20,8 +20,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/5ReplaceMethod/types/controllers/BuildController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/BuildController.d.ts index ed8adf6..2cb9c59 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/BuildController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/BuildController.d.ts @@ -9,8 +9,8 @@ import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BuildController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/5ReplaceMethod/types/controllers/GameController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/GameController.d.ts index 533a81c..e219c04 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/GameController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/GameController.d.ts @@ -34,10 +34,10 @@ import { ProfileActivityService } from "@spt/services/ProfileActivityService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GameController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/5ReplaceMethod/types/controllers/HealthController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/HealthController.d.ts index 5482283..5a0a0a6 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/HealthController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/HealthController.d.ts @@ -12,8 +12,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthController { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/5ReplaceMethod/types/controllers/HideoutController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/HideoutController.d.ts index e9d1ed9..89a428c 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/HideoutController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/HideoutController.d.ts @@ -35,11 +35,11 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; import { ProfileActivityService } from "@spt/services/ProfileActivityService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/5ReplaceMethod/types/controllers/InraidController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/InraidController.d.ts index 87f419b..9f0c409 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/InraidController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/InraidController.d.ts @@ -13,6 +13,7 @@ import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRe import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState"; import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig"; import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; @@ -31,7 +32,6 @@ import { PmcChatResponseService } from "@spt/services/PmcChatResponseService"; import { TraderServicesService } from "@spt/services/TraderServicesService"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; -import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; /** * Logic for handling In Raid callbacks */ diff --git a/TypeScript/5ReplaceMethod/types/controllers/InsuranceController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/InsuranceController.d.ts index f921b83..543e915 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/InsuranceController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/InsuranceController.d.ts @@ -21,11 +21,11 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PaymentService } from "@spt/services/PaymentService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceController { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/5ReplaceMethod/types/controllers/InventoryController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/InventoryController.d.ts index 40bb084..c986ce8 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/InventoryController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/InventoryController.d.ts @@ -37,10 +37,10 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MapMarkerService } from "@spt/services/MapMarkerService"; import { PlayerService } from "@spt/services/PlayerService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/5ReplaceMethod/types/controllers/LocationController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/LocationController.d.ts index 727a8c8..a541b9c 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/LocationController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/LocationController.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class LocationController { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; diff --git a/TypeScript/5ReplaceMethod/types/controllers/ProfileController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/ProfileController.d.ts index e8dae73..7e6d35c 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/ProfileController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/ProfileController.d.ts @@ -26,9 +26,9 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/5ReplaceMethod/types/controllers/QuestController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/QuestController.d.ts index 3cdce00..6a5b415 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/QuestController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/QuestController.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/5ReplaceMethod/types/controllers/RepeatableQuestController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/RepeatableQuestController.d.ts index 74f39eb..016f8c6 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/RepeatableQuestController.d.ts @@ -18,11 +18,11 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/5ReplaceMethod/types/controllers/TradeController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/TradeController.d.ts index bc72e92..842a97b 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/TradeController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/TradeController.d.ts @@ -1,5 +1,6 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper"; import { TradeHelper } from "@spt/helpers/TradeHelper"; import { TraderHelper } from "@spt/helpers/TraderHelper"; import { IPmcData } from "@spt/models/eft/common/IPmcData"; @@ -35,6 +36,7 @@ export declare class TradeController { protected hashUtil: HashUtil; protected itemHelper: ItemHelper; protected profileHelper: ProfileHelper; + protected ragfairOfferHelper: RagfairOfferHelper; protected traderHelper: TraderHelper; protected ragfairServer: RagfairServer; protected httpResponse: HttpResponseUtil; @@ -44,7 +46,7 @@ export declare class TradeController { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairOfferHelper: RagfairOfferHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); /** Handle TradingConfirm event */ confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; /** Handle RagFairBuyOffer event */ @@ -67,10 +69,17 @@ export declare class TradeController { * @param output Output to send back to client */ protected buyPmcItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void; + /** + * Is the provided offerid and ownerid from a player made offer + * @param offerId Id of the offer + * @param offerOwnerId Owner id + * @returns true if offer was made by a player + */ + protected isPlayerOffer(offerId: string, offerOwnerId: string): boolean; /** * Does Player have necessary trader loyalty to purchase flea offer * @param sellerIsTrader is seller trader - * @param fleaOffer FLea offer being bought + * @param fleaOffer Flea offer being bought * @param pmcData Player profile * @returns True if player can buy offer */ diff --git a/TypeScript/5ReplaceMethod/types/controllers/TraderController.d.ts b/TypeScript/5ReplaceMethod/types/controllers/TraderController.d.ts index 7fc6d78..3592fc6 100644 --- a/TypeScript/5ReplaceMethod/types/controllers/TraderController.d.ts +++ b/TypeScript/5ReplaceMethod/types/controllers/TraderController.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/5ReplaceMethod/types/generators/BotEquipmentModGenerator.d.ts b/TypeScript/5ReplaceMethod/types/generators/BotEquipmentModGenerator.d.ts index 419120f..3952293 100644 --- a/TypeScript/5ReplaceMethod/types/generators/BotEquipmentModGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/generators/BotEquipmentModGenerator.d.ts @@ -25,9 +25,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotEquipmentModGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -65,7 +65,7 @@ export declare class BotEquipmentModGenerator { * @param settings Bot equipment generation settings * @param modSlot Armor slot being filtered * @param existingPlateTplPool Plates tpls to choose from - * @param armorItem + * @param armorItem The armor items db template * @returns Array of plate tpls to choose from */ protected filterPlateModsForSlotByLevel(settings: IGenerateEquipmentProperties, modSlot: string, existingPlateTplPool: string[], armorItem: ITemplateItem): IFilterPlateModsForSlotByLevelResult; diff --git a/TypeScript/5ReplaceMethod/types/generators/BotGenerator.d.ts b/TypeScript/5ReplaceMethod/types/generators/BotGenerator.d.ts index 8ab4371..ebb8a59 100644 --- a/TypeScript/5ReplaceMethod/types/generators/BotGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/generators/BotGenerator.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/5ReplaceMethod/types/generators/BotLevelGenerator.d.ts b/TypeScript/5ReplaceMethod/types/generators/BotLevelGenerator.d.ts index dee61e2..a8a8895 100644 --- a/TypeScript/5ReplaceMethod/types/generators/BotLevelGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/generators/BotLevelGenerator.d.ts @@ -4,12 +4,14 @@ import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; +import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class BotLevelGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; protected databaseService: DatabaseService; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService); + protected mathUtil: MathUtil; + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, mathUtil: MathUtil); /** * Return a randomised bot level and exp value * @param levelDetails Min and max of level for bot @@ -18,6 +20,7 @@ export declare class BotLevelGenerator { * @returns IRandomisedBotLevelResult object */ generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult; + protected chooseBotLevel(min: number, max: number, shift: number, number: number): number; /** * Get the highest level a bot can be relative to the players level, but no further than the max size from globals.exp_table * @param botGenerationDetails Details to help generate a bot diff --git a/TypeScript/5ReplaceMethod/types/generators/BotLootGenerator.d.ts b/TypeScript/5ReplaceMethod/types/generators/BotLootGenerator.d.ts index fee56ce..c0583c6 100644 --- a/TypeScript/5ReplaceMethod/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/generators/BotLootGenerator.d.ts @@ -18,9 +18,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/5ReplaceMethod/types/generators/BotWeaponGenerator.d.ts b/TypeScript/5ReplaceMethod/types/generators/BotWeaponGenerator.d.ts index 5559bfa..8e03b35 100644 --- a/TypeScript/5ReplaceMethod/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/generators/BotWeaponGenerator.d.ts @@ -18,9 +18,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RepairService } from "@spt/services/RepairService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotWeaponGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/5ReplaceMethod/types/generators/LocationGenerator.d.ts b/TypeScript/5ReplaceMethod/types/generators/LocationGenerator.d.ts index 222b0ab..9a2b0c4 100644 --- a/TypeScript/5ReplaceMethod/types/generators/LocationGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/generators/LocationGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export interface IContainerItem { items: Item[]; width: number; diff --git a/TypeScript/5ReplaceMethod/types/generators/PlayerScavGenerator.d.ts b/TypeScript/5ReplaceMethod/types/generators/PlayerScavGenerator.d.ts index 2414150..e317bf6 100644 --- a/TypeScript/5ReplaceMethod/types/generators/PlayerScavGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/generators/PlayerScavGenerator.d.ts @@ -14,9 +14,9 @@ import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class PlayerScavGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/5ReplaceMethod/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/5ReplaceMethod/types/generators/RagfairOfferGenerator.d.ts index 9435390..ca09729 100644 --- a/TypeScript/5ReplaceMethod/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/generators/RagfairOfferGenerator.d.ts @@ -19,10 +19,10 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/5ReplaceMethod/types/generators/RepeatableQuestGenerator.d.ts b/TypeScript/5ReplaceMethod/types/generators/RepeatableQuestGenerator.d.ts index 77c4e79..339f322 100644 --- a/TypeScript/5ReplaceMethod/types/generators/RepeatableQuestGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/generators/RepeatableQuestGenerator.d.ts @@ -11,10 +11,10 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/5ReplaceMethod/types/generators/RepeatableQuestRewardGenerator.d.ts b/TypeScript/5ReplaceMethod/types/generators/RepeatableQuestRewardGenerator.d.ts index 1e09994..713a394 100644 --- a/TypeScript/5ReplaceMethod/types/generators/RepeatableQuestRewardGenerator.d.ts +++ b/TypeScript/5ReplaceMethod/types/generators/RepeatableQuestRewardGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestRewardGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/5ReplaceMethod/types/helpers/BotDifficultyHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/BotDifficultyHelper.d.ts index 63572a5..2348bd3 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/BotDifficultyHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/BotDifficultyHelper.d.ts @@ -5,8 +5,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotDifficultyHelper { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/5ReplaceMethod/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/5ReplaceMethod/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index c51bf7e..c38f0a0 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GiveSptCommand implements ISptCommand { protected logger: ILogger; protected itemHelper: ItemHelper; diff --git a/TypeScript/5ReplaceMethod/types/helpers/HealthHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/HealthHelper.d.ts index 650f633..a164285 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/HealthHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/HealthHelper.d.ts @@ -5,8 +5,8 @@ import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/5ReplaceMethod/types/helpers/HideoutHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/HideoutHelper.d.ts index c4aaa4c..df0376b 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/HideoutHelper.d.ts @@ -18,10 +18,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/5ReplaceMethod/types/helpers/InRaidHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/InRaidHelper.d.ts index 449be9f..987c9ec 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/InRaidHelper.d.ts @@ -15,9 +15,9 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InRaidHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/5ReplaceMethod/types/helpers/InventoryHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/InventoryHelper.d.ts index f0ff69a..92bb49c 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/InventoryHelper.d.ts @@ -23,9 +23,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/5ReplaceMethod/types/helpers/ItemHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/ItemHelper.d.ts index da5dd11..c304cee 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/ItemHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/ItemHelper.d.ts @@ -11,13 +11,13 @@ import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { CompareUtil } from "@spt/utils/CompareUtil"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ItemHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/5ReplaceMethod/types/helpers/ProfileHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/ProfileHelper.d.ts index 0671179..cdab870 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/ProfileHelper.d.ts @@ -11,10 +11,10 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/5ReplaceMethod/types/helpers/QuestHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/QuestHelper.d.ts index 2b84b8f..2d5730d 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/QuestHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/QuestHelper.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/5ReplaceMethod/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/RagfairOfferHelper.d.ts index b526554..2386316 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/RagfairOfferHelper.d.ts @@ -151,7 +151,7 @@ export declare class RagfairOfferHelper { * @param boughtAmount Amount item was purchased for * @returns IItemEventRouterResponse */ - protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; + completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; /** * Get a localised message for when players offer has sold on flea * @param itemTpl Item sold diff --git a/TypeScript/5ReplaceMethod/types/helpers/RagfairServerHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/RagfairServerHelper.d.ts index 927caf5..3e1fea9 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/RagfairServerHelper.d.ts @@ -12,9 +12,9 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Helper class for common ragfair server actions */ diff --git a/TypeScript/5ReplaceMethod/types/helpers/RepairHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/RepairHelper.d.ts index 99a21da..63c78c9 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/RepairHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/RepairHelper.d.ts @@ -4,8 +4,8 @@ import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/5ReplaceMethod/types/helpers/RepeatableQuestHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/RepeatableQuestHelper.d.ts index d92657e..8c65f40 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/RepeatableQuestHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/RepeatableQuestHelper.d.ts @@ -1,8 +1,8 @@ import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestHelper { protected mathUtil: MathUtil; protected configServer: ConfigServer; diff --git a/TypeScript/5ReplaceMethod/types/helpers/TradeHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/TradeHelper.d.ts index f994fda..6e6f3a2 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/TradeHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/TradeHelper.d.ts @@ -17,8 +17,8 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TradeHelper { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/5ReplaceMethod/types/helpers/TraderAssortHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/TraderAssortHelper.d.ts index 8f8f802..f1ecd3b 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/TraderAssortHelper.d.ts @@ -14,9 +14,9 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; diff --git a/TypeScript/5ReplaceMethod/types/loaders/BundleLoader.d.ts b/TypeScript/5ReplaceMethod/types/loaders/BundleLoader.d.ts index e270988..8c0ed4d 100644 --- a/TypeScript/5ReplaceMethod/types/loaders/BundleLoader.d.ts +++ b/TypeScript/5ReplaceMethod/types/loaders/BundleLoader.d.ts @@ -1,8 +1,8 @@ import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BundleInfo { modpath: string; filename: string; diff --git a/TypeScript/5ReplaceMethod/types/loaders/PostDBModLoader.d.ts b/TypeScript/5ReplaceMethod/types/loaders/PostDBModLoader.d.ts index b0c4bf4..a8bb6a9 100644 --- a/TypeScript/5ReplaceMethod/types/loaders/PostDBModLoader.d.ts +++ b/TypeScript/5ReplaceMethod/types/loaders/PostDBModLoader.d.ts @@ -1,10 +1,10 @@ -import { DependencyContainer } from "tsyringe"; import { OnLoad } from "@spt/di/OnLoad"; import { BundleLoader } from "@spt/loaders/BundleLoader"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostDBModLoader implements OnLoad { protected logger: ILogger; protected bundleLoader: BundleLoader; diff --git a/TypeScript/5ReplaceMethod/types/loaders/PostSptModLoader.d.ts b/TypeScript/5ReplaceMethod/types/loaders/PostSptModLoader.d.ts index fb54579..2603497 100644 --- a/TypeScript/5ReplaceMethod/types/loaders/PostSptModLoader.d.ts +++ b/TypeScript/5ReplaceMethod/types/loaders/PostSptModLoader.d.ts @@ -1,9 +1,9 @@ -import { DependencyContainer } from "tsyringe"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { IModLoader } from "@spt/models/spt/mod/IModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostSptModLoader implements IModLoader { protected logger: ILogger; protected preSptModLoader: PreSptModLoader; diff --git a/TypeScript/5ReplaceMethod/types/loaders/PreSptModLoader.d.ts b/TypeScript/5ReplaceMethod/types/loaders/PreSptModLoader.d.ts index bc846c8..8814525 100644 --- a/TypeScript/5ReplaceMethod/types/loaders/PreSptModLoader.d.ts +++ b/TypeScript/5ReplaceMethod/types/loaders/PreSptModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { ModDetails } from "@spt/models/eft/profile/ISptProfile"; @@ -11,6 +10,7 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { ModCompilerService } from "@spt/services/ModCompilerService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { DependencyContainer } from "tsyringe"; export declare class PreSptModLoader implements IModLoader { protected logger: ILogger; protected vfs: VFS; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/IEmptyRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/IEmptyRequestData.d.ts index 284d16e..52a7b12 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/IEmptyRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/IEmptyRequestData.d.ts @@ -1,2 +1 @@ -export interface IEmptyRequestData { -} +export type IEmptyRequestData = {}; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IBotBase.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IBotBase.d.ts index a7fe1ca..be37845 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IBotBase.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IBotBase.d.ts @@ -373,8 +373,7 @@ export interface LastCompleted { export interface Notes { Notes: Note[]; } -export interface CarExtractCounts { -} +export type CarExtractCounts = {}; export declare enum SurvivorClass { UNKNOWN = 0, NEUTRALIZER = 1, diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ILocationsBase.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ILocationsBase.d.ts index 2c96af3..16bca24 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ILocationsBase.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ILocationsBase.d.ts @@ -2,8 +2,7 @@ export interface ILocationsBase { locations: Locations; paths: Path[]; } -export interface Locations { -} +export type Locations = {}; export interface Path { Source: string; Destination: string; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IProfileTemplate.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IProfileTemplate.d.ts index 20923bc..6ba9221 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IProfileTemplate.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -1,12 +1,12 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { Dialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; export interface IProfileTemplates { - "Standard": IProfileSides; + Standard: IProfileSides; "Left Behind": IProfileSides; "Prepare To Escape": IProfileSides; "Edge Of Darkness": IProfileSides; - "Unheard": IProfileSides; - "Tournament": IProfileSides; + Unheard: IProfileSides; + Tournament: IProfileSides; "SPT Developer": IProfileSides; "SPT Easy start": IProfileSides; "SPT Zero to hero": IProfileSides; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ITrader.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ITrader.d.ts index 14ab409..40cf004 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ITrader.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ITrader.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; export interface ITrader { assort?: ITraderAssort; @@ -78,6 +79,8 @@ export interface IBarterScheme { _tpl: string; onlyFunctional?: boolean; sptQuestLocked?: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface ISuit { _id: string; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/hideout/IQteData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IQteData.d.ts index 7f507e1..fe6cce6 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/hideout/IQteData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/hideout/IQteData.d.ts @@ -1,14 +1,14 @@ import { Effect } from "@spt/models/eft/health/Effect"; import { BodyPart } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; import { QteActivityType } from "@spt/models/enums/hideout/QteActivityType"; import { QteEffectType } from "@spt/models/enums/hideout/QteEffectType"; import { QteResultType } from "@spt/models/enums/hideout/QteResultType"; import { QteRewardType } from "@spt/models/enums/hideout/QteRewardType"; import { QteType } from "@spt/models/enums/hideout/QteType"; import { RequirementType } from "@spt/models/enums/hideout/RequirementType"; -import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt/models/enums/SkillTypes"; -import { Traders } from "@spt/models/enums/Traders"; export interface IQteData { id: string; type: QteActivityType; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index f1123c1..5971372 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -15,7 +15,5 @@ export interface Items { change: any[]; del: any[]; } -export interface Production { -} -export interface TraderRelations { -} +export type Production = {}; +export type TraderRelations = {}; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/profile/ISptProfile.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/profile/ISptProfile.d.ts index a8e742a..dd7aea6 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/profile/ISptProfile.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/profile/ISptProfile.d.ts @@ -209,12 +209,9 @@ export interface Effects { LeftLeg: LeftLeg; RightLeg: RightLeg; } -export interface Head { -} -export interface Chest { -} -export interface Stomach { -} +export type Head = {}; +export type Chest = {}; +export type Stomach = {}; export interface LeftArm { Fracture?: number; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IRagfairOffer.d.ts index eeeb79d..f6c07fc 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IRagfairOffer.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/ragfair/IRagfairOffer.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface IRagfairOffer { sellResult?: SellResult[]; @@ -28,6 +29,8 @@ export interface OfferRequirement { _tpl: string; count: number; onlyFunctional: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface IRagfairOfferUser { id: string; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/ragfair/ISearchRequestData.d.ts index 8261c5b..c631de8 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/ragfair/ISearchRequestData.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/ragfair/ISearchRequestData.d.ts @@ -29,5 +29,4 @@ export declare enum OfferOwnerType { TRADEROWNERTYPE = 1, PLAYEROWNERTYPE = 2 } -export interface BuildItems { -} +export type BuildItems = {}; diff --git a/TypeScript/5ReplaceMethod/types/models/enums/BaseClasses.d.ts b/TypeScript/5ReplaceMethod/types/models/enums/BaseClasses.d.ts index 65fc95e..32ebf7c 100644 --- a/TypeScript/5ReplaceMethod/types/models/enums/BaseClasses.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/enums/BaseClasses.d.ts @@ -107,6 +107,6 @@ export declare enum BaseClasses { RECEIVER = "55818a304bdc2db5418b457d", BARREL = "555ef6e44bdc2de9068b457e", CHARGING_HANDLE = "55818a6f4bdc2db9688b456b", - COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569 ", + COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569", HIDEOUT_AREA_CONTAINER = "63da6da4784a55176c018dba" } diff --git a/TypeScript/5ReplaceMethod/types/models/enums/DogtagExchangeSide.d.ts b/TypeScript/5ReplaceMethod/types/models/enums/DogtagExchangeSide.d.ts new file mode 100644 index 0000000..de3d4df --- /dev/null +++ b/TypeScript/5ReplaceMethod/types/models/enums/DogtagExchangeSide.d.ts @@ -0,0 +1,5 @@ +export declare enum DogtagExchangeSide { + USEC = "Usec", + BEAR = "Bear", + ANY = "Any" +} diff --git a/TypeScript/5ReplaceMethod/types/models/spt/server/ExhaustableArray.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/server/ExhaustableArray.d.ts index c27f41f..50a6b68 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/server/ExhaustableArray.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/server/ExhaustableArray.d.ts @@ -1,5 +1,5 @@ -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ExhaustableArray implements IExhaustableArray { private itemPool; private randomUtil; diff --git a/TypeScript/5ReplaceMethod/types/routers/EventOutputHolder.d.ts b/TypeScript/5ReplaceMethod/types/routers/EventOutputHolder.d.ts index ef20706..148461a 100644 --- a/TypeScript/5ReplaceMethod/types/routers/EventOutputHolder.d.ts +++ b/TypeScript/5ReplaceMethod/types/routers/EventOutputHolder.d.ts @@ -3,8 +3,8 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IHideoutImprovement, Productive, TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; import { TraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class EventOutputHolder { protected profileHelper: ProfileHelper; protected timeUtil: TimeUtil; @@ -12,7 +12,7 @@ export declare class EventOutputHolder { /** * What has client been informed of this game session * Key = sessionId, then second key is prod id - */ + */ protected clientActiveSessionStorage: Record>; diff --git a/TypeScript/5ReplaceMethod/types/servers/HttpServer.d.ts b/TypeScript/5ReplaceMethod/types/servers/HttpServer.d.ts index b00fe68..0024ba3 100644 --- a/TypeScript/5ReplaceMethod/types/servers/HttpServer.d.ts +++ b/TypeScript/5ReplaceMethod/types/servers/HttpServer.d.ts @@ -6,8 +6,8 @@ import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; -import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { WebSocketServer } from "@spt/servers/WebSocketServer"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { LocalisationService } from "@spt/services/LocalisationService"; export declare class HttpServer { protected logger: ILogger; diff --git a/TypeScript/5ReplaceMethod/types/servers/WebSocketServer.d.ts b/TypeScript/5ReplaceMethod/types/servers/WebSocketServer.d.ts index f4e07bb..6121824 100644 --- a/TypeScript/5ReplaceMethod/types/servers/WebSocketServer.d.ts +++ b/TypeScript/5ReplaceMethod/types/servers/WebSocketServer.d.ts @@ -1,12 +1,12 @@ /// import http, { IncomingMessage } from "node:http"; -import { WebSocket, Server } from "ws"; import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { Server, WebSocket } from "ws"; export declare class WebSocketServer { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/5ReplaceMethod/types/servers/ws/SptWebSocketConnectionHandler.d.ts b/TypeScript/5ReplaceMethod/types/servers/ws/SptWebSocketConnectionHandler.d.ts index 98d0898..70fc96a 100644 --- a/TypeScript/5ReplaceMethod/types/servers/ws/SptWebSocketConnectionHandler.d.ts +++ b/TypeScript/5ReplaceMethod/types/servers/ws/SptWebSocketConnectionHandler.d.ts @@ -1,7 +1,6 @@ /// /// import { IncomingMessage } from "http"; -import { WebSocket } from "ws"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; @@ -11,6 +10,7 @@ import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectio import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; +import { WebSocket } from "ws"; export declare class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler { protected logger: ILogger; protected profileHelper: ProfileHelper; diff --git a/TypeScript/5ReplaceMethod/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts b/TypeScript/5ReplaceMethod/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts index d5247ec..5556129 100644 --- a/TypeScript/5ReplaceMethod/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts +++ b/TypeScript/5ReplaceMethod/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts @@ -1,6 +1,6 @@ -import { RawData, WebSocket } from "ws"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; +import { RawData, WebSocket } from "ws"; export declare class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler { protected logger: ILogger; constructor(logger: ILogger); diff --git a/TypeScript/5ReplaceMethod/types/services/FenceService.d.ts b/TypeScript/5ReplaceMethod/types/services/FenceService.d.ts index c156122..58dc076 100644 --- a/TypeScript/5ReplaceMethod/types/services/FenceService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/FenceService.d.ts @@ -13,9 +13,9 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Handle actions surrounding Fence * e.g. generating or refreshing assorts / get next refresh time diff --git a/TypeScript/5ReplaceMethod/types/services/InsuranceService.d.ts b/TypeScript/5ReplaceMethod/types/services/InsuranceService.d.ts index 0000e66..f799102 100644 --- a/TypeScript/5ReplaceMethod/types/services/InsuranceService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/InsuranceService.d.ts @@ -18,10 +18,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceService { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/5ReplaceMethod/types/services/LocalisationService.d.ts b/TypeScript/5ReplaceMethod/types/services/LocalisationService.d.ts index 42dfa4e..855c138 100644 --- a/TypeScript/5ReplaceMethod/types/services/LocalisationService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/LocalisationService.d.ts @@ -1,8 +1,8 @@ -import { I18n } from "i18n"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { LocaleService } from "@spt/services/LocaleService"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { I18n } from "i18n"; /** * Handles translating server text into different langauges */ diff --git a/TypeScript/5ReplaceMethod/types/services/ProfileFixerService.d.ts b/TypeScript/5ReplaceMethod/types/services/ProfileFixerService.d.ts index 525b867..91e4780 100644 --- a/TypeScript/5ReplaceMethod/types/services/ProfileFixerService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/ProfileFixerService.d.ts @@ -8,7 +8,7 @@ import { Bonus, HideoutSlot } from "@spt/models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea"; -import { ISptProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; +import { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; @@ -16,11 +16,11 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileFixerService { protected logger: ILogger; protected watermark: Watermark; @@ -73,6 +73,7 @@ export declare class ProfileFixerService { */ protected removeDanglingTaskConditionCounters(pmcProfile: IPmcData): void; protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullRagfairRatings(pmcProfile: IPmcData): void; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; /** diff --git a/TypeScript/5ReplaceMethod/types/services/RagfairOfferService.d.ts b/TypeScript/5ReplaceMethod/types/services/RagfairOfferService.d.ts index 6c13b1d..98dd179 100644 --- a/TypeScript/5ReplaceMethod/types/services/RagfairOfferService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/RagfairOfferService.d.ts @@ -10,10 +10,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/5ReplaceMethod/types/services/mod/CustomItemService.d.ts b/TypeScript/5ReplaceMethod/types/services/mod/CustomItemService.d.ts index 1926bed..f112872 100644 --- a/TypeScript/5ReplaceMethod/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/mod/CustomItemService.d.ts @@ -4,8 +4,8 @@ import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetail import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/5ReplaceMethod/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/5ReplaceMethod/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts index 3c9d955..91c84d9 100644 --- a/TypeScript/5ReplaceMethod/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class DynamicRouterModService { private container; constructor(container: DependencyContainer); diff --git a/TypeScript/5ReplaceMethod/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/5ReplaceMethod/types/services/mod/staticRouter/StaticRouterModService.d.ts index f60432d..0c3d4d8 100644 --- a/TypeScript/5ReplaceMethod/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class StaticRouterModService { protected container: DependencyContainer; constructor(container: DependencyContainer); diff --git a/TypeScript/5ReplaceMethod/types/utils/JsonUtil.d.ts b/TypeScript/5ReplaceMethod/types/utils/JsonUtil.d.ts index b30822c..4419228 100644 --- a/TypeScript/5ReplaceMethod/types/utils/JsonUtil.d.ts +++ b/TypeScript/5ReplaceMethod/types/utils/JsonUtil.d.ts @@ -1,7 +1,7 @@ -import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { HashUtil } from "@spt/utils/HashUtil"; import { VFS } from "@spt/utils/VFS"; +import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; export declare class JsonUtil { protected vfs: VFS; protected hashUtil: HashUtil; diff --git a/TypeScript/5ReplaceMethod/types/utils/RandomUtil.d.ts b/TypeScript/5ReplaceMethod/types/utils/RandomUtil.d.ts index 49f242d..0da184f 100644 --- a/TypeScript/5ReplaceMethod/types/utils/RandomUtil.d.ts +++ b/TypeScript/5ReplaceMethod/types/utils/RandomUtil.d.ts @@ -1,6 +1,6 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects * based on the relative probability of each of its elements. diff --git a/TypeScript/5ReplaceMethod/types/utils/logging/AbstractWinstonLogger.d.ts b/TypeScript/5ReplaceMethod/types/utils/logging/AbstractWinstonLogger.d.ts index 7098f85..ef54434 100644 --- a/TypeScript/5ReplaceMethod/types/utils/logging/AbstractWinstonLogger.d.ts +++ b/TypeScript/5ReplaceMethod/types/utils/logging/AbstractWinstonLogger.d.ts @@ -1,12 +1,12 @@ /// import fs from "node:fs"; -import winston from "winston"; import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; import { SptLogger } from "@spt/models/spt/logging/SptLogger"; import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; import { ILogger } from "@spt/models/spt/utils/ILogger"; +import winston from "winston"; export declare abstract class AbstractWinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected showDebugInConsole: boolean; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/BotController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/BotController.d.ts index 6431fca..475f51b 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/BotController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/BotController.d.ts @@ -20,8 +20,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/BuildController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/BuildController.d.ts index ed8adf6..2cb9c59 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/BuildController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/BuildController.d.ts @@ -9,8 +9,8 @@ import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BuildController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/GameController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/GameController.d.ts index 533a81c..e219c04 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/GameController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/GameController.d.ts @@ -34,10 +34,10 @@ import { ProfileActivityService } from "@spt/services/ProfileActivityService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GameController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/HealthController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/HealthController.d.ts index 5482283..5a0a0a6 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/HealthController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/HealthController.d.ts @@ -12,8 +12,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthController { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/HideoutController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/HideoutController.d.ts index e9d1ed9..89a428c 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/HideoutController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/HideoutController.d.ts @@ -35,11 +35,11 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; import { ProfileActivityService } from "@spt/services/ProfileActivityService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/InraidController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/InraidController.d.ts index 87f419b..9f0c409 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/InraidController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/InraidController.d.ts @@ -13,6 +13,7 @@ import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRe import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState"; import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig"; import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; @@ -31,7 +32,6 @@ import { PmcChatResponseService } from "@spt/services/PmcChatResponseService"; import { TraderServicesService } from "@spt/services/TraderServicesService"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; -import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; /** * Logic for handling In Raid callbacks */ diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/InsuranceController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/InsuranceController.d.ts index f921b83..543e915 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/InsuranceController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/InsuranceController.d.ts @@ -21,11 +21,11 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PaymentService } from "@spt/services/PaymentService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceController { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/InventoryController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/InventoryController.d.ts index 40bb084..c986ce8 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/InventoryController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/InventoryController.d.ts @@ -37,10 +37,10 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MapMarkerService } from "@spt/services/MapMarkerService"; import { PlayerService } from "@spt/services/PlayerService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/LocationController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/LocationController.d.ts index 727a8c8..a541b9c 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/LocationController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/LocationController.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class LocationController { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/ProfileController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/ProfileController.d.ts index e8dae73..7e6d35c 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/ProfileController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/ProfileController.d.ts @@ -26,9 +26,9 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/QuestController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/QuestController.d.ts index 3cdce00..6a5b415 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/QuestController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/QuestController.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/RepeatableQuestController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/RepeatableQuestController.d.ts index 74f39eb..016f8c6 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/RepeatableQuestController.d.ts @@ -18,11 +18,11 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/TradeController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/TradeController.d.ts index bc72e92..842a97b 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/TradeController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/TradeController.d.ts @@ -1,5 +1,6 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper"; import { TradeHelper } from "@spt/helpers/TradeHelper"; import { TraderHelper } from "@spt/helpers/TraderHelper"; import { IPmcData } from "@spt/models/eft/common/IPmcData"; @@ -35,6 +36,7 @@ export declare class TradeController { protected hashUtil: HashUtil; protected itemHelper: ItemHelper; protected profileHelper: ProfileHelper; + protected ragfairOfferHelper: RagfairOfferHelper; protected traderHelper: TraderHelper; protected ragfairServer: RagfairServer; protected httpResponse: HttpResponseUtil; @@ -44,7 +46,7 @@ export declare class TradeController { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairOfferHelper: RagfairOfferHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); /** Handle TradingConfirm event */ confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; /** Handle RagFairBuyOffer event */ @@ -67,10 +69,17 @@ export declare class TradeController { * @param output Output to send back to client */ protected buyPmcItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void; + /** + * Is the provided offerid and ownerid from a player made offer + * @param offerId Id of the offer + * @param offerOwnerId Owner id + * @returns true if offer was made by a player + */ + protected isPlayerOffer(offerId: string, offerOwnerId: string): boolean; /** * Does Player have necessary trader loyalty to purchase flea offer * @param sellerIsTrader is seller trader - * @param fleaOffer FLea offer being bought + * @param fleaOffer Flea offer being bought * @param pmcData Player profile * @returns True if player can buy offer */ diff --git a/TypeScript/6ReferenceAnotherClass/types/controllers/TraderController.d.ts b/TypeScript/6ReferenceAnotherClass/types/controllers/TraderController.d.ts index 7fc6d78..3592fc6 100644 --- a/TypeScript/6ReferenceAnotherClass/types/controllers/TraderController.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/controllers/TraderController.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/generators/BotEquipmentModGenerator.d.ts b/TypeScript/6ReferenceAnotherClass/types/generators/BotEquipmentModGenerator.d.ts index 419120f..3952293 100644 --- a/TypeScript/6ReferenceAnotherClass/types/generators/BotEquipmentModGenerator.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/generators/BotEquipmentModGenerator.d.ts @@ -25,9 +25,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotEquipmentModGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -65,7 +65,7 @@ export declare class BotEquipmentModGenerator { * @param settings Bot equipment generation settings * @param modSlot Armor slot being filtered * @param existingPlateTplPool Plates tpls to choose from - * @param armorItem + * @param armorItem The armor items db template * @returns Array of plate tpls to choose from */ protected filterPlateModsForSlotByLevel(settings: IGenerateEquipmentProperties, modSlot: string, existingPlateTplPool: string[], armorItem: ITemplateItem): IFilterPlateModsForSlotByLevelResult; diff --git a/TypeScript/6ReferenceAnotherClass/types/generators/BotGenerator.d.ts b/TypeScript/6ReferenceAnotherClass/types/generators/BotGenerator.d.ts index 8ab4371..ebb8a59 100644 --- a/TypeScript/6ReferenceAnotherClass/types/generators/BotGenerator.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/generators/BotGenerator.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/generators/BotLevelGenerator.d.ts b/TypeScript/6ReferenceAnotherClass/types/generators/BotLevelGenerator.d.ts index dee61e2..a8a8895 100644 --- a/TypeScript/6ReferenceAnotherClass/types/generators/BotLevelGenerator.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/generators/BotLevelGenerator.d.ts @@ -4,12 +4,14 @@ import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; +import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class BotLevelGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; protected databaseService: DatabaseService; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService); + protected mathUtil: MathUtil; + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, mathUtil: MathUtil); /** * Return a randomised bot level and exp value * @param levelDetails Min and max of level for bot @@ -18,6 +20,7 @@ export declare class BotLevelGenerator { * @returns IRandomisedBotLevelResult object */ generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult; + protected chooseBotLevel(min: number, max: number, shift: number, number: number): number; /** * Get the highest level a bot can be relative to the players level, but no further than the max size from globals.exp_table * @param botGenerationDetails Details to help generate a bot diff --git a/TypeScript/6ReferenceAnotherClass/types/generators/BotLootGenerator.d.ts b/TypeScript/6ReferenceAnotherClass/types/generators/BotLootGenerator.d.ts index fee56ce..c0583c6 100644 --- a/TypeScript/6ReferenceAnotherClass/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/generators/BotLootGenerator.d.ts @@ -18,9 +18,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/generators/BotWeaponGenerator.d.ts b/TypeScript/6ReferenceAnotherClass/types/generators/BotWeaponGenerator.d.ts index 5559bfa..8e03b35 100644 --- a/TypeScript/6ReferenceAnotherClass/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/generators/BotWeaponGenerator.d.ts @@ -18,9 +18,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RepairService } from "@spt/services/RepairService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotWeaponGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/generators/LocationGenerator.d.ts b/TypeScript/6ReferenceAnotherClass/types/generators/LocationGenerator.d.ts index 222b0ab..9a2b0c4 100644 --- a/TypeScript/6ReferenceAnotherClass/types/generators/LocationGenerator.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/generators/LocationGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export interface IContainerItem { items: Item[]; width: number; diff --git a/TypeScript/6ReferenceAnotherClass/types/generators/PlayerScavGenerator.d.ts b/TypeScript/6ReferenceAnotherClass/types/generators/PlayerScavGenerator.d.ts index 2414150..e317bf6 100644 --- a/TypeScript/6ReferenceAnotherClass/types/generators/PlayerScavGenerator.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/generators/PlayerScavGenerator.d.ts @@ -14,9 +14,9 @@ import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class PlayerScavGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/6ReferenceAnotherClass/types/generators/RagfairOfferGenerator.d.ts index 9435390..ca09729 100644 --- a/TypeScript/6ReferenceAnotherClass/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/generators/RagfairOfferGenerator.d.ts @@ -19,10 +19,10 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/generators/RepeatableQuestGenerator.d.ts b/TypeScript/6ReferenceAnotherClass/types/generators/RepeatableQuestGenerator.d.ts index 77c4e79..339f322 100644 --- a/TypeScript/6ReferenceAnotherClass/types/generators/RepeatableQuestGenerator.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/generators/RepeatableQuestGenerator.d.ts @@ -11,10 +11,10 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/generators/RepeatableQuestRewardGenerator.d.ts b/TypeScript/6ReferenceAnotherClass/types/generators/RepeatableQuestRewardGenerator.d.ts index 1e09994..713a394 100644 --- a/TypeScript/6ReferenceAnotherClass/types/generators/RepeatableQuestRewardGenerator.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/generators/RepeatableQuestRewardGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestRewardGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/BotDifficultyHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/BotDifficultyHelper.d.ts index 63572a5..2348bd3 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/BotDifficultyHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/BotDifficultyHelper.d.ts @@ -5,8 +5,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotDifficultyHelper { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index c51bf7e..c38f0a0 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GiveSptCommand implements ISptCommand { protected logger: ILogger; protected itemHelper: ItemHelper; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/HealthHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/HealthHelper.d.ts index 650f633..a164285 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/HealthHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/HealthHelper.d.ts @@ -5,8 +5,8 @@ import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/HideoutHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/HideoutHelper.d.ts index c4aaa4c..df0376b 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/HideoutHelper.d.ts @@ -18,10 +18,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/InRaidHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/InRaidHelper.d.ts index 449be9f..987c9ec 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/InRaidHelper.d.ts @@ -15,9 +15,9 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InRaidHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/InventoryHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/InventoryHelper.d.ts index f0ff69a..92bb49c 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/InventoryHelper.d.ts @@ -23,9 +23,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/ItemHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/ItemHelper.d.ts index da5dd11..c304cee 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/ItemHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/ItemHelper.d.ts @@ -11,13 +11,13 @@ import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { CompareUtil } from "@spt/utils/CompareUtil"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ItemHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/ProfileHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/ProfileHelper.d.ts index 0671179..cdab870 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/ProfileHelper.d.ts @@ -11,10 +11,10 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/QuestHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/QuestHelper.d.ts index 2b84b8f..2d5730d 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/QuestHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/QuestHelper.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairOfferHelper.d.ts index b526554..2386316 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairOfferHelper.d.ts @@ -151,7 +151,7 @@ export declare class RagfairOfferHelper { * @param boughtAmount Amount item was purchased for * @returns IItemEventRouterResponse */ - protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; + completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; /** * Get a localised message for when players offer has sold on flea * @param itemTpl Item sold diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairServerHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairServerHelper.d.ts index 927caf5..3e1fea9 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairServerHelper.d.ts @@ -12,9 +12,9 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Helper class for common ragfair server actions */ diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/RepairHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/RepairHelper.d.ts index 99a21da..63c78c9 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/RepairHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/RepairHelper.d.ts @@ -4,8 +4,8 @@ import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/RepeatableQuestHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/RepeatableQuestHelper.d.ts index d92657e..8c65f40 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/RepeatableQuestHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/RepeatableQuestHelper.d.ts @@ -1,8 +1,8 @@ import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestHelper { protected mathUtil: MathUtil; protected configServer: ConfigServer; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/TradeHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/TradeHelper.d.ts index f994fda..6e6f3a2 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/TradeHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/TradeHelper.d.ts @@ -17,8 +17,8 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TradeHelper { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/TraderAssortHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/TraderAssortHelper.d.ts index 8f8f802..f1ecd3b 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/TraderAssortHelper.d.ts @@ -14,9 +14,9 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/loaders/BundleLoader.d.ts b/TypeScript/6ReferenceAnotherClass/types/loaders/BundleLoader.d.ts index e270988..8c0ed4d 100644 --- a/TypeScript/6ReferenceAnotherClass/types/loaders/BundleLoader.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/loaders/BundleLoader.d.ts @@ -1,8 +1,8 @@ import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BundleInfo { modpath: string; filename: string; diff --git a/TypeScript/6ReferenceAnotherClass/types/loaders/PostDBModLoader.d.ts b/TypeScript/6ReferenceAnotherClass/types/loaders/PostDBModLoader.d.ts index b0c4bf4..a8bb6a9 100644 --- a/TypeScript/6ReferenceAnotherClass/types/loaders/PostDBModLoader.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/loaders/PostDBModLoader.d.ts @@ -1,10 +1,10 @@ -import { DependencyContainer } from "tsyringe"; import { OnLoad } from "@spt/di/OnLoad"; import { BundleLoader } from "@spt/loaders/BundleLoader"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostDBModLoader implements OnLoad { protected logger: ILogger; protected bundleLoader: BundleLoader; diff --git a/TypeScript/6ReferenceAnotherClass/types/loaders/PostSptModLoader.d.ts b/TypeScript/6ReferenceAnotherClass/types/loaders/PostSptModLoader.d.ts index fb54579..2603497 100644 --- a/TypeScript/6ReferenceAnotherClass/types/loaders/PostSptModLoader.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/loaders/PostSptModLoader.d.ts @@ -1,9 +1,9 @@ -import { DependencyContainer } from "tsyringe"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { IModLoader } from "@spt/models/spt/mod/IModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostSptModLoader implements IModLoader { protected logger: ILogger; protected preSptModLoader: PreSptModLoader; diff --git a/TypeScript/6ReferenceAnotherClass/types/loaders/PreSptModLoader.d.ts b/TypeScript/6ReferenceAnotherClass/types/loaders/PreSptModLoader.d.ts index bc846c8..8814525 100644 --- a/TypeScript/6ReferenceAnotherClass/types/loaders/PreSptModLoader.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/loaders/PreSptModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { ModDetails } from "@spt/models/eft/profile/ISptProfile"; @@ -11,6 +10,7 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { ModCompilerService } from "@spt/services/ModCompilerService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { DependencyContainer } from "tsyringe"; export declare class PreSptModLoader implements IModLoader { protected logger: ILogger; protected vfs: VFS; diff --git a/TypeScript/6ReferenceAnotherClass/types/models/eft/common/IEmptyRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/IEmptyRequestData.d.ts index 284d16e..52a7b12 100644 --- a/TypeScript/6ReferenceAnotherClass/types/models/eft/common/IEmptyRequestData.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/IEmptyRequestData.d.ts @@ -1,2 +1 @@ -export interface IEmptyRequestData { -} +export type IEmptyRequestData = {}; diff --git a/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IBotBase.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IBotBase.d.ts index a7fe1ca..be37845 100644 --- a/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IBotBase.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IBotBase.d.ts @@ -373,8 +373,7 @@ export interface LastCompleted { export interface Notes { Notes: Note[]; } -export interface CarExtractCounts { -} +export type CarExtractCounts = {}; export declare enum SurvivorClass { UNKNOWN = 0, NEUTRALIZER = 1, diff --git a/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/ILocationsBase.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/ILocationsBase.d.ts index 2c96af3..16bca24 100644 --- a/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/ILocationsBase.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/ILocationsBase.d.ts @@ -2,8 +2,7 @@ export interface ILocationsBase { locations: Locations; paths: Path[]; } -export interface Locations { -} +export type Locations = {}; export interface Path { Source: string; Destination: string; diff --git a/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IProfileTemplate.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IProfileTemplate.d.ts index 20923bc..6ba9221 100644 --- a/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IProfileTemplate.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -1,12 +1,12 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { Dialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; export interface IProfileTemplates { - "Standard": IProfileSides; + Standard: IProfileSides; "Left Behind": IProfileSides; "Prepare To Escape": IProfileSides; "Edge Of Darkness": IProfileSides; - "Unheard": IProfileSides; - "Tournament": IProfileSides; + Unheard: IProfileSides; + Tournament: IProfileSides; "SPT Developer": IProfileSides; "SPT Easy start": IProfileSides; "SPT Zero to hero": IProfileSides; diff --git a/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/ITrader.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/ITrader.d.ts index 14ab409..40cf004 100644 --- a/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/ITrader.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/ITrader.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; export interface ITrader { assort?: ITraderAssort; @@ -78,6 +79,8 @@ export interface IBarterScheme { _tpl: string; onlyFunctional?: boolean; sptQuestLocked?: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface ISuit { _id: string; diff --git a/TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/IQteData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/IQteData.d.ts index 7f507e1..fe6cce6 100644 --- a/TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/IQteData.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/models/eft/hideout/IQteData.d.ts @@ -1,14 +1,14 @@ import { Effect } from "@spt/models/eft/health/Effect"; import { BodyPart } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; import { QteActivityType } from "@spt/models/enums/hideout/QteActivityType"; import { QteEffectType } from "@spt/models/enums/hideout/QteEffectType"; import { QteResultType } from "@spt/models/enums/hideout/QteResultType"; import { QteRewardType } from "@spt/models/enums/hideout/QteRewardType"; import { QteType } from "@spt/models/enums/hideout/QteType"; import { RequirementType } from "@spt/models/enums/hideout/RequirementType"; -import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt/models/enums/SkillTypes"; -import { Traders } from "@spt/models/enums/Traders"; export interface IQteData { id: string; type: QteActivityType; diff --git a/TypeScript/6ReferenceAnotherClass/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index f1123c1..5971372 100644 --- a/TypeScript/6ReferenceAnotherClass/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -15,7 +15,5 @@ export interface Items { change: any[]; del: any[]; } -export interface Production { -} -export interface TraderRelations { -} +export type Production = {}; +export type TraderRelations = {}; diff --git a/TypeScript/6ReferenceAnotherClass/types/models/eft/profile/ISptProfile.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/profile/ISptProfile.d.ts index a8e742a..dd7aea6 100644 --- a/TypeScript/6ReferenceAnotherClass/types/models/eft/profile/ISptProfile.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/models/eft/profile/ISptProfile.d.ts @@ -209,12 +209,9 @@ export interface Effects { LeftLeg: LeftLeg; RightLeg: RightLeg; } -export interface Head { -} -export interface Chest { -} -export interface Stomach { -} +export type Head = {}; +export type Chest = {}; +export type Stomach = {}; export interface LeftArm { Fracture?: number; } diff --git a/TypeScript/6ReferenceAnotherClass/types/models/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/ragfair/IRagfairOffer.d.ts index eeeb79d..f6c07fc 100644 --- a/TypeScript/6ReferenceAnotherClass/types/models/eft/ragfair/IRagfairOffer.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/models/eft/ragfair/IRagfairOffer.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface IRagfairOffer { sellResult?: SellResult[]; @@ -28,6 +29,8 @@ export interface OfferRequirement { _tpl: string; count: number; onlyFunctional: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface IRagfairOfferUser { id: string; diff --git a/TypeScript/6ReferenceAnotherClass/types/models/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/ragfair/ISearchRequestData.d.ts index 8261c5b..c631de8 100644 --- a/TypeScript/6ReferenceAnotherClass/types/models/eft/ragfair/ISearchRequestData.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/models/eft/ragfair/ISearchRequestData.d.ts @@ -29,5 +29,4 @@ export declare enum OfferOwnerType { TRADEROWNERTYPE = 1, PLAYEROWNERTYPE = 2 } -export interface BuildItems { -} +export type BuildItems = {}; diff --git a/TypeScript/6ReferenceAnotherClass/types/models/enums/BaseClasses.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/enums/BaseClasses.d.ts index 65fc95e..32ebf7c 100644 --- a/TypeScript/6ReferenceAnotherClass/types/models/enums/BaseClasses.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/models/enums/BaseClasses.d.ts @@ -107,6 +107,6 @@ export declare enum BaseClasses { RECEIVER = "55818a304bdc2db5418b457d", BARREL = "555ef6e44bdc2de9068b457e", CHARGING_HANDLE = "55818a6f4bdc2db9688b456b", - COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569 ", + COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569", HIDEOUT_AREA_CONTAINER = "63da6da4784a55176c018dba" } diff --git a/TypeScript/6ReferenceAnotherClass/types/models/enums/DogtagExchangeSide.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/enums/DogtagExchangeSide.d.ts new file mode 100644 index 0000000..de3d4df --- /dev/null +++ b/TypeScript/6ReferenceAnotherClass/types/models/enums/DogtagExchangeSide.d.ts @@ -0,0 +1,5 @@ +export declare enum DogtagExchangeSide { + USEC = "Usec", + BEAR = "Bear", + ANY = "Any" +} diff --git a/TypeScript/6ReferenceAnotherClass/types/models/spt/server/ExhaustableArray.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/server/ExhaustableArray.d.ts index c27f41f..50a6b68 100644 --- a/TypeScript/6ReferenceAnotherClass/types/models/spt/server/ExhaustableArray.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/models/spt/server/ExhaustableArray.d.ts @@ -1,5 +1,5 @@ -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ExhaustableArray implements IExhaustableArray { private itemPool; private randomUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/routers/EventOutputHolder.d.ts b/TypeScript/6ReferenceAnotherClass/types/routers/EventOutputHolder.d.ts index ef20706..148461a 100644 --- a/TypeScript/6ReferenceAnotherClass/types/routers/EventOutputHolder.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/routers/EventOutputHolder.d.ts @@ -3,8 +3,8 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IHideoutImprovement, Productive, TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; import { TraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class EventOutputHolder { protected profileHelper: ProfileHelper; protected timeUtil: TimeUtil; @@ -12,7 +12,7 @@ export declare class EventOutputHolder { /** * What has client been informed of this game session * Key = sessionId, then second key is prod id - */ + */ protected clientActiveSessionStorage: Record>; diff --git a/TypeScript/6ReferenceAnotherClass/types/servers/HttpServer.d.ts b/TypeScript/6ReferenceAnotherClass/types/servers/HttpServer.d.ts index b00fe68..0024ba3 100644 --- a/TypeScript/6ReferenceAnotherClass/types/servers/HttpServer.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/servers/HttpServer.d.ts @@ -6,8 +6,8 @@ import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; -import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { WebSocketServer } from "@spt/servers/WebSocketServer"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { LocalisationService } from "@spt/services/LocalisationService"; export declare class HttpServer { protected logger: ILogger; diff --git a/TypeScript/6ReferenceAnotherClass/types/servers/WebSocketServer.d.ts b/TypeScript/6ReferenceAnotherClass/types/servers/WebSocketServer.d.ts index f4e07bb..6121824 100644 --- a/TypeScript/6ReferenceAnotherClass/types/servers/WebSocketServer.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/servers/WebSocketServer.d.ts @@ -1,12 +1,12 @@ /// import http, { IncomingMessage } from "node:http"; -import { WebSocket, Server } from "ws"; import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { Server, WebSocket } from "ws"; export declare class WebSocketServer { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/servers/ws/SptWebSocketConnectionHandler.d.ts b/TypeScript/6ReferenceAnotherClass/types/servers/ws/SptWebSocketConnectionHandler.d.ts index 98d0898..70fc96a 100644 --- a/TypeScript/6ReferenceAnotherClass/types/servers/ws/SptWebSocketConnectionHandler.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/servers/ws/SptWebSocketConnectionHandler.d.ts @@ -1,7 +1,6 @@ /// /// import { IncomingMessage } from "http"; -import { WebSocket } from "ws"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; @@ -11,6 +10,7 @@ import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectio import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; +import { WebSocket } from "ws"; export declare class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler { protected logger: ILogger; protected profileHelper: ProfileHelper; diff --git a/TypeScript/6ReferenceAnotherClass/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts b/TypeScript/6ReferenceAnotherClass/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts index d5247ec..5556129 100644 --- a/TypeScript/6ReferenceAnotherClass/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts @@ -1,6 +1,6 @@ -import { RawData, WebSocket } from "ws"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; +import { RawData, WebSocket } from "ws"; export declare class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler { protected logger: ILogger; constructor(logger: ILogger); diff --git a/TypeScript/6ReferenceAnotherClass/types/services/FenceService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/FenceService.d.ts index c156122..58dc076 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/FenceService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/FenceService.d.ts @@ -13,9 +13,9 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Handle actions surrounding Fence * e.g. generating or refreshing assorts / get next refresh time diff --git a/TypeScript/6ReferenceAnotherClass/types/services/InsuranceService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/InsuranceService.d.ts index 0000e66..f799102 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/InsuranceService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/InsuranceService.d.ts @@ -18,10 +18,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceService { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/6ReferenceAnotherClass/types/services/LocalisationService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/LocalisationService.d.ts index 42dfa4e..855c138 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/LocalisationService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/LocalisationService.d.ts @@ -1,8 +1,8 @@ -import { I18n } from "i18n"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { LocaleService } from "@spt/services/LocaleService"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { I18n } from "i18n"; /** * Handles translating server text into different langauges */ diff --git a/TypeScript/6ReferenceAnotherClass/types/services/ProfileFixerService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/ProfileFixerService.d.ts index 525b867..91e4780 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/ProfileFixerService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/ProfileFixerService.d.ts @@ -8,7 +8,7 @@ import { Bonus, HideoutSlot } from "@spt/models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea"; -import { ISptProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; +import { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; @@ -16,11 +16,11 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileFixerService { protected logger: ILogger; protected watermark: Watermark; @@ -73,6 +73,7 @@ export declare class ProfileFixerService { */ protected removeDanglingTaskConditionCounters(pmcProfile: IPmcData): void; protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullRagfairRatings(pmcProfile: IPmcData): void; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; /** diff --git a/TypeScript/6ReferenceAnotherClass/types/services/RagfairOfferService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/RagfairOfferService.d.ts index 6c13b1d..98dd179 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/RagfairOfferService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/RagfairOfferService.d.ts @@ -10,10 +10,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/services/mod/CustomItemService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/mod/CustomItemService.d.ts index 1926bed..f112872 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/mod/CustomItemService.d.ts @@ -4,8 +4,8 @@ import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetail import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts index 3c9d955..91c84d9 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class DynamicRouterModService { private container; constructor(container: DependencyContainer); diff --git a/TypeScript/6ReferenceAnotherClass/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/mod/staticRouter/StaticRouterModService.d.ts index f60432d..0c3d4d8 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class StaticRouterModService { protected container: DependencyContainer; constructor(container: DependencyContainer); diff --git a/TypeScript/6ReferenceAnotherClass/types/utils/JsonUtil.d.ts b/TypeScript/6ReferenceAnotherClass/types/utils/JsonUtil.d.ts index b30822c..4419228 100644 --- a/TypeScript/6ReferenceAnotherClass/types/utils/JsonUtil.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/utils/JsonUtil.d.ts @@ -1,7 +1,7 @@ -import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { HashUtil } from "@spt/utils/HashUtil"; import { VFS } from "@spt/utils/VFS"; +import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; export declare class JsonUtil { protected vfs: VFS; protected hashUtil: HashUtil; diff --git a/TypeScript/6ReferenceAnotherClass/types/utils/RandomUtil.d.ts b/TypeScript/6ReferenceAnotherClass/types/utils/RandomUtil.d.ts index 49f242d..0da184f 100644 --- a/TypeScript/6ReferenceAnotherClass/types/utils/RandomUtil.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/utils/RandomUtil.d.ts @@ -1,6 +1,6 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects * based on the relative probability of each of its elements. diff --git a/TypeScript/6ReferenceAnotherClass/types/utils/logging/AbstractWinstonLogger.d.ts b/TypeScript/6ReferenceAnotherClass/types/utils/logging/AbstractWinstonLogger.d.ts index 7098f85..ef54434 100644 --- a/TypeScript/6ReferenceAnotherClass/types/utils/logging/AbstractWinstonLogger.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/utils/logging/AbstractWinstonLogger.d.ts @@ -1,12 +1,12 @@ /// import fs from "node:fs"; -import winston from "winston"; import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; import { SptLogger } from "@spt/models/spt/logging/SptLogger"; import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; import { ILogger } from "@spt/models/spt/utils/ILogger"; +import winston from "winston"; export declare abstract class AbstractWinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected showDebugInConsole: boolean; diff --git a/TypeScript/7OnLoadHook/types/controllers/BotController.d.ts b/TypeScript/7OnLoadHook/types/controllers/BotController.d.ts index 6431fca..475f51b 100644 --- a/TypeScript/7OnLoadHook/types/controllers/BotController.d.ts +++ b/TypeScript/7OnLoadHook/types/controllers/BotController.d.ts @@ -20,8 +20,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/7OnLoadHook/types/controllers/BuildController.d.ts b/TypeScript/7OnLoadHook/types/controllers/BuildController.d.ts index ed8adf6..2cb9c59 100644 --- a/TypeScript/7OnLoadHook/types/controllers/BuildController.d.ts +++ b/TypeScript/7OnLoadHook/types/controllers/BuildController.d.ts @@ -9,8 +9,8 @@ import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BuildController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/7OnLoadHook/types/controllers/GameController.d.ts b/TypeScript/7OnLoadHook/types/controllers/GameController.d.ts index 533a81c..e219c04 100644 --- a/TypeScript/7OnLoadHook/types/controllers/GameController.d.ts +++ b/TypeScript/7OnLoadHook/types/controllers/GameController.d.ts @@ -34,10 +34,10 @@ import { ProfileActivityService } from "@spt/services/ProfileActivityService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GameController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/7OnLoadHook/types/controllers/HealthController.d.ts b/TypeScript/7OnLoadHook/types/controllers/HealthController.d.ts index 5482283..5a0a0a6 100644 --- a/TypeScript/7OnLoadHook/types/controllers/HealthController.d.ts +++ b/TypeScript/7OnLoadHook/types/controllers/HealthController.d.ts @@ -12,8 +12,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthController { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/7OnLoadHook/types/controllers/HideoutController.d.ts b/TypeScript/7OnLoadHook/types/controllers/HideoutController.d.ts index e9d1ed9..89a428c 100644 --- a/TypeScript/7OnLoadHook/types/controllers/HideoutController.d.ts +++ b/TypeScript/7OnLoadHook/types/controllers/HideoutController.d.ts @@ -35,11 +35,11 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; import { ProfileActivityService } from "@spt/services/ProfileActivityService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/7OnLoadHook/types/controllers/InraidController.d.ts b/TypeScript/7OnLoadHook/types/controllers/InraidController.d.ts index 87f419b..9f0c409 100644 --- a/TypeScript/7OnLoadHook/types/controllers/InraidController.d.ts +++ b/TypeScript/7OnLoadHook/types/controllers/InraidController.d.ts @@ -13,6 +13,7 @@ import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRe import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState"; import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig"; import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; @@ -31,7 +32,6 @@ import { PmcChatResponseService } from "@spt/services/PmcChatResponseService"; import { TraderServicesService } from "@spt/services/TraderServicesService"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; -import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; /** * Logic for handling In Raid callbacks */ diff --git a/TypeScript/7OnLoadHook/types/controllers/InsuranceController.d.ts b/TypeScript/7OnLoadHook/types/controllers/InsuranceController.d.ts index f921b83..543e915 100644 --- a/TypeScript/7OnLoadHook/types/controllers/InsuranceController.d.ts +++ b/TypeScript/7OnLoadHook/types/controllers/InsuranceController.d.ts @@ -21,11 +21,11 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PaymentService } from "@spt/services/PaymentService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceController { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/7OnLoadHook/types/controllers/InventoryController.d.ts b/TypeScript/7OnLoadHook/types/controllers/InventoryController.d.ts index 40bb084..c986ce8 100644 --- a/TypeScript/7OnLoadHook/types/controllers/InventoryController.d.ts +++ b/TypeScript/7OnLoadHook/types/controllers/InventoryController.d.ts @@ -37,10 +37,10 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MapMarkerService } from "@spt/services/MapMarkerService"; import { PlayerService } from "@spt/services/PlayerService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/7OnLoadHook/types/controllers/LocationController.d.ts b/TypeScript/7OnLoadHook/types/controllers/LocationController.d.ts index 727a8c8..a541b9c 100644 --- a/TypeScript/7OnLoadHook/types/controllers/LocationController.d.ts +++ b/TypeScript/7OnLoadHook/types/controllers/LocationController.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class LocationController { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; diff --git a/TypeScript/7OnLoadHook/types/controllers/ProfileController.d.ts b/TypeScript/7OnLoadHook/types/controllers/ProfileController.d.ts index e8dae73..7e6d35c 100644 --- a/TypeScript/7OnLoadHook/types/controllers/ProfileController.d.ts +++ b/TypeScript/7OnLoadHook/types/controllers/ProfileController.d.ts @@ -26,9 +26,9 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/7OnLoadHook/types/controllers/QuestController.d.ts b/TypeScript/7OnLoadHook/types/controllers/QuestController.d.ts index 3cdce00..6a5b415 100644 --- a/TypeScript/7OnLoadHook/types/controllers/QuestController.d.ts +++ b/TypeScript/7OnLoadHook/types/controllers/QuestController.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/7OnLoadHook/types/controllers/RepeatableQuestController.d.ts b/TypeScript/7OnLoadHook/types/controllers/RepeatableQuestController.d.ts index 74f39eb..016f8c6 100644 --- a/TypeScript/7OnLoadHook/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/7OnLoadHook/types/controllers/RepeatableQuestController.d.ts @@ -18,11 +18,11 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/7OnLoadHook/types/controllers/TradeController.d.ts b/TypeScript/7OnLoadHook/types/controllers/TradeController.d.ts index bc72e92..842a97b 100644 --- a/TypeScript/7OnLoadHook/types/controllers/TradeController.d.ts +++ b/TypeScript/7OnLoadHook/types/controllers/TradeController.d.ts @@ -1,5 +1,6 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper"; import { TradeHelper } from "@spt/helpers/TradeHelper"; import { TraderHelper } from "@spt/helpers/TraderHelper"; import { IPmcData } from "@spt/models/eft/common/IPmcData"; @@ -35,6 +36,7 @@ export declare class TradeController { protected hashUtil: HashUtil; protected itemHelper: ItemHelper; protected profileHelper: ProfileHelper; + protected ragfairOfferHelper: RagfairOfferHelper; protected traderHelper: TraderHelper; protected ragfairServer: RagfairServer; protected httpResponse: HttpResponseUtil; @@ -44,7 +46,7 @@ export declare class TradeController { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairOfferHelper: RagfairOfferHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); /** Handle TradingConfirm event */ confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; /** Handle RagFairBuyOffer event */ @@ -67,10 +69,17 @@ export declare class TradeController { * @param output Output to send back to client */ protected buyPmcItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void; + /** + * Is the provided offerid and ownerid from a player made offer + * @param offerId Id of the offer + * @param offerOwnerId Owner id + * @returns true if offer was made by a player + */ + protected isPlayerOffer(offerId: string, offerOwnerId: string): boolean; /** * Does Player have necessary trader loyalty to purchase flea offer * @param sellerIsTrader is seller trader - * @param fleaOffer FLea offer being bought + * @param fleaOffer Flea offer being bought * @param pmcData Player profile * @returns True if player can buy offer */ diff --git a/TypeScript/7OnLoadHook/types/controllers/TraderController.d.ts b/TypeScript/7OnLoadHook/types/controllers/TraderController.d.ts index 7fc6d78..3592fc6 100644 --- a/TypeScript/7OnLoadHook/types/controllers/TraderController.d.ts +++ b/TypeScript/7OnLoadHook/types/controllers/TraderController.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/7OnLoadHook/types/generators/BotEquipmentModGenerator.d.ts b/TypeScript/7OnLoadHook/types/generators/BotEquipmentModGenerator.d.ts index 419120f..3952293 100644 --- a/TypeScript/7OnLoadHook/types/generators/BotEquipmentModGenerator.d.ts +++ b/TypeScript/7OnLoadHook/types/generators/BotEquipmentModGenerator.d.ts @@ -25,9 +25,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotEquipmentModGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -65,7 +65,7 @@ export declare class BotEquipmentModGenerator { * @param settings Bot equipment generation settings * @param modSlot Armor slot being filtered * @param existingPlateTplPool Plates tpls to choose from - * @param armorItem + * @param armorItem The armor items db template * @returns Array of plate tpls to choose from */ protected filterPlateModsForSlotByLevel(settings: IGenerateEquipmentProperties, modSlot: string, existingPlateTplPool: string[], armorItem: ITemplateItem): IFilterPlateModsForSlotByLevelResult; diff --git a/TypeScript/7OnLoadHook/types/generators/BotGenerator.d.ts b/TypeScript/7OnLoadHook/types/generators/BotGenerator.d.ts index 8ab4371..ebb8a59 100644 --- a/TypeScript/7OnLoadHook/types/generators/BotGenerator.d.ts +++ b/TypeScript/7OnLoadHook/types/generators/BotGenerator.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/7OnLoadHook/types/generators/BotLevelGenerator.d.ts b/TypeScript/7OnLoadHook/types/generators/BotLevelGenerator.d.ts index dee61e2..a8a8895 100644 --- a/TypeScript/7OnLoadHook/types/generators/BotLevelGenerator.d.ts +++ b/TypeScript/7OnLoadHook/types/generators/BotLevelGenerator.d.ts @@ -4,12 +4,14 @@ import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; +import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class BotLevelGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; protected databaseService: DatabaseService; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService); + protected mathUtil: MathUtil; + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, mathUtil: MathUtil); /** * Return a randomised bot level and exp value * @param levelDetails Min and max of level for bot @@ -18,6 +20,7 @@ export declare class BotLevelGenerator { * @returns IRandomisedBotLevelResult object */ generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult; + protected chooseBotLevel(min: number, max: number, shift: number, number: number): number; /** * Get the highest level a bot can be relative to the players level, but no further than the max size from globals.exp_table * @param botGenerationDetails Details to help generate a bot diff --git a/TypeScript/7OnLoadHook/types/generators/BotLootGenerator.d.ts b/TypeScript/7OnLoadHook/types/generators/BotLootGenerator.d.ts index fee56ce..c0583c6 100644 --- a/TypeScript/7OnLoadHook/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/7OnLoadHook/types/generators/BotLootGenerator.d.ts @@ -18,9 +18,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/7OnLoadHook/types/generators/BotWeaponGenerator.d.ts b/TypeScript/7OnLoadHook/types/generators/BotWeaponGenerator.d.ts index 5559bfa..8e03b35 100644 --- a/TypeScript/7OnLoadHook/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/7OnLoadHook/types/generators/BotWeaponGenerator.d.ts @@ -18,9 +18,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RepairService } from "@spt/services/RepairService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotWeaponGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/7OnLoadHook/types/generators/LocationGenerator.d.ts b/TypeScript/7OnLoadHook/types/generators/LocationGenerator.d.ts index 222b0ab..9a2b0c4 100644 --- a/TypeScript/7OnLoadHook/types/generators/LocationGenerator.d.ts +++ b/TypeScript/7OnLoadHook/types/generators/LocationGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export interface IContainerItem { items: Item[]; width: number; diff --git a/TypeScript/7OnLoadHook/types/generators/PlayerScavGenerator.d.ts b/TypeScript/7OnLoadHook/types/generators/PlayerScavGenerator.d.ts index 2414150..e317bf6 100644 --- a/TypeScript/7OnLoadHook/types/generators/PlayerScavGenerator.d.ts +++ b/TypeScript/7OnLoadHook/types/generators/PlayerScavGenerator.d.ts @@ -14,9 +14,9 @@ import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class PlayerScavGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/7OnLoadHook/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/7OnLoadHook/types/generators/RagfairOfferGenerator.d.ts index 9435390..ca09729 100644 --- a/TypeScript/7OnLoadHook/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/7OnLoadHook/types/generators/RagfairOfferGenerator.d.ts @@ -19,10 +19,10 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/7OnLoadHook/types/generators/RepeatableQuestGenerator.d.ts b/TypeScript/7OnLoadHook/types/generators/RepeatableQuestGenerator.d.ts index 77c4e79..339f322 100644 --- a/TypeScript/7OnLoadHook/types/generators/RepeatableQuestGenerator.d.ts +++ b/TypeScript/7OnLoadHook/types/generators/RepeatableQuestGenerator.d.ts @@ -11,10 +11,10 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/7OnLoadHook/types/generators/RepeatableQuestRewardGenerator.d.ts b/TypeScript/7OnLoadHook/types/generators/RepeatableQuestRewardGenerator.d.ts index 1e09994..713a394 100644 --- a/TypeScript/7OnLoadHook/types/generators/RepeatableQuestRewardGenerator.d.ts +++ b/TypeScript/7OnLoadHook/types/generators/RepeatableQuestRewardGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestRewardGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/7OnLoadHook/types/helpers/BotDifficultyHelper.d.ts b/TypeScript/7OnLoadHook/types/helpers/BotDifficultyHelper.d.ts index 63572a5..2348bd3 100644 --- a/TypeScript/7OnLoadHook/types/helpers/BotDifficultyHelper.d.ts +++ b/TypeScript/7OnLoadHook/types/helpers/BotDifficultyHelper.d.ts @@ -5,8 +5,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotDifficultyHelper { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/7OnLoadHook/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/7OnLoadHook/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index c51bf7e..c38f0a0 100644 --- a/TypeScript/7OnLoadHook/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/7OnLoadHook/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GiveSptCommand implements ISptCommand { protected logger: ILogger; protected itemHelper: ItemHelper; diff --git a/TypeScript/7OnLoadHook/types/helpers/HealthHelper.d.ts b/TypeScript/7OnLoadHook/types/helpers/HealthHelper.d.ts index 650f633..a164285 100644 --- a/TypeScript/7OnLoadHook/types/helpers/HealthHelper.d.ts +++ b/TypeScript/7OnLoadHook/types/helpers/HealthHelper.d.ts @@ -5,8 +5,8 @@ import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/7OnLoadHook/types/helpers/HideoutHelper.d.ts b/TypeScript/7OnLoadHook/types/helpers/HideoutHelper.d.ts index c4aaa4c..df0376b 100644 --- a/TypeScript/7OnLoadHook/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/7OnLoadHook/types/helpers/HideoutHelper.d.ts @@ -18,10 +18,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/7OnLoadHook/types/helpers/InRaidHelper.d.ts b/TypeScript/7OnLoadHook/types/helpers/InRaidHelper.d.ts index 449be9f..987c9ec 100644 --- a/TypeScript/7OnLoadHook/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/7OnLoadHook/types/helpers/InRaidHelper.d.ts @@ -15,9 +15,9 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InRaidHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/7OnLoadHook/types/helpers/InventoryHelper.d.ts b/TypeScript/7OnLoadHook/types/helpers/InventoryHelper.d.ts index f0ff69a..92bb49c 100644 --- a/TypeScript/7OnLoadHook/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/7OnLoadHook/types/helpers/InventoryHelper.d.ts @@ -23,9 +23,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/7OnLoadHook/types/helpers/ItemHelper.d.ts b/TypeScript/7OnLoadHook/types/helpers/ItemHelper.d.ts index da5dd11..c304cee 100644 --- a/TypeScript/7OnLoadHook/types/helpers/ItemHelper.d.ts +++ b/TypeScript/7OnLoadHook/types/helpers/ItemHelper.d.ts @@ -11,13 +11,13 @@ import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { CompareUtil } from "@spt/utils/CompareUtil"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ItemHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/7OnLoadHook/types/helpers/ProfileHelper.d.ts b/TypeScript/7OnLoadHook/types/helpers/ProfileHelper.d.ts index 0671179..cdab870 100644 --- a/TypeScript/7OnLoadHook/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/7OnLoadHook/types/helpers/ProfileHelper.d.ts @@ -11,10 +11,10 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/7OnLoadHook/types/helpers/QuestHelper.d.ts b/TypeScript/7OnLoadHook/types/helpers/QuestHelper.d.ts index 2b84b8f..2d5730d 100644 --- a/TypeScript/7OnLoadHook/types/helpers/QuestHelper.d.ts +++ b/TypeScript/7OnLoadHook/types/helpers/QuestHelper.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/7OnLoadHook/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/7OnLoadHook/types/helpers/RagfairOfferHelper.d.ts index b526554..2386316 100644 --- a/TypeScript/7OnLoadHook/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/7OnLoadHook/types/helpers/RagfairOfferHelper.d.ts @@ -151,7 +151,7 @@ export declare class RagfairOfferHelper { * @param boughtAmount Amount item was purchased for * @returns IItemEventRouterResponse */ - protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; + completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; /** * Get a localised message for when players offer has sold on flea * @param itemTpl Item sold diff --git a/TypeScript/7OnLoadHook/types/helpers/RagfairServerHelper.d.ts b/TypeScript/7OnLoadHook/types/helpers/RagfairServerHelper.d.ts index 927caf5..3e1fea9 100644 --- a/TypeScript/7OnLoadHook/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/7OnLoadHook/types/helpers/RagfairServerHelper.d.ts @@ -12,9 +12,9 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Helper class for common ragfair server actions */ diff --git a/TypeScript/7OnLoadHook/types/helpers/RepairHelper.d.ts b/TypeScript/7OnLoadHook/types/helpers/RepairHelper.d.ts index 99a21da..63c78c9 100644 --- a/TypeScript/7OnLoadHook/types/helpers/RepairHelper.d.ts +++ b/TypeScript/7OnLoadHook/types/helpers/RepairHelper.d.ts @@ -4,8 +4,8 @@ import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/7OnLoadHook/types/helpers/RepeatableQuestHelper.d.ts b/TypeScript/7OnLoadHook/types/helpers/RepeatableQuestHelper.d.ts index d92657e..8c65f40 100644 --- a/TypeScript/7OnLoadHook/types/helpers/RepeatableQuestHelper.d.ts +++ b/TypeScript/7OnLoadHook/types/helpers/RepeatableQuestHelper.d.ts @@ -1,8 +1,8 @@ import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestHelper { protected mathUtil: MathUtil; protected configServer: ConfigServer; diff --git a/TypeScript/7OnLoadHook/types/helpers/TradeHelper.d.ts b/TypeScript/7OnLoadHook/types/helpers/TradeHelper.d.ts index f994fda..6e6f3a2 100644 --- a/TypeScript/7OnLoadHook/types/helpers/TradeHelper.d.ts +++ b/TypeScript/7OnLoadHook/types/helpers/TradeHelper.d.ts @@ -17,8 +17,8 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TradeHelper { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/7OnLoadHook/types/helpers/TraderAssortHelper.d.ts b/TypeScript/7OnLoadHook/types/helpers/TraderAssortHelper.d.ts index 8f8f802..f1ecd3b 100644 --- a/TypeScript/7OnLoadHook/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/7OnLoadHook/types/helpers/TraderAssortHelper.d.ts @@ -14,9 +14,9 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; diff --git a/TypeScript/7OnLoadHook/types/loaders/BundleLoader.d.ts b/TypeScript/7OnLoadHook/types/loaders/BundleLoader.d.ts index e270988..8c0ed4d 100644 --- a/TypeScript/7OnLoadHook/types/loaders/BundleLoader.d.ts +++ b/TypeScript/7OnLoadHook/types/loaders/BundleLoader.d.ts @@ -1,8 +1,8 @@ import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BundleInfo { modpath: string; filename: string; diff --git a/TypeScript/7OnLoadHook/types/loaders/PostDBModLoader.d.ts b/TypeScript/7OnLoadHook/types/loaders/PostDBModLoader.d.ts index b0c4bf4..a8bb6a9 100644 --- a/TypeScript/7OnLoadHook/types/loaders/PostDBModLoader.d.ts +++ b/TypeScript/7OnLoadHook/types/loaders/PostDBModLoader.d.ts @@ -1,10 +1,10 @@ -import { DependencyContainer } from "tsyringe"; import { OnLoad } from "@spt/di/OnLoad"; import { BundleLoader } from "@spt/loaders/BundleLoader"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostDBModLoader implements OnLoad { protected logger: ILogger; protected bundleLoader: BundleLoader; diff --git a/TypeScript/7OnLoadHook/types/loaders/PostSptModLoader.d.ts b/TypeScript/7OnLoadHook/types/loaders/PostSptModLoader.d.ts index fb54579..2603497 100644 --- a/TypeScript/7OnLoadHook/types/loaders/PostSptModLoader.d.ts +++ b/TypeScript/7OnLoadHook/types/loaders/PostSptModLoader.d.ts @@ -1,9 +1,9 @@ -import { DependencyContainer } from "tsyringe"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { IModLoader } from "@spt/models/spt/mod/IModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostSptModLoader implements IModLoader { protected logger: ILogger; protected preSptModLoader: PreSptModLoader; diff --git a/TypeScript/7OnLoadHook/types/loaders/PreSptModLoader.d.ts b/TypeScript/7OnLoadHook/types/loaders/PreSptModLoader.d.ts index bc846c8..8814525 100644 --- a/TypeScript/7OnLoadHook/types/loaders/PreSptModLoader.d.ts +++ b/TypeScript/7OnLoadHook/types/loaders/PreSptModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { ModDetails } from "@spt/models/eft/profile/ISptProfile"; @@ -11,6 +10,7 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { ModCompilerService } from "@spt/services/ModCompilerService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { DependencyContainer } from "tsyringe"; export declare class PreSptModLoader implements IModLoader { protected logger: ILogger; protected vfs: VFS; diff --git a/TypeScript/7OnLoadHook/types/models/eft/common/IEmptyRequestData.d.ts b/TypeScript/7OnLoadHook/types/models/eft/common/IEmptyRequestData.d.ts index 284d16e..52a7b12 100644 --- a/TypeScript/7OnLoadHook/types/models/eft/common/IEmptyRequestData.d.ts +++ b/TypeScript/7OnLoadHook/types/models/eft/common/IEmptyRequestData.d.ts @@ -1,2 +1 @@ -export interface IEmptyRequestData { -} +export type IEmptyRequestData = {}; diff --git a/TypeScript/7OnLoadHook/types/models/eft/common/tables/IBotBase.d.ts b/TypeScript/7OnLoadHook/types/models/eft/common/tables/IBotBase.d.ts index a7fe1ca..be37845 100644 --- a/TypeScript/7OnLoadHook/types/models/eft/common/tables/IBotBase.d.ts +++ b/TypeScript/7OnLoadHook/types/models/eft/common/tables/IBotBase.d.ts @@ -373,8 +373,7 @@ export interface LastCompleted { export interface Notes { Notes: Note[]; } -export interface CarExtractCounts { -} +export type CarExtractCounts = {}; export declare enum SurvivorClass { UNKNOWN = 0, NEUTRALIZER = 1, diff --git a/TypeScript/7OnLoadHook/types/models/eft/common/tables/ILocationsBase.d.ts b/TypeScript/7OnLoadHook/types/models/eft/common/tables/ILocationsBase.d.ts index 2c96af3..16bca24 100644 --- a/TypeScript/7OnLoadHook/types/models/eft/common/tables/ILocationsBase.d.ts +++ b/TypeScript/7OnLoadHook/types/models/eft/common/tables/ILocationsBase.d.ts @@ -2,8 +2,7 @@ export interface ILocationsBase { locations: Locations; paths: Path[]; } -export interface Locations { -} +export type Locations = {}; export interface Path { Source: string; Destination: string; diff --git a/TypeScript/7OnLoadHook/types/models/eft/common/tables/IProfileTemplate.d.ts b/TypeScript/7OnLoadHook/types/models/eft/common/tables/IProfileTemplate.d.ts index 20923bc..6ba9221 100644 --- a/TypeScript/7OnLoadHook/types/models/eft/common/tables/IProfileTemplate.d.ts +++ b/TypeScript/7OnLoadHook/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -1,12 +1,12 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { Dialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; export interface IProfileTemplates { - "Standard": IProfileSides; + Standard: IProfileSides; "Left Behind": IProfileSides; "Prepare To Escape": IProfileSides; "Edge Of Darkness": IProfileSides; - "Unheard": IProfileSides; - "Tournament": IProfileSides; + Unheard: IProfileSides; + Tournament: IProfileSides; "SPT Developer": IProfileSides; "SPT Easy start": IProfileSides; "SPT Zero to hero": IProfileSides; diff --git a/TypeScript/7OnLoadHook/types/models/eft/common/tables/ITrader.d.ts b/TypeScript/7OnLoadHook/types/models/eft/common/tables/ITrader.d.ts index 14ab409..40cf004 100644 --- a/TypeScript/7OnLoadHook/types/models/eft/common/tables/ITrader.d.ts +++ b/TypeScript/7OnLoadHook/types/models/eft/common/tables/ITrader.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; export interface ITrader { assort?: ITraderAssort; @@ -78,6 +79,8 @@ export interface IBarterScheme { _tpl: string; onlyFunctional?: boolean; sptQuestLocked?: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface ISuit { _id: string; diff --git a/TypeScript/7OnLoadHook/types/models/eft/hideout/IQteData.d.ts b/TypeScript/7OnLoadHook/types/models/eft/hideout/IQteData.d.ts index 7f507e1..fe6cce6 100644 --- a/TypeScript/7OnLoadHook/types/models/eft/hideout/IQteData.d.ts +++ b/TypeScript/7OnLoadHook/types/models/eft/hideout/IQteData.d.ts @@ -1,14 +1,14 @@ import { Effect } from "@spt/models/eft/health/Effect"; import { BodyPart } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; import { QteActivityType } from "@spt/models/enums/hideout/QteActivityType"; import { QteEffectType } from "@spt/models/enums/hideout/QteEffectType"; import { QteResultType } from "@spt/models/enums/hideout/QteResultType"; import { QteRewardType } from "@spt/models/enums/hideout/QteRewardType"; import { QteType } from "@spt/models/enums/hideout/QteType"; import { RequirementType } from "@spt/models/enums/hideout/RequirementType"; -import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt/models/enums/SkillTypes"; -import { Traders } from "@spt/models/enums/Traders"; export interface IQteData { id: string; type: QteActivityType; diff --git a/TypeScript/7OnLoadHook/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/7OnLoadHook/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index f1123c1..5971372 100644 --- a/TypeScript/7OnLoadHook/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/TypeScript/7OnLoadHook/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -15,7 +15,5 @@ export interface Items { change: any[]; del: any[]; } -export interface Production { -} -export interface TraderRelations { -} +export type Production = {}; +export type TraderRelations = {}; diff --git a/TypeScript/7OnLoadHook/types/models/eft/profile/ISptProfile.d.ts b/TypeScript/7OnLoadHook/types/models/eft/profile/ISptProfile.d.ts index a8e742a..dd7aea6 100644 --- a/TypeScript/7OnLoadHook/types/models/eft/profile/ISptProfile.d.ts +++ b/TypeScript/7OnLoadHook/types/models/eft/profile/ISptProfile.d.ts @@ -209,12 +209,9 @@ export interface Effects { LeftLeg: LeftLeg; RightLeg: RightLeg; } -export interface Head { -} -export interface Chest { -} -export interface Stomach { -} +export type Head = {}; +export type Chest = {}; +export type Stomach = {}; export interface LeftArm { Fracture?: number; } diff --git a/TypeScript/7OnLoadHook/types/models/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/7OnLoadHook/types/models/eft/ragfair/IRagfairOffer.d.ts index eeeb79d..f6c07fc 100644 --- a/TypeScript/7OnLoadHook/types/models/eft/ragfair/IRagfairOffer.d.ts +++ b/TypeScript/7OnLoadHook/types/models/eft/ragfair/IRagfairOffer.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface IRagfairOffer { sellResult?: SellResult[]; @@ -28,6 +29,8 @@ export interface OfferRequirement { _tpl: string; count: number; onlyFunctional: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface IRagfairOfferUser { id: string; diff --git a/TypeScript/7OnLoadHook/types/models/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/7OnLoadHook/types/models/eft/ragfair/ISearchRequestData.d.ts index 8261c5b..c631de8 100644 --- a/TypeScript/7OnLoadHook/types/models/eft/ragfair/ISearchRequestData.d.ts +++ b/TypeScript/7OnLoadHook/types/models/eft/ragfair/ISearchRequestData.d.ts @@ -29,5 +29,4 @@ export declare enum OfferOwnerType { TRADEROWNERTYPE = 1, PLAYEROWNERTYPE = 2 } -export interface BuildItems { -} +export type BuildItems = {}; diff --git a/TypeScript/7OnLoadHook/types/models/enums/BaseClasses.d.ts b/TypeScript/7OnLoadHook/types/models/enums/BaseClasses.d.ts index 65fc95e..32ebf7c 100644 --- a/TypeScript/7OnLoadHook/types/models/enums/BaseClasses.d.ts +++ b/TypeScript/7OnLoadHook/types/models/enums/BaseClasses.d.ts @@ -107,6 +107,6 @@ export declare enum BaseClasses { RECEIVER = "55818a304bdc2db5418b457d", BARREL = "555ef6e44bdc2de9068b457e", CHARGING_HANDLE = "55818a6f4bdc2db9688b456b", - COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569 ", + COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569", HIDEOUT_AREA_CONTAINER = "63da6da4784a55176c018dba" } diff --git a/TypeScript/7OnLoadHook/types/models/enums/DogtagExchangeSide.d.ts b/TypeScript/7OnLoadHook/types/models/enums/DogtagExchangeSide.d.ts new file mode 100644 index 0000000..de3d4df --- /dev/null +++ b/TypeScript/7OnLoadHook/types/models/enums/DogtagExchangeSide.d.ts @@ -0,0 +1,5 @@ +export declare enum DogtagExchangeSide { + USEC = "Usec", + BEAR = "Bear", + ANY = "Any" +} diff --git a/TypeScript/7OnLoadHook/types/models/spt/server/ExhaustableArray.d.ts b/TypeScript/7OnLoadHook/types/models/spt/server/ExhaustableArray.d.ts index c27f41f..50a6b68 100644 --- a/TypeScript/7OnLoadHook/types/models/spt/server/ExhaustableArray.d.ts +++ b/TypeScript/7OnLoadHook/types/models/spt/server/ExhaustableArray.d.ts @@ -1,5 +1,5 @@ -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ExhaustableArray implements IExhaustableArray { private itemPool; private randomUtil; diff --git a/TypeScript/7OnLoadHook/types/routers/EventOutputHolder.d.ts b/TypeScript/7OnLoadHook/types/routers/EventOutputHolder.d.ts index ef20706..148461a 100644 --- a/TypeScript/7OnLoadHook/types/routers/EventOutputHolder.d.ts +++ b/TypeScript/7OnLoadHook/types/routers/EventOutputHolder.d.ts @@ -3,8 +3,8 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IHideoutImprovement, Productive, TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; import { TraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class EventOutputHolder { protected profileHelper: ProfileHelper; protected timeUtil: TimeUtil; @@ -12,7 +12,7 @@ export declare class EventOutputHolder { /** * What has client been informed of this game session * Key = sessionId, then second key is prod id - */ + */ protected clientActiveSessionStorage: Record>; diff --git a/TypeScript/7OnLoadHook/types/servers/HttpServer.d.ts b/TypeScript/7OnLoadHook/types/servers/HttpServer.d.ts index b00fe68..0024ba3 100644 --- a/TypeScript/7OnLoadHook/types/servers/HttpServer.d.ts +++ b/TypeScript/7OnLoadHook/types/servers/HttpServer.d.ts @@ -6,8 +6,8 @@ import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; -import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { WebSocketServer } from "@spt/servers/WebSocketServer"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { LocalisationService } from "@spt/services/LocalisationService"; export declare class HttpServer { protected logger: ILogger; diff --git a/TypeScript/7OnLoadHook/types/servers/WebSocketServer.d.ts b/TypeScript/7OnLoadHook/types/servers/WebSocketServer.d.ts index f4e07bb..6121824 100644 --- a/TypeScript/7OnLoadHook/types/servers/WebSocketServer.d.ts +++ b/TypeScript/7OnLoadHook/types/servers/WebSocketServer.d.ts @@ -1,12 +1,12 @@ /// import http, { IncomingMessage } from "node:http"; -import { WebSocket, Server } from "ws"; import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { Server, WebSocket } from "ws"; export declare class WebSocketServer { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/7OnLoadHook/types/servers/ws/SptWebSocketConnectionHandler.d.ts b/TypeScript/7OnLoadHook/types/servers/ws/SptWebSocketConnectionHandler.d.ts index 98d0898..70fc96a 100644 --- a/TypeScript/7OnLoadHook/types/servers/ws/SptWebSocketConnectionHandler.d.ts +++ b/TypeScript/7OnLoadHook/types/servers/ws/SptWebSocketConnectionHandler.d.ts @@ -1,7 +1,6 @@ /// /// import { IncomingMessage } from "http"; -import { WebSocket } from "ws"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; @@ -11,6 +10,7 @@ import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectio import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; +import { WebSocket } from "ws"; export declare class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler { protected logger: ILogger; protected profileHelper: ProfileHelper; diff --git a/TypeScript/7OnLoadHook/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts b/TypeScript/7OnLoadHook/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts index d5247ec..5556129 100644 --- a/TypeScript/7OnLoadHook/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts +++ b/TypeScript/7OnLoadHook/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts @@ -1,6 +1,6 @@ -import { RawData, WebSocket } from "ws"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; +import { RawData, WebSocket } from "ws"; export declare class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler { protected logger: ILogger; constructor(logger: ILogger); diff --git a/TypeScript/7OnLoadHook/types/services/FenceService.d.ts b/TypeScript/7OnLoadHook/types/services/FenceService.d.ts index c156122..58dc076 100644 --- a/TypeScript/7OnLoadHook/types/services/FenceService.d.ts +++ b/TypeScript/7OnLoadHook/types/services/FenceService.d.ts @@ -13,9 +13,9 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Handle actions surrounding Fence * e.g. generating or refreshing assorts / get next refresh time diff --git a/TypeScript/7OnLoadHook/types/services/InsuranceService.d.ts b/TypeScript/7OnLoadHook/types/services/InsuranceService.d.ts index 0000e66..f799102 100644 --- a/TypeScript/7OnLoadHook/types/services/InsuranceService.d.ts +++ b/TypeScript/7OnLoadHook/types/services/InsuranceService.d.ts @@ -18,10 +18,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceService { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/7OnLoadHook/types/services/LocalisationService.d.ts b/TypeScript/7OnLoadHook/types/services/LocalisationService.d.ts index 42dfa4e..855c138 100644 --- a/TypeScript/7OnLoadHook/types/services/LocalisationService.d.ts +++ b/TypeScript/7OnLoadHook/types/services/LocalisationService.d.ts @@ -1,8 +1,8 @@ -import { I18n } from "i18n"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { LocaleService } from "@spt/services/LocaleService"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { I18n } from "i18n"; /** * Handles translating server text into different langauges */ diff --git a/TypeScript/7OnLoadHook/types/services/ProfileFixerService.d.ts b/TypeScript/7OnLoadHook/types/services/ProfileFixerService.d.ts index 525b867..91e4780 100644 --- a/TypeScript/7OnLoadHook/types/services/ProfileFixerService.d.ts +++ b/TypeScript/7OnLoadHook/types/services/ProfileFixerService.d.ts @@ -8,7 +8,7 @@ import { Bonus, HideoutSlot } from "@spt/models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea"; -import { ISptProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; +import { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; @@ -16,11 +16,11 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileFixerService { protected logger: ILogger; protected watermark: Watermark; @@ -73,6 +73,7 @@ export declare class ProfileFixerService { */ protected removeDanglingTaskConditionCounters(pmcProfile: IPmcData): void; protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullRagfairRatings(pmcProfile: IPmcData): void; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; /** diff --git a/TypeScript/7OnLoadHook/types/services/RagfairOfferService.d.ts b/TypeScript/7OnLoadHook/types/services/RagfairOfferService.d.ts index 6c13b1d..98dd179 100644 --- a/TypeScript/7OnLoadHook/types/services/RagfairOfferService.d.ts +++ b/TypeScript/7OnLoadHook/types/services/RagfairOfferService.d.ts @@ -10,10 +10,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/7OnLoadHook/types/services/mod/CustomItemService.d.ts b/TypeScript/7OnLoadHook/types/services/mod/CustomItemService.d.ts index 1926bed..f112872 100644 --- a/TypeScript/7OnLoadHook/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/7OnLoadHook/types/services/mod/CustomItemService.d.ts @@ -4,8 +4,8 @@ import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetail import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/7OnLoadHook/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/7OnLoadHook/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts index 3c9d955..91c84d9 100644 --- a/TypeScript/7OnLoadHook/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts +++ b/TypeScript/7OnLoadHook/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class DynamicRouterModService { private container; constructor(container: DependencyContainer); diff --git a/TypeScript/7OnLoadHook/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/7OnLoadHook/types/services/mod/staticRouter/StaticRouterModService.d.ts index f60432d..0c3d4d8 100644 --- a/TypeScript/7OnLoadHook/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/TypeScript/7OnLoadHook/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class StaticRouterModService { protected container: DependencyContainer; constructor(container: DependencyContainer); diff --git a/TypeScript/7OnLoadHook/types/utils/JsonUtil.d.ts b/TypeScript/7OnLoadHook/types/utils/JsonUtil.d.ts index b30822c..4419228 100644 --- a/TypeScript/7OnLoadHook/types/utils/JsonUtil.d.ts +++ b/TypeScript/7OnLoadHook/types/utils/JsonUtil.d.ts @@ -1,7 +1,7 @@ -import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { HashUtil } from "@spt/utils/HashUtil"; import { VFS } from "@spt/utils/VFS"; +import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; export declare class JsonUtil { protected vfs: VFS; protected hashUtil: HashUtil; diff --git a/TypeScript/7OnLoadHook/types/utils/RandomUtil.d.ts b/TypeScript/7OnLoadHook/types/utils/RandomUtil.d.ts index 49f242d..0da184f 100644 --- a/TypeScript/7OnLoadHook/types/utils/RandomUtil.d.ts +++ b/TypeScript/7OnLoadHook/types/utils/RandomUtil.d.ts @@ -1,6 +1,6 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects * based on the relative probability of each of its elements. diff --git a/TypeScript/7OnLoadHook/types/utils/logging/AbstractWinstonLogger.d.ts b/TypeScript/7OnLoadHook/types/utils/logging/AbstractWinstonLogger.d.ts index 7098f85..ef54434 100644 --- a/TypeScript/7OnLoadHook/types/utils/logging/AbstractWinstonLogger.d.ts +++ b/TypeScript/7OnLoadHook/types/utils/logging/AbstractWinstonLogger.d.ts @@ -1,12 +1,12 @@ /// import fs from "node:fs"; -import winston from "winston"; import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; import { SptLogger } from "@spt/models/spt/logging/SptLogger"; import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; import { ILogger } from "@spt/models/spt/utils/ILogger"; +import winston from "winston"; export declare abstract class AbstractWinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected showDebugInConsole: boolean; diff --git a/TypeScript/8OnUpdateHook/types/controllers/BotController.d.ts b/TypeScript/8OnUpdateHook/types/controllers/BotController.d.ts index 6431fca..475f51b 100644 --- a/TypeScript/8OnUpdateHook/types/controllers/BotController.d.ts +++ b/TypeScript/8OnUpdateHook/types/controllers/BotController.d.ts @@ -20,8 +20,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/8OnUpdateHook/types/controllers/BuildController.d.ts b/TypeScript/8OnUpdateHook/types/controllers/BuildController.d.ts index ed8adf6..2cb9c59 100644 --- a/TypeScript/8OnUpdateHook/types/controllers/BuildController.d.ts +++ b/TypeScript/8OnUpdateHook/types/controllers/BuildController.d.ts @@ -9,8 +9,8 @@ import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BuildController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/8OnUpdateHook/types/controllers/GameController.d.ts b/TypeScript/8OnUpdateHook/types/controllers/GameController.d.ts index 533a81c..e219c04 100644 --- a/TypeScript/8OnUpdateHook/types/controllers/GameController.d.ts +++ b/TypeScript/8OnUpdateHook/types/controllers/GameController.d.ts @@ -34,10 +34,10 @@ import { ProfileActivityService } from "@spt/services/ProfileActivityService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GameController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/8OnUpdateHook/types/controllers/HealthController.d.ts b/TypeScript/8OnUpdateHook/types/controllers/HealthController.d.ts index 5482283..5a0a0a6 100644 --- a/TypeScript/8OnUpdateHook/types/controllers/HealthController.d.ts +++ b/TypeScript/8OnUpdateHook/types/controllers/HealthController.d.ts @@ -12,8 +12,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthController { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/8OnUpdateHook/types/controllers/HideoutController.d.ts b/TypeScript/8OnUpdateHook/types/controllers/HideoutController.d.ts index e9d1ed9..89a428c 100644 --- a/TypeScript/8OnUpdateHook/types/controllers/HideoutController.d.ts +++ b/TypeScript/8OnUpdateHook/types/controllers/HideoutController.d.ts @@ -35,11 +35,11 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; import { ProfileActivityService } from "@spt/services/ProfileActivityService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/8OnUpdateHook/types/controllers/InraidController.d.ts b/TypeScript/8OnUpdateHook/types/controllers/InraidController.d.ts index 87f419b..9f0c409 100644 --- a/TypeScript/8OnUpdateHook/types/controllers/InraidController.d.ts +++ b/TypeScript/8OnUpdateHook/types/controllers/InraidController.d.ts @@ -13,6 +13,7 @@ import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRe import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState"; import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig"; import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; @@ -31,7 +32,6 @@ import { PmcChatResponseService } from "@spt/services/PmcChatResponseService"; import { TraderServicesService } from "@spt/services/TraderServicesService"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; -import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; /** * Logic for handling In Raid callbacks */ diff --git a/TypeScript/8OnUpdateHook/types/controllers/InsuranceController.d.ts b/TypeScript/8OnUpdateHook/types/controllers/InsuranceController.d.ts index f921b83..543e915 100644 --- a/TypeScript/8OnUpdateHook/types/controllers/InsuranceController.d.ts +++ b/TypeScript/8OnUpdateHook/types/controllers/InsuranceController.d.ts @@ -21,11 +21,11 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PaymentService } from "@spt/services/PaymentService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceController { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/8OnUpdateHook/types/controllers/InventoryController.d.ts b/TypeScript/8OnUpdateHook/types/controllers/InventoryController.d.ts index 40bb084..c986ce8 100644 --- a/TypeScript/8OnUpdateHook/types/controllers/InventoryController.d.ts +++ b/TypeScript/8OnUpdateHook/types/controllers/InventoryController.d.ts @@ -37,10 +37,10 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MapMarkerService } from "@spt/services/MapMarkerService"; import { PlayerService } from "@spt/services/PlayerService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/8OnUpdateHook/types/controllers/LocationController.d.ts b/TypeScript/8OnUpdateHook/types/controllers/LocationController.d.ts index 727a8c8..a541b9c 100644 --- a/TypeScript/8OnUpdateHook/types/controllers/LocationController.d.ts +++ b/TypeScript/8OnUpdateHook/types/controllers/LocationController.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class LocationController { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; diff --git a/TypeScript/8OnUpdateHook/types/controllers/ProfileController.d.ts b/TypeScript/8OnUpdateHook/types/controllers/ProfileController.d.ts index e8dae73..7e6d35c 100644 --- a/TypeScript/8OnUpdateHook/types/controllers/ProfileController.d.ts +++ b/TypeScript/8OnUpdateHook/types/controllers/ProfileController.d.ts @@ -26,9 +26,9 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/8OnUpdateHook/types/controllers/QuestController.d.ts b/TypeScript/8OnUpdateHook/types/controllers/QuestController.d.ts index 3cdce00..6a5b415 100644 --- a/TypeScript/8OnUpdateHook/types/controllers/QuestController.d.ts +++ b/TypeScript/8OnUpdateHook/types/controllers/QuestController.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/8OnUpdateHook/types/controllers/RepeatableQuestController.d.ts b/TypeScript/8OnUpdateHook/types/controllers/RepeatableQuestController.d.ts index 74f39eb..016f8c6 100644 --- a/TypeScript/8OnUpdateHook/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/8OnUpdateHook/types/controllers/RepeatableQuestController.d.ts @@ -18,11 +18,11 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/8OnUpdateHook/types/controllers/TradeController.d.ts b/TypeScript/8OnUpdateHook/types/controllers/TradeController.d.ts index bc72e92..842a97b 100644 --- a/TypeScript/8OnUpdateHook/types/controllers/TradeController.d.ts +++ b/TypeScript/8OnUpdateHook/types/controllers/TradeController.d.ts @@ -1,5 +1,6 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper"; import { TradeHelper } from "@spt/helpers/TradeHelper"; import { TraderHelper } from "@spt/helpers/TraderHelper"; import { IPmcData } from "@spt/models/eft/common/IPmcData"; @@ -35,6 +36,7 @@ export declare class TradeController { protected hashUtil: HashUtil; protected itemHelper: ItemHelper; protected profileHelper: ProfileHelper; + protected ragfairOfferHelper: RagfairOfferHelper; protected traderHelper: TraderHelper; protected ragfairServer: RagfairServer; protected httpResponse: HttpResponseUtil; @@ -44,7 +46,7 @@ export declare class TradeController { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairOfferHelper: RagfairOfferHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); /** Handle TradingConfirm event */ confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; /** Handle RagFairBuyOffer event */ @@ -67,10 +69,17 @@ export declare class TradeController { * @param output Output to send back to client */ protected buyPmcItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void; + /** + * Is the provided offerid and ownerid from a player made offer + * @param offerId Id of the offer + * @param offerOwnerId Owner id + * @returns true if offer was made by a player + */ + protected isPlayerOffer(offerId: string, offerOwnerId: string): boolean; /** * Does Player have necessary trader loyalty to purchase flea offer * @param sellerIsTrader is seller trader - * @param fleaOffer FLea offer being bought + * @param fleaOffer Flea offer being bought * @param pmcData Player profile * @returns True if player can buy offer */ diff --git a/TypeScript/8OnUpdateHook/types/controllers/TraderController.d.ts b/TypeScript/8OnUpdateHook/types/controllers/TraderController.d.ts index 7fc6d78..3592fc6 100644 --- a/TypeScript/8OnUpdateHook/types/controllers/TraderController.d.ts +++ b/TypeScript/8OnUpdateHook/types/controllers/TraderController.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/8OnUpdateHook/types/generators/BotEquipmentModGenerator.d.ts b/TypeScript/8OnUpdateHook/types/generators/BotEquipmentModGenerator.d.ts index 419120f..3952293 100644 --- a/TypeScript/8OnUpdateHook/types/generators/BotEquipmentModGenerator.d.ts +++ b/TypeScript/8OnUpdateHook/types/generators/BotEquipmentModGenerator.d.ts @@ -25,9 +25,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotEquipmentModGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -65,7 +65,7 @@ export declare class BotEquipmentModGenerator { * @param settings Bot equipment generation settings * @param modSlot Armor slot being filtered * @param existingPlateTplPool Plates tpls to choose from - * @param armorItem + * @param armorItem The armor items db template * @returns Array of plate tpls to choose from */ protected filterPlateModsForSlotByLevel(settings: IGenerateEquipmentProperties, modSlot: string, existingPlateTplPool: string[], armorItem: ITemplateItem): IFilterPlateModsForSlotByLevelResult; diff --git a/TypeScript/8OnUpdateHook/types/generators/BotGenerator.d.ts b/TypeScript/8OnUpdateHook/types/generators/BotGenerator.d.ts index 8ab4371..ebb8a59 100644 --- a/TypeScript/8OnUpdateHook/types/generators/BotGenerator.d.ts +++ b/TypeScript/8OnUpdateHook/types/generators/BotGenerator.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/8OnUpdateHook/types/generators/BotLevelGenerator.d.ts b/TypeScript/8OnUpdateHook/types/generators/BotLevelGenerator.d.ts index dee61e2..a8a8895 100644 --- a/TypeScript/8OnUpdateHook/types/generators/BotLevelGenerator.d.ts +++ b/TypeScript/8OnUpdateHook/types/generators/BotLevelGenerator.d.ts @@ -4,12 +4,14 @@ import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; +import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class BotLevelGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; protected databaseService: DatabaseService; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService); + protected mathUtil: MathUtil; + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, mathUtil: MathUtil); /** * Return a randomised bot level and exp value * @param levelDetails Min and max of level for bot @@ -18,6 +20,7 @@ export declare class BotLevelGenerator { * @returns IRandomisedBotLevelResult object */ generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult; + protected chooseBotLevel(min: number, max: number, shift: number, number: number): number; /** * Get the highest level a bot can be relative to the players level, but no further than the max size from globals.exp_table * @param botGenerationDetails Details to help generate a bot diff --git a/TypeScript/8OnUpdateHook/types/generators/BotLootGenerator.d.ts b/TypeScript/8OnUpdateHook/types/generators/BotLootGenerator.d.ts index fee56ce..c0583c6 100644 --- a/TypeScript/8OnUpdateHook/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/8OnUpdateHook/types/generators/BotLootGenerator.d.ts @@ -18,9 +18,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/8OnUpdateHook/types/generators/BotWeaponGenerator.d.ts b/TypeScript/8OnUpdateHook/types/generators/BotWeaponGenerator.d.ts index 5559bfa..8e03b35 100644 --- a/TypeScript/8OnUpdateHook/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/8OnUpdateHook/types/generators/BotWeaponGenerator.d.ts @@ -18,9 +18,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RepairService } from "@spt/services/RepairService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotWeaponGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/8OnUpdateHook/types/generators/LocationGenerator.d.ts b/TypeScript/8OnUpdateHook/types/generators/LocationGenerator.d.ts index 222b0ab..9a2b0c4 100644 --- a/TypeScript/8OnUpdateHook/types/generators/LocationGenerator.d.ts +++ b/TypeScript/8OnUpdateHook/types/generators/LocationGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export interface IContainerItem { items: Item[]; width: number; diff --git a/TypeScript/8OnUpdateHook/types/generators/PlayerScavGenerator.d.ts b/TypeScript/8OnUpdateHook/types/generators/PlayerScavGenerator.d.ts index 2414150..e317bf6 100644 --- a/TypeScript/8OnUpdateHook/types/generators/PlayerScavGenerator.d.ts +++ b/TypeScript/8OnUpdateHook/types/generators/PlayerScavGenerator.d.ts @@ -14,9 +14,9 @@ import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class PlayerScavGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/8OnUpdateHook/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/8OnUpdateHook/types/generators/RagfairOfferGenerator.d.ts index 9435390..ca09729 100644 --- a/TypeScript/8OnUpdateHook/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/8OnUpdateHook/types/generators/RagfairOfferGenerator.d.ts @@ -19,10 +19,10 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/8OnUpdateHook/types/generators/RepeatableQuestGenerator.d.ts b/TypeScript/8OnUpdateHook/types/generators/RepeatableQuestGenerator.d.ts index 77c4e79..339f322 100644 --- a/TypeScript/8OnUpdateHook/types/generators/RepeatableQuestGenerator.d.ts +++ b/TypeScript/8OnUpdateHook/types/generators/RepeatableQuestGenerator.d.ts @@ -11,10 +11,10 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/8OnUpdateHook/types/generators/RepeatableQuestRewardGenerator.d.ts b/TypeScript/8OnUpdateHook/types/generators/RepeatableQuestRewardGenerator.d.ts index 1e09994..713a394 100644 --- a/TypeScript/8OnUpdateHook/types/generators/RepeatableQuestRewardGenerator.d.ts +++ b/TypeScript/8OnUpdateHook/types/generators/RepeatableQuestRewardGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestRewardGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/8OnUpdateHook/types/helpers/BotDifficultyHelper.d.ts b/TypeScript/8OnUpdateHook/types/helpers/BotDifficultyHelper.d.ts index 63572a5..2348bd3 100644 --- a/TypeScript/8OnUpdateHook/types/helpers/BotDifficultyHelper.d.ts +++ b/TypeScript/8OnUpdateHook/types/helpers/BotDifficultyHelper.d.ts @@ -5,8 +5,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotDifficultyHelper { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/8OnUpdateHook/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/8OnUpdateHook/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index c51bf7e..c38f0a0 100644 --- a/TypeScript/8OnUpdateHook/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/8OnUpdateHook/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GiveSptCommand implements ISptCommand { protected logger: ILogger; protected itemHelper: ItemHelper; diff --git a/TypeScript/8OnUpdateHook/types/helpers/HealthHelper.d.ts b/TypeScript/8OnUpdateHook/types/helpers/HealthHelper.d.ts index 650f633..a164285 100644 --- a/TypeScript/8OnUpdateHook/types/helpers/HealthHelper.d.ts +++ b/TypeScript/8OnUpdateHook/types/helpers/HealthHelper.d.ts @@ -5,8 +5,8 @@ import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/8OnUpdateHook/types/helpers/HideoutHelper.d.ts b/TypeScript/8OnUpdateHook/types/helpers/HideoutHelper.d.ts index c4aaa4c..df0376b 100644 --- a/TypeScript/8OnUpdateHook/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/8OnUpdateHook/types/helpers/HideoutHelper.d.ts @@ -18,10 +18,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/8OnUpdateHook/types/helpers/InRaidHelper.d.ts b/TypeScript/8OnUpdateHook/types/helpers/InRaidHelper.d.ts index 449be9f..987c9ec 100644 --- a/TypeScript/8OnUpdateHook/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/8OnUpdateHook/types/helpers/InRaidHelper.d.ts @@ -15,9 +15,9 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InRaidHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/8OnUpdateHook/types/helpers/InventoryHelper.d.ts b/TypeScript/8OnUpdateHook/types/helpers/InventoryHelper.d.ts index f0ff69a..92bb49c 100644 --- a/TypeScript/8OnUpdateHook/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/8OnUpdateHook/types/helpers/InventoryHelper.d.ts @@ -23,9 +23,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/8OnUpdateHook/types/helpers/ItemHelper.d.ts b/TypeScript/8OnUpdateHook/types/helpers/ItemHelper.d.ts index da5dd11..c304cee 100644 --- a/TypeScript/8OnUpdateHook/types/helpers/ItemHelper.d.ts +++ b/TypeScript/8OnUpdateHook/types/helpers/ItemHelper.d.ts @@ -11,13 +11,13 @@ import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { CompareUtil } from "@spt/utils/CompareUtil"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ItemHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/8OnUpdateHook/types/helpers/ProfileHelper.d.ts b/TypeScript/8OnUpdateHook/types/helpers/ProfileHelper.d.ts index 0671179..cdab870 100644 --- a/TypeScript/8OnUpdateHook/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/8OnUpdateHook/types/helpers/ProfileHelper.d.ts @@ -11,10 +11,10 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/8OnUpdateHook/types/helpers/QuestHelper.d.ts b/TypeScript/8OnUpdateHook/types/helpers/QuestHelper.d.ts index 2b84b8f..2d5730d 100644 --- a/TypeScript/8OnUpdateHook/types/helpers/QuestHelper.d.ts +++ b/TypeScript/8OnUpdateHook/types/helpers/QuestHelper.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/8OnUpdateHook/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/8OnUpdateHook/types/helpers/RagfairOfferHelper.d.ts index b526554..2386316 100644 --- a/TypeScript/8OnUpdateHook/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/8OnUpdateHook/types/helpers/RagfairOfferHelper.d.ts @@ -151,7 +151,7 @@ export declare class RagfairOfferHelper { * @param boughtAmount Amount item was purchased for * @returns IItemEventRouterResponse */ - protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; + completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; /** * Get a localised message for when players offer has sold on flea * @param itemTpl Item sold diff --git a/TypeScript/8OnUpdateHook/types/helpers/RagfairServerHelper.d.ts b/TypeScript/8OnUpdateHook/types/helpers/RagfairServerHelper.d.ts index 927caf5..3e1fea9 100644 --- a/TypeScript/8OnUpdateHook/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/8OnUpdateHook/types/helpers/RagfairServerHelper.d.ts @@ -12,9 +12,9 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Helper class for common ragfair server actions */ diff --git a/TypeScript/8OnUpdateHook/types/helpers/RepairHelper.d.ts b/TypeScript/8OnUpdateHook/types/helpers/RepairHelper.d.ts index 99a21da..63c78c9 100644 --- a/TypeScript/8OnUpdateHook/types/helpers/RepairHelper.d.ts +++ b/TypeScript/8OnUpdateHook/types/helpers/RepairHelper.d.ts @@ -4,8 +4,8 @@ import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/8OnUpdateHook/types/helpers/RepeatableQuestHelper.d.ts b/TypeScript/8OnUpdateHook/types/helpers/RepeatableQuestHelper.d.ts index d92657e..8c65f40 100644 --- a/TypeScript/8OnUpdateHook/types/helpers/RepeatableQuestHelper.d.ts +++ b/TypeScript/8OnUpdateHook/types/helpers/RepeatableQuestHelper.d.ts @@ -1,8 +1,8 @@ import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestHelper { protected mathUtil: MathUtil; protected configServer: ConfigServer; diff --git a/TypeScript/8OnUpdateHook/types/helpers/TradeHelper.d.ts b/TypeScript/8OnUpdateHook/types/helpers/TradeHelper.d.ts index f994fda..6e6f3a2 100644 --- a/TypeScript/8OnUpdateHook/types/helpers/TradeHelper.d.ts +++ b/TypeScript/8OnUpdateHook/types/helpers/TradeHelper.d.ts @@ -17,8 +17,8 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TradeHelper { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/8OnUpdateHook/types/helpers/TraderAssortHelper.d.ts b/TypeScript/8OnUpdateHook/types/helpers/TraderAssortHelper.d.ts index 8f8f802..f1ecd3b 100644 --- a/TypeScript/8OnUpdateHook/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/8OnUpdateHook/types/helpers/TraderAssortHelper.d.ts @@ -14,9 +14,9 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; diff --git a/TypeScript/8OnUpdateHook/types/loaders/BundleLoader.d.ts b/TypeScript/8OnUpdateHook/types/loaders/BundleLoader.d.ts index e270988..8c0ed4d 100644 --- a/TypeScript/8OnUpdateHook/types/loaders/BundleLoader.d.ts +++ b/TypeScript/8OnUpdateHook/types/loaders/BundleLoader.d.ts @@ -1,8 +1,8 @@ import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BundleInfo { modpath: string; filename: string; diff --git a/TypeScript/8OnUpdateHook/types/loaders/PostDBModLoader.d.ts b/TypeScript/8OnUpdateHook/types/loaders/PostDBModLoader.d.ts index b0c4bf4..a8bb6a9 100644 --- a/TypeScript/8OnUpdateHook/types/loaders/PostDBModLoader.d.ts +++ b/TypeScript/8OnUpdateHook/types/loaders/PostDBModLoader.d.ts @@ -1,10 +1,10 @@ -import { DependencyContainer } from "tsyringe"; import { OnLoad } from "@spt/di/OnLoad"; import { BundleLoader } from "@spt/loaders/BundleLoader"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostDBModLoader implements OnLoad { protected logger: ILogger; protected bundleLoader: BundleLoader; diff --git a/TypeScript/8OnUpdateHook/types/loaders/PostSptModLoader.d.ts b/TypeScript/8OnUpdateHook/types/loaders/PostSptModLoader.d.ts index fb54579..2603497 100644 --- a/TypeScript/8OnUpdateHook/types/loaders/PostSptModLoader.d.ts +++ b/TypeScript/8OnUpdateHook/types/loaders/PostSptModLoader.d.ts @@ -1,9 +1,9 @@ -import { DependencyContainer } from "tsyringe"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { IModLoader } from "@spt/models/spt/mod/IModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostSptModLoader implements IModLoader { protected logger: ILogger; protected preSptModLoader: PreSptModLoader; diff --git a/TypeScript/8OnUpdateHook/types/loaders/PreSptModLoader.d.ts b/TypeScript/8OnUpdateHook/types/loaders/PreSptModLoader.d.ts index bc846c8..8814525 100644 --- a/TypeScript/8OnUpdateHook/types/loaders/PreSptModLoader.d.ts +++ b/TypeScript/8OnUpdateHook/types/loaders/PreSptModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { ModDetails } from "@spt/models/eft/profile/ISptProfile"; @@ -11,6 +10,7 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { ModCompilerService } from "@spt/services/ModCompilerService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { DependencyContainer } from "tsyringe"; export declare class PreSptModLoader implements IModLoader { protected logger: ILogger; protected vfs: VFS; diff --git a/TypeScript/8OnUpdateHook/types/models/eft/common/IEmptyRequestData.d.ts b/TypeScript/8OnUpdateHook/types/models/eft/common/IEmptyRequestData.d.ts index 284d16e..52a7b12 100644 --- a/TypeScript/8OnUpdateHook/types/models/eft/common/IEmptyRequestData.d.ts +++ b/TypeScript/8OnUpdateHook/types/models/eft/common/IEmptyRequestData.d.ts @@ -1,2 +1 @@ -export interface IEmptyRequestData { -} +export type IEmptyRequestData = {}; diff --git a/TypeScript/8OnUpdateHook/types/models/eft/common/tables/IBotBase.d.ts b/TypeScript/8OnUpdateHook/types/models/eft/common/tables/IBotBase.d.ts index a7fe1ca..be37845 100644 --- a/TypeScript/8OnUpdateHook/types/models/eft/common/tables/IBotBase.d.ts +++ b/TypeScript/8OnUpdateHook/types/models/eft/common/tables/IBotBase.d.ts @@ -373,8 +373,7 @@ export interface LastCompleted { export interface Notes { Notes: Note[]; } -export interface CarExtractCounts { -} +export type CarExtractCounts = {}; export declare enum SurvivorClass { UNKNOWN = 0, NEUTRALIZER = 1, diff --git a/TypeScript/8OnUpdateHook/types/models/eft/common/tables/ILocationsBase.d.ts b/TypeScript/8OnUpdateHook/types/models/eft/common/tables/ILocationsBase.d.ts index 2c96af3..16bca24 100644 --- a/TypeScript/8OnUpdateHook/types/models/eft/common/tables/ILocationsBase.d.ts +++ b/TypeScript/8OnUpdateHook/types/models/eft/common/tables/ILocationsBase.d.ts @@ -2,8 +2,7 @@ export interface ILocationsBase { locations: Locations; paths: Path[]; } -export interface Locations { -} +export type Locations = {}; export interface Path { Source: string; Destination: string; diff --git a/TypeScript/8OnUpdateHook/types/models/eft/common/tables/IProfileTemplate.d.ts b/TypeScript/8OnUpdateHook/types/models/eft/common/tables/IProfileTemplate.d.ts index 20923bc..6ba9221 100644 --- a/TypeScript/8OnUpdateHook/types/models/eft/common/tables/IProfileTemplate.d.ts +++ b/TypeScript/8OnUpdateHook/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -1,12 +1,12 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { Dialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; export interface IProfileTemplates { - "Standard": IProfileSides; + Standard: IProfileSides; "Left Behind": IProfileSides; "Prepare To Escape": IProfileSides; "Edge Of Darkness": IProfileSides; - "Unheard": IProfileSides; - "Tournament": IProfileSides; + Unheard: IProfileSides; + Tournament: IProfileSides; "SPT Developer": IProfileSides; "SPT Easy start": IProfileSides; "SPT Zero to hero": IProfileSides; diff --git a/TypeScript/8OnUpdateHook/types/models/eft/common/tables/ITrader.d.ts b/TypeScript/8OnUpdateHook/types/models/eft/common/tables/ITrader.d.ts index 14ab409..40cf004 100644 --- a/TypeScript/8OnUpdateHook/types/models/eft/common/tables/ITrader.d.ts +++ b/TypeScript/8OnUpdateHook/types/models/eft/common/tables/ITrader.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; export interface ITrader { assort?: ITraderAssort; @@ -78,6 +79,8 @@ export interface IBarterScheme { _tpl: string; onlyFunctional?: boolean; sptQuestLocked?: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface ISuit { _id: string; diff --git a/TypeScript/8OnUpdateHook/types/models/eft/hideout/IQteData.d.ts b/TypeScript/8OnUpdateHook/types/models/eft/hideout/IQteData.d.ts index 7f507e1..fe6cce6 100644 --- a/TypeScript/8OnUpdateHook/types/models/eft/hideout/IQteData.d.ts +++ b/TypeScript/8OnUpdateHook/types/models/eft/hideout/IQteData.d.ts @@ -1,14 +1,14 @@ import { Effect } from "@spt/models/eft/health/Effect"; import { BodyPart } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; import { QteActivityType } from "@spt/models/enums/hideout/QteActivityType"; import { QteEffectType } from "@spt/models/enums/hideout/QteEffectType"; import { QteResultType } from "@spt/models/enums/hideout/QteResultType"; import { QteRewardType } from "@spt/models/enums/hideout/QteRewardType"; import { QteType } from "@spt/models/enums/hideout/QteType"; import { RequirementType } from "@spt/models/enums/hideout/RequirementType"; -import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt/models/enums/SkillTypes"; -import { Traders } from "@spt/models/enums/Traders"; export interface IQteData { id: string; type: QteActivityType; diff --git a/TypeScript/8OnUpdateHook/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/8OnUpdateHook/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index f1123c1..5971372 100644 --- a/TypeScript/8OnUpdateHook/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/TypeScript/8OnUpdateHook/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -15,7 +15,5 @@ export interface Items { change: any[]; del: any[]; } -export interface Production { -} -export interface TraderRelations { -} +export type Production = {}; +export type TraderRelations = {}; diff --git a/TypeScript/8OnUpdateHook/types/models/eft/profile/ISptProfile.d.ts b/TypeScript/8OnUpdateHook/types/models/eft/profile/ISptProfile.d.ts index a8e742a..dd7aea6 100644 --- a/TypeScript/8OnUpdateHook/types/models/eft/profile/ISptProfile.d.ts +++ b/TypeScript/8OnUpdateHook/types/models/eft/profile/ISptProfile.d.ts @@ -209,12 +209,9 @@ export interface Effects { LeftLeg: LeftLeg; RightLeg: RightLeg; } -export interface Head { -} -export interface Chest { -} -export interface Stomach { -} +export type Head = {}; +export type Chest = {}; +export type Stomach = {}; export interface LeftArm { Fracture?: number; } diff --git a/TypeScript/8OnUpdateHook/types/models/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/8OnUpdateHook/types/models/eft/ragfair/IRagfairOffer.d.ts index eeeb79d..f6c07fc 100644 --- a/TypeScript/8OnUpdateHook/types/models/eft/ragfair/IRagfairOffer.d.ts +++ b/TypeScript/8OnUpdateHook/types/models/eft/ragfair/IRagfairOffer.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface IRagfairOffer { sellResult?: SellResult[]; @@ -28,6 +29,8 @@ export interface OfferRequirement { _tpl: string; count: number; onlyFunctional: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface IRagfairOfferUser { id: string; diff --git a/TypeScript/8OnUpdateHook/types/models/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/8OnUpdateHook/types/models/eft/ragfair/ISearchRequestData.d.ts index 8261c5b..c631de8 100644 --- a/TypeScript/8OnUpdateHook/types/models/eft/ragfair/ISearchRequestData.d.ts +++ b/TypeScript/8OnUpdateHook/types/models/eft/ragfair/ISearchRequestData.d.ts @@ -29,5 +29,4 @@ export declare enum OfferOwnerType { TRADEROWNERTYPE = 1, PLAYEROWNERTYPE = 2 } -export interface BuildItems { -} +export type BuildItems = {}; diff --git a/TypeScript/8OnUpdateHook/types/models/enums/BaseClasses.d.ts b/TypeScript/8OnUpdateHook/types/models/enums/BaseClasses.d.ts index 65fc95e..32ebf7c 100644 --- a/TypeScript/8OnUpdateHook/types/models/enums/BaseClasses.d.ts +++ b/TypeScript/8OnUpdateHook/types/models/enums/BaseClasses.d.ts @@ -107,6 +107,6 @@ export declare enum BaseClasses { RECEIVER = "55818a304bdc2db5418b457d", BARREL = "555ef6e44bdc2de9068b457e", CHARGING_HANDLE = "55818a6f4bdc2db9688b456b", - COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569 ", + COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569", HIDEOUT_AREA_CONTAINER = "63da6da4784a55176c018dba" } diff --git a/TypeScript/8OnUpdateHook/types/models/enums/DogtagExchangeSide.d.ts b/TypeScript/8OnUpdateHook/types/models/enums/DogtagExchangeSide.d.ts new file mode 100644 index 0000000..de3d4df --- /dev/null +++ b/TypeScript/8OnUpdateHook/types/models/enums/DogtagExchangeSide.d.ts @@ -0,0 +1,5 @@ +export declare enum DogtagExchangeSide { + USEC = "Usec", + BEAR = "Bear", + ANY = "Any" +} diff --git a/TypeScript/8OnUpdateHook/types/models/spt/server/ExhaustableArray.d.ts b/TypeScript/8OnUpdateHook/types/models/spt/server/ExhaustableArray.d.ts index c27f41f..50a6b68 100644 --- a/TypeScript/8OnUpdateHook/types/models/spt/server/ExhaustableArray.d.ts +++ b/TypeScript/8OnUpdateHook/types/models/spt/server/ExhaustableArray.d.ts @@ -1,5 +1,5 @@ -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ExhaustableArray implements IExhaustableArray { private itemPool; private randomUtil; diff --git a/TypeScript/8OnUpdateHook/types/routers/EventOutputHolder.d.ts b/TypeScript/8OnUpdateHook/types/routers/EventOutputHolder.d.ts index ef20706..148461a 100644 --- a/TypeScript/8OnUpdateHook/types/routers/EventOutputHolder.d.ts +++ b/TypeScript/8OnUpdateHook/types/routers/EventOutputHolder.d.ts @@ -3,8 +3,8 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IHideoutImprovement, Productive, TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; import { TraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class EventOutputHolder { protected profileHelper: ProfileHelper; protected timeUtil: TimeUtil; @@ -12,7 +12,7 @@ export declare class EventOutputHolder { /** * What has client been informed of this game session * Key = sessionId, then second key is prod id - */ + */ protected clientActiveSessionStorage: Record>; diff --git a/TypeScript/8OnUpdateHook/types/servers/HttpServer.d.ts b/TypeScript/8OnUpdateHook/types/servers/HttpServer.d.ts index b00fe68..0024ba3 100644 --- a/TypeScript/8OnUpdateHook/types/servers/HttpServer.d.ts +++ b/TypeScript/8OnUpdateHook/types/servers/HttpServer.d.ts @@ -6,8 +6,8 @@ import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; -import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { WebSocketServer } from "@spt/servers/WebSocketServer"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { LocalisationService } from "@spt/services/LocalisationService"; export declare class HttpServer { protected logger: ILogger; diff --git a/TypeScript/8OnUpdateHook/types/servers/WebSocketServer.d.ts b/TypeScript/8OnUpdateHook/types/servers/WebSocketServer.d.ts index f4e07bb..6121824 100644 --- a/TypeScript/8OnUpdateHook/types/servers/WebSocketServer.d.ts +++ b/TypeScript/8OnUpdateHook/types/servers/WebSocketServer.d.ts @@ -1,12 +1,12 @@ /// import http, { IncomingMessage } from "node:http"; -import { WebSocket, Server } from "ws"; import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { Server, WebSocket } from "ws"; export declare class WebSocketServer { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/8OnUpdateHook/types/servers/ws/SptWebSocketConnectionHandler.d.ts b/TypeScript/8OnUpdateHook/types/servers/ws/SptWebSocketConnectionHandler.d.ts index 98d0898..70fc96a 100644 --- a/TypeScript/8OnUpdateHook/types/servers/ws/SptWebSocketConnectionHandler.d.ts +++ b/TypeScript/8OnUpdateHook/types/servers/ws/SptWebSocketConnectionHandler.d.ts @@ -1,7 +1,6 @@ /// /// import { IncomingMessage } from "http"; -import { WebSocket } from "ws"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; @@ -11,6 +10,7 @@ import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectio import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; +import { WebSocket } from "ws"; export declare class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler { protected logger: ILogger; protected profileHelper: ProfileHelper; diff --git a/TypeScript/8OnUpdateHook/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts b/TypeScript/8OnUpdateHook/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts index d5247ec..5556129 100644 --- a/TypeScript/8OnUpdateHook/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts +++ b/TypeScript/8OnUpdateHook/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts @@ -1,6 +1,6 @@ -import { RawData, WebSocket } from "ws"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; +import { RawData, WebSocket } from "ws"; export declare class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler { protected logger: ILogger; constructor(logger: ILogger); diff --git a/TypeScript/8OnUpdateHook/types/services/FenceService.d.ts b/TypeScript/8OnUpdateHook/types/services/FenceService.d.ts index c156122..58dc076 100644 --- a/TypeScript/8OnUpdateHook/types/services/FenceService.d.ts +++ b/TypeScript/8OnUpdateHook/types/services/FenceService.d.ts @@ -13,9 +13,9 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Handle actions surrounding Fence * e.g. generating or refreshing assorts / get next refresh time diff --git a/TypeScript/8OnUpdateHook/types/services/InsuranceService.d.ts b/TypeScript/8OnUpdateHook/types/services/InsuranceService.d.ts index 0000e66..f799102 100644 --- a/TypeScript/8OnUpdateHook/types/services/InsuranceService.d.ts +++ b/TypeScript/8OnUpdateHook/types/services/InsuranceService.d.ts @@ -18,10 +18,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceService { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/8OnUpdateHook/types/services/LocalisationService.d.ts b/TypeScript/8OnUpdateHook/types/services/LocalisationService.d.ts index 42dfa4e..855c138 100644 --- a/TypeScript/8OnUpdateHook/types/services/LocalisationService.d.ts +++ b/TypeScript/8OnUpdateHook/types/services/LocalisationService.d.ts @@ -1,8 +1,8 @@ -import { I18n } from "i18n"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { LocaleService } from "@spt/services/LocaleService"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { I18n } from "i18n"; /** * Handles translating server text into different langauges */ diff --git a/TypeScript/8OnUpdateHook/types/services/ProfileFixerService.d.ts b/TypeScript/8OnUpdateHook/types/services/ProfileFixerService.d.ts index 525b867..91e4780 100644 --- a/TypeScript/8OnUpdateHook/types/services/ProfileFixerService.d.ts +++ b/TypeScript/8OnUpdateHook/types/services/ProfileFixerService.d.ts @@ -8,7 +8,7 @@ import { Bonus, HideoutSlot } from "@spt/models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea"; -import { ISptProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; +import { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; @@ -16,11 +16,11 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileFixerService { protected logger: ILogger; protected watermark: Watermark; @@ -73,6 +73,7 @@ export declare class ProfileFixerService { */ protected removeDanglingTaskConditionCounters(pmcProfile: IPmcData): void; protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullRagfairRatings(pmcProfile: IPmcData): void; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; /** diff --git a/TypeScript/8OnUpdateHook/types/services/RagfairOfferService.d.ts b/TypeScript/8OnUpdateHook/types/services/RagfairOfferService.d.ts index 6c13b1d..98dd179 100644 --- a/TypeScript/8OnUpdateHook/types/services/RagfairOfferService.d.ts +++ b/TypeScript/8OnUpdateHook/types/services/RagfairOfferService.d.ts @@ -10,10 +10,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/8OnUpdateHook/types/services/mod/CustomItemService.d.ts b/TypeScript/8OnUpdateHook/types/services/mod/CustomItemService.d.ts index 1926bed..f112872 100644 --- a/TypeScript/8OnUpdateHook/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/8OnUpdateHook/types/services/mod/CustomItemService.d.ts @@ -4,8 +4,8 @@ import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetail import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/8OnUpdateHook/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/8OnUpdateHook/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts index 3c9d955..91c84d9 100644 --- a/TypeScript/8OnUpdateHook/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts +++ b/TypeScript/8OnUpdateHook/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class DynamicRouterModService { private container; constructor(container: DependencyContainer); diff --git a/TypeScript/8OnUpdateHook/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/8OnUpdateHook/types/services/mod/staticRouter/StaticRouterModService.d.ts index f60432d..0c3d4d8 100644 --- a/TypeScript/8OnUpdateHook/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/TypeScript/8OnUpdateHook/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class StaticRouterModService { protected container: DependencyContainer; constructor(container: DependencyContainer); diff --git a/TypeScript/8OnUpdateHook/types/utils/JsonUtil.d.ts b/TypeScript/8OnUpdateHook/types/utils/JsonUtil.d.ts index b30822c..4419228 100644 --- a/TypeScript/8OnUpdateHook/types/utils/JsonUtil.d.ts +++ b/TypeScript/8OnUpdateHook/types/utils/JsonUtil.d.ts @@ -1,7 +1,7 @@ -import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { HashUtil } from "@spt/utils/HashUtil"; import { VFS } from "@spt/utils/VFS"; +import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; export declare class JsonUtil { protected vfs: VFS; protected hashUtil: HashUtil; diff --git a/TypeScript/8OnUpdateHook/types/utils/RandomUtil.d.ts b/TypeScript/8OnUpdateHook/types/utils/RandomUtil.d.ts index 49f242d..0da184f 100644 --- a/TypeScript/8OnUpdateHook/types/utils/RandomUtil.d.ts +++ b/TypeScript/8OnUpdateHook/types/utils/RandomUtil.d.ts @@ -1,6 +1,6 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects * based on the relative probability of each of its elements. diff --git a/TypeScript/8OnUpdateHook/types/utils/logging/AbstractWinstonLogger.d.ts b/TypeScript/8OnUpdateHook/types/utils/logging/AbstractWinstonLogger.d.ts index 7098f85..ef54434 100644 --- a/TypeScript/8OnUpdateHook/types/utils/logging/AbstractWinstonLogger.d.ts +++ b/TypeScript/8OnUpdateHook/types/utils/logging/AbstractWinstonLogger.d.ts @@ -1,12 +1,12 @@ /// import fs from "node:fs"; -import winston from "winston"; import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; import { SptLogger } from "@spt/models/spt/logging/SptLogger"; import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; import { ILogger } from "@spt/models/spt/utils/ILogger"; +import winston from "winston"; export declare abstract class AbstractWinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected showDebugInConsole: boolean; diff --git a/TypeScript/9RouterHooks/types/controllers/BotController.d.ts b/TypeScript/9RouterHooks/types/controllers/BotController.d.ts index 6431fca..475f51b 100644 --- a/TypeScript/9RouterHooks/types/controllers/BotController.d.ts +++ b/TypeScript/9RouterHooks/types/controllers/BotController.d.ts @@ -20,8 +20,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/9RouterHooks/types/controllers/BuildController.d.ts b/TypeScript/9RouterHooks/types/controllers/BuildController.d.ts index ed8adf6..2cb9c59 100644 --- a/TypeScript/9RouterHooks/types/controllers/BuildController.d.ts +++ b/TypeScript/9RouterHooks/types/controllers/BuildController.d.ts @@ -9,8 +9,8 @@ import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BuildController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/9RouterHooks/types/controllers/GameController.d.ts b/TypeScript/9RouterHooks/types/controllers/GameController.d.ts index 533a81c..e219c04 100644 --- a/TypeScript/9RouterHooks/types/controllers/GameController.d.ts +++ b/TypeScript/9RouterHooks/types/controllers/GameController.d.ts @@ -34,10 +34,10 @@ import { ProfileActivityService } from "@spt/services/ProfileActivityService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GameController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/9RouterHooks/types/controllers/HealthController.d.ts b/TypeScript/9RouterHooks/types/controllers/HealthController.d.ts index 5482283..5a0a0a6 100644 --- a/TypeScript/9RouterHooks/types/controllers/HealthController.d.ts +++ b/TypeScript/9RouterHooks/types/controllers/HealthController.d.ts @@ -12,8 +12,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthController { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/9RouterHooks/types/controllers/HideoutController.d.ts b/TypeScript/9RouterHooks/types/controllers/HideoutController.d.ts index e9d1ed9..89a428c 100644 --- a/TypeScript/9RouterHooks/types/controllers/HideoutController.d.ts +++ b/TypeScript/9RouterHooks/types/controllers/HideoutController.d.ts @@ -35,11 +35,11 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; import { ProfileActivityService } from "@spt/services/ProfileActivityService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/9RouterHooks/types/controllers/InraidController.d.ts b/TypeScript/9RouterHooks/types/controllers/InraidController.d.ts index 87f419b..9f0c409 100644 --- a/TypeScript/9RouterHooks/types/controllers/InraidController.d.ts +++ b/TypeScript/9RouterHooks/types/controllers/InraidController.d.ts @@ -13,6 +13,7 @@ import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRe import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState"; import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig"; import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; @@ -31,7 +32,6 @@ import { PmcChatResponseService } from "@spt/services/PmcChatResponseService"; import { TraderServicesService } from "@spt/services/TraderServicesService"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; -import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; /** * Logic for handling In Raid callbacks */ diff --git a/TypeScript/9RouterHooks/types/controllers/InsuranceController.d.ts b/TypeScript/9RouterHooks/types/controllers/InsuranceController.d.ts index f921b83..543e915 100644 --- a/TypeScript/9RouterHooks/types/controllers/InsuranceController.d.ts +++ b/TypeScript/9RouterHooks/types/controllers/InsuranceController.d.ts @@ -21,11 +21,11 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PaymentService } from "@spt/services/PaymentService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceController { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/9RouterHooks/types/controllers/InventoryController.d.ts b/TypeScript/9RouterHooks/types/controllers/InventoryController.d.ts index 40bb084..c986ce8 100644 --- a/TypeScript/9RouterHooks/types/controllers/InventoryController.d.ts +++ b/TypeScript/9RouterHooks/types/controllers/InventoryController.d.ts @@ -37,10 +37,10 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MapMarkerService } from "@spt/services/MapMarkerService"; import { PlayerService } from "@spt/services/PlayerService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/9RouterHooks/types/controllers/LocationController.d.ts b/TypeScript/9RouterHooks/types/controllers/LocationController.d.ts index 727a8c8..a541b9c 100644 --- a/TypeScript/9RouterHooks/types/controllers/LocationController.d.ts +++ b/TypeScript/9RouterHooks/types/controllers/LocationController.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class LocationController { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; diff --git a/TypeScript/9RouterHooks/types/controllers/ProfileController.d.ts b/TypeScript/9RouterHooks/types/controllers/ProfileController.d.ts index e8dae73..7e6d35c 100644 --- a/TypeScript/9RouterHooks/types/controllers/ProfileController.d.ts +++ b/TypeScript/9RouterHooks/types/controllers/ProfileController.d.ts @@ -26,9 +26,9 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileController { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/9RouterHooks/types/controllers/QuestController.d.ts b/TypeScript/9RouterHooks/types/controllers/QuestController.d.ts index 3cdce00..6a5b415 100644 --- a/TypeScript/9RouterHooks/types/controllers/QuestController.d.ts +++ b/TypeScript/9RouterHooks/types/controllers/QuestController.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/9RouterHooks/types/controllers/RepeatableQuestController.d.ts b/TypeScript/9RouterHooks/types/controllers/RepeatableQuestController.d.ts index 74f39eb..016f8c6 100644 --- a/TypeScript/9RouterHooks/types/controllers/RepeatableQuestController.d.ts +++ b/TypeScript/9RouterHooks/types/controllers/RepeatableQuestController.d.ts @@ -18,11 +18,11 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestController { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/9RouterHooks/types/controllers/TradeController.d.ts b/TypeScript/9RouterHooks/types/controllers/TradeController.d.ts index bc72e92..842a97b 100644 --- a/TypeScript/9RouterHooks/types/controllers/TradeController.d.ts +++ b/TypeScript/9RouterHooks/types/controllers/TradeController.d.ts @@ -1,5 +1,6 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper"; import { TradeHelper } from "@spt/helpers/TradeHelper"; import { TraderHelper } from "@spt/helpers/TraderHelper"; import { IPmcData } from "@spt/models/eft/common/IPmcData"; @@ -35,6 +36,7 @@ export declare class TradeController { protected hashUtil: HashUtil; protected itemHelper: ItemHelper; protected profileHelper: ProfileHelper; + protected ragfairOfferHelper: RagfairOfferHelper; protected traderHelper: TraderHelper; protected ragfairServer: RagfairServer; protected httpResponse: HttpResponseUtil; @@ -44,7 +46,7 @@ export declare class TradeController { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected traderConfig: ITraderConfig; - constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairOfferHelper: RagfairOfferHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer); /** Handle TradingConfirm event */ confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; /** Handle RagFairBuyOffer event */ @@ -67,10 +69,17 @@ export declare class TradeController { * @param output Output to send back to client */ protected buyPmcItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void; + /** + * Is the provided offerid and ownerid from a player made offer + * @param offerId Id of the offer + * @param offerOwnerId Owner id + * @returns true if offer was made by a player + */ + protected isPlayerOffer(offerId: string, offerOwnerId: string): boolean; /** * Does Player have necessary trader loyalty to purchase flea offer * @param sellerIsTrader is seller trader - * @param fleaOffer FLea offer being bought + * @param fleaOffer Flea offer being bought * @param pmcData Player profile * @returns True if player can buy offer */ diff --git a/TypeScript/9RouterHooks/types/controllers/TraderController.d.ts b/TypeScript/9RouterHooks/types/controllers/TraderController.d.ts index 7fc6d78..3592fc6 100644 --- a/TypeScript/9RouterHooks/types/controllers/TraderController.d.ts +++ b/TypeScript/9RouterHooks/types/controllers/TraderController.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderController { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/9RouterHooks/types/generators/BotEquipmentModGenerator.d.ts b/TypeScript/9RouterHooks/types/generators/BotEquipmentModGenerator.d.ts index 419120f..3952293 100644 --- a/TypeScript/9RouterHooks/types/generators/BotEquipmentModGenerator.d.ts +++ b/TypeScript/9RouterHooks/types/generators/BotEquipmentModGenerator.d.ts @@ -25,9 +25,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotEquipmentModGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -65,7 +65,7 @@ export declare class BotEquipmentModGenerator { * @param settings Bot equipment generation settings * @param modSlot Armor slot being filtered * @param existingPlateTplPool Plates tpls to choose from - * @param armorItem + * @param armorItem The armor items db template * @returns Array of plate tpls to choose from */ protected filterPlateModsForSlotByLevel(settings: IGenerateEquipmentProperties, modSlot: string, existingPlateTplPool: string[], armorItem: ITemplateItem): IFilterPlateModsForSlotByLevelResult; diff --git a/TypeScript/9RouterHooks/types/generators/BotGenerator.d.ts b/TypeScript/9RouterHooks/types/generators/BotGenerator.d.ts index 8ab4371..ebb8a59 100644 --- a/TypeScript/9RouterHooks/types/generators/BotGenerator.d.ts +++ b/TypeScript/9RouterHooks/types/generators/BotGenerator.d.ts @@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/9RouterHooks/types/generators/BotLevelGenerator.d.ts b/TypeScript/9RouterHooks/types/generators/BotLevelGenerator.d.ts index dee61e2..a8a8895 100644 --- a/TypeScript/9RouterHooks/types/generators/BotLevelGenerator.d.ts +++ b/TypeScript/9RouterHooks/types/generators/BotLevelGenerator.d.ts @@ -4,12 +4,14 @@ import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; +import { MathUtil } from "@spt/utils/MathUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class BotLevelGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; protected databaseService: DatabaseService; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService); + protected mathUtil: MathUtil; + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, mathUtil: MathUtil); /** * Return a randomised bot level and exp value * @param levelDetails Min and max of level for bot @@ -18,6 +20,7 @@ export declare class BotLevelGenerator { * @returns IRandomisedBotLevelResult object */ generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult; + protected chooseBotLevel(min: number, max: number, shift: number, number: number): number; /** * Get the highest level a bot can be relative to the players level, but no further than the max size from globals.exp_table * @param botGenerationDetails Details to help generate a bot diff --git a/TypeScript/9RouterHooks/types/generators/BotLootGenerator.d.ts b/TypeScript/9RouterHooks/types/generators/BotLootGenerator.d.ts index fee56ce..c0583c6 100644 --- a/TypeScript/9RouterHooks/types/generators/BotLootGenerator.d.ts +++ b/TypeScript/9RouterHooks/types/generators/BotLootGenerator.d.ts @@ -18,9 +18,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/9RouterHooks/types/generators/BotWeaponGenerator.d.ts b/TypeScript/9RouterHooks/types/generators/BotWeaponGenerator.d.ts index 5559bfa..8e03b35 100644 --- a/TypeScript/9RouterHooks/types/generators/BotWeaponGenerator.d.ts +++ b/TypeScript/9RouterHooks/types/generators/BotWeaponGenerator.d.ts @@ -18,9 +18,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RepairService } from "@spt/services/RepairService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotWeaponGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/9RouterHooks/types/generators/LocationGenerator.d.ts b/TypeScript/9RouterHooks/types/generators/LocationGenerator.d.ts index 222b0ab..9a2b0c4 100644 --- a/TypeScript/9RouterHooks/types/generators/LocationGenerator.d.ts +++ b/TypeScript/9RouterHooks/types/generators/LocationGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export interface IContainerItem { items: Item[]; width: number; diff --git a/TypeScript/9RouterHooks/types/generators/PlayerScavGenerator.d.ts b/TypeScript/9RouterHooks/types/generators/PlayerScavGenerator.d.ts index 2414150..e317bf6 100644 --- a/TypeScript/9RouterHooks/types/generators/PlayerScavGenerator.d.ts +++ b/TypeScript/9RouterHooks/types/generators/PlayerScavGenerator.d.ts @@ -14,9 +14,9 @@ import { BotLootCacheService } from "@spt/services/BotLootCacheService"; import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class PlayerScavGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/9RouterHooks/types/generators/RagfairOfferGenerator.d.ts b/TypeScript/9RouterHooks/types/generators/RagfairOfferGenerator.d.ts index 9435390..ca09729 100644 --- a/TypeScript/9RouterHooks/types/generators/RagfairOfferGenerator.d.ts +++ b/TypeScript/9RouterHooks/types/generators/RagfairOfferGenerator.d.ts @@ -19,10 +19,10 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RagfairOfferService } from "@spt/services/RagfairOfferService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferGenerator { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/9RouterHooks/types/generators/RepeatableQuestGenerator.d.ts b/TypeScript/9RouterHooks/types/generators/RepeatableQuestGenerator.d.ts index 77c4e79..339f322 100644 --- a/TypeScript/9RouterHooks/types/generators/RepeatableQuestGenerator.d.ts +++ b/TypeScript/9RouterHooks/types/generators/RepeatableQuestGenerator.d.ts @@ -11,10 +11,10 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/9RouterHooks/types/generators/RepeatableQuestRewardGenerator.d.ts b/TypeScript/9RouterHooks/types/generators/RepeatableQuestRewardGenerator.d.ts index 1e09994..713a394 100644 --- a/TypeScript/9RouterHooks/types/generators/RepeatableQuestRewardGenerator.d.ts +++ b/TypeScript/9RouterHooks/types/generators/RepeatableQuestRewardGenerator.d.ts @@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestRewardGenerator { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/9RouterHooks/types/helpers/BotDifficultyHelper.d.ts b/TypeScript/9RouterHooks/types/helpers/BotDifficultyHelper.d.ts index 63572a5..2348bd3 100644 --- a/TypeScript/9RouterHooks/types/helpers/BotDifficultyHelper.d.ts +++ b/TypeScript/9RouterHooks/types/helpers/BotDifficultyHelper.d.ts @@ -5,8 +5,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BotDifficultyHelper { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/9RouterHooks/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/9RouterHooks/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index c51bf7e..c38f0a0 100644 --- a/TypeScript/9RouterHooks/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/9RouterHooks/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class GiveSptCommand implements ISptCommand { protected logger: ILogger; protected itemHelper: ItemHelper; diff --git a/TypeScript/9RouterHooks/types/helpers/HealthHelper.d.ts b/TypeScript/9RouterHooks/types/helpers/HealthHelper.d.ts index 650f633..a164285 100644 --- a/TypeScript/9RouterHooks/types/helpers/HealthHelper.d.ts +++ b/TypeScript/9RouterHooks/types/helpers/HealthHelper.d.ts @@ -5,8 +5,8 @@ import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HealthHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/9RouterHooks/types/helpers/HideoutHelper.d.ts b/TypeScript/9RouterHooks/types/helpers/HideoutHelper.d.ts index c4aaa4c..df0376b 100644 --- a/TypeScript/9RouterHooks/types/helpers/HideoutHelper.d.ts +++ b/TypeScript/9RouterHooks/types/helpers/HideoutHelper.d.ts @@ -18,10 +18,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class HideoutHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/9RouterHooks/types/helpers/InRaidHelper.d.ts b/TypeScript/9RouterHooks/types/helpers/InRaidHelper.d.ts index 449be9f..987c9ec 100644 --- a/TypeScript/9RouterHooks/types/helpers/InRaidHelper.d.ts +++ b/TypeScript/9RouterHooks/types/helpers/InRaidHelper.d.ts @@ -15,9 +15,9 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileFixerService } from "@spt/services/ProfileFixerService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InRaidHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/9RouterHooks/types/helpers/InventoryHelper.d.ts b/TypeScript/9RouterHooks/types/helpers/InventoryHelper.d.ts index f0ff69a..92bb49c 100644 --- a/TypeScript/9RouterHooks/types/helpers/InventoryHelper.d.ts +++ b/TypeScript/9RouterHooks/types/helpers/InventoryHelper.d.ts @@ -23,9 +23,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InventoryHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/9RouterHooks/types/helpers/ItemHelper.d.ts b/TypeScript/9RouterHooks/types/helpers/ItemHelper.d.ts index da5dd11..c304cee 100644 --- a/TypeScript/9RouterHooks/types/helpers/ItemHelper.d.ts +++ b/TypeScript/9RouterHooks/types/helpers/ItemHelper.d.ts @@ -11,13 +11,13 @@ import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { CompareUtil } from "@spt/utils/CompareUtil"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { MathUtil } from "@spt/utils/MathUtil"; import { ObjectId } from "@spt/utils/ObjectId"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ItemHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/9RouterHooks/types/helpers/ProfileHelper.d.ts b/TypeScript/9RouterHooks/types/helpers/ProfileHelper.d.ts index 0671179..cdab870 100644 --- a/TypeScript/9RouterHooks/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/9RouterHooks/types/helpers/ProfileHelper.d.ts @@ -11,10 +11,10 @@ import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileHelper { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/9RouterHooks/types/helpers/QuestHelper.d.ts b/TypeScript/9RouterHooks/types/helpers/QuestHelper.d.ts index 2b84b8f..2d5730d 100644 --- a/TypeScript/9RouterHooks/types/helpers/QuestHelper.d.ts +++ b/TypeScript/9RouterHooks/types/helpers/QuestHelper.d.ts @@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; import { SeasonalEventService } from "@spt/services/SeasonalEventService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class QuestHelper { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/9RouterHooks/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/9RouterHooks/types/helpers/RagfairOfferHelper.d.ts index b526554..2386316 100644 --- a/TypeScript/9RouterHooks/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/9RouterHooks/types/helpers/RagfairOfferHelper.d.ts @@ -151,7 +151,7 @@ export declare class RagfairOfferHelper { * @param boughtAmount Amount item was purchased for * @returns IItemEventRouterResponse */ - protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; + completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; /** * Get a localised message for when players offer has sold on flea * @param itemTpl Item sold diff --git a/TypeScript/9RouterHooks/types/helpers/RagfairServerHelper.d.ts b/TypeScript/9RouterHooks/types/helpers/RagfairServerHelper.d.ts index 927caf5..3e1fea9 100644 --- a/TypeScript/9RouterHooks/types/helpers/RagfairServerHelper.d.ts +++ b/TypeScript/9RouterHooks/types/helpers/RagfairServerHelper.d.ts @@ -12,9 +12,9 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Helper class for common ragfair server actions */ diff --git a/TypeScript/9RouterHooks/types/helpers/RepairHelper.d.ts b/TypeScript/9RouterHooks/types/helpers/RepairHelper.d.ts index 99a21da..63c78c9 100644 --- a/TypeScript/9RouterHooks/types/helpers/RepairHelper.d.ts +++ b/TypeScript/9RouterHooks/types/helpers/RepairHelper.d.ts @@ -4,8 +4,8 @@ import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/9RouterHooks/types/helpers/RepeatableQuestHelper.d.ts b/TypeScript/9RouterHooks/types/helpers/RepeatableQuestHelper.d.ts index d92657e..8c65f40 100644 --- a/TypeScript/9RouterHooks/types/helpers/RepeatableQuestHelper.d.ts +++ b/TypeScript/9RouterHooks/types/helpers/RepeatableQuestHelper.d.ts @@ -1,8 +1,8 @@ import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RepeatableQuestHelper { protected mathUtil: MathUtil; protected configServer: ConfigServer; diff --git a/TypeScript/9RouterHooks/types/helpers/TradeHelper.d.ts b/TypeScript/9RouterHooks/types/helpers/TradeHelper.d.ts index f994fda..6e6f3a2 100644 --- a/TypeScript/9RouterHooks/types/helpers/TradeHelper.d.ts +++ b/TypeScript/9RouterHooks/types/helpers/TradeHelper.d.ts @@ -17,8 +17,8 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TradeHelper { protected logger: ILogger; protected eventOutputHolder: EventOutputHolder; diff --git a/TypeScript/9RouterHooks/types/helpers/TraderAssortHelper.d.ts b/TypeScript/9RouterHooks/types/helpers/TraderAssortHelper.d.ts index 8f8f802..f1ecd3b 100644 --- a/TypeScript/9RouterHooks/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/9RouterHooks/types/helpers/TraderAssortHelper.d.ts @@ -14,9 +14,9 @@ import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; diff --git a/TypeScript/9RouterHooks/types/loaders/BundleLoader.d.ts b/TypeScript/9RouterHooks/types/loaders/BundleLoader.d.ts index e270988..8c0ed4d 100644 --- a/TypeScript/9RouterHooks/types/loaders/BundleLoader.d.ts +++ b/TypeScript/9RouterHooks/types/loaders/BundleLoader.d.ts @@ -1,8 +1,8 @@ import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class BundleInfo { modpath: string; filename: string; diff --git a/TypeScript/9RouterHooks/types/loaders/PostDBModLoader.d.ts b/TypeScript/9RouterHooks/types/loaders/PostDBModLoader.d.ts index b0c4bf4..a8bb6a9 100644 --- a/TypeScript/9RouterHooks/types/loaders/PostDBModLoader.d.ts +++ b/TypeScript/9RouterHooks/types/loaders/PostDBModLoader.d.ts @@ -1,10 +1,10 @@ -import { DependencyContainer } from "tsyringe"; import { OnLoad } from "@spt/di/OnLoad"; import { BundleLoader } from "@spt/loaders/BundleLoader"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostDBModLoader implements OnLoad { protected logger: ILogger; protected bundleLoader: BundleLoader; diff --git a/TypeScript/9RouterHooks/types/loaders/PostSptModLoader.d.ts b/TypeScript/9RouterHooks/types/loaders/PostSptModLoader.d.ts index fb54579..2603497 100644 --- a/TypeScript/9RouterHooks/types/loaders/PostSptModLoader.d.ts +++ b/TypeScript/9RouterHooks/types/loaders/PostSptModLoader.d.ts @@ -1,9 +1,9 @@ -import { DependencyContainer } from "tsyringe"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { IModLoader } from "@spt/models/spt/mod/IModLoader"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { LocalisationService } from "@spt/services/LocalisationService"; +import { DependencyContainer } from "tsyringe"; export declare class PostSptModLoader implements IModLoader { protected logger: ILogger; protected preSptModLoader: PreSptModLoader; diff --git a/TypeScript/9RouterHooks/types/loaders/PreSptModLoader.d.ts b/TypeScript/9RouterHooks/types/loaders/PreSptModLoader.d.ts index bc846c8..8814525 100644 --- a/TypeScript/9RouterHooks/types/loaders/PreSptModLoader.d.ts +++ b/TypeScript/9RouterHooks/types/loaders/PreSptModLoader.d.ts @@ -1,4 +1,3 @@ -import { DependencyContainer } from "tsyringe"; import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; import { ModDetails } from "@spt/models/eft/profile/ISptProfile"; @@ -11,6 +10,7 @@ import { LocalisationService } from "@spt/services/LocalisationService"; import { ModCompilerService } from "@spt/services/ModCompilerService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { VFS } from "@spt/utils/VFS"; +import { DependencyContainer } from "tsyringe"; export declare class PreSptModLoader implements IModLoader { protected logger: ILogger; protected vfs: VFS; diff --git a/TypeScript/9RouterHooks/types/models/eft/common/IEmptyRequestData.d.ts b/TypeScript/9RouterHooks/types/models/eft/common/IEmptyRequestData.d.ts index 284d16e..52a7b12 100644 --- a/TypeScript/9RouterHooks/types/models/eft/common/IEmptyRequestData.d.ts +++ b/TypeScript/9RouterHooks/types/models/eft/common/IEmptyRequestData.d.ts @@ -1,2 +1 @@ -export interface IEmptyRequestData { -} +export type IEmptyRequestData = {}; diff --git a/TypeScript/9RouterHooks/types/models/eft/common/tables/IBotBase.d.ts b/TypeScript/9RouterHooks/types/models/eft/common/tables/IBotBase.d.ts index a7fe1ca..be37845 100644 --- a/TypeScript/9RouterHooks/types/models/eft/common/tables/IBotBase.d.ts +++ b/TypeScript/9RouterHooks/types/models/eft/common/tables/IBotBase.d.ts @@ -373,8 +373,7 @@ export interface LastCompleted { export interface Notes { Notes: Note[]; } -export interface CarExtractCounts { -} +export type CarExtractCounts = {}; export declare enum SurvivorClass { UNKNOWN = 0, NEUTRALIZER = 1, diff --git a/TypeScript/9RouterHooks/types/models/eft/common/tables/ILocationsBase.d.ts b/TypeScript/9RouterHooks/types/models/eft/common/tables/ILocationsBase.d.ts index 2c96af3..16bca24 100644 --- a/TypeScript/9RouterHooks/types/models/eft/common/tables/ILocationsBase.d.ts +++ b/TypeScript/9RouterHooks/types/models/eft/common/tables/ILocationsBase.d.ts @@ -2,8 +2,7 @@ export interface ILocationsBase { locations: Locations; paths: Path[]; } -export interface Locations { -} +export type Locations = {}; export interface Path { Source: string; Destination: string; diff --git a/TypeScript/9RouterHooks/types/models/eft/common/tables/IProfileTemplate.d.ts b/TypeScript/9RouterHooks/types/models/eft/common/tables/IProfileTemplate.d.ts index 20923bc..6ba9221 100644 --- a/TypeScript/9RouterHooks/types/models/eft/common/tables/IProfileTemplate.d.ts +++ b/TypeScript/9RouterHooks/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -1,12 +1,12 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { Dialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; export interface IProfileTemplates { - "Standard": IProfileSides; + Standard: IProfileSides; "Left Behind": IProfileSides; "Prepare To Escape": IProfileSides; "Edge Of Darkness": IProfileSides; - "Unheard": IProfileSides; - "Tournament": IProfileSides; + Unheard: IProfileSides; + Tournament: IProfileSides; "SPT Developer": IProfileSides; "SPT Easy start": IProfileSides; "SPT Zero to hero": IProfileSides; diff --git a/TypeScript/9RouterHooks/types/models/eft/common/tables/ITrader.d.ts b/TypeScript/9RouterHooks/types/models/eft/common/tables/ITrader.d.ts index 14ab409..40cf004 100644 --- a/TypeScript/9RouterHooks/types/models/eft/common/tables/ITrader.d.ts +++ b/TypeScript/9RouterHooks/types/models/eft/common/tables/ITrader.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; export interface ITrader { assort?: ITraderAssort; @@ -78,6 +79,8 @@ export interface IBarterScheme { _tpl: string; onlyFunctional?: boolean; sptQuestLocked?: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface ISuit { _id: string; diff --git a/TypeScript/9RouterHooks/types/models/eft/hideout/IQteData.d.ts b/TypeScript/9RouterHooks/types/models/eft/hideout/IQteData.d.ts index 7f507e1..fe6cce6 100644 --- a/TypeScript/9RouterHooks/types/models/eft/hideout/IQteData.d.ts +++ b/TypeScript/9RouterHooks/types/models/eft/hideout/IQteData.d.ts @@ -1,14 +1,14 @@ import { Effect } from "@spt/models/eft/health/Effect"; import { BodyPart } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; import { QteActivityType } from "@spt/models/enums/hideout/QteActivityType"; import { QteEffectType } from "@spt/models/enums/hideout/QteEffectType"; import { QteResultType } from "@spt/models/enums/hideout/QteResultType"; import { QteRewardType } from "@spt/models/enums/hideout/QteRewardType"; import { QteType } from "@spt/models/enums/hideout/QteType"; import { RequirementType } from "@spt/models/enums/hideout/RequirementType"; -import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt/models/enums/SkillTypes"; -import { Traders } from "@spt/models/enums/Traders"; export interface IQteData { id: string; type: QteActivityType; diff --git a/TypeScript/9RouterHooks/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/TypeScript/9RouterHooks/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index f1123c1..5971372 100644 --- a/TypeScript/9RouterHooks/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/TypeScript/9RouterHooks/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -15,7 +15,5 @@ export interface Items { change: any[]; del: any[]; } -export interface Production { -} -export interface TraderRelations { -} +export type Production = {}; +export type TraderRelations = {}; diff --git a/TypeScript/9RouterHooks/types/models/eft/profile/ISptProfile.d.ts b/TypeScript/9RouterHooks/types/models/eft/profile/ISptProfile.d.ts index a8e742a..dd7aea6 100644 --- a/TypeScript/9RouterHooks/types/models/eft/profile/ISptProfile.d.ts +++ b/TypeScript/9RouterHooks/types/models/eft/profile/ISptProfile.d.ts @@ -209,12 +209,9 @@ export interface Effects { LeftLeg: LeftLeg; RightLeg: RightLeg; } -export interface Head { -} -export interface Chest { -} -export interface Stomach { -} +export type Head = {}; +export type Chest = {}; +export type Stomach = {}; export interface LeftArm { Fracture?: number; } diff --git a/TypeScript/9RouterHooks/types/models/eft/ragfair/IRagfairOffer.d.ts b/TypeScript/9RouterHooks/types/models/eft/ragfair/IRagfairOffer.d.ts index eeeb79d..f6c07fc 100644 --- a/TypeScript/9RouterHooks/types/models/eft/ragfair/IRagfairOffer.d.ts +++ b/TypeScript/9RouterHooks/types/models/eft/ragfair/IRagfairOffer.d.ts @@ -1,4 +1,5 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; +import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide"; import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface IRagfairOffer { sellResult?: SellResult[]; @@ -28,6 +29,8 @@ export interface OfferRequirement { _tpl: string; count: number; onlyFunctional: boolean; + level?: number; + side?: DogtagExchangeSide; } export interface IRagfairOfferUser { id: string; diff --git a/TypeScript/9RouterHooks/types/models/eft/ragfair/ISearchRequestData.d.ts b/TypeScript/9RouterHooks/types/models/eft/ragfair/ISearchRequestData.d.ts index 8261c5b..c631de8 100644 --- a/TypeScript/9RouterHooks/types/models/eft/ragfair/ISearchRequestData.d.ts +++ b/TypeScript/9RouterHooks/types/models/eft/ragfair/ISearchRequestData.d.ts @@ -29,5 +29,4 @@ export declare enum OfferOwnerType { TRADEROWNERTYPE = 1, PLAYEROWNERTYPE = 2 } -export interface BuildItems { -} +export type BuildItems = {}; diff --git a/TypeScript/9RouterHooks/types/models/enums/BaseClasses.d.ts b/TypeScript/9RouterHooks/types/models/enums/BaseClasses.d.ts index 65fc95e..32ebf7c 100644 --- a/TypeScript/9RouterHooks/types/models/enums/BaseClasses.d.ts +++ b/TypeScript/9RouterHooks/types/models/enums/BaseClasses.d.ts @@ -107,6 +107,6 @@ export declare enum BaseClasses { RECEIVER = "55818a304bdc2db5418b457d", BARREL = "555ef6e44bdc2de9068b457e", CHARGING_HANDLE = "55818a6f4bdc2db9688b456b", - COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569 ", + COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569", HIDEOUT_AREA_CONTAINER = "63da6da4784a55176c018dba" } diff --git a/TypeScript/9RouterHooks/types/models/enums/DogtagExchangeSide.d.ts b/TypeScript/9RouterHooks/types/models/enums/DogtagExchangeSide.d.ts new file mode 100644 index 0000000..de3d4df --- /dev/null +++ b/TypeScript/9RouterHooks/types/models/enums/DogtagExchangeSide.d.ts @@ -0,0 +1,5 @@ +export declare enum DogtagExchangeSide { + USEC = "Usec", + BEAR = "Bear", + ANY = "Any" +} diff --git a/TypeScript/9RouterHooks/types/models/spt/server/ExhaustableArray.d.ts b/TypeScript/9RouterHooks/types/models/spt/server/ExhaustableArray.d.ts index c27f41f..50a6b68 100644 --- a/TypeScript/9RouterHooks/types/models/spt/server/ExhaustableArray.d.ts +++ b/TypeScript/9RouterHooks/types/models/spt/server/ExhaustableArray.d.ts @@ -1,5 +1,5 @@ -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ExhaustableArray implements IExhaustableArray { private itemPool; private randomUtil; diff --git a/TypeScript/9RouterHooks/types/routers/EventOutputHolder.d.ts b/TypeScript/9RouterHooks/types/routers/EventOutputHolder.d.ts index ef20706..148461a 100644 --- a/TypeScript/9RouterHooks/types/routers/EventOutputHolder.d.ts +++ b/TypeScript/9RouterHooks/types/routers/EventOutputHolder.d.ts @@ -3,8 +3,8 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IHideoutImprovement, Productive, TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; import { TraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class EventOutputHolder { protected profileHelper: ProfileHelper; protected timeUtil: TimeUtil; @@ -12,7 +12,7 @@ export declare class EventOutputHolder { /** * What has client been informed of this game session * Key = sessionId, then second key is prod id - */ + */ protected clientActiveSessionStorage: Record>; diff --git a/TypeScript/9RouterHooks/types/servers/HttpServer.d.ts b/TypeScript/9RouterHooks/types/servers/HttpServer.d.ts index b00fe68..0024ba3 100644 --- a/TypeScript/9RouterHooks/types/servers/HttpServer.d.ts +++ b/TypeScript/9RouterHooks/types/servers/HttpServer.d.ts @@ -6,8 +6,8 @@ import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; -import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { WebSocketServer } from "@spt/servers/WebSocketServer"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; import { LocalisationService } from "@spt/services/LocalisationService"; export declare class HttpServer { protected logger: ILogger; diff --git a/TypeScript/9RouterHooks/types/servers/WebSocketServer.d.ts b/TypeScript/9RouterHooks/types/servers/WebSocketServer.d.ts index f4e07bb..6121824 100644 --- a/TypeScript/9RouterHooks/types/servers/WebSocketServer.d.ts +++ b/TypeScript/9RouterHooks/types/servers/WebSocketServer.d.ts @@ -1,12 +1,12 @@ /// import http, { IncomingMessage } from "node:http"; -import { WebSocket, Server } from "ws"; import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { Server, WebSocket } from "ws"; export declare class WebSocketServer { protected logger: ILogger; protected randomUtil: RandomUtil; diff --git a/TypeScript/9RouterHooks/types/servers/ws/SptWebSocketConnectionHandler.d.ts b/TypeScript/9RouterHooks/types/servers/ws/SptWebSocketConnectionHandler.d.ts index 98d0898..70fc96a 100644 --- a/TypeScript/9RouterHooks/types/servers/ws/SptWebSocketConnectionHandler.d.ts +++ b/TypeScript/9RouterHooks/types/servers/ws/SptWebSocketConnectionHandler.d.ts @@ -1,7 +1,6 @@ /// /// import { IncomingMessage } from "http"; -import { WebSocket } from "ws"; import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; @@ -11,6 +10,7 @@ import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectio import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; import { LocalisationService } from "@spt/services/LocalisationService"; import { JsonUtil } from "@spt/utils/JsonUtil"; +import { WebSocket } from "ws"; export declare class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler { protected logger: ILogger; protected profileHelper: ProfileHelper; diff --git a/TypeScript/9RouterHooks/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts b/TypeScript/9RouterHooks/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts index d5247ec..5556129 100644 --- a/TypeScript/9RouterHooks/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts +++ b/TypeScript/9RouterHooks/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts @@ -1,6 +1,6 @@ -import { RawData, WebSocket } from "ws"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; +import { RawData, WebSocket } from "ws"; export declare class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler { protected logger: ILogger; constructor(logger: ILogger); diff --git a/TypeScript/9RouterHooks/types/services/FenceService.d.ts b/TypeScript/9RouterHooks/types/services/FenceService.d.ts index c156122..58dc076 100644 --- a/TypeScript/9RouterHooks/types/services/FenceService.d.ts +++ b/TypeScript/9RouterHooks/types/services/FenceService.d.ts @@ -13,9 +13,9 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Handle actions surrounding Fence * e.g. generating or refreshing assorts / get next refresh time diff --git a/TypeScript/9RouterHooks/types/services/InsuranceService.d.ts b/TypeScript/9RouterHooks/types/services/InsuranceService.d.ts index 0000e66..f799102 100644 --- a/TypeScript/9RouterHooks/types/services/InsuranceService.d.ts +++ b/TypeScript/9RouterHooks/types/services/InsuranceService.d.ts @@ -18,10 +18,10 @@ import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class InsuranceService { protected logger: ILogger; protected databaseService: DatabaseService; diff --git a/TypeScript/9RouterHooks/types/services/LocalisationService.d.ts b/TypeScript/9RouterHooks/types/services/LocalisationService.d.ts index 42dfa4e..855c138 100644 --- a/TypeScript/9RouterHooks/types/services/LocalisationService.d.ts +++ b/TypeScript/9RouterHooks/types/services/LocalisationService.d.ts @@ -1,8 +1,8 @@ -import { I18n } from "i18n"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { LocaleService } from "@spt/services/LocaleService"; import { RandomUtil } from "@spt/utils/RandomUtil"; +import { I18n } from "i18n"; /** * Handles translating server text into different langauges */ diff --git a/TypeScript/9RouterHooks/types/services/ProfileFixerService.d.ts b/TypeScript/9RouterHooks/types/services/ProfileFixerService.d.ts index 525b867..91e4780 100644 --- a/TypeScript/9RouterHooks/types/services/ProfileFixerService.d.ts +++ b/TypeScript/9RouterHooks/types/services/ProfileFixerService.d.ts @@ -8,7 +8,7 @@ import { Bonus, HideoutSlot } from "@spt/models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea"; -import { ISptProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; +import { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; @@ -16,11 +16,11 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; import { JsonUtil } from "@spt/utils/JsonUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; import { Watermark } from "@spt/utils/Watermark"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class ProfileFixerService { protected logger: ILogger; protected watermark: Watermark; @@ -73,6 +73,7 @@ export declare class ProfileFixerService { */ protected removeDanglingTaskConditionCounters(pmcProfile: IPmcData): void; protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullRagfairRatings(pmcProfile: IPmcData): void; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; /** diff --git a/TypeScript/9RouterHooks/types/services/RagfairOfferService.d.ts b/TypeScript/9RouterHooks/types/services/RagfairOfferService.d.ts index 6c13b1d..98dd179 100644 --- a/TypeScript/9RouterHooks/types/services/RagfairOfferService.d.ts +++ b/TypeScript/9RouterHooks/types/services/RagfairOfferService.d.ts @@ -10,10 +10,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer"; import { SaveServer } from "@spt/servers/SaveServer"; import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; import { TimeUtil } from "@spt/utils/TimeUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; diff --git a/TypeScript/9RouterHooks/types/services/mod/CustomItemService.d.ts b/TypeScript/9RouterHooks/types/services/mod/CustomItemService.d.ts index 1926bed..f112872 100644 --- a/TypeScript/9RouterHooks/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/9RouterHooks/types/services/mod/CustomItemService.d.ts @@ -4,8 +4,8 @@ import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetail import { ILogger } from "@spt/models/spt/utils/ILogger"; import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { HashUtil } from "@spt/utils/HashUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; diff --git a/TypeScript/9RouterHooks/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/TypeScript/9RouterHooks/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts index 3c9d955..91c84d9 100644 --- a/TypeScript/9RouterHooks/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts +++ b/TypeScript/9RouterHooks/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class DynamicRouterModService { private container; constructor(container: DependencyContainer); diff --git a/TypeScript/9RouterHooks/types/services/mod/staticRouter/StaticRouterModService.d.ts b/TypeScript/9RouterHooks/types/services/mod/staticRouter/StaticRouterModService.d.ts index f60432d..0c3d4d8 100644 --- a/TypeScript/9RouterHooks/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/TypeScript/9RouterHooks/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,5 +1,5 @@ -import { DependencyContainer } from "tsyringe"; import { RouteAction } from "@spt/di/Router"; +import { DependencyContainer } from "tsyringe"; export declare class StaticRouterModService { protected container: DependencyContainer; constructor(container: DependencyContainer); diff --git a/TypeScript/9RouterHooks/types/utils/JsonUtil.d.ts b/TypeScript/9RouterHooks/types/utils/JsonUtil.d.ts index b30822c..4419228 100644 --- a/TypeScript/9RouterHooks/types/utils/JsonUtil.d.ts +++ b/TypeScript/9RouterHooks/types/utils/JsonUtil.d.ts @@ -1,7 +1,7 @@ -import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { HashUtil } from "@spt/utils/HashUtil"; import { VFS } from "@spt/utils/VFS"; +import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; export declare class JsonUtil { protected vfs: VFS; protected hashUtil: HashUtil; diff --git a/TypeScript/9RouterHooks/types/utils/RandomUtil.d.ts b/TypeScript/9RouterHooks/types/utils/RandomUtil.d.ts index 49f242d..0da184f 100644 --- a/TypeScript/9RouterHooks/types/utils/RandomUtil.d.ts +++ b/TypeScript/9RouterHooks/types/utils/RandomUtil.d.ts @@ -1,6 +1,6 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { ICloner } from "@spt/utils/cloners/ICloner"; import { MathUtil } from "@spt/utils/MathUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; /** * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects * based on the relative probability of each of its elements. diff --git a/TypeScript/9RouterHooks/types/utils/logging/AbstractWinstonLogger.d.ts b/TypeScript/9RouterHooks/types/utils/logging/AbstractWinstonLogger.d.ts index 7098f85..ef54434 100644 --- a/TypeScript/9RouterHooks/types/utils/logging/AbstractWinstonLogger.d.ts +++ b/TypeScript/9RouterHooks/types/utils/logging/AbstractWinstonLogger.d.ts @@ -1,12 +1,12 @@ /// import fs from "node:fs"; -import winston from "winston"; import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; import { SptLogger } from "@spt/models/spt/logging/SptLogger"; import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; import { ILogger } from "@spt/models/spt/utils/ILogger"; +import winston from "winston"; export declare abstract class AbstractWinstonLogger implements ILogger { protected asyncQueue: IAsyncQueue; protected showDebugInConsole: boolean;